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 267EB1C68C; Sun, 1 Sep 2024 16:50:49 +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=1725209449; cv=none; b=jnztc5SoPxK0ShNvUC6uaks6YR2h6zYqmPd3xF9CCY2WZ1/lJVkF7t/y4o1ZfsFeT6nZBl92Drl63znWp5nJS/r0MW8w8d3Tsu8mncqdB7jQ9J9k7dJJg6iuQAbkLdk5P7jAMGAezH79/XSO47yCwjnEff/NEzcFCHq8Vo0M3/w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725209449; c=relaxed/simple; bh=fQj6k945/yIcPc0t5TcaXFNOGqhXdTZ5q6T13wAF9CM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jGYXUaJqHIvXKIcCCQIU/QvyymWf4Fv0Qp+aTyPAT+pxTCFItWHSmrGaxGP/mfXDsOY3sPPFWtoNkuPBzUN6EnhZXAMVfZW272IiqxRIx0W/kHdV6T3O+hyfiMEqysaysEG6eSzv5R3ee9A51FFZr80eLk+GABltjrenKolM5pY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=UWwb9AXH; 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="UWwb9AXH" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A28FCC4CEC3; Sun, 1 Sep 2024 16:50:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1725209449; bh=fQj6k945/yIcPc0t5TcaXFNOGqhXdTZ5q6T13wAF9CM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UWwb9AXHyprvWrCKmtT46GUk5mSILWXzn7Sg8JBqY+jIsxL9hl85vbsRvnrVQS2N2 kCRgmsXk9nY8qBimNoRgmFLcl8BOq594ccYUBWt2HWYBO4uhlQtUbvQdfPMwLjUpDW O4IQe9Kv/ZAqgMo3/aQ0zYMsss1B80b5V1+Vhgxw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Chengfeng Ye , Sasha Levin Subject: [PATCH 5.10 040/151] staging: ks7010: disable bh on tx_dev_lock Date: Sun, 1 Sep 2024 18:16:40 +0200 Message-ID: <20240901160815.609310566@linuxfoundation.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240901160814.090297276@linuxfoundation.org> References: <20240901160814.090297276@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Chengfeng Ye [ Upstream commit 058cbee52ccd7be77e373d31a4f14670cfd32018 ] As &priv->tx_dev.tx_dev_lock is also acquired by xmit callback which could be call from timer under softirq context, use spin_lock_bh() on it to prevent potential deadlock. hostif_sme_work() --> hostif_sme_set_pmksa() --> hostif_mib_set_request() --> ks_wlan_hw_tx() --> spin_lock(&priv->tx_dev.tx_dev_lock) ks_wlan_start_xmit() --> hostif_data_request() --> ks_wlan_hw_tx() --> spin_lock(&priv->tx_dev.tx_dev_lock) Signed-off-by: Chengfeng Ye Link: https://lore.kernel.org/r/20230926161323.41928-1-dg573847474@gmail.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/staging/ks7010/ks7010_sdio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/ks7010/ks7010_sdio.c b/drivers/staging/ks7010/ks7010_sdio.c index 8c740c771f509..8e3fc4b78fd20 100644 --- a/drivers/staging/ks7010/ks7010_sdio.c +++ b/drivers/staging/ks7010/ks7010_sdio.c @@ -395,9 +395,9 @@ int ks_wlan_hw_tx(struct ks_wlan_private *priv, void *p, unsigned long size, priv->hostt.buff[priv->hostt.qtail] = le16_to_cpu(hdr->event); priv->hostt.qtail = (priv->hostt.qtail + 1) % SME_EVENT_BUFF_SIZE; - spin_lock(&priv->tx_dev.tx_dev_lock); + spin_lock_bh(&priv->tx_dev.tx_dev_lock); result = enqueue_txdev(priv, p, size, complete_handler, skb); - spin_unlock(&priv->tx_dev.tx_dev_lock); + spin_unlock_bh(&priv->tx_dev.tx_dev_lock); if (txq_has_space(priv)) queue_delayed_work(priv->wq, &priv->rw_dwork, 0); -- 2.43.0