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 53DEB1420D7; Tue, 14 May 2024 11:27:21 +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=1715686041; cv=none; b=V2qnyWWStwms+oIgjmqd5/YUFqbm6bBMnSj+uYCn+g4fLjBuwQN4Njmg5YfE6fgofJaESW1ANMw/D59MhsNEmcGv/GdHAQ02AaunfdoCduNUdfOJ3tdWxYRPSvuNz8qiPIvdIiHOSDLc7wUy7H4FAEMJwPX7YpUHnfhzELd8rfk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715686041; c=relaxed/simple; bh=8DY8qudAWLsFddiKmKLgFJDlgtYloitTdnGQSepdwr4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=u06pE1mtqfjZCtcBr43xciErQkSyKN6RS38JxbUiES7a+up1XcTAfv1f2ZFvzS0TBaETiCjxSRZLIOizBvqkrTa3ttZiGOsRzRS/26HPZt7ys9fGfqD4FBdHd1H07u7hV4sNyj2KgMag/9UEFLoMIypo8XRxMAOiieIrpRykj7E= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=RrLYikn+; 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="RrLYikn+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AA68BC2BD10; Tue, 14 May 2024 11:27:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1715686041; bh=8DY8qudAWLsFddiKmKLgFJDlgtYloitTdnGQSepdwr4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RrLYikn+plZvK1DWE9oPT0qSUOMNLzsEBdiMz2rJqPa+va4UTdflzIET0PeB/Ab3G Tq/p8WCzbM3S2ojiu5s4cKw23/C7Sd/Nd7OgOciCQuSns6Rib5KfLndiEu4YWKP+Wl kxTms3bf2f4iwSRnmbSsVAvP/25BXZJPl4PSwdec= 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.6 262/301] slimbus: qcom-ngd-ctrl: Add timeout for wait operation Date: Tue, 14 May 2024 12:18:53 +0200 Message-ID: <20240514101042.148473832@linuxfoundation.org> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240514101032.219857983@linuxfoundation.org> References: <20240514101032.219857983@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.6-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 @@ -1451,7 +1451,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);