From: Felix Fietkau <nbd@nbd.name>
To: linux-wireless@vger.kernel.org
Cc: johannes@sipsolutions.net
Subject: [PATCH v2 09/13] mac80211: support using ieee80211_tx_status_ext to free skbs without status info
Date: Fri, 21 Aug 2020 06:19:57 +0200 [thread overview]
Message-ID: <20200821042001.23388-10-nbd@nbd.name> (raw)
In-Reply-To: <20200821042001.23388-1-nbd@nbd.name>
For encap-offloaded packets, ieee80211_free_txskb cannot be used, since it
does not have the vif pointer.
Using ieee80211_tx_status_ext for this purpose has the advantage of being able
avoid an extra station lookup for AQL
Signed-off-by: Felix Fietkau <nbd@nbd.name>
---
net/mac80211/status.c | 27 ++++++++++++++++-----------
1 file changed, 16 insertions(+), 11 deletions(-)
diff --git a/net/mac80211/status.c b/net/mac80211/status.c
index ac4d988556b0..261bdda2ec08 100644
--- a/net/mac80211/status.c
+++ b/net/mac80211/status.c
@@ -1094,6 +1094,21 @@ void ieee80211_tx_status_ext(struct ieee80211_hw *hw,
acked = !!(info->flags & IEEE80211_TX_STAT_ACK);
noack_success = !!(info->flags & IEEE80211_TX_STAT_NOACK_TRANSMITTED);
+ if (skb && (tx_time_est =
+ ieee80211_info_get_tx_time_est(IEEE80211_SKB_CB(skb))) > 0) {
+ /* Do this here to avoid the expensive lookup of the sta
+ * in ieee80211_report_used_skb().
+ */
+ ieee80211_sta_update_pending_airtime(local, sta,
+ skb_get_queue_mapping(skb),
+ tx_time_est,
+ true);
+ ieee80211_info_set_tx_time_est(info, 0);
+ }
+
+ if (!status->info)
+ goto free;
+
if (pubsta) {
sta = container_of(pubsta, struct sta_info, sta);
@@ -1132,17 +1147,6 @@ void ieee80211_tx_status_ext(struct ieee80211_hw *hw,
ieee80211s_update_metric(local, sta, status);
}
- if (skb && (tx_time_est = ieee80211_info_get_tx_time_est(info)) > 0) {
- /* Do this here to avoid the expensive lookup of the sta
- * in ieee80211_report_used_skb().
- */
- ieee80211_sta_update_pending_airtime(local, sta,
- skb_get_queue_mapping(skb),
- tx_time_est,
- true);
- ieee80211_info_set_tx_time_est(info, 0);
- }
-
if (skb && !(info->flags & IEEE80211_TX_CTL_HW_80211_ENCAP))
return __ieee80211_tx_status(hw, status, rates_idx,
retry_count);
@@ -1159,6 +1163,7 @@ void ieee80211_tx_status_ext(struct ieee80211_hw *hw,
I802_DEBUG_INC(local->dot11FailedCount);
}
+free:
if (!skb)
return;
--
2.28.0
next prev parent reply other threads:[~2020-08-21 4:20 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-21 4:19 [PATCH v2 00/13] mac80211 encapsulation offload / performance patches Felix Fietkau
2020-08-21 4:19 ` [PATCH v2 01/13] mac80211: rework tx encapsulation offload API Felix Fietkau
2020-08-21 4:19 ` [PATCH v2 02/13] mac80211: reduce duplication in tx status functions Felix Fietkau
2020-08-21 4:19 ` [PATCH v2 03/13] mac80211: remove tx status call to ieee80211_sta_register_airtime Felix Fietkau
2020-08-21 4:19 ` [PATCH v2 04/13] mac80211: optimize station connection monitor Felix Fietkau
2020-08-21 4:19 ` [PATCH v2 05/13] mac80211: swap NEED_TXPROCESSING and HW_80211_ENCAP tx flags Felix Fietkau
2020-08-21 4:19 ` [PATCH v2 06/13] mac80211: unify 802.3 (offload) and 802.11 tx status codepath Felix Fietkau
2020-08-21 4:19 ` [PATCH v2 07/13] mac80211: add missing queue/hash initialization to 802.3 xmit Felix Fietkau
2020-08-21 4:19 ` [PATCH v2 08/13] mac80211: check and refresh aggregation session in encap offload tx Felix Fietkau
2020-08-21 4:19 ` Felix Fietkau [this message]
2020-08-21 6:40 ` [PATCH v2 09/13] mac80211: support using ieee80211_tx_status_ext to free skbs without status info Felix Fietkau
2020-08-21 4:19 ` [PATCH v2 10/13] mac80211: extend ieee80211_tx_status_ext to support bulk free Felix Fietkau
2020-08-21 4:19 ` [PATCH v2 11/13] mac80211: notify the driver when a sta uses 4-address mode Felix Fietkau
2020-08-21 4:20 ` [PATCH v2 12/13] mac80211: skip encap offload for tx multicast/control packets Felix Fietkau
2020-08-21 4:20 ` [PATCH v2 13/13] mac80211: set info->control.hw_key for encap offload packets Felix Fietkau
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=20200821042001.23388-10-nbd@nbd.name \
--to=nbd@nbd.name \
--cc=johannes@sipsolutions.net \
--cc=linux-wireless@vger.kernel.org \
/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