Two small patches for UFS
v2 cover Two small patches for UFS
Hi,
Here are two small patches, one is to fix a potential bug which could result in system hang-up, another one is to add more helpful debug hint.
v1-v2:
1. add reveiwed-by tags
2. fix one typo in second patch commit comment
Bean Huo (2):
scsi: ufs: print helpful hint when response size exceed buffer size
scsi: ufs: fix potential bug which ends in system hang-up
drivers/scsi/ufs/ufshcd.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
Signature · 1 line
2.17.1
PATCH v2 1/2 scsi: ufs: print helpful hint when response size exceed buffer size
From: Bean Huo <[email protected]>
Print out returned response size and buffer size, while the front one is bigger than the back one.
--- drivers/scsi/ufs/ufshcd.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/scsi/ufs/ufshcd.c +5 -3
@@ -1938,8 +1938,8 @@ int ufshcd_copy_query_response(struct ufs_hba *hba, struct ufshcd_lrb *lrbp)memcpy (hba->dev_cmd.query.descriptor, descp, resp_len); }else {dev_warn (hba->dev, -"%s: Response size is bigger than buffer" , - __func__); +"%s: rsp size %d is bigger than buffer size %d" , + __func__, resp_len, buf_len);return -EINVAL ; } }
@@ -5864,7 +5864,9 @@ static int ufshcd_issue_devman_upiu_cmd(struct ufs_hba *hba,memcpy (desc_buff, descp, resp_len); *buff_len = resp_len; }else { -dev_warn (hba->dev,"rsp size is bigger than buffer" ); +dev_warn (hba->dev, +"%s: rsp size %d is bigger than buffer size %d" , + __func__, resp_len, *buff_len); *buff_len =0 ; err = -EINVAL ; }
Signature · 1 line
2.17.1
PATCH v2 2/2 scsi: ufs: fix potential bug which ends in system hang-up
In reply to Bean HuoFrom: Bean Huo <[email protected]>
In function __ufshcd_query_descriptor(), in the event of an error happening, we directly goto out_unlock, and forget to invaliate hba->dev_cmd.query.descriptor pointer. Thus results in this pointer still validity in ufshcd_copy_query_response() for other query requests which go through ufshcd_exec_raw_upiu_cmd(). This will cuases __memcpy() crash and system hangs up, log shows as below:
Unable to handle kernel paging request at virtual address
ffff000012233c40
Mem abort info:
ESR = 0x96000047
Exception class = DABT (current EL), IL = 32 bits SET = 0, FnV = 0
EA = 0, S1PTW = 0
Data abort info:
ISV = 0, ISS = 0x00000047
CM = 0, WnR = 1
swapper pgtable: 4k pages, 48-bit VAs, pgdp = 0000000028cc735c [ffff000012233c40] pgd=00000000bffff003, pud=00000000bfffe003, pmd=00000000ba8b8003, pte=0000000000000000
Internal error: Oops: 96000047 [#2] PREEMPT SMP ... Call trace: __memcpy+0x74/0x180 ufshcd_issue_devman_upiu_cmd+0x250/0x3c0 ufshcd_exec_raw_upiu_cmd+0xfc/0x1a8 ufs_bsg_request+0x178/0x3b0 bsg_queue_rq+0xc0/0x118 blk_mq_dispatch_rq_list+0xb0/0x538 blk_mq_sched_dispatch_requests+0x18c/0x1d8 __blk_mq_run_hw_queue+0xb4/0x118 blk_mq_run_work_fn+0x28/0x38 process_one_work+0x1ec/0x470 worker_thread+0x48/0x458 kthread+0x130/0x138 ret_from_fork+0x10/0x1c Code: 540000ab a8c12027 a88120c7 a8c12027 (a88120c7) ---[ end trace 793e1eb5dff69f2d ]--- note: kworker/0:2H[2054] exited with preempt_count 1
This patch is to move "descriptor = NULL" down to below the label "out_unlock".
--- drivers/scsi/ufs/ufshcd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/ufs/ufshcd.c +1 -1
@@ -2989,10 +2989,10 @@ static int __ufshcd_query_descriptor(struct ufs_hba *hba, goto out_unlock; } - hba->dev_cmd.query.descriptor =NULL ; *buf_len =be16_to_cpu (response->upiu_res.length); out_unlock: + hba->dev_cmd.query.descriptor =NULL ;mutex_unlock (&hba->dev_cmd.lock); out:ufshcd_release (hba);
Signature · 1 line
2.17.1
Martin K. Petersen
AppliedBean,
Quoted 3 lines
Here are two small patches, one is to fix a potential bug which could result in system hang-up, another one is to add more helpful debug hint.
Applied to 5.5/scsi-queue, thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering