wifi: mac80211: fold tid_ampdu_rx allocations into a flexible array
PATCH v2 1/1 wifi: mac80211: fold tid_ampdu_rx allocations into a flexible array
Convert the separately-allocated reorder_buf pointer to a C99 flexible array member at the end of struct tid_ampdu_rx, with both the sk_buff_head and the jiffies timestamp in each array element. This collapses three allocations into one and removes the corresponding kfree() pairs from the error and free paths.
---
v2: use anonymous struct to combine allocations
net/mac80211/agg-rx.c | 22 +++------------------- net/mac80211/rx.c | 14 +++++++------- net/mac80211/sta_info.h | 12 +++++++----- 3 files changed, 17 insertions(+), 31 deletions(-)
net/mac80211/agg-rx.c +3 -19
@@ -49,9 +49,7 @@ static void ieee80211_free_tid_rx(struct rcu_head *h)int i;for (i =0 ; i < tid_rx->buf_size; i++) -__skb_queue_purge (&tid_rx->reorder_buf[i]); -kfree (tid_rx->reorder_buf); -kfree (tid_rx->reorder_time); +__skb_queue_purge (&tid_rx->reorder[i].buf);kfree (tid_rx); }
@@ -412,7 +410,7 @@ void __ieee80211_start_rx_ba_session(struct sta_info *sta, }/* prepare A-MPDU MLME for Rx aggregation */ - tid_agg_rx =kzalloc_obj (*tid_agg_rx); + tid_agg_rx =kzalloc_flex (*tid_agg_rx, reorder, buf_size);if (!tid_agg_rx) goto end;
@@ -426,27 +424,13 @@ void __ieee80211_start_rx_ba_session(struct sta_info *sta,timer_setup (&tid_agg_rx->reorder_timer, sta_rx_agg_reorder_timer_expired,0 ); -/* prepare reordering buffer */ - tid_agg_rx->reorder_buf = - kzalloc_objs(struct sk_buff_head, buf_size); - tid_agg_rx->reorder_time = -kcalloc (buf_size,sizeof (unsigned long ),GFP_KERNEL ); -if (!tid_agg_rx->reorder_buf || !tid_agg_rx->reorder_time) { -kfree (tid_agg_rx->reorder_buf); -kfree (tid_agg_rx->reorder_time); -kfree (tid_agg_rx); - goto end; - } -for (i =0 ; i < buf_size; i++) -__skb_queue_head_init (&tid_agg_rx->reorder_buf[i]); +__skb_queue_head_init (&tid_agg_rx->reorder[i].buf); ret =drv_ampdu_action (local, sta->sdata, ¶ms);ht_dbg (sta->sdata,"Rx A-MPDU request on %pM tid %d result %d\n" , sta->sta.addr, tid, ret);if (ret) { -kfree (tid_agg_rx->reorder_buf); -kfree (tid_agg_rx->reorder_time);kfree (tid_agg_rx); goto end; }
net/mac80211/rx.c +7 -7
@@ -1188,7 +1188,7 @@ static ieee80211_rx_result ieee80211_rx_mesh_check(struct ieee80211_rx_data *rx)static inline bool ieee80211_rx_reorder_ready (struct tid_ampdu_rx *tid_agg_rx,int index) { -struct sk_buff_head *frames = &tid_agg_rx->reorder_buf[index]; +struct sk_buff_head *frames = &tid_agg_rx->reorder[index].buf;struct sk_buff *tail =skb_peek_tail (frames);struct ieee80211_rx_status *status;
@@ -1211,7 +1211,7 @@ static void ieee80211_release_reorder_frame(struct ieee80211_sub_if_data *sdata,int index, struct sk_buff_head *frames) { - struct sk_buff_head *skb_list = &tid_agg_rx->reorder_buf[index]; + struct sk_buff_head *skb_list = &tid_agg_rx->reorder[index].buf;struct sk_buff *skb;struct ieee80211_rx_status *status;
@@ -1290,14 +1290,14 @@ static void ieee80211_sta_reorder_release(struct ieee80211_sub_if_data *sdata,continue ; }if (skipped && - !time_after (jiffies, tid_agg_rx->reorder_time[j] + + !time_after (jiffies, tid_agg_rx->reorder[j].time +HT_RX_REORDER_BUF_TIMEOUT )) goto set_release_timer;/* don't leave incomplete A-MSDUs around */ for (i = (index +1 ) % tid_agg_rx->buf_size; i != j; i = (i +1 ) % tid_agg_rx->buf_size) -__skb_queue_purge (&tid_agg_rx->reorder_buf[i]); +__skb_queue_purge (&tid_agg_rx->reorder[i].buf);ht_dbg_ratelimited (sdata,"release an RX reorder frame due to timeout on earlier frames\n" );
@@ -1331,7 +1331,7 @@ static void ieee80211_sta_reorder_release(struct ieee80211_sub_if_data *sdata,if (!tid_agg_rx->removed)mod_timer (&tid_agg_rx->reorder_timer, - tid_agg_rx->reorder_time[j] +1 + + tid_agg_rx->reorder[j].time +1 +HT_RX_REORDER_BUF_TIMEOUT ); }else {timer_delete (&tid_agg_rx->reorder_timer);
@@ -1426,9 +1426,9 @@ static bool ieee80211_sta_manage_reorder_buf(struct ieee80211_sub_if_data *sdata }/* put the frame in the reordering buffer */ -__skb_queue_tail (&tid_agg_rx->reorder_buf[index], skb); +__skb_queue_tail (&tid_agg_rx->reorder[index].buf, skb);if (!(status->flag &RX_FLAG_AMSDU_MORE )) { - tid_agg_rx->reorder_time[index] = jiffies; + tid_agg_rx->reorder[index].time = jiffies; tid_agg_rx->stored_mpdu_num++;ieee80211_sta_reorder_release (sdata, tid_agg_rx, frames); }
net/mac80211/sta_info.h +7 -5
@@ -207,11 +207,8 @@ struct tid_ampdu_tx {/** * struct tid_ampdu_rx - TID aggregation information (Rx). * -* @reorder_buf: buffer to reorder incoming aggregated MPDUs. An MPDU may be an -* A-MSDU with individually reported subframes. * @reorder_buf_filtered: bitmap indicating where there are filtered frames in * the reorder buffer that should be ignored when releasing frames -* @reorder_time: jiffies when skb was added * @session_timer: check if peer keeps Tx-ing on the TID (by timeout value) * @reorder_timer: releases expired frames from the reorder buffer. * @sta: station we are attached to
@@ -228,6 +225,9 @@ struct tid_ampdu_tx {* and ssn. * @removed: this session is removed (but might have been found due to RCU) * @started: this session has started (head ssn or higher was received) +* @reorder: reorder buffer entries, each with &sk_buff_head @reorder[].buf +* and jiffies @reorder[].time. An MPDU may be an A-MSDU with individually +* reported subframes. * * This structure's lifetime is managed by RCU, assignments to * the array holding it must hold the aggregation mutex.
@@ -241,8 +241,6 @@ struct tid_ampdu_rx {struct rcu_head rcu_head;spinlock_t reorder_lock;u64 reorder_buf_filtered; -struct sk_buff_head *reorder_buf; -unsigned long *reorder_time;struct sta_info *sta;struct timer_list session_timer;struct timer_list reorder_timer;
@@ -256,6 +254,10 @@ struct tid_ampdu_rx { u8 auto_seq:1, removed:1, started:1; +struct { +struct sk_buff_head buf; +unsigned long time; + } reorder[]; };/**
--
2.54.0
kernel test robot
build botkernel test robot noticed the following build warnings:
Hi Rosen,
kernel test robot noticed the following build warnings:
[auto build test WARNING on wireless-next/main]
[also build test WARNING on wireless/main linus/master v7.1-rc6 next-20260604] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Rosen-Penev/wifi-mac80211-fold-tid_ampdu_rx-allocations-into-a-flexible-array/20260605-085839 base: https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git main patch link: https://lore.kernel.org/r/20260605005627.317194-1-rosenp%40gmail.com patch subject: [PATCHv2 wireless-next] wifi: mac80211: fold tid_ampdu_rx allocations into a flexible array compiler: clang version 22.0.0git (https://github.com/llvm/llvm-project f43d6834093b19baf79beda8c0337ab020ac5f17) docutils: docutils (Docutils 0.21.2, Python 3.13.5, on linux) reproduce: (https://download.01.org/0day-ci/archive/20260605/[email protected]/reproduce)
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 <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All warnings (new ones prefixed by >>):
int kref_put_mutex (struct kref *kref, void (*release)(struct kref *kref), struct mutex *mutex) __cond_acquires(true# mutex) ------------------------------------------------------------------------------------------------^ Documentation/core-api/kref:328: ./include/linux/kref.h:94: WARNING: Invalid C declaration: Expected end of definition. [error at 92] int kref_put_lock (struct kref *kref, void (*release)(struct kref *kref), spinlock_t *lock) __cond_acquires(true# lock) --------------------------------------------------------------------------------------------^
>> Documentation/driver-api/80211/mac80211-advanced:228: ./net/mac80211/sta_info.h:229: WARNING: Inline strong start-string without end-string. [docutils] >> Documentation/driver-api/80211/mac80211-advanced:228: ./net/mac80211/sta_info.h:229: WARNING: Inline strong start-string without end-string. [docutils]
Documentation/driver-api/basics:42: ./kernel/time/time.c:370: WARNING: Duplicate C declaration, also defined at driver-api/basics:436. Declaration is '.. c:function:: unsigned int jiffies_to_msecs (const unsigned long j)'. [duplicate_declaration.c] Documentation/driver-api/basics:42: ./kernel/time/time.c:393: WARNING: Duplicate C declaration, also defined at driver-api/basics:453. Declaration is '.. c:function:: unsigned int jiffies_to_usecs (const unsigned long j)'. [duplicate_declaration.c] Documentation/driver-api/target:25: ./drivers/target/target_core_user.c:35: ERROR: Unexpected section title.
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki