2024-03-04 14:05:26

by Viken Dadhaniya

Subject: [PATCH v1] slimbus: qcom-ngd-ctrl: Add timeout for wait operation

In current driver qcom_slim_ngd_up_worker() indefinitely
waiting for ctrl->qmi_up completion object. This is
resulting in workqueue lockup on Kthread.

Added wait_for_completion_interruptible_timeout to
allow the thread to wait for specific timeout period and
bail out instead waiting infinitely.

Signed-off-by: Viken Dadhaniya <[email protected]>
---
drivers/slimbus/qcom-ngd-ctrl.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/slimbus/qcom-ngd-ctrl.c b/drivers/slimbus/qcom-ngd-ctrl.c
index efeba8275a66..c27076d8b7db 100644
--- a/drivers/slimbus/qcom-ngd-ctrl.c
+++ b/drivers/slimbus/qcom-ngd-ctrl.c
@@ -83,6 +83,7 @@

#define QCOM_SLIM_NGD_AUTOSUSPEND MSEC_PER_SEC
#define SLIM_RX_MSGQ_TIMEOUT_VAL 0x10000
+#define SLIM_QMI_TIMEOUT_MS 1000

#define SLIM_LA_MGR 0xFF
#define SLIM_ROOT_FREQ 24576000
@@ -1451,7 +1452,11 @@ static void qcom_slim_ngd_up_worker(struct work_struct *work)
ctrl = container_of(work, struct qcom_slim_ngd_ctrl, ngd_up_work);

/* Make sure qmi service is up before continuing */
- wait_for_completion_interruptible(&ctrl->qmi_up);
+ if (!wait_for_completion_interruptible_timeout(&ctrl->qmi_up,
+ msecs_to_jiffies(SLIM_QMI_TIMEOUT_MS))) {
+ dev_err(ctrl->dev, "QMI wait timeout\n");
+ return;
+ }

mutex_lock(&ctrl->ssr_lock);
qcom_slim_ngd_enable(ctrl, true);
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation

2024-03-05 21:19:19

by Konrad Dybcio

Subject: Re: [PATCH v1] slimbus: qcom-ngd-ctrl: Add timeout for wait operation

On 3/4/24 14:42, Viken Dadhaniya wrote:
> In current driver qcom_slim_ngd_up_worker() indefinitely
> waiting for ctrl->qmi_up completion object. This is
> resulting in workqueue lockup on Kthread.
>
> Added wait_for_completion_interruptible_timeout to
> allow the thread to wait for specific timeout period and
> bail out instead waiting infinitely.
>
> Signed-off-by: Viken Dadhaniya <[email protected]>
> ---

Fixes: a899d324863a ("slimbus: qcom-ngd-ctrl: add Sub System Restart support")
Cc: [email protected]

Reviewed-by: Konrad Dybcio <[email protected]>

> drivers/slimbus/qcom-ngd-ctrl.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/slimbus/qcom-ngd-ctrl.c b/drivers/slimbus/qcom-ngd-ctrl.c
> index efeba8275a66..c27076d8b7db 100644
> --- a/drivers/slimbus/qcom-ngd-ctrl.c
> +++ b/drivers/slimbus/qcom-ngd-ctrl.c
> @@ -83,6 +83,7 @@
>
> #define QCOM_SLIM_NGD_AUTOSUSPEND MSEC_PER_SEC
> #define SLIM_RX_MSGQ_TIMEOUT_VAL 0x10000
> +#define SLIM_QMI_TIMEOUT_MS 1000

This could be inlined instead

Konrad

2024-03-06 09:18:33

by Viken Dadhaniya

Subject: Re: [PATCH v1] slimbus: qcom-ngd-ctrl: Add timeout for wait operation

On 3/6/2024 2:49 AM, Konrad Dybcio wrote:
>
>
> On 3/4/24 14:42, Viken Dadhaniya wrote:
>> In current driver qcom_slim_ngd_up_worker() indefinitely
>> waiting for ctrl->qmi_up completion object. This is
>> resulting in workqueue lockup on Kthread.
>>
>> Added wait_for_completion_interruptible_timeout to
>> allow the thread to wait for specific timeout period and
>> bail out instead waiting infinitely.
>>
>> Signed-off-by: Viken Dadhaniya <[email protected]>
>> ---
>
> Fixes: a899d324863a ("slimbus: qcom-ngd-ctrl: add Sub System Restart
> support")
> Cc: [email protected]
>
> Reviewed-by: Konrad Dybcio <[email protected]>
>
>>   drivers/slimbus/qcom-ngd-ctrl.c | 7 ++++++-
>>   1 file changed, 6 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/slimbus/qcom-ngd-ctrl.c
>> b/drivers/slimbus/qcom-ngd-ctrl.c
>> index efeba8275a66..c27076d8b7db 100644
>> --- a/drivers/slimbus/qcom-ngd-ctrl.c
>> +++ b/drivers/slimbus/qcom-ngd-ctrl.c
>> @@ -83,6 +83,7 @@
>>   #define QCOM_SLIM_NGD_AUTOSUSPEND    MSEC_PER_SEC
>>   #define SLIM_RX_MSGQ_TIMEOUT_VAL    0x10000
>> +#define SLIM_QMI_TIMEOUT_MS        1000
>
> This could be inlined instead

Updated in v2.

>
> Konrad