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 6CF931C4EF9; Tue, 27 Aug 2024 14:47:33 +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=1724770053; cv=none; b=oY2m5gEaKqOm19D6SOSWGfIoVA/geStmQHwaw1YoVFrE/4hwMX1lmF7m+NV5hSOm8bin7I9WEOUtjSIeHtQ9EJUCDUM/66lWbPvdjbr5cfV45j/AvbKKWzYkhe3Sms668lEX2sYpz0JNpaoVqgKXC6+yR7dQGicaJ1k+6vFTVRM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724770053; c=relaxed/simple; bh=GDVxL35vPKPFCX2InLTWWVNCPcwq1cXy6dpzt9ZpQiw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=koviOUd+KT3eqDTXJVdvvZ/VLtGZ/eLkWDr5sE0W/35SX9QyPFY2fVNrj8lXh/lfxfYyJvySf8qhfslIsNPaumzwA8bKfibqSXk9QP0pzTOBAq4voKOn0LjpjWqxgcRas6vsRGl2LI9Uj+Q2Cyu0WVbeqXvNFNT97/zcmmog4u0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=SqsgbgLv; 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="SqsgbgLv" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DD3E6C61040; Tue, 27 Aug 2024 14:47:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1724770053; bh=GDVxL35vPKPFCX2InLTWWVNCPcwq1cXy6dpzt9ZpQiw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SqsgbgLv+SF07yn9l216Q4W+JeNnS25cjeGxwgAizL4zUfrhg9N/jZKL0LPaEQ4aG 94qG/Uox/X5eX2JRx1fSbJxGs+Z1jMVgYdd2jifVON7/w74SewQ/v/HzEE2ws6I7BQ LtrnRF1xZO4jlkUkkidCn8qiCkE3k7yBYrSYVoEQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Chengfeng Ye , Sasha Levin Subject: [PATCH 6.6 112/341] staging: ks7010: disable bh on tx_dev_lock Date: Tue, 27 Aug 2024 16:35:43 +0200 Message-ID: <20240827143847.674597268@linuxfoundation.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240827143843.399359062@linuxfoundation.org> References: <20240827143843.399359062@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: 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 9fb118e77a1f0..f1d44e4955fc6 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