Message ID | 20231019153115.26401-2-johan+linaro@kernel.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2010:b0:403:3b70:6f57 with SMTP id fe16csp469857vqb; Thu, 19 Oct 2023 08:33:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEzDVdnK0xz72ES0pVGElzQT8QCndAiryTEP73HQhYqpHyIUFW5gIJMhnsrlsnQV5v/z4we X-Received: by 2002:a17:902:ecd2:b0:1c7:562d:9b16 with SMTP id a18-20020a170902ecd200b001c7562d9b16mr2977021plh.24.1697729600627; Thu, 19 Oct 2023 08:33:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697729600; cv=none; d=google.com; s=arc-20160816; b=AwycQYWAMkMSGGjteol70P0WpHJsyzhnZaJ8MMMG2KMPb3/3bXZDb4lw6az/BCawpr VLctGP/KX7oNcGbozr/MeTZcjd0mU53cJXGqgR+zXbpoqnRRUgHuF6hNbc4XVw+v3eY9 QRZ9xqv3cXyxGGOlZgs8ZtWHHuizNEDI5eUSCPaUh6ogxHvTn35zm49DUAA/1sLEqTVU y1kQqjrj0tJfrc+ExH1OCY3nRzyWHafiC/Vc6ydRdamVhhxvP0UWEuPyH47Q3XQx5ELD MquPyxQUhG8arW1E45IyOwDn7PaTO4xH5MwIqlaTHKjqfUhaT7qKoSXuTYEU73ykW7a2 DGGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=LoGQRqJtynk6BmA2y7HxZj45goR1gDAV0mk2dlVp8Jk=; fh=wVjIh4Ry7X7gqxD7x4+f60lKPnJwP7xEuzok5FQ1a8Q=; b=jxh9HzFwT/3+8ARfXoYPUcvX3cOV7iO0i26qREXZ8e5wV4yMvJK+DFeVQV1qbUrVT6 KG4XAtF12wiXrU+ACSG3KPq+Ln9RXpDR05I3lhuOkZ8EdvTZcNYZQCXT4btHYYtDRGPI rstxg+GZhZM2jAJ41qI+gvCV2myYHei8ytQkr0GLbZqSv4zDiPybyPYzc6i1pHDy9mOg e6iUHpeVItSrZx+3l5VQOqfdYEnuIJY4gGzxRn16HmnuC/1qQTNkd75GDlCtsHfXulTh dV7DvlsS2p8WkehhwTPvx4zU6tYMTqKvXPu9tMSTNJ9MM3u+9QetY6Mzjo2aghnWkvas RrZw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=WPXJJ494; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id u11-20020a170903124b00b001bb0ba81053si2696416plh.50.2023.10.19.08.33.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Oct 2023 08:33:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=WPXJJ494; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 63BB58325EAE; Thu, 19 Oct 2023 08:33:18 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346302AbjJSPdC (ORCPT <rfc822;a1648639935@gmail.com> + 26 others); Thu, 19 Oct 2023 11:33:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49076 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345965AbjJSPc6 (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Thu, 19 Oct 2023 11:32:58 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C9465132; Thu, 19 Oct 2023 08:32:56 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6F38EC433C7; Thu, 19 Oct 2023 15:32:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1697729576; bh=ybnrjlLviCjSD8GSKMljRyMDeDtfP4Uw7YCw85cfwvM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WPXJJ494N+eQZDwnrF5/v4p3ljxHkhrb79+NS63aMaP8W7GUKRqOqEEWUV/LreBag HTxotFRSHtLz/rFWarbLOJNw1T2cWLMnZdVQ335Hp2fEyrar9dvQO05e82mbwu5yKq DTjzRvqhCmIJWpe1BO4BmxWi5s8ogvv3+H5rjW/jO53qoFb6ZaVbwdMcZz7Z/p8Rws UQzf2yGkDD8Me+A2p5mgUwCArQEExqPnb85OvdAndNgu2aZjBRI1AvVW4JCOqHNYFq iUOofKwV48HRgk75KinzjO9cPqCR5y7YtmJ3e191nYLXKnfqUq/IwCffYcSxO7pzTy brbnGVQpzxGug== Received: from johan by xi.lan with local (Exim 4.96) (envelope-from <johan+linaro@kernel.org>) id 1qtV1A-0006tA-0W; Thu, 19 Oct 2023 17:33:00 +0200 From: Johan Hovold <johan+linaro@kernel.org> To: Kalle Valo <kvalo@kernel.org> Cc: Jeff Johnson <quic_jjohnson@quicinc.com>, ath11k@lists.infradead.org, linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold <johan+linaro@kernel.org>, stable@vger.kernel.org Subject: [PATCH v2 1/2] wifi: ath11k: fix temperature event locking Date: Thu, 19 Oct 2023 17:31:14 +0200 Message-ID: <20231019153115.26401-2-johan+linaro@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231019153115.26401-1-johan+linaro@kernel.org> References: <20231019153115.26401-1-johan+linaro@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Thu, 19 Oct 2023 08:33:18 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780198513610636962 X-GMAIL-MSGID: 1780198513610636962 |
Series |
wifi: ath11k: fix event locking
|
|
Commit Message
Johan Hovold
Oct. 19, 2023, 3:31 p.m. UTC
The ath11k active pdevs are protected by RCU but the temperature event
handling code calling ath11k_mac_get_ar_by_pdev_id() was not marked as a
read-side critical section as reported by RCU lockdep:
=============================
WARNING: suspicious RCU usage
6.6.0-rc6 #7 Not tainted
-----------------------------
drivers/net/wireless/ath/ath11k/mac.c:638 suspicious rcu_dereference_check() usage!
other info that might help us debug this:
rcu_scheduler_active = 2, debug_locks = 1
no locks held by swapper/0/0.
...
Call trace:
...
lockdep_rcu_suspicious+0x16c/0x22c
ath11k_mac_get_ar_by_pdev_id+0x194/0x1b0 [ath11k]
ath11k_wmi_tlv_op_rx+0xa84/0x2c1c [ath11k]
ath11k_htc_rx_completion_handler+0x388/0x510 [ath11k]
Mark the code in question as an RCU read-side critical section to avoid
any potential use-after-free issues.
Fixes: a41d10348b01 ("ath11k: add thermal sensor device support")
Cc: stable@vger.kernel.org # 5.7
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
---
drivers/net/wireless/ath/ath11k/wmi.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
Comments
On 10/19/2023 8:31 AM, Johan Hovold wrote: > The ath11k active pdevs are protected by RCU but the temperature event > handling code calling ath11k_mac_get_ar_by_pdev_id() was not marked as a > read-side critical section as reported by RCU lockdep: > > ============================= > WARNING: suspicious RCU usage > 6.6.0-rc6 #7 Not tainted > ----------------------------- > drivers/net/wireless/ath/ath11k/mac.c:638 suspicious rcu_dereference_check() usage! > > other info that might help us debug this: > > rcu_scheduler_active = 2, debug_locks = 1 > no locks held by swapper/0/0. > ... > Call trace: > ... > lockdep_rcu_suspicious+0x16c/0x22c > ath11k_mac_get_ar_by_pdev_id+0x194/0x1b0 [ath11k] > ath11k_wmi_tlv_op_rx+0xa84/0x2c1c [ath11k] > ath11k_htc_rx_completion_handler+0x388/0x510 [ath11k] > > Mark the code in question as an RCU read-side critical section to avoid > any potential use-after-free issues. > > Fixes: a41d10348b01 ("ath11k: add thermal sensor device support") > Cc: stable@vger.kernel.org # 5.7 > Signed-off-by: Johan Hovold <johan+linaro@kernel.org> Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com>
Johan Hovold <johan+linaro@kernel.org> writes: > The ath11k active pdevs are protected by RCU but the temperature event > handling code calling ath11k_mac_get_ar_by_pdev_id() was not marked as a > read-side critical section as reported by RCU lockdep: > > ============================= > WARNING: suspicious RCU usage > 6.6.0-rc6 #7 Not tainted > ----------------------------- > drivers/net/wireless/ath/ath11k/mac.c:638 suspicious rcu_dereference_check() usage! > > other info that might help us debug this: > > rcu_scheduler_active = 2, debug_locks = 1 > no locks held by swapper/0/0. > ... > Call trace: > ... > lockdep_rcu_suspicious+0x16c/0x22c > ath11k_mac_get_ar_by_pdev_id+0x194/0x1b0 [ath11k] > ath11k_wmi_tlv_op_rx+0xa84/0x2c1c [ath11k] > ath11k_htc_rx_completion_handler+0x388/0x510 [ath11k] > > Mark the code in question as an RCU read-side critical section to avoid > any potential use-after-free issues. > > Fixes: a41d10348b01 ("ath11k: add thermal sensor device support") > Cc: stable@vger.kernel.org # 5.7 > Signed-off-by: Johan Hovold <johan+linaro@kernel.org> On what hardware and firmware version did you test this? As there's so many different combos we use Tested-on tag to provide that information in the commit message: https://wireless.wiki.kernel.org/en/users/drivers/ath11k/submittingpatches#tested-on_tag I can add that if you let me know what you used.
On Tue, Oct 24, 2023 at 04:59:35PM +0300, Kalle Valo wrote: > Johan Hovold <johan+linaro@kernel.org> writes: > > > The ath11k active pdevs are protected by RCU but the temperature event > > handling code calling ath11k_mac_get_ar_by_pdev_id() was not marked as a > > read-side critical section as reported by RCU lockdep: > On what hardware and firmware version did you test this? As there's so > many different combos we use Tested-on tag to provide that information > in the commit message: > > https://wireless.wiki.kernel.org/en/users/drivers/ath11k/submittingpatches#tested-on_tag > > I can add that if you let me know what you used. I hit this on the Lenovo Thinkpad X13s and I guess the tag should be: Tested-on: QCNFA765 hw2.1 WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.23 Note that I've only been able to test the ath11k fixes (not the corresponding ath12k) and I only tested this particular patch fully (e.g. since I didn't trigger any radar events). Johan
Johan Hovold <johan@kernel.org> writes: > On Tue, Oct 24, 2023 at 04:59:35PM +0300, Kalle Valo wrote: >> Johan Hovold <johan+linaro@kernel.org> writes: >> >> > The ath11k active pdevs are protected by RCU but the temperature event >> > handling code calling ath11k_mac_get_ar_by_pdev_id() was not marked as a >> > read-side critical section as reported by RCU lockdep: > >> On what hardware and firmware version did you test this? As there's so >> many different combos we use Tested-on tag to provide that information >> in the commit message: >> >> https://wireless.wiki.kernel.org/en/users/drivers/ath11k/submittingpatches#tested-on_tag >> >> I can add that if you let me know what you used. > > I hit this on the Lenovo Thinkpad X13s and I guess the tag should be: > > Tested-on: QCNFA765 hw2.1 WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.23 From ath11k point of view QCNFA765 is WCN6855 so I used this one: Tested-on: WCN6855 hw2.1 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.23 > Note that I've only been able to test the ath11k fixes (not the > corresponding ath12k) and I only tested this particular patch fully Thanks, I added Tested-on to this patch 1 and for the rest I added "compile tested only".
Johan Hovold <johan+linaro@kernel.org> wrote: > The ath11k active pdevs are protected by RCU but the temperature event > handling code calling ath11k_mac_get_ar_by_pdev_id() was not marked as a > read-side critical section as reported by RCU lockdep: > > ============================= > WARNING: suspicious RCU usage > 6.6.0-rc6 #7 Not tainted > ----------------------------- > drivers/net/wireless/ath/ath11k/mac.c:638 suspicious rcu_dereference_check() usage! > > other info that might help us debug this: > > rcu_scheduler_active = 2, debug_locks = 1 > no locks held by swapper/0/0. > ... > Call trace: > ... > lockdep_rcu_suspicious+0x16c/0x22c > ath11k_mac_get_ar_by_pdev_id+0x194/0x1b0 [ath11k] > ath11k_wmi_tlv_op_rx+0xa84/0x2c1c [ath11k] > ath11k_htc_rx_completion_handler+0x388/0x510 [ath11k] > > Mark the code in question as an RCU read-side critical section to avoid > any potential use-after-free issues. > > Tested-on: WCN6855 hw2.1 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.23 > > Fixes: a41d10348b01 ("ath11k: add thermal sensor device support") > Cc: stable@vger.kernel.org # 5.7 > Signed-off-by: Johan Hovold <johan+linaro@kernel.org> > Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com> > Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com> 2 patches applied to ath-next branch of ath.git, thanks. 1a5352a81b47 wifi: ath11k: fix temperature event locking 3b6c14833165 wifi: ath11k: fix dfs radar event locking
On Wed, Oct 25, 2023 at 12:51:10PM +0300, Kalle Valo wrote: > Johan Hovold <johan@kernel.org> writes: > > I hit this on the Lenovo Thinkpad X13s and I guess the tag should be: > > > > Tested-on: QCNFA765 hw2.1 WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.23 > > From ath11k point of view QCNFA765 is WCN6855 so I used this one: > > Tested-on: WCN6855 hw2.1 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.23 > > > Note that I've only been able to test the ath11k fixes (not the > > corresponding ath12k) and I only tested this particular patch fully > > Thanks, I added Tested-on to this patch 1 and for the rest I added > "compile tested only". Thanks for fixing that, I'll try to remember the Tested-on tag next time. Johan
diff --git a/drivers/net/wireless/ath/ath11k/wmi.c b/drivers/net/wireless/ath/ath11k/wmi.c index 23ad6825e5be..da1582b8dc30 100644 --- a/drivers/net/wireless/ath/ath11k/wmi.c +++ b/drivers/net/wireless/ath/ath11k/wmi.c @@ -8383,14 +8383,17 @@ ath11k_wmi_pdev_temperature_event(struct ath11k_base *ab, ath11k_dbg(ab, ATH11K_DBG_WMI, "event pdev temperature ev temp %d pdev_id %d\n", ev->temp, ev->pdev_id); + rcu_read_lock(); + ar = ath11k_mac_get_ar_by_pdev_id(ab, ev->pdev_id); if (!ar) { ath11k_warn(ab, "invalid pdev id in pdev temperature ev %d", ev->pdev_id); - kfree(tb); - return; + goto exit; } ath11k_thermal_event_temperature(ar, ev->temp); +exit: + rcu_read_unlock(); kfree(tb); }