Commit 14cd6da5 authored by Peter Wang's avatar Peter Wang Committed by Wentao Guan
Browse files

scsi: ufs: core: Fix deadlock during RTC update 

stable inclusion
from stable-v6.6.81
commit a4921b76bc9421d3838e167f6a17ea3112d8fe62
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IBYZED

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=a4921b76bc9421d3838e167f6a17ea3112d8fe62



--------------------------------

commit 3911af778f208e5f49d43ce739332b91e26bc48e upstream.

There is a deadlock when runtime suspend waits for the flush of RTC work,
and the RTC work calls ufshcd_rpm_get_sync() to wait for runtime resume.

Here is deadlock backtrace:

kworker/0:1     D 4892.876354 10 10971 4859 0x4208060 0x8 10 0 120 670730152367
ptr            f0ffff80c2e40000 0 1 0x00000001 0x000000ff 0x000000ff 0x000000ff
<ffffffee5e71ddb0> __switch_to+0x1a8/0x2d4
<ffffffee5e71e604> __schedule+0x684/0xa98
<ffffffee5e71ea60> schedule+0x48/0xc8
<ffffffee5e725f78> schedule_timeout+0x48/0x170
<ffffffee5e71fb74> do_wait_for_common+0x108/0x1b0
<ffffffee5e71efe0> wait_for_completion+0x44/0x60
<ffffffee5d6de968> __flush_work+0x39c/0x424
<ffffffee5d6decc0> __cancel_work_sync+0xd8/0x208
<ffffffee5d6dee2c> cancel_delayed_work_sync+0x14/0x28
<ffffffee5e2551b8> __ufshcd_wl_suspend+0x19c/0x480
<ffffffee5e255fb8> ufshcd_wl_runtime_suspend+0x3c/0x1d4
<ffffffee5dffd80c> scsi_runtime_suspend+0x78/0xc8
<ffffffee5df93580> __rpm_callback+0x94/0x3e0
<ffffffee5df90b0c> rpm_suspend+0x2d4/0x65c
<ffffffee5df91448> __pm_runtime_suspend+0x80/0x114
<ffffffee5dffd95c> scsi_runtime_idle+0x38/0x6c
<ffffffee5df912f4> rpm_idle+0x264/0x338
<ffffffee5df90f14> __pm_runtime_idle+0x80/0x110
<ffffffee5e24ce44> ufshcd_rtc_work+0x128/0x1e4
<ffffffee5d6e3a40> process_one_work+0x26c/0x650
<ffffffee5d6e65c8> worker_thread+0x260/0x3d8
<ffffffee5d6edec8> kthread+0x110/0x134
<ffffffee5d616b18> ret_from_fork+0x10/0x20

Skip updating RTC if RPM state is not RPM_ACTIVE.

Fixes: 6bf999e0eb41 ("scsi: ufs: core: Add UFS RTC support")
Cc: stable@vger.kernel.org # 6.9.x
Signed-off-by: default avatarPeter Wang <peter.wang@mediatek.com>
Link: https://lore.kernel.org/r/20240715063831.29792-1-peter.wang@mediatek.com


Reviewed-by: default avatarBean Huo <beanhuo@micron.com>
Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit a4921b76bc9421d3838e167f6a17ea3112d8fe62)
Signed-off-by: default avatarWentao Guan <guanwentao@uniontech.com>
parent a656de59

drivers/ufs/core/ufshcd-priv.h

+5 −0
Original line number Diff line number Diff line
@@ -324,6 +324,11 @@ static inline int ufshcd_rpm_get_sync(struct ufs_hba *hba) 
	return pm_runtime_get_sync(&hba->ufs_device_wlun->sdev_gendev);

}



static inline int ufshcd_rpm_get_if_active(struct ufs_hba *hba)

{

	return pm_runtime_get_if_active(&hba->ufs_device_wlun->sdev_gendev, true);

}



static inline int ufshcd_rpm_put_sync(struct ufs_hba *hba)

{

	return pm_runtime_put_sync(&hba->ufs_device_wlun->sdev_gendev);

drivers/ufs/core/ufshcd.c

+4 −1
Original line number Diff line number Diff line
@@ -8179,7 +8179,10 @@ static void ufshcd_update_rtc(struct ufs_hba *hba) 
	 */

	val = ts64.tv_sec - hba->dev_info.rtc_time_baseline;



	ufshcd_rpm_get_sync(hba);

	/* Skip update RTC if RPM state is not RPM_ACTIVE */

	if (ufshcd_rpm_get_if_active(hba) <= 0)

		return;



	err = ufshcd_query_attr(hba, UPIU_QUERY_OPCODE_WRITE_ATTR, QUERY_ATTR_IDN_SECONDS_PASSED,

				0, 0, &val);

	ufshcd_rpm_put_sync(hba);