mac80211: avoid rearming BA session timers unnecessarily
RFC 1/1 mac80211: avoid rearming BA session timers unnecessarily
From: "Luis R. Rodriguez" <[email protected]>
If mac80211 tears down the BA sessions with del_timer_sync() technically mod_timer() can still rearm them. If mac80211 tears the BA sessions down we don't want to rearm the timers at a later time so avoid this possibility.
---
Figure I'd start reviewing mod_timer()/mod_timer_pending() as no one caught on. Likely not an issue on mac80211 but I suspect drivers will all be poo.
net/mac80211/agg-rx.c | 2 +- net/mac80211/agg-tx.c | 2 +- net/mac80211/rx.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)
net/mac80211/agg-rx.c +1 -1
@@ -153,7 +153,7 @@ static void sta_rx_agg_session_timer_expired(unsigned long data) timeout = tid_rx->last_rx +TU_TO_JIFFIES (tid_rx->timeout);if (time_is_after_jiffies (timeout)) { -mod_timer (&tid_rx->session_timer, timeout); +mod_timer_pending (&tid_rx->session_timer, timeout);rcu_read_unlock ();return ; }
net/mac80211/agg-tx.c +1 -1
@@ -488,7 +488,7 @@ static void sta_tx_agg_session_timer_expired(unsigned long data) timeout = tid_tx->last_tx +TU_TO_JIFFIES (tid_tx->timeout);if (time_is_after_jiffies (timeout)) { -mod_timer (&tid_tx->session_timer, timeout); +mod_timer_pending (&tid_tx->session_timer, timeout);rcu_read_unlock ();return ; }
net/mac80211/rx.c +2 -2
@@ -2216,8 +2216,8 @@ ieee80211_rx_h_ctrl(struct ieee80211_rx_data *rx, struct sk_buff_head *frames)/* reset session timer */ if (tid_agg_rx->timeout) -mod_timer (&tid_agg_rx->session_timer, -TU_TO_EXP_TIME (tid_agg_rx->timeout)); +mod_timer_pending (&tid_agg_rx->session_timer, +TU_TO_EXP_TIME (tid_agg_rx->timeout));spin_lock (&tid_agg_rx->reorder_lock);/* release stored frames up to start of BAR */
Signature · 1 line
1.7.10.4
Johannes Berg
maintainerQuoted 6 lines · Luis R. Rodriguez
From: "Luis R. Rodriguez" <[email protected]>
If mac80211 tears down the BA sessions with
del_timer_sync()technicallymod_timer()can still rearm them. If mac80211 tears the BA sessions down we don't want to rearm the timers at a later time so avoid this possibility.
Hmm, you may be onto something, but I'm not sure I want to apply this. You don't seem to actually understand what you're doing -- two of the three changes you're making don't really seem to be needed and the third one should probably be fixed differently?
johannes
Quoted 8 lines · Johannes Berg
Quoted 6 lines · Luis R. Rodriguez
From: "Luis R. Rodriguez" <[email protected]>
If mac80211 tears down the BA sessions with
del_timer_sync()technicallymod_timer()can still rearm them. If mac80211 tears the BA sessions down we don't want to rearm the timers at a later time so avoid this possibility.
Quoted 4 lines
Hmm, you may be onto something, but I'm not sure I want to apply this. You don't seem to actually understand what you're doing -- two of the three changes you're making don't really seem to be needed and the third one should probably be fixed differently?
If I get to review it further to the point I don't disappoint, sure, otherwise at least you now know of my suspicions.
Luis