[PATCH 298/379][SRU][OEM-5.6] mac80211: extend ieee80211_tx_status_ext to support bulk free
You-Sheng Yang
vicamo.yang at canonical.com
Wed Dec 23 08:50:31 UTC 2020
From: Felix Fietkau <nbd at nbd.name>
BugLink: https://bugs.launchpad.net/bugs/1879633
Store processed skbs ready to be freed in a list so the driver bulk free them
Signed-off-by: Felix Fietkau <nbd at nbd.name>
Link: https://lore.kernel.org/r/20200908123702.88454-13-nbd@nbd.name
Signed-off-by: Johannes Berg <johannes.berg at intel.com>
(cherry picked from commit f02dff93e26bef46f5511f1e8229061bd23c3074)
Signed-off-by: You-Sheng Yang <vicamo.yang at canonical.com>
---
include/net/mac80211.h | 2 ++
net/mac80211/status.c | 10 ++++++++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 123d7ad563ac..8ad6d104109f 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -1091,12 +1091,14 @@ ieee80211_info_get_tx_time_est(struct ieee80211_tx_info *info)
* @info: Basic tx status information
* @skb: Packet skb (can be NULL if not provided by the driver)
* @rate: The TX rate that was used when sending the packet
+ * @free_list: list where processed skbs are stored to be free'd by the driver
*/
struct ieee80211_tx_status {
struct ieee80211_sta *sta;
struct ieee80211_tx_info *info;
struct sk_buff *skb;
struct rate_info *rate;
+ struct list_head *free_list;
};
/**
diff --git a/net/mac80211/status.c b/net/mac80211/status.c
index 500d77f21e4e..7f92458ddd67 100644
--- a/net/mac80211/status.c
+++ b/net/mac80211/status.c
@@ -1038,7 +1038,10 @@ static void __ieee80211_tx_status(struct ieee80211_hw *hw,
* with this test...
*/
if (!local->monitors && (!send_to_cooked || !local->cooked_mntrs)) {
- dev_kfree_skb(skb);
+ if (status->free_list)
+ list_add_tail(&skb->list, status->free_list);
+ else
+ dev_kfree_skb(skb);
return;
}
@@ -1167,7 +1170,10 @@ void ieee80211_tx_status_ext(struct ieee80211_hw *hw,
return;
ieee80211_report_used_skb(local, skb, false);
- dev_kfree_skb(skb);
+ if (status->free_list)
+ list_add_tail(&skb->list, status->free_list);
+ else
+ dev_kfree_skb(skb);
}
EXPORT_SYMBOL(ieee80211_tx_status_ext);
--
2.29.2
More information about the kernel-team
mailing list