Skip to content

Commit

Permalink
scsi: target: core: Add gfp_t arg to target_cmd_init_cdb()
Browse files Browse the repository at this point in the history
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.com
Tested-by: Laurence Oberman <loberman@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Mike Christie <michael.christie@oracle.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
  • Loading branch information
Mike Christie authored and Martin K. Petersen committed Mar 4, 2021
1 parent 0fa50a8 commit 0869419
Show file tree
Hide file tree
Showing 10 changed files with 23 additions and 16 deletions.
3 changes: 2 additions & 1 deletion drivers/infiniband/ulp/srpt/ib_srpt.c
Original file line number Diff line number Diff line change
Expand Up @@ -1537,7 +1537,8 @@ static void srpt_handle_cmd(struct srpt_rdma_ch *ch,
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;

target_submit(cmd);
Expand Down
3 changes: 2 additions & 1 deletion drivers/scsi/qla2xxx/tcm_qla2xxx.c
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,8 @@ static int tcm_qla2xxx_handle_cmd(scsi_qla_host_t *vha, struct qla_tgt_cmd *cmd,
if (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;

target_submit(se_cmd);
Expand Down
3 changes: 2 additions & 1 deletion drivers/target/iscsi/iscsi_target.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

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 == TCM_OUT_OF_RESOURCES) {
return iscsit_add_reject_cmd(cmd,
Expand Down
3 changes: 2 additions & 1 deletion drivers/target/loopback/tcm_loop.c
Original file line number Diff line number Diff line change
Expand Up @@ -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),
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;

target_submit(se_cmd);
Expand Down
14 changes: 8 additions & 6 deletions drivers/target/target_core_transport.c
Original file line number Diff line number Diff line change
Expand Up @@ -1429,7 +1429,7 @@ transport_check_alloc_task_attr(struct se_cmd *cmd)
}

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;

Expand All @@ -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.
*/
if (scsi_command_size(cdb) > sizeof(cmd->__t_task_cdb)) {
cmd->t_task_cdb = kzalloc(scsi_command_size(cdb),
GFP_KERNEL);
cmd->t_task_cdb = kzalloc(scsi_command_size(cdb), gfp);
if (!cmd->t_task_cdb) {
pr_err("Unable to allocate cmd->t_task_cdb"
" %u > sizeof(cmd->__t_task_cdb): %lu ops\n",
Expand Down Expand Up @@ -1640,6 +1639,7 @@ EXPORT_SYMBOL_GPL(target_init_cmd);
* @sgl_bidi_count: scatterlist count for bidirectional READ mapping
* @sgl_prot: struct scatterlist memory protection information
* @sgl_prot_count: scatterlist count for protection information
* @gfp: gfp allocation type
*
* Returns:
* - less than zero to signal failure.
Expand All @@ -1650,11 +1650,12 @@ EXPORT_SYMBOL_GPL(target_init_cmd);
int target_submit_prep(struct se_cmd *se_cmd, unsigned char *cdb,
struct scatterlist *sgl, u32 sgl_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;

rc = target_cmd_init_cdb(se_cmd, cdb);
rc = target_cmd_init_cdb(se_cmd, cdb, gfp);
if (rc)
goto send_cc_direct;

Expand Down Expand Up @@ -1790,7 +1791,8 @@ void target_submit_cmd(struct se_cmd *se_cmd, struct se_session *se_sess,
if (rc)
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;

target_submit(se_cmd);
Expand Down
2 changes: 1 addition & 1 deletion drivers/target/target_core_xcopy.c
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,7 @@ static int target_xcopy_setup_pt_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;

cmd->tag = 0;
Expand Down
2 changes: 1 addition & 1 deletion drivers/target/tcm_fc/tfc_cmd.c
Original file line number Diff line number Diff line change
Expand Up @@ -555,7 +555,7 @@ static void ft_send_work(struct work_struct *work)
goto err;

if (target_submit_prep(&cmd->se_cmd, fcp->fc_cdb, NULL, 0, NULL, 0,
NULL, 0))
NULL, 0, GFP_KERNEL))
return;

target_submit(&cmd->se_cmd);
Expand Down
2 changes: 1 addition & 1 deletion drivers/vhost/scsi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
cmd->tvc_sgl_count, NULL, 0, sg_prot_ptr,
cmd->tvc_prot_sgl_count))
cmd->tvc_prot_sgl_count, GFP_KERNEL))
return;

target_submit(se_cmd);
Expand Down
2 changes: 1 addition & 1 deletion drivers/xen/xen-scsiback.c
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ static void scsiback_cmd_exec(struct vscsibk_pend *pending_req)
pending_req->sc_data_direction, TARGET_SCF_ACK_KREF);

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;

target_submit(se_cmd);
Expand Down
5 changes: 3 additions & 2 deletions include/target/target_core_fabric.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
struct scatterlist *sgl, u32 sgl_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);
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 *);
void target_submit_cmd(struct se_cmd *, struct se_session *, unsigned char *,
unsigned char *, u64, u32, int, int, int);
Expand Down

0 comments on commit 0869419

Please sign in to comment.