From: "Linus Lüssing" <linus.luessing@c0d3.blue>
To: Kalle Valo <kvalo@codeaurora.org>, Felix Fietkau <nbd@nbd.name>,
Sujith Manoharan <c_manoha@qca.qualcomm.com>,
ath9k-devel@qca.qualcomm.com
Cc: linux-wireless@vger.kernel.org,
"David S . Miller" <davem@davemloft.net>,
"Jakub Kicinski" <kuba@kernel.org>,
"John W . Linville" <linville@tuxdriver.com>,
"Felix Fietkau" <nbd@openwrt.org>,
"Simon Wunderlich" <sw@simonwunderlich.de>,
"Sven Eckelmann" <sven@narfation.org>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
"Linus Lüssing" <ll@simonwunderlich.de>,
"Linus Lüssing" <linus.luessing@c0d3.blue>
Subject: [PATCH 3/3] ath9k: Fix potential hw interrupt resume during reset
Date: Tue, 14 Sep 2021 21:25:15 +0200 [thread overview]
Message-ID: <20210914192515.9273-4-linus.luessing@c0d3.blue> (raw)
In-Reply-To: <20210914192515.9273-1-linus.luessing@c0d3.blue>
From: Linus Lüssing <ll@simonwunderlich.de>
There is a small risk of the ath9k hw interrupts being reenabled in the
following way:
1) ath_reset_internal()
...
-> disable_irq()
...
<- returns
2) ath9k_tasklet()
...
-> ath9k_hw_resume_interrupts()
...
1) ath_reset_internal() continued:
-> tasklet_disable(&sc->intr_tq); (= ath9k_tasklet() off)
By first disabling the ath9k interrupt there is a small window
afterwards which allows ath9k hw interrupts being reenabled through
the ath9k_tasklet() before we disable this tasklet in
ath_reset_internal(). Leading to having the ath9k hw interrupts enabled
during the reset, which we should avoid.
Fixing this by first disabling all ath9k tasklets. And only after
they are not running anymore also disabling the overall ath9k interrupt.
Either ath9k_queue_reset()->ath9k_kill_hw_interrupts() or
ath_reset_internal()->disable_irq()->ath_isr()->ath9k_kill_hw_interrupts()
should then have ensured that no ath9k hw interrupts are running during
the actual ath9k reset.
We could reproduce this issue with two Lima boards from 8devices
(QCA4531) on OpenWrt 19.07 while sending UDP traffic between the two and
triggering an ath9k_queue_reset() and with added msleep()s between
disable_irq() and tasklet_disable() in ath_reset_internal().
Cc: Sven Eckelmann <sven@narfation.org>
Cc: Simon Wunderlich <sw@simonwunderlich.de>
Cc: Linus Lüssing <linus.luessing@c0d3.blue>
Fixes: e3f31175a3ee ("ath9k: fix race condition in irq processing during hardware reset")
Signed-off-by: Linus Lüssing <ll@simonwunderlich.de>
---
drivers/net/wireless/ath/ath9k/main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index 98090e40e1cf..b9f9a8ae3b56 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -292,9 +292,9 @@ static int ath_reset_internal(struct ath_softc *sc, struct ath9k_channel *hchan)
__ath_cancel_work(sc);
- disable_irq(sc->irq);
tasklet_disable(&sc->intr_tq);
tasklet_disable(&sc->bcon_tasklet);
+ disable_irq(sc->irq);
spin_lock_bh(&sc->sc_pcu_lock);
if (!sc->cur_chan->offchannel) {
--
2.31.0
next prev parent reply other threads:[~2021-09-14 19:33 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-14 19:25 [PATCH 0/3] ath9k: interrupt fixes on queue reset Linus Lüssing
2021-09-14 19:25 ` [PATCH 1/3] ath9k: add option to reset the wifi chip via debugfs Linus Lüssing
2021-10-05 14:27 ` Kalle Valo
2021-09-14 19:25 ` [PATCH 2/3] ath9k: Fix potential interrupt storm on queue reset Linus Lüssing
2021-09-14 19:25 ` Linus Lüssing [this message]
2021-09-15 9:48 ` [PATCH 3/3] ath9k: Fix potential hw interrupt resume during reset Felix Fietkau
2021-09-15 19:18 ` Linus Lüssing
2021-09-14 19:53 ` [PATCH 0/3] ath9k: interrupt fixes on queue reset Toke Høiland-Jørgensen
2021-09-15 9:23 ` Linus Lüssing
2021-10-05 14:12 ` Linus Lüssing
2021-10-05 14:24 ` Kalle Valo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210914192515.9273-4-linus.luessing@c0d3.blue \
--to=linus.luessing@c0d3.blue \
--cc=ath9k-devel@qca.qualcomm.com \
--cc=c_manoha@qca.qualcomm.com \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=kvalo@codeaurora.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=ll@simonwunderlich.de \
--cc=nbd@nbd.name \
--cc=nbd@openwrt.org \
--cc=netdev@vger.kernel.org \
--cc=sven@narfation.org \
--cc=sw@simonwunderlich.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).