* [PATCH v2 0/2] Improve ath10k flush queue mechanism
@ 2024-10-22 9:14 Remi Pommarel
2024-10-22 9:14 ` [PATCH v2 1/2] wifi: ath10k: Implement ieee80211 flush_sta callback Remi Pommarel
2024-10-22 9:14 ` [PATCH v2 2/2] wifi: ath10k: Flush only requested txq in ath10k_flush() Remi Pommarel
0 siblings, 2 replies; 5+ messages in thread
From: Remi Pommarel @ 2024-10-22 9:14 UTC (permalink / raw)
To: ath10k, linux-wireless, linux-kernel
Cc: Kalle Valo, Jeff Johnson, Cedric Veilleux,
Vasanthakumar Thiagarajan, Remi Pommarel
It has been reported [0] that a 3-4 seconds (actually up to 5 sec) of
radio silence could be observed followed by the error below on ath10k
devices:
ath10k_pci 0000:04:00.0: failed to flush transmit queue (skip 0 ar-state 1): 0
This is due to how the TX queues are flushed in ath10k. When a STA is
removed, mac80211 need to flush queues [1], but because ath10k does not
have a lightweight .flush_sta operation, ieee80211_flush_queues() is
called instead effectively blocking the whole queue during the drain
causing this radio silence. Also because ath10k_flush() waits for all
queued to be emptied, not only the flushed ones it could more easily
take up to 5 seconds to finish making the whole situation worst.
The first patch of this series adds a .flush_sta operation to flush only
specific STA traffic avoiding the need to stop whole queues and should
be enough in itself to fix the reported issue.
The second patch of this series is a proposal to improve ath10k_flush so
that it will be less likely to timeout waiting for non related queues to
drain.
The abose kernel warning could still be observed (e.g. flushing a dead
STA) but should be now harmless.
[0]: https://lore.kernel.org/all/CA+Xfe4FjUmzM5mvPxGbpJsF3SvSdE5_wgxvgFJ0bsdrKODVXCQ@mail.gmail.com/
[1]: commit 0b75a1b1e42e ("wifi: mac80211: flush queues on STA removal")
V2:
- Add Closes tag
- Use atomic instead of spinlock for per sta pending frame counter
- Call ath10k_htt_tx_sta_dec_pending within rcu
- Rename pending_per_queue[] to num_pending_per_queue[]
Remi Pommarel (2):
wifi: ath10k: Implement ieee80211 flush_sta callback
wifi: ath10k: Flush only requested txq in ath10k_flush()
drivers/net/wireless/ath/ath10k/core.h | 2 +
drivers/net/wireless/ath/ath10k/htt.h | 11 +++-
drivers/net/wireless/ath/ath10k/htt_tx.c | 49 +++++++++++++++-
drivers/net/wireless/ath/ath10k/mac.c | 73 ++++++++++++++++++++----
drivers/net/wireless/ath/ath10k/txrx.c | 11 ++--
5 files changed, 126 insertions(+), 20 deletions(-)
--
2.40.0
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2 1/2] wifi: ath10k: Implement ieee80211 flush_sta callback
2024-10-22 9:14 [PATCH v2 0/2] Improve ath10k flush queue mechanism Remi Pommarel
@ 2024-10-22 9:14 ` Remi Pommarel
2024-10-22 9:14 ` [PATCH v2 2/2] wifi: ath10k: Flush only requested txq in ath10k_flush() Remi Pommarel
1 sibling, 0 replies; 5+ messages in thread
From: Remi Pommarel @ 2024-10-22 9:14 UTC (permalink / raw)
To: ath10k, linux-wireless, linux-kernel
Cc: Kalle Valo, Jeff Johnson, Cedric Veilleux,
Vasanthakumar Thiagarajan, Remi Pommarel
When a STA reassociates, mac80211's _sta_info_move_state() waits for all
pending frame to be flushed before removing the key (so that no frame
get sent unencrypted after key removable [0]). When a driver does not
implement the flush_sta callback, ieee80211_flush_queues() is called
instead which effectively stops the whole queue until it is completely
drained.
The ath10k driver configure all STAs of one vdev to share the same
queue. So when flushing one STA this is the whole vdev queue that is
blocked until completely drained causing Tx to other STA to also stall
this whole time.
One easy way to reproduce the issue is to connect two STAs (STA0 and
STA1) to an ath10k AP. While Generating a bunch of traffic from AP to
STA0 (e.g. fping -l -p 20 <STA0-IP>) disconnect STA0 from AP without
clean disassociation (e.g. remove power, reboot -f). Then as soon as
STA0 is effectively disconnected from AP (either after inactivity
timeout or forced with iw dev AP station del STA0), its queues get
flushed using ieee80211_flush_queues(). This causes STA1 to suffer a
connectivity stall for about 5 seconds (see ATH10K_FLUSH_TIMEOUT_HZ).
Implement a flush_sta callback in ath10k to wait only for a specific
STA pending frames to be drained (without stopping the whole HW queue)
to fix that.
[0]: commit 0b75a1b1e42e ("wifi: mac80211: flush queues on STA removal")
Reported-by: Cedric Veilleux <veilleux.cedric@gmail.com>
Closes: https://lore.kernel.org/all/CA+Xfe4FjUmzM5mvPxGbpJsF3SvSdE5_wgxvgFJ0bsdrKODVXCQ@mail.gmail.com/
Signed-off-by: Remi Pommarel <repk@triplefau.lt>
---
drivers/net/wireless/ath/ath10k/core.h | 2 ++
drivers/net/wireless/ath/ath10k/htt.h | 4 +++
drivers/net/wireless/ath/ath10k/htt_tx.c | 31 ++++++++++++++++++
drivers/net/wireless/ath/ath10k/mac.c | 40 +++++++++++++++++++++++-
drivers/net/wireless/ath/ath10k/txrx.c | 9 ++++--
5 files changed, 82 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h
index 446dca74f06a..4ec2faa055c0 100644
--- a/drivers/net/wireless/ath/ath10k/core.h
+++ b/drivers/net/wireless/ath/ath10k/core.h
@@ -558,6 +558,8 @@ struct ath10k_sta {
u8 rate_ctrl[ATH10K_TID_MAX];
u32 rate_code[ATH10K_TID_MAX];
int rtscts[ATH10K_TID_MAX];
+ wait_queue_head_t empty_tx_wq;
+ atomic_t num_fw_queued;
};
#define ATH10K_VDEV_SETUP_TIMEOUT_HZ (5 * HZ)
diff --git a/drivers/net/wireless/ath/ath10k/htt.h b/drivers/net/wireless/ath/ath10k/htt.h
index 603f6de62b0a..d150f9330941 100644
--- a/drivers/net/wireless/ath/ath10k/htt.h
+++ b/drivers/net/wireless/ath/ath10k/htt.h
@@ -2452,6 +2452,10 @@ int ath10k_htt_tx_inc_pending(struct ath10k_htt *htt);
void ath10k_htt_tx_mgmt_dec_pending(struct ath10k_htt *htt);
int ath10k_htt_tx_mgmt_inc_pending(struct ath10k_htt *htt, bool is_mgmt,
bool is_presp);
+void ath10k_htt_tx_sta_inc_pending(struct ath10k_htt *htt,
+ struct ieee80211_sta *sta);
+void ath10k_htt_tx_sta_dec_pending(struct ath10k_htt *htt,
+ struct ieee80211_sta *sta);
int ath10k_htt_tx_alloc_msdu_id(struct ath10k_htt *htt, struct sk_buff *skb);
void ath10k_htt_tx_free_msdu_id(struct ath10k_htt *htt, u16 msdu_id);
diff --git a/drivers/net/wireless/ath/ath10k/htt_tx.c b/drivers/net/wireless/ath/ath10k/htt_tx.c
index 9725feecefd6..211752bd0f65 100644
--- a/drivers/net/wireless/ath/ath10k/htt_tx.c
+++ b/drivers/net/wireless/ath/ath10k/htt_tx.c
@@ -195,6 +195,37 @@ void ath10k_htt_tx_mgmt_dec_pending(struct ath10k_htt *htt)
htt->num_pending_mgmt_tx--;
}
+void ath10k_htt_tx_sta_inc_pending(struct ath10k_htt *htt,
+ struct ieee80211_sta *sta)
+{
+ struct ath10k_sta *arsta;
+
+ if (!sta)
+ return;
+
+ arsta = (struct ath10k_sta *)sta->drv_priv;
+
+ atomic_inc(&arsta->num_fw_queued);
+}
+
+void ath10k_htt_tx_sta_dec_pending(struct ath10k_htt *htt,
+ struct ieee80211_sta *sta)
+{
+ struct ath10k_sta *arsta;
+ int v;
+
+ if (!sta)
+ return;
+
+ arsta = (struct ath10k_sta *)sta->drv_priv;
+
+ v = atomic_dec_if_positive(&arsta->num_fw_queued);
+ if (v < 0)
+ WARN_ON_ONCE(1);
+ if (v == 0)
+ wake_up(&arsta->empty_tx_wq);
+}
+
int ath10k_htt_tx_alloc_msdu_id(struct ath10k_htt *htt, struct sk_buff *skb)
{
struct ath10k *ar = htt->ar;
diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index 646e1737d4c4..86386a0af14d 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -4423,6 +4423,8 @@ int ath10k_mac_tx_push_txq(struct ieee80211_hw *hw,
spin_unlock_bh(&ar->htt.tx_lock);
}
+ ath10k_htt_tx_sta_inc_pending(&ar->htt, sta);
+
ret = ath10k_mac_tx(ar, vif, txmode, txpath, skb, false);
if (unlikely(ret)) {
ath10k_warn(ar, "failed to push frame: %d\n", ret);
@@ -4432,6 +4434,7 @@ int ath10k_mac_tx_push_txq(struct ieee80211_hw *hw,
if (is_mgmt)
ath10k_htt_tx_mgmt_dec_pending(htt);
spin_unlock_bh(&ar->htt.tx_lock);
+ ath10k_htt_tx_sta_dec_pending(&ar->htt, sta);
return ret;
}
@@ -7474,7 +7477,7 @@ static int ath10k_sta_state(struct ieee80211_hw *hw,
arsta->peer_ps_state = WMI_PEER_PS_STATE_DISABLED;
INIT_WORK(&arsta->update_wk, ath10k_sta_rc_update_wk);
INIT_WORK(&arsta->tid_config_wk, ath10k_sta_tid_cfg_wk);
-
+ init_waitqueue_head(&arsta->empty_tx_wq);
for (i = 0; i < ARRAY_SIZE(sta->txq); i++)
ath10k_mac_txq_init(sta->txq[i]);
}
@@ -8098,6 +8101,40 @@ static void ath10k_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
mutex_unlock(&ar->conf_mutex);
}
+static void ath10k_flush_sta(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
+ struct ieee80211_sta *sta)
+{
+ struct ath10k_sta *arsta = (struct ath10k_sta *)sta->drv_priv;
+ struct ath10k *ar = hw->priv;
+ bool skip;
+ long time_left;
+
+ /* TODO do we need drop implemented here ? */
+
+ mutex_lock(&ar->conf_mutex);
+
+ if (ar->state == ATH10K_STATE_WEDGED)
+ goto out;
+
+ time_left = wait_event_timeout(arsta->empty_tx_wq, ({
+ bool empty;
+
+ empty = atomic_read(&arsta->num_fw_queued) == 0;
+
+ skip = (ar->state == ATH10K_STATE_WEDGED) ||
+ test_bit(ATH10K_FLAG_CRASH_FLUSH,
+ &ar->dev_flags);
+
+ (empty || skip);
+ }), ATH10K_FLUSH_TIMEOUT_HZ);
+
+ if (time_left == 0 || skip)
+ ath10k_warn(ar, "failed to flush sta txq (sta %pM skip %i ar-state %i): %ld\n",
+ sta->addr, skip, ar->state, time_left);
+out:
+ mutex_unlock(&ar->conf_mutex);
+}
+
/* TODO: Implement this function properly
* For now it is needed to reply to Probe Requests in IBSS mode.
* Probably we need this information from FW.
@@ -9444,6 +9481,7 @@ static const struct ieee80211_ops ath10k_ops = {
.set_rts_threshold = ath10k_set_rts_threshold,
.set_frag_threshold = ath10k_mac_op_set_frag_threshold,
.flush = ath10k_flush,
+ .flush_sta = ath10k_flush_sta,
.tx_last_beacon = ath10k_tx_last_beacon,
.set_antenna = ath10k_set_antenna,
.get_antenna = ath10k_get_antenna,
diff --git a/drivers/net/wireless/ath/ath10k/txrx.c b/drivers/net/wireless/ath/ath10k/txrx.c
index da3bc35e41aa..5b6750ef7d19 100644
--- a/drivers/net/wireless/ath/ath10k/txrx.c
+++ b/drivers/net/wireless/ath/ath10k/txrx.c
@@ -86,9 +86,12 @@ int ath10k_txrx_tx_unref(struct ath10k_htt *htt,
spin_unlock_bh(&htt->tx_lock);
rcu_read_lock();
- if (txq && txq->sta && skb_cb->airtime_est)
- ieee80211_sta_register_airtime(txq->sta, txq->tid,
- skb_cb->airtime_est, 0);
+ if (txq && txq->sta) {
+ if (skb_cb->airtime_est)
+ ieee80211_sta_register_airtime(txq->sta, txq->tid,
+ skb_cb->airtime_est, 0);
+ ath10k_htt_tx_sta_dec_pending(htt, txq->sta);
+ }
rcu_read_unlock();
if (ar->bus_param.dev_type != ATH10K_DEV_TYPE_HL)
--
2.40.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v2 2/2] wifi: ath10k: Flush only requested txq in ath10k_flush()
2024-10-22 9:14 [PATCH v2 0/2] Improve ath10k flush queue mechanism Remi Pommarel
2024-10-22 9:14 ` [PATCH v2 1/2] wifi: ath10k: Implement ieee80211 flush_sta callback Remi Pommarel
@ 2024-10-22 9:14 ` Remi Pommarel
2024-10-25 7:44 ` Dan Carpenter
1 sibling, 1 reply; 5+ messages in thread
From: Remi Pommarel @ 2024-10-22 9:14 UTC (permalink / raw)
To: ath10k, linux-wireless, linux-kernel
Cc: Kalle Valo, Jeff Johnson, Cedric Veilleux,
Vasanthakumar Thiagarajan, Remi Pommarel
The ieee80211 flush callback can be called to flush only part of all hw
queues. The ath10k's flush callback implementation (i.e. ath10k_flush())
was waiting for all pending frames of all queues to be flushed ignoring
the queue parameter. Because only the queues to be flushed are stopped
by mac80211, skb can still be queued to other queues meanwhile. Thus
ath10k_flush() could fail (and wait 5sec holding ar->conf lock) even if
the requested queues are flushed correctly.
A way to reproduce the issue is to use two different APs because
each vdev has its own hw queue in ath10k. Connect STA0 to AP0 and STA1
to AP1. Then generate traffic from AP0 to STA0 and kill STA0 without
clean disassociation frame (e.g. unplug power cable, reboot -f, ...).
Now if we were to flush AP1's queue, ath10k_flush() would fail (and
effectively block 5 seconds with ar->conf or even wiphy's lock held)
with the following warning:
ath10k_pci 0000:01:00.0: failed to flush transmit queue (skip 0 ar-state 2): 0
Wait only for pending frames of the requested queues to be flushed in
ath10k_flush() to avoid that long blocking.
Reported-by: Cedric Veilleux <veilleux.cedric@gmail.com>
Closes: https://lore.kernel.org/all/CA+Xfe4FjUmzM5mvPxGbpJsF3SvSdE5_wgxvgFJ0bsdrKODVXCQ@mail.gmail.com/
Signed-off-by: Remi Pommarel <repk@triplefau.lt>
---
drivers/net/wireless/ath/ath10k/htt.h | 7 +++--
drivers/net/wireless/ath/ath10k/htt_tx.c | 18 ++++++++++---
drivers/net/wireless/ath/ath10k/mac.c | 33 +++++++++++++++++-------
drivers/net/wireless/ath/ath10k/txrx.c | 2 +-
4 files changed, 44 insertions(+), 16 deletions(-)
diff --git a/drivers/net/wireless/ath/ath10k/htt.h b/drivers/net/wireless/ath/ath10k/htt.h
index d150f9330941..ca8bf3b6766d 100644
--- a/drivers/net/wireless/ath/ath10k/htt.h
+++ b/drivers/net/wireless/ath/ath10k/htt.h
@@ -1870,6 +1870,7 @@ struct ath10k_htt {
spinlock_t tx_lock;
int max_num_pending_tx;
int num_pending_tx;
+ int num_pending_per_queue[IEEE80211_MAX_QUEUES];
int num_pending_mgmt_tx;
struct idr pending_tx;
wait_queue_head_t empty_tx_wq;
@@ -2447,8 +2448,10 @@ void ath10k_htt_tx_txq_update(struct ieee80211_hw *hw,
void ath10k_htt_tx_txq_recalc(struct ieee80211_hw *hw,
struct ieee80211_txq *txq);
void ath10k_htt_tx_txq_sync(struct ath10k *ar);
-void ath10k_htt_tx_dec_pending(struct ath10k_htt *htt);
-int ath10k_htt_tx_inc_pending(struct ath10k_htt *htt);
+void ath10k_htt_tx_dec_pending(struct ath10k_htt *htt,
+ struct ieee80211_txq *txq);
+int ath10k_htt_tx_inc_pending(struct ath10k_htt *htt,
+ struct ieee80211_txq *txq);
void ath10k_htt_tx_mgmt_dec_pending(struct ath10k_htt *htt);
int ath10k_htt_tx_mgmt_inc_pending(struct ath10k_htt *htt, bool is_mgmt,
bool is_presp);
diff --git a/drivers/net/wireless/ath/ath10k/htt_tx.c b/drivers/net/wireless/ath/ath10k/htt_tx.c
index 211752bd0f65..ef5a992e8cce 100644
--- a/drivers/net/wireless/ath/ath10k/htt_tx.c
+++ b/drivers/net/wireless/ath/ath10k/htt_tx.c
@@ -140,19 +140,26 @@ void ath10k_htt_tx_txq_update(struct ieee80211_hw *hw,
spin_unlock_bh(&ar->htt.tx_lock);
}
-void ath10k_htt_tx_dec_pending(struct ath10k_htt *htt)
+void ath10k_htt_tx_dec_pending(struct ath10k_htt *htt,
+ struct ieee80211_txq *txq)
{
+ int qnr = -1;
+
lockdep_assert_held(&htt->tx_lock);
htt->num_pending_tx--;
if (htt->num_pending_tx == htt->max_num_pending_tx - 1)
ath10k_mac_tx_unlock(htt->ar, ATH10K_TX_PAUSE_Q_FULL);
- if (htt->num_pending_tx == 0)
+ if (txq)
+ qnr = --htt->num_pending_per_queue[txq->vif->hw_queue[txq->ac]];
+
+ if (htt->num_pending_tx == 0 || qnr == 0)
wake_up(&htt->empty_tx_wq);
}
-int ath10k_htt_tx_inc_pending(struct ath10k_htt *htt)
+int ath10k_htt_tx_inc_pending(struct ath10k_htt *htt,
+ struct ieee80211_txq *txq)
{
lockdep_assert_held(&htt->tx_lock);
@@ -163,6 +170,11 @@ int ath10k_htt_tx_inc_pending(struct ath10k_htt *htt)
if (htt->num_pending_tx == htt->max_num_pending_tx)
ath10k_mac_tx_lock(htt->ar, ATH10K_TX_PAUSE_Q_FULL);
+ if (!txq)
+ return 0;
+
+ htt->num_pending_per_queue[txq->vif->hw_queue[txq->ac]]++;
+
return 0;
}
diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index 86386a0af14d..e78b112df339 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -4385,7 +4385,7 @@ int ath10k_mac_tx_push_txq(struct ieee80211_hw *hw,
u16 airtime;
spin_lock_bh(&ar->htt.tx_lock);
- ret = ath10k_htt_tx_inc_pending(htt);
+ ret = ath10k_htt_tx_inc_pending(htt, txq);
spin_unlock_bh(&ar->htt.tx_lock);
if (ret)
@@ -4394,7 +4394,7 @@ int ath10k_mac_tx_push_txq(struct ieee80211_hw *hw,
skb = ieee80211_tx_dequeue_ni(hw, txq);
if (!skb) {
spin_lock_bh(&ar->htt.tx_lock);
- ath10k_htt_tx_dec_pending(htt);
+ ath10k_htt_tx_dec_pending(htt, txq);
spin_unlock_bh(&ar->htt.tx_lock);
return -ENOENT;
@@ -4416,7 +4416,7 @@ int ath10k_mac_tx_push_txq(struct ieee80211_hw *hw,
ret = ath10k_htt_tx_mgmt_inc_pending(htt, is_mgmt, is_presp);
if (ret) {
- ath10k_htt_tx_dec_pending(htt);
+ ath10k_htt_tx_dec_pending(htt, txq);
spin_unlock_bh(&ar->htt.tx_lock);
return ret;
}
@@ -4430,7 +4430,7 @@ int ath10k_mac_tx_push_txq(struct ieee80211_hw *hw,
ath10k_warn(ar, "failed to push frame: %d\n", ret);
spin_lock_bh(&ar->htt.tx_lock);
- ath10k_htt_tx_dec_pending(htt);
+ ath10k_htt_tx_dec_pending(htt, txq);
if (is_mgmt)
ath10k_htt_tx_mgmt_dec_pending(htt);
spin_unlock_bh(&ar->htt.tx_lock);
@@ -4693,7 +4693,7 @@ static void ath10k_mac_op_tx(struct ieee80211_hw *hw,
is_presp = ieee80211_is_probe_resp(hdr->frame_control);
}
- ret = ath10k_htt_tx_inc_pending(htt);
+ ret = ath10k_htt_tx_inc_pending(htt, txq);
if (ret) {
ath10k_warn(ar, "failed to increase tx pending count: %d, dropping\n",
ret);
@@ -4706,7 +4706,7 @@ static void ath10k_mac_op_tx(struct ieee80211_hw *hw,
if (ret) {
ath10k_dbg(ar, ATH10K_DBG_MAC, "failed to increase tx mgmt pending count: %d, dropping\n",
ret);
- ath10k_htt_tx_dec_pending(htt);
+ ath10k_htt_tx_dec_pending(htt, txq);
spin_unlock_bh(&ar->htt.tx_lock);
ieee80211_free_txskb(ar->hw, skb);
return;
@@ -4719,7 +4719,7 @@ static void ath10k_mac_op_tx(struct ieee80211_hw *hw,
ath10k_warn(ar, "failed to transmit frame: %d\n", ret);
if (is_htt) {
spin_lock_bh(&ar->htt.tx_lock);
- ath10k_htt_tx_dec_pending(htt);
+ ath10k_htt_tx_dec_pending(htt, txq);
if (is_mgmt)
ath10k_htt_tx_mgmt_dec_pending(htt);
spin_unlock_bh(&ar->htt.tx_lock);
@@ -8045,10 +8045,12 @@ static int ath10k_mac_op_set_frag_threshold(struct ieee80211_hw *hw, u32 value)
return -EOPNOTSUPP;
}
-void ath10k_mac_wait_tx_complete(struct ath10k *ar)
+static void _ath10k_mac_wait_tx_complete(struct ath10k *ar,
+ unsigned long queues)
{
bool skip;
long time_left;
+ unsigned int q;
/* mac80211 doesn't care if we really xmit queued frames or not
* we'll collect those frames either way if we stop/delete vdevs
@@ -8061,7 +8063,11 @@ void ath10k_mac_wait_tx_complete(struct ath10k *ar)
bool empty;
spin_lock_bh(&ar->htt.tx_lock);
- empty = (ar->htt.num_pending_tx == 0);
+ for_each_set_bit(q, &queues, ar->hw->queues) {
+ empty = (ar->htt.num_pending_per_queue[q] == 0);
+ if (!empty)
+ break;
+ }
spin_unlock_bh(&ar->htt.tx_lock);
skip = (ar->state == ATH10K_STATE_WEDGED) ||
@@ -8076,6 +8082,13 @@ void ath10k_mac_wait_tx_complete(struct ath10k *ar)
skip, ar->state, time_left);
}
+void ath10k_mac_wait_tx_complete(struct ath10k *ar)
+{
+ unsigned int queues = GENMASK(ar->hw->queues - 1, 0);
+
+ _ath10k_mac_wait_tx_complete(ar, queues);
+}
+
static void ath10k_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
u32 queues, bool drop)
{
@@ -8097,7 +8110,7 @@ static void ath10k_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
}
mutex_lock(&ar->conf_mutex);
- ath10k_mac_wait_tx_complete(ar);
+ _ath10k_mac_wait_tx_complete(ar, queues);
mutex_unlock(&ar->conf_mutex);
}
diff --git a/drivers/net/wireless/ath/ath10k/txrx.c b/drivers/net/wireless/ath/ath10k/txrx.c
index 5b6750ef7d19..b848962fc8fb 100644
--- a/drivers/net/wireless/ath/ath10k/txrx.c
+++ b/drivers/net/wireless/ath/ath10k/txrx.c
@@ -82,7 +82,7 @@ int ath10k_txrx_tx_unref(struct ath10k_htt *htt,
flags = skb_cb->flags;
ath10k_htt_tx_free_msdu_id(htt, tx_done->msdu_id);
- ath10k_htt_tx_dec_pending(htt);
+ ath10k_htt_tx_dec_pending(htt, txq);
spin_unlock_bh(&htt->tx_lock);
rcu_read_lock();
--
2.40.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v2 2/2] wifi: ath10k: Flush only requested txq in ath10k_flush()
2024-10-22 9:14 ` [PATCH v2 2/2] wifi: ath10k: Flush only requested txq in ath10k_flush() Remi Pommarel
@ 2024-10-25 7:44 ` Dan Carpenter
2024-10-25 8:01 ` Remi Pommarel
0 siblings, 1 reply; 5+ messages in thread
From: Dan Carpenter @ 2024-10-25 7:44 UTC (permalink / raw)
To: oe-kbuild, Remi Pommarel, ath10k, linux-wireless, linux-kernel
Cc: lkp, oe-kbuild-all, Kalle Valo, Jeff Johnson, Cedric Veilleux,
Vasanthakumar Thiagarajan, Remi Pommarel
Hi Remi,
kernel test robot noticed the following build warnings:
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Remi-Pommarel/wifi-ath10k-Implement-ieee80211-flush_sta-callback/20241022-172038
base: https://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git ath-next
patch link: https://lore.kernel.org/r/0f55986ebe34f2b5aa4ccbcb0bed445324099fbd.1729586267.git.repk%40triplefau.lt
patch subject: [PATCH v2 2/2] wifi: ath10k: Flush only requested txq in ath10k_flush()
config: parisc-randconfig-r071-20241024 (https://download.01.org/0day-ci/archive/20241025/202410251152.A5axJliR-lkp@intel.com/config)
compiler: hppa-linux-gcc (GCC) 14.1.0
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
| Closes: https://lore.kernel.org/r/202410251152.A5axJliR-lkp@intel.com/
New smatch warnings:
drivers/net/wireless/ath/ath10k/mac.c:8076 _ath10k_mac_wait_tx_complete() error: uninitialized symbol 'empty'.
vim +/empty +8076 drivers/net/wireless/ath/ath10k/mac.c
c4f7022f0ef0aa Remi Pommarel 2024-10-22 8062 static void _ath10k_mac_wait_tx_complete(struct ath10k *ar,
c4f7022f0ef0aa Remi Pommarel 2024-10-22 8063 unsigned long queues)
5e3dd157d7e70f Kalle Valo 2013-06-12 8064 {
affd321733eebc Michal Kazior 2013-07-16 8065 bool skip;
d4298a3a8c92a1 Nicholas Mc Guire 2015-06-15 8066 long time_left;
c4f7022f0ef0aa Remi Pommarel 2024-10-22 8067 unsigned int q;
5e3dd157d7e70f Kalle Valo 2013-06-12 8068
5e3dd157d7e70f Kalle Valo 2013-06-12 8069 /* mac80211 doesn't care if we really xmit queued frames or not
d6dfe25c8bb200 Marcin Rokicki 2017-02-20 8070 * we'll collect those frames either way if we stop/delete vdevs
d6dfe25c8bb200 Marcin Rokicki 2017-02-20 8071 */
548db54cc1890b Michal Kazior 2013-07-05 8072
affd321733eebc Michal Kazior 2013-07-16 8073 if (ar->state == ATH10K_STATE_WEDGED)
828853ac58265c Wen Gong 2018-08-28 8074 return;
affd321733eebc Michal Kazior 2013-07-16 8075
d4298a3a8c92a1 Nicholas Mc Guire 2015-06-15 @8076 time_left = wait_event_timeout(ar->htt.empty_tx_wq, ({
5e3dd157d7e70f Kalle Valo 2013-06-12 8077 bool empty;
affd321733eebc Michal Kazior 2013-07-16 8078
edb8236df4d042 Michal Kazior 2013-07-05 8079 spin_lock_bh(&ar->htt.tx_lock);
c4f7022f0ef0aa Remi Pommarel 2024-10-22 8080 for_each_set_bit(q, &queues, ar->hw->queues) {
Smatch is concerned that there might not be any set bits. (You know that the
compiler is automatically going to ininitialize empty to false so it costs
nothing to initialize it to false explicitly and silence this warning).
c4f7022f0ef0aa Remi Pommarel 2024-10-22 8081 empty = (ar->htt.num_pending_per_queue[q] == 0);
c4f7022f0ef0aa Remi Pommarel 2024-10-22 8082 if (!empty)
c4f7022f0ef0aa Remi Pommarel 2024-10-22 8083 break;
c4f7022f0ef0aa Remi Pommarel 2024-10-22 8084 }
edb8236df4d042 Michal Kazior 2013-07-05 8085 spin_unlock_bh(&ar->htt.tx_lock);
affd321733eebc Michal Kazior 2013-07-16 8086
7962b0d898accd Michal Kazior 2014-10-28 8087 skip = (ar->state == ATH10K_STATE_WEDGED) ||
7962b0d898accd Michal Kazior 2014-10-28 8088 test_bit(ATH10K_FLAG_CRASH_FLUSH,
7962b0d898accd Michal Kazior 2014-10-28 8089 &ar->dev_flags);
affd321733eebc Michal Kazior 2013-07-16 8090
affd321733eebc Michal Kazior 2013-07-16 8091 (empty || skip);
5e3dd157d7e70f Kalle Valo 2013-06-12 8092 }), ATH10K_FLUSH_TIMEOUT_HZ);
affd321733eebc Michal Kazior 2013-07-16 8093
d4298a3a8c92a1 Nicholas Mc Guire 2015-06-15 8094 if (time_left == 0 || skip)
d4298a3a8c92a1 Nicholas Mc Guire 2015-06-15 8095 ath10k_warn(ar, "failed to flush transmit queue (skip %i ar-state %i): %ld\n",
d4298a3a8c92a1 Nicholas Mc Guire 2015-06-15 8096 skip, ar->state, time_left);
828853ac58265c Wen Gong 2018-08-28 8097 }
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2 2/2] wifi: ath10k: Flush only requested txq in ath10k_flush()
2024-10-25 7:44 ` Dan Carpenter
@ 2024-10-25 8:01 ` Remi Pommarel
0 siblings, 0 replies; 5+ messages in thread
From: Remi Pommarel @ 2024-10-25 8:01 UTC (permalink / raw)
To: Dan Carpenter
Cc: oe-kbuild, ath10k, linux-wireless, linux-kernel, lkp,
oe-kbuild-all, Kalle Valo, Jeff Johnson, Cedric Veilleux,
Vasanthakumar Thiagarajan
Hi,
On Fri, Oct 25, 2024 at 10:44:09AM +0300, Dan Carpenter wrote:
> Hi Remi,
>
> kernel test robot noticed the following build warnings:
>
> https://git-scm.com/docs/git-format-patch#_base_tree_information]
>
> url: https://github.com/intel-lab-lkp/linux/commits/Remi-Pommarel/wifi-ath10k-Implement-ieee80211-flush_sta-callback/20241022-172038
> base: https://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git ath-next
> patch link: https://lore.kernel.org/r/0f55986ebe34f2b5aa4ccbcb0bed445324099fbd.1729586267.git.repk%40triplefau.lt
> patch subject: [PATCH v2 2/2] wifi: ath10k: Flush only requested txq in ath10k_flush()
> config: parisc-randconfig-r071-20241024 (https://download.01.org/0day-ci/archive/20241025/202410251152.A5axJliR-lkp@intel.com/config)
> compiler: hppa-linux-gcc (GCC) 14.1.0
>
> If you fix the issue in a separate patch/commit (i.e. not just a new version of
> the same patch/commit), kindly add following tags
> | Reported-by: kernel test robot <lkp@intel.com>
> | Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
> | Closes: https://lore.kernel.org/r/202410251152.A5axJliR-lkp@intel.com/
>
> New smatch warnings:
> drivers/net/wireless/ath/ath10k/mac.c:8076 _ath10k_mac_wait_tx_complete() error: uninitialized symbol 'empty'.
>
> vim +/empty +8076 drivers/net/wireless/ath/ath10k/mac.c
>
> c4f7022f0ef0aa Remi Pommarel 2024-10-22 8062 static void _ath10k_mac_wait_tx_complete(struct ath10k *ar,
> c4f7022f0ef0aa Remi Pommarel 2024-10-22 8063 unsigned long queues)
> 5e3dd157d7e70f Kalle Valo 2013-06-12 8064 {
> affd321733eebc Michal Kazior 2013-07-16 8065 bool skip;
> d4298a3a8c92a1 Nicholas Mc Guire 2015-06-15 8066 long time_left;
> c4f7022f0ef0aa Remi Pommarel 2024-10-22 8067 unsigned int q;
> 5e3dd157d7e70f Kalle Valo 2013-06-12 8068
> 5e3dd157d7e70f Kalle Valo 2013-06-12 8069 /* mac80211 doesn't care if we really xmit queued frames or not
> d6dfe25c8bb200 Marcin Rokicki 2017-02-20 8070 * we'll collect those frames either way if we stop/delete vdevs
> d6dfe25c8bb200 Marcin Rokicki 2017-02-20 8071 */
> 548db54cc1890b Michal Kazior 2013-07-05 8072
> affd321733eebc Michal Kazior 2013-07-16 8073 if (ar->state == ATH10K_STATE_WEDGED)
> 828853ac58265c Wen Gong 2018-08-28 8074 return;
> affd321733eebc Michal Kazior 2013-07-16 8075
> d4298a3a8c92a1 Nicholas Mc Guire 2015-06-15 @8076 time_left = wait_event_timeout(ar->htt.empty_tx_wq, ({
> 5e3dd157d7e70f Kalle Valo 2013-06-12 8077 bool empty;
> affd321733eebc Michal Kazior 2013-07-16 8078
> edb8236df4d042 Michal Kazior 2013-07-05 8079 spin_lock_bh(&ar->htt.tx_lock);
> c4f7022f0ef0aa Remi Pommarel 2024-10-22 8080 for_each_set_bit(q, &queues, ar->hw->queues) {
>
> Smatch is concerned that there might not be any set bits. (You know that the
> compiler is automatically going to ininitialize empty to false so it costs
> nothing to initialize it to false explicitly and silence this warning).
Actually I think empty should be true here, if there is no queue to
wait for being drained then no need to wait at all. Will send a v3
with that fixed.
Thanks for the report and the analysis.
--
Remi
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-10-25 8:02 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-22 9:14 [PATCH v2 0/2] Improve ath10k flush queue mechanism Remi Pommarel
2024-10-22 9:14 ` [PATCH v2 1/2] wifi: ath10k: Implement ieee80211 flush_sta callback Remi Pommarel
2024-10-22 9:14 ` [PATCH v2 2/2] wifi: ath10k: Flush only requested txq in ath10k_flush() Remi Pommarel
2024-10-25 7:44 ` Dan Carpenter
2024-10-25 8:01 ` Remi Pommarel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox