[openwrt/openwrt] mac80211: system hang caused by deferring calls into minstrel to dequeue
LEDE Commits
lede-commits at lists.infradead.org
Thu Jun 17 09:25:44 PDT 2021
nbd pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/a603e82dd342680d584c4eb5f1b222e056379890
commit a603e82dd342680d584c4eb5f1b222e056379890
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Thu Jun 17 18:10:36 2021 +0200
mac80211: system hang caused by deferring calls into minstrel to dequeue
Move the aggregation check to mac80211
Signed-off-by: Felix Fietkau <nbd at nbd.name>
---
...ve-A-MPDU-session-check-from-minstrel_ht-.patch | 126 +++++++++++++++++++++
...ll-ieee80211_tx_h_rate_ctrl-when-dequeue.patch} | 0
...nstrel_ht-fix-minstrel_aggr_check-for-enc.patch | 39 -------
...ac80211-minstrel_ht-fix-sample-time-check.patch | 2 +-
4 files changed, 127 insertions(+), 40 deletions(-)
diff --git a/package/kernel/mac80211/patches/subsys/374-mac80211-move-A-MPDU-session-check-from-minstrel_ht-.patch b/package/kernel/mac80211/patches/subsys/374-mac80211-move-A-MPDU-session-check-from-minstrel_ht-.patch
new file mode 100644
index 0000000000..4e3242e6a9
--- /dev/null
+++ b/package/kernel/mac80211/patches/subsys/374-mac80211-move-A-MPDU-session-check-from-minstrel_ht-.patch
@@ -0,0 +1,126 @@
+From: Felix Fietkau <nbd at nbd.name>
+Date: Thu, 17 Jun 2021 17:56:54 +0200
+Subject: [PATCH] mac80211: move A-MPDU session check from minstrel_ht to
+ mac80211
+
+This avoids calling back into tx handlers from within the rate control module.
+Preparation for deferring rate control until tx dequeue
+
+Signed-off-by: Felix Fietkau <nbd at nbd.name>
+---
+
+--- a/include/net/mac80211.h
++++ b/include/net/mac80211.h
+@@ -6160,6 +6160,11 @@ enum rate_control_capabilities {
+ * otherwise the NSS difference doesn't bother us.
+ */
+ RATE_CTRL_CAPA_VHT_EXT_NSS_BW = BIT(0),
++ /**
++ * @RATE_CTRL_CAPA_AMPDU_TRIGGER:
++ * mac80211 should start A-MPDU sessions on tx
++ */
++ RATE_CTRL_CAPA_AMPDU_TRIGGER = BIT(1),
+ };
+
+ struct rate_control_ops {
+--- a/net/mac80211/rc80211_minstrel_ht.c
++++ b/net/mac80211/rc80211_minstrel_ht.c
+@@ -1153,29 +1153,6 @@ minstrel_downgrade_prob_rate(struct mins
+ }
+
+ static void
+-minstrel_aggr_check(struct ieee80211_sta *pubsta, struct sk_buff *skb)
+-{
+- struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
+- struct sta_info *sta = container_of(pubsta, struct sta_info, sta);
+- u16 tid;
+-
+- if (skb_get_queue_mapping(skb) == IEEE80211_AC_VO)
+- return;
+-
+- if (unlikely(!ieee80211_is_data_qos(hdr->frame_control)))
+- return;
+-
+- if (unlikely(skb->protocol == cpu_to_be16(ETH_P_PAE)))
+- return;
+-
+- tid = ieee80211_get_tid(hdr);
+- if (likely(sta->ampdu_mlme.tid_tx[tid]))
+- return;
+-
+- ieee80211_start_tx_ba_session(pubsta, tid, 0);
+-}
+-
+-static void
+ minstrel_ht_tx_status(void *priv, struct ieee80211_supported_band *sband,
+ void *priv_sta, struct ieee80211_tx_status *st)
+ {
+@@ -1477,10 +1454,6 @@ minstrel_ht_get_rate(void *priv, struct
+ struct minstrel_priv *mp = priv;
+ u16 sample_idx;
+
+- if (!(info->flags & IEEE80211_TX_CTL_AMPDU) &&
+- !minstrel_ht_is_legacy_group(MI_RATE_GROUP(mi->max_prob_rate)))
+- minstrel_aggr_check(sta, txrc->skb);
+-
+ info->flags |= mi->tx_flags;
+
+ #ifdef CPTCFG_MAC80211_DEBUGFS
+@@ -1894,6 +1867,7 @@ static u32 minstrel_ht_get_expected_thro
+
+ static const struct rate_control_ops mac80211_minstrel_ht = {
+ .name = "minstrel_ht",
++ .capa = RATE_CTRL_CAPA_AMPDU_TRIGGER,
+ .tx_status_ext = minstrel_ht_tx_status,
+ .get_rate = minstrel_ht_get_rate,
+ .rate_init = minstrel_ht_rate_init,
+--- a/net/mac80211/tx.c
++++ b/net/mac80211/tx.c
+@@ -3933,6 +3933,29 @@ void ieee80211_txq_schedule_start(struct
+ }
+ EXPORT_SYMBOL(ieee80211_txq_schedule_start);
+
++static void
++ieee80211_aggr_check(struct ieee80211_sub_if_data *sdata,
++ struct sta_info *sta,
++ struct sk_buff *skb)
++{
++ struct rate_control_ref *ref = sdata->local->rate_ctrl;
++ u16 tid;
++
++ if (!ref || !(ref->ops->capa & RATE_CTRL_CAPA_AMPDU_TRIGGER))
++ return;
++
++ if (!sta || !sta->sta.ht_cap.ht_supported ||
++ !sta->sta.wme || skb_get_queue_mapping(skb) == IEEE80211_AC_VO ||
++ skb->protocol == sdata->control_port_protocol)
++ return;
++
++ tid = skb->priority & IEEE80211_QOS_CTL_TID_MASK;
++ if (likely(sta->ampdu_mlme.tid_tx[tid]))
++ return;
++
++ ieee80211_start_tx_ba_session(&sta->sta, tid, 0);
++}
++
+ void __ieee80211_subif_start_xmit(struct sk_buff *skb,
+ struct net_device *dev,
+ u32 info_flags,
+@@ -3963,6 +3986,8 @@ void __ieee80211_subif_start_xmit(struct
+ skb_get_hash(skb);
+ }
+
++ ieee80211_aggr_check(sdata, sta, skb);
++
+ if (sta) {
+ struct ieee80211_fast_tx *fast_tx;
+
+@@ -4226,6 +4251,8 @@ static void ieee80211_8023_xmit(struct i
+
+ memset(info, 0, sizeof(*info));
+
++ ieee80211_aggr_check(sdata, sta, skb);
++
+ tid = skb->priority & IEEE80211_QOS_CTL_TAG1D_MASK;
+ tid_tx = rcu_dereference(sta->ampdu_mlme.tid_tx[tid]);
+ if (tid_tx) {
diff --git a/package/kernel/mac80211/patches/subsys/374-mac80211-call-ieee80211_tx_h_rate_ctrl-when-dequeue.patch b/package/kernel/mac80211/patches/subsys/375-mac80211-call-ieee80211_tx_h_rate_ctrl-when-dequeue.patch
similarity index 100%
rename from package/kernel/mac80211/patches/subsys/374-mac80211-call-ieee80211_tx_h_rate_ctrl-when-dequeue.patch
rename to package/kernel/mac80211/patches/subsys/375-mac80211-call-ieee80211_tx_h_rate_ctrl-when-dequeue.patch
diff --git a/package/kernel/mac80211/patches/subsys/375-mac80211-minstrel_ht-fix-minstrel_aggr_check-for-enc.patch b/package/kernel/mac80211/patches/subsys/375-mac80211-minstrel_ht-fix-minstrel_aggr_check-for-enc.patch
deleted file mode 100644
index 2fe19dfd94..0000000000
--- a/package/kernel/mac80211/patches/subsys/375-mac80211-minstrel_ht-fix-minstrel_aggr_check-for-enc.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Ryder Lee <ryder.lee at mediatek.com>
-Date: Fri, 28 May 2021 14:05:42 +0800
-Subject: [PATCH] mac80211: minstrel_ht: fix minstrel_aggr_check for encap
- offload
-
-Avoid checking ieee80211_hdr to support encap offload.
-
-Signed-off-by: Ryder Lee <ryder.lee at mediatek.com>
----
-
---- a/net/mac80211/rc80211_minstrel_ht.c
-+++ b/net/mac80211/rc80211_minstrel_ht.c
-@@ -1156,19 +1156,24 @@ static void
- minstrel_aggr_check(struct ieee80211_sta *pubsta, struct sk_buff *skb)
- {
- struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
-+ struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
- struct sta_info *sta = container_of(pubsta, struct sta_info, sta);
- u16 tid;
-
- if (skb_get_queue_mapping(skb) == IEEE80211_AC_VO)
- return;
-
-- if (unlikely(!ieee80211_is_data_qos(hdr->frame_control)))
-+ if (unlikely(!pubsta->wme))
-+ return;
-+
-+ if (!(info->flags & IEEE80211_TX_CTL_HW_80211_ENCAP) &&
-+ unlikely(!ieee80211_is_data_qos(hdr->frame_control)))
- return;
-
- if (unlikely(skb->protocol == cpu_to_be16(ETH_P_PAE)))
- return;
-
-- tid = ieee80211_get_tid(hdr);
-+ tid = skb->priority & IEEE80211_QOS_CTL_TID_MASK;
- if (likely(sta->ampdu_mlme.tid_tx[tid]))
- return;
-
diff --git a/package/kernel/mac80211/patches/subsys/377-mac80211-minstrel_ht-fix-sample-time-check.patch b/package/kernel/mac80211/patches/subsys/377-mac80211-minstrel_ht-fix-sample-time-check.patch
index 787254b4df..d4b327c69c 100644
--- a/package/kernel/mac80211/patches/subsys/377-mac80211-minstrel_ht-fix-sample-time-check.patch
+++ b/package/kernel/mac80211/patches/subsys/377-mac80211-minstrel_ht-fix-sample-time-check.patch
@@ -12,7 +12,7 @@ Signed-off-by: Felix Fietkau <nbd at nbd.name>
--- a/net/mac80211/rc80211_minstrel_ht.c
+++ b/net/mac80211/rc80211_minstrel_ht.c
-@@ -1498,7 +1498,7 @@ minstrel_ht_get_rate(void *priv, struct
+@@ -1466,7 +1466,7 @@ minstrel_ht_get_rate(void *priv, struct
(info->control.flags & IEEE80211_TX_CTRL_PORT_CTRL_PROTO))
return;
More information about the lede-commits
mailing list