2020-09-08 20:04:50

by Felix Fietkau

Subject: [PATCH v4 02/14] mac80211: check and refresh aggregation session in encap offload tx

Update the last_tx timestamp to avoid tearing down the aggregation session
early. Fall back to the slow path if the session setup is still running

Signed-off-by: Felix Fietkau <[email protected]>
---
net/mac80211/tx.c | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index bee9b01c5a6b..cd54d197caab 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -4198,6 +4198,8 @@ static void ieee80211_8023_xmit(struct ieee80211_sub_if_data *sdata,
bool authorized = false;
bool multicast;
unsigned char *ra = ehdr->h_dest;
+ struct tid_ampdu_tx *tid_tx;
+ u8 tid;

if (IS_ERR(sta) || (sta && !sta->uploaded))
sta = NULL;
@@ -4235,6 +4237,22 @@ static void ieee80211_8023_xmit(struct ieee80211_sub_if_data *sdata,

memset(info, 0, sizeof(*info));

+ if (sta) {
+ tid = skb->priority & IEEE80211_QOS_CTL_TAG1D_MASK;
+ tid_tx = rcu_dereference(sta->ampdu_mlme.tid_tx[tid]);
+ if (tid_tx) {
+ if (!test_bit(HT_AGG_STATE_OPERATIONAL, &tid_tx->state)) {
+ /* fall back to non-offload slow path */
+ __ieee80211_subif_start_xmit(skb, dev, 0, 0, NULL);
+ return;
+ }
+
+ info->flags |= IEEE80211_TX_CTL_AMPDU;
+ if (tid_tx->timeout)
+ tid_tx->last_tx = jiffies;
+ }
+ }
+
if (unlikely(!multicast && skb->sk &&
skb_shinfo(skb)->tx_flags & SKBTX_WIFI_STATUS))
info->ack_frame_id = ieee80211_store_ack_skb(local, skb,
--
2.28.0

2020-09-18 10:01:17

by Johannes Berg

Subject: Re: [PATCH v4 02/14] mac80211: check and refresh aggregation session in encap offload tx

++

On Tue, 2020-09-08 at 14:36 +0200, Felix Fietkau wrote:
> Update the last_tx timestamp to avoid tearing down the aggregation session
> early. Fall back to the slow path if the session setup is still running

I'm going to apply this for now, but I suspect that the fallback here is
going to be tricky depending on the hardware - how should that be
handled?

johannes