Commit 08694199 authored by Mike Christie's avatar Mike Christie Committed by Martin K. Petersen

scsi: target: core: Add gfp_t arg to target_cmd_init_cdb()

tcm_loop could be used like a normal block device, so we can't use
GFP_KERNEL and should use GFP_NOIO. This adds a gfp_t arg to
target_cmd_init_cdb() and converts the users. For every driver but loop
GFP_KERNEL is kept.

This will also be useful in subsequent patches where loop needs to do
target_submit_prep() from interrupt context to get a ref to the se_device,
and so it will need to use GFP_ATOMIC.

Link: https://lore.kernel.org/r/20210227170006.5077-16-michael.christie@oracle.comTested-by: default avatarLaurence Oberman <loberman@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMike Christie <michael.christie@oracle.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 0fa50a8b
...@@ -1537,7 +1537,8 @@ static void srpt_handle_cmd(struct srpt_rdma_ch *ch, ...@@ -1537,7 +1537,8 @@ static void srpt_handle_cmd(struct srpt_rdma_ch *ch,
goto busy; goto busy;
} }
if (target_submit_prep(cmd, srp_cmd->cdb, sg, sg_cnt, NULL, 0, NULL, 0)) if (target_submit_prep(cmd, srp_cmd->cdb, sg, sg_cnt, NULL, 0, NULL, 0,
GFP_KERNEL))
return; return;
target_submit(cmd); target_submit(cmd);
......
...@@ -492,7 +492,8 @@ static int tcm_qla2xxx_handle_cmd(scsi_qla_host_t *vha, struct qla_tgt_cmd *cmd, ...@@ -492,7 +492,8 @@ static int tcm_qla2xxx_handle_cmd(scsi_qla_host_t *vha, struct qla_tgt_cmd *cmd,
if (rc) if (rc)
return rc; return rc;
if (target_submit_prep(se_cmd, cdb, NULL, 0, NULL, 0, NULL, 0)) if (target_submit_prep(se_cmd, cdb, NULL, 0, NULL, 0, NULL, 0,
GFP_KERNEL))
return 0; return 0;
target_submit(se_cmd); target_submit(se_cmd);
......
...@@ -1166,7 +1166,8 @@ int iscsit_setup_scsi_cmd(struct iscsi_conn *conn, struct iscsi_cmd *cmd, ...@@ -1166,7 +1166,8 @@ int iscsit_setup_scsi_cmd(struct iscsi_conn *conn, struct iscsi_cmd *cmd,
target_get_sess_cmd(&cmd->se_cmd, true); target_get_sess_cmd(&cmd->se_cmd, true);
cmd->sense_reason = target_cmd_init_cdb(&cmd->se_cmd, hdr->cdb); cmd->sense_reason = target_cmd_init_cdb(&cmd->se_cmd, hdr->cdb,
GFP_KERNEL);
if (cmd->sense_reason) { if (cmd->sense_reason) {
if (cmd->sense_reason == TCM_OUT_OF_RESOURCES) { if (cmd->sense_reason == TCM_OUT_OF_RESOURCES) {
return iscsit_add_reject_cmd(cmd, return iscsit_add_reject_cmd(cmd,
......
...@@ -156,7 +156,8 @@ static void tcm_loop_submission_work(struct work_struct *work) ...@@ -156,7 +156,8 @@ static void tcm_loop_submission_work(struct work_struct *work)
if (target_submit_prep(se_cmd, sc->cmnd, scsi_sglist(sc), if (target_submit_prep(se_cmd, sc->cmnd, scsi_sglist(sc),
scsi_sg_count(sc), sgl_bidi, sgl_bidi_count, scsi_sg_count(sc), sgl_bidi, sgl_bidi_count,
scsi_prot_sglist(sc), scsi_prot_sg_count(sc))) scsi_prot_sglist(sc), scsi_prot_sg_count(sc),
GFP_NOIO))
return; return;
target_submit(se_cmd); target_submit(se_cmd);
......
...@@ -1429,7 +1429,7 @@ transport_check_alloc_task_attr(struct se_cmd *cmd) ...@@ -1429,7 +1429,7 @@ transport_check_alloc_task_attr(struct se_cmd *cmd)
} }
sense_reason_t sense_reason_t
target_cmd_init_cdb(struct se_cmd *cmd, unsigned char *cdb) target_cmd_init_cdb(struct se_cmd *cmd, unsigned char *cdb, gfp_t gfp)
{ {
sense_reason_t ret; sense_reason_t ret;
...@@ -1450,8 +1450,7 @@ target_cmd_init_cdb(struct se_cmd *cmd, unsigned char *cdb) ...@@ -1450,8 +1450,7 @@ target_cmd_init_cdb(struct se_cmd *cmd, unsigned char *cdb)
* setup the pointer from __t_task_cdb to t_task_cdb. * setup the pointer from __t_task_cdb to t_task_cdb.
*/ */
if (scsi_command_size(cdb) > sizeof(cmd->__t_task_cdb)) { if (scsi_command_size(cdb) > sizeof(cmd->__t_task_cdb)) {
cmd->t_task_cdb = kzalloc(scsi_command_size(cdb), cmd->t_task_cdb = kzalloc(scsi_command_size(cdb), gfp);
GFP_KERNEL);
if (!cmd->t_task_cdb) { if (!cmd->t_task_cdb) {
pr_err("Unable to allocate cmd->t_task_cdb" pr_err("Unable to allocate cmd->t_task_cdb"
" %u > sizeof(cmd->__t_task_cdb): %lu ops\n", " %u > sizeof(cmd->__t_task_cdb): %lu ops\n",
...@@ -1640,6 +1639,7 @@ EXPORT_SYMBOL_GPL(target_init_cmd); ...@@ -1640,6 +1639,7 @@ EXPORT_SYMBOL_GPL(target_init_cmd);
* @sgl_bidi_count: scatterlist count for bidirectional READ mapping * @sgl_bidi_count: scatterlist count for bidirectional READ mapping
* @sgl_prot: struct scatterlist memory protection information * @sgl_prot: struct scatterlist memory protection information
* @sgl_prot_count: scatterlist count for protection information * @sgl_prot_count: scatterlist count for protection information
* @gfp: gfp allocation type
* *
* Returns: * Returns:
* - less than zero to signal failure. * - less than zero to signal failure.
...@@ -1650,11 +1650,12 @@ EXPORT_SYMBOL_GPL(target_init_cmd); ...@@ -1650,11 +1650,12 @@ EXPORT_SYMBOL_GPL(target_init_cmd);
int target_submit_prep(struct se_cmd *se_cmd, unsigned char *cdb, int target_submit_prep(struct se_cmd *se_cmd, unsigned char *cdb,
struct scatterlist *sgl, u32 sgl_count, struct scatterlist *sgl, u32 sgl_count,
struct scatterlist *sgl_bidi, u32 sgl_bidi_count, struct scatterlist *sgl_bidi, u32 sgl_bidi_count,
struct scatterlist *sgl_prot, u32 sgl_prot_count) struct scatterlist *sgl_prot, u32 sgl_prot_count,
gfp_t gfp)
{ {
sense_reason_t rc; sense_reason_t rc;
rc = target_cmd_init_cdb(se_cmd, cdb); rc = target_cmd_init_cdb(se_cmd, cdb, gfp);
if (rc) if (rc)
goto send_cc_direct; goto send_cc_direct;
...@@ -1790,7 +1791,8 @@ void target_submit_cmd(struct se_cmd *se_cmd, struct se_session *se_sess, ...@@ -1790,7 +1791,8 @@ void target_submit_cmd(struct se_cmd *se_cmd, struct se_session *se_sess,
if (rc) if (rc)
return; return;
if (target_submit_prep(se_cmd, cdb, NULL, 0, NULL, 0, NULL, 0)) if (target_submit_prep(se_cmd, cdb, NULL, 0, NULL, 0, NULL, 0,
GFP_KERNEL))
return; return;
target_submit(se_cmd); target_submit(se_cmd);
......
...@@ -554,7 +554,7 @@ static int target_xcopy_setup_pt_cmd( ...@@ -554,7 +554,7 @@ static int target_xcopy_setup_pt_cmd(
} }
cmd->se_cmd_flags |= SCF_SE_LUN_CMD; cmd->se_cmd_flags |= SCF_SE_LUN_CMD;
if (target_cmd_init_cdb(cmd, cdb)) if (target_cmd_init_cdb(cmd, cdb, GFP_KERNEL))
return -EINVAL; return -EINVAL;
cmd->tag = 0; cmd->tag = 0;
......
...@@ -555,7 +555,7 @@ static void ft_send_work(struct work_struct *work) ...@@ -555,7 +555,7 @@ static void ft_send_work(struct work_struct *work)
goto err; goto err;
if (target_submit_prep(&cmd->se_cmd, fcp->fc_cdb, NULL, 0, NULL, 0, if (target_submit_prep(&cmd->se_cmd, fcp->fc_cdb, NULL, 0, NULL, 0,
NULL, 0)) NULL, 0, GFP_KERNEL))
return; return;
target_submit(&cmd->se_cmd); target_submit(&cmd->se_cmd);
......
...@@ -811,7 +811,7 @@ static void vhost_scsi_submission_work(struct work_struct *work) ...@@ -811,7 +811,7 @@ static void vhost_scsi_submission_work(struct work_struct *work)
if (target_submit_prep(se_cmd, cmd->tvc_cdb, sg_ptr, if (target_submit_prep(se_cmd, cmd->tvc_cdb, sg_ptr,
cmd->tvc_sgl_count, NULL, 0, sg_prot_ptr, cmd->tvc_sgl_count, NULL, 0, sg_prot_ptr,
cmd->tvc_prot_sgl_count)) cmd->tvc_prot_sgl_count, GFP_KERNEL))
return; return;
target_submit(se_cmd); target_submit(se_cmd);
......
...@@ -368,7 +368,7 @@ static void scsiback_cmd_exec(struct vscsibk_pend *pending_req) ...@@ -368,7 +368,7 @@ static void scsiback_cmd_exec(struct vscsibk_pend *pending_req)
pending_req->sc_data_direction, TARGET_SCF_ACK_KREF); pending_req->sc_data_direction, TARGET_SCF_ACK_KREF);
if (target_submit_prep(se_cmd, pending_req->cmnd, pending_req->sgl, if (target_submit_prep(se_cmd, pending_req->cmnd, pending_req->sgl,
pending_req->n_sg, NULL, 0, NULL, 0)) pending_req->n_sg, NULL, 0, NULL, 0, GFP_KERNEL))
return; return;
target_submit(se_cmd); target_submit(se_cmd);
......
...@@ -157,10 +157,11 @@ int target_init_cmd(struct se_cmd *se_cmd, struct se_session *se_sess, ...@@ -157,10 +157,11 @@ int target_init_cmd(struct se_cmd *se_cmd, struct se_session *se_sess,
int target_submit_prep(struct se_cmd *se_cmd, unsigned char *cdb, int target_submit_prep(struct se_cmd *se_cmd, unsigned char *cdb,
struct scatterlist *sgl, u32 sgl_count, struct scatterlist *sgl, u32 sgl_count,
struct scatterlist *sgl_bidi, u32 sgl_bidi_count, struct scatterlist *sgl_bidi, u32 sgl_bidi_count,
struct scatterlist *sgl_prot, u32 sgl_prot_count); struct scatterlist *sgl_prot, u32 sgl_prot_count, gfp_t gfp);
void target_submit(struct se_cmd *se_cmd); void target_submit(struct se_cmd *se_cmd);
sense_reason_t transport_lookup_cmd_lun(struct se_cmd *); sense_reason_t transport_lookup_cmd_lun(struct se_cmd *);
sense_reason_t target_cmd_init_cdb(struct se_cmd *, unsigned char *); sense_reason_t target_cmd_init_cdb(struct se_cmd *se_cmd, unsigned char *cdb,
gfp_t gfp);
sense_reason_t target_cmd_parse_cdb(struct se_cmd *); sense_reason_t target_cmd_parse_cdb(struct se_cmd *);
void target_submit_cmd(struct se_cmd *, struct se_session *, unsigned char *, void target_submit_cmd(struct se_cmd *, struct se_session *, unsigned char *,
unsigned char *, u64, u32, int, int, int); unsigned char *, u64, u32, int, int, int);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment