From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A6E6B12E1E2; Tue, 14 May 2024 11:38:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715686728; cv=none; b=QYnZczPOBDZHdzDRwgoiB3M0A4Pev1PjlCONr+M3rTzC7eJWUaaDFE3zdpYMAqb4ai2i1gFYdAaCtZuS/Vchzb7M+SC2Ot1WoAYk8GcYa0iqn9vBDM9QceJ/a7ANTSb1sKMA0LllFP9I0xNoZoJ6Kn2xkAk2/sK0tsJVX434qDo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715686728; c=relaxed/simple; bh=xljTn7UfEC4jy8Aa/E4M/F8lA0M5IEwGwC8AFZaC1Ck=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PcYhcQCV81kxmwgDI7W/iWQ7QFGIgWr1747LP+iR9/YaRahvR7r3swzkW9Rpdq3/fp+Uira88tw2ggZW7Okr/W3sFRlCbxJeKAE0qezUYXSmRMjSXj4hzNh/HzkTUJCJCMP8y4RcZbMqjeKS/iWs6QUpn7kFEk7N/gR/UuVL/1Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=NeZesl5O; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="NeZesl5O" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2E1D7C2BD10; Tue, 14 May 2024 11:38:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1715686728; bh=xljTn7UfEC4jy8Aa/E4M/F8lA0M5IEwGwC8AFZaC1Ck=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NeZesl5Oqs4QecUNr28IgaK6y74DefUteiRBrgo2AiFtKnQ346ubA4ZHjNrdkCuNs 5Ya9D0idN0X3fI1TCXXJYX2COJC0y8wKuL3nQJZUKhNfozoW+XoLphSsHj5LXi0Bd3 zZv8DCqILP2KyXJ46HKqqzLJs49qrAyHGPNQEOrQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Konrad Dybcio , Viken Dadhaniya , Srinivas Kandagatla Subject: [PATCH 6.1 218/236] slimbus: qcom-ngd-ctrl: Add timeout for wait operation Date: Tue, 14 May 2024 12:19:40 +0200 Message-ID: <20240514101028.633502330@linuxfoundation.org> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240514101020.320785513@linuxfoundation.org> References: <20240514101020.320785513@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Viken Dadhaniya commit 98241a774db49988f25b7b3657026ce51ccec293 upstream. 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. Fixes: a899d324863a ("slimbus: qcom-ngd-ctrl: add Sub System Restart support") Cc: stable@vger.kernel.org Reviewed-by: Konrad Dybcio Signed-off-by: Viken Dadhaniya Signed-off-by: Srinivas Kandagatla Link: https://lore.kernel.org/r/20240430091238.35209-2-srinivas.kandagatla@linaro.org Signed-off-by: Greg Kroah-Hartman --- drivers/slimbus/qcom-ngd-ctrl.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) --- a/drivers/slimbus/qcom-ngd-ctrl.c +++ b/drivers/slimbus/qcom-ngd-ctrl.c @@ -1376,7 +1376,11 @@ static void qcom_slim_ngd_up_worker(stru 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(MSEC_PER_SEC))) { + dev_err(ctrl->dev, "QMI wait timeout\n"); + return; + } mutex_lock(&ctrl->ssr_lock); qcom_slim_ngd_enable(ctrl, true);