scsi: ufs: fix LRB pointer incorrect initialization issue
v3 cover scsi: ufs: fix LRB pointer incorrect initialization issue
From: Bean Huo <[email protected]>
Hi, Martin and Bart
Based on the Bart's suggestion, delete ufshcd_init_lrb(), and update the patch to v3. This version patch passed stress test.
Thanks,
//Bean
Bean Huo (1):
scsi: ufs: fix LRB pointer incorrect initialization issue
drivers/scsi/ufs/ufshcd.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-)
Signature · 1 line
2.17.1
PATCH v3 1/1 scsi: ufs: fix LRB pointer incorrect initialization issue
From: Bean Huo <[email protected]>
There are two issues with the ufshcd_init_lrb() call in ufshcd_init_cmd_priv():
- cmd->tag is set from inside scsi_mq_prep_fn() and hence is not yet set when ufshcd_init_cmd_priv() is set.
- Inside ufshcd_init_cmd_priv() the tag can only be derived from the SCSI command pointer if no scheduler has been associated with the UFS block device. If no scheduler is associated with a block device, the relationship between hctx->tags->static_rqs[] and rq->tag is static. If a scheduler has been configured, a single tag can be associated with a different struct request if a request is reallocated.
v2-v3:
- delete ufshcd_init_cmd_priv()
- change commit message
--- drivers/scsi/ufs/ufshcd.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-)
drivers/scsi/ufs/ufshcd.c +5 -9
@@ -2471,6 +2471,8 @@ static int ufshcd_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd)BUG (); } +ufshcd_init_lrb (hba, lrbp, tag); +WARN_ON_ONCE (!ufshcd_is_scsi (cmd->request));if (!down_read_trylock (&hba->clk_scaling_lock))
@@ -2707,6 +2709,7 @@ static int ufshcd_exec_dev_cmd(struct ufs_hba *hba,init_completion (&wait); lrbp =ufshcd_req_to_lrb (req); +ufshcd_init_lrb (hba, lrbp, tag); err =ufshcd_compose_dev_cmd (hba, lrbp, cmd_type, tag);if (unlikely (err)) goto out_put_tag;
@@ -3504,14 +3507,6 @@ static void ufshcd_host_memory_configure(struct ufs_hba *hba) } } -static int ufshcd_init_cmd_priv (struct Scsi_Host *shost,struct scsi_cmnd *cmd) -{ -struct ufs_hba *hba =shost_priv (shost); - -ufshcd_init_lrb (hba,scsi_cmd_priv (cmd), cmd->tag); -return 0 ; -} -/** * ufshcd_dme_link_startup - Notify Unipro to perform link startup * @hba: per adapter instance
@@ -4834,6 +4829,7 @@ static void __ufshcd_transfer_req_compl(struct ufs_hba *hba,continue ; cmd =blk_mq_rq_to_pdu (req); lrbp =scsi_cmd_priv (cmd); +ufshcd_init_lrb (hba, lrbp, index);if (ufshcd_is_scsi (req)) {ufshcd_add_command_trace (hba, req,"complete" ); result =ufshcd_transfer_rsp_status (hba, lrbp);
@@ -5900,6 +5896,7 @@ static int ufshcd_issue_devman_upiu_cmd(struct ufs_hba *hba,init_completion (&wait); lrbp =ufshcd_req_to_lrb (req); +ufshcd_init_lrb (hba, lrbp, tag); lrbp->sense_bufflen =0 ; lrbp->sense_buffer =NULL ; lrbp->task_tag = tag;
@@ -7180,7 +7177,6 @@ static struct scsi_host_template ufshcd_driver_template = { .module = THIS_MODULE, .name = UFSHCD, .proc_name = UFSHCD, - .init_cmd_priv = ufshcd_init_cmd_priv, .queuecommand = ufshcd_queuecommand, .slave_alloc = ufshcd_slave_alloc, .slave_configure = ufshcd_slave_configure,
Signature · 1 line
2.17.1
drivers/scsi/ufs/ufshcd.c static void __ufshcd_transfer_req_compl(struct ufs_hba *hba, · line 4835
Quoted 8 lines · On 2020-03-09 09:10, [email protected] wrote:
drivers/scsi/ufs/ufshcd.c +1
-0@@ -4834,6 +4829,7 @@ static void __ufshcd_transfer_req_compl(struct ufs_hba *hba,continue ; cmd =blk_mq_rq_to_pdu (req); lrbp =scsi_cmd_priv (cmd); +ufshcd_init_lrb (hba, lrbp, index);if (ufshcd_is_scsi (req)) {ufshcd_add_command_trace (hba, req,"complete" ); result =ufshcd_transfer_rsp_status (hba, lrbp);
This ufshcd_init_lrb() call looks incorrect to me. I think that ufshcd_init_lrb() should only be called before a request is submitted to the UFS controller and also that ufshcd_init_lrb() should not be called from the completion path.
Thanks,
Bart.
Hi, Bart
Quoted 6 lines
Subject: [EXT] Re: [PATCH v3 1/1] scsi: ufs: fix LRB pointer incorrect initialization issue
Review static void __ufshcd_transfer_req_compl(struct
Quoted 1 line · On 2020-03-09 09:10, [email protected] wrote:
(quoted diff) +0
-0@@ -4834,6 +4829,7 @@ static void __ufshcd_transfer_req_compl(struct
ufs_hba*hba,
Quoted 13 lines
drivers/scsi/ufs/ufshcd.c static void __ufshcd_transfer_req_compl(struct ufs_hba *hba, · line 4835
Quoted 7 lines
drivers/scsi/ufs/ufshcd.c +1
-0continue ; cmd =blk_mq_rq_to_pdu (req); lrbp =scsi_cmd_priv (cmd); +ufshcd_init_lrb (hba, lrbp, index);if (ufshcd_is_scsi (req)) {ufshcd_add_command_trace (hba, req,"complete" ); result =ufshcd_transfer_rsp_status (hba, lrbp);This
ufshcd_init_lrb()call looks incorrect to me. I think thatufshcd_init_lrb()should only be called before a request is submitted to the UFS controller and also thatufshcd_init_lrb()should not be called from the completion path.
__ufshcd_transfer_req_compl()
ufshcd_transfer_rsp_status() will access lrbp->ucd_rsp_ptr.
Without calling ufshcd_init_lrb() here, there will be an error.
//Bean
Quoted 3 lines
Thanks,
Bart.
Quoted 21 lines · Bean Huo (beanhuo)
Hi, Bart
Quoted 6 lines
Subject: [EXT] Re: [PATCH v3 1/1] scsi: ufs: fix LRB pointer incorrect initialization issue
Review static void __ufshcd_transfer_req_compl(struct
Quoted 1 line · On 2020-03-09 09:10, [email protected] wrote:
(quoted diff) +0
-0@@ -4834,6 +4829,7 @@ static void __ufshcd_transfer_req_compl(struct
ufs_hba*hba,Quoted 12 lines
drivers/scsi/ufs/ufshcd.c static void __ufshcd_transfer_req_compl(struct ufs_hba *hba, · line 4835
Quoted 7 lines
drivers/scsi/ufs/ufshcd.c +1
-0continue ; cmd =blk_mq_rq_to_pdu (req); lrbp =scsi_cmd_priv (cmd); +ufshcd_init_lrb (hba, lrbp, index);if (ufshcd_is_scsi (req)) {ufshcd_add_command_trace (hba, req,"complete" ); result =ufshcd_transfer_rsp_status (hba, lrbp);This
ufshcd_init_lrb()call looks incorrect to me. I think thatufshcd_init_lrb()should only be called before a request is submitted to the UFS controller and also thatufshcd_init_lrb()should not be called from the completion path.
Quoted 3 lines
__ufshcd_transfer_req_compl()ufshcd_transfer_rsp_status() will access lrbp->ucd_rsp_ptr.Without calling
ufshcd_init_lrb()here, there will be an error.
Hi Bean,
I think that ufshcd_init_lrb() should only be called from the code that prepares a command before it is submitted and not from the command completion path. Because v5.6-rc5 has already been released, there is not that much time left until the merge window opens. I think it is less risky to revert commit 34656dda81ac ("scsi: ufs: Let the SCSI core allocate per-command UFS data") than to proceed with the above patch. Do you want to submit a revert or do you perhaps want me to do that?
Thanks,
Bart.