Skip to content

Commit

Permalink
wifi: mac80211: rx: track link in RX data
Browse files Browse the repository at this point in the history
We'll need the link e.g. for decrypt, and shouldn't be
looking it up all the time later, so track it in the RX
data.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
  • Loading branch information
Johannes Berg committed Jul 22, 2022
1 parent 963d0e8 commit 56057da
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 2 deletions.
1 change: 1 addition & 0 deletions net/mac80211/ieee80211_i.h
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@ struct ieee80211_rx_data {
struct sk_buff *skb;
struct ieee80211_local *local;
struct ieee80211_sub_if_data *sdata;
struct ieee80211_link_data *link;
struct sta_info *sta;
struct ieee80211_key *key;

Expand Down
19 changes: 17 additions & 2 deletions net/mac80211/rx.c
Original file line number Diff line number Diff line change
Expand Up @@ -3990,6 +3990,9 @@ static void ieee80211_rx_handlers(struct ieee80211_rx_data *rx,
*/
rx->skb = skb;

if (WARN_ON_ONCE(!rx->link))
goto rxh_next;

CALL_RXH(ieee80211_rx_h_check_more_data);
CALL_RXH(ieee80211_rx_h_uapsd_and_pspoll);
CALL_RXH(ieee80211_rx_h_sta_process);
Expand Down Expand Up @@ -4118,6 +4121,7 @@ void ieee80211_mark_rx_ba_filtered_frames(struct ieee80211_sta *pubsta, u8 tid,

rx.sta = sta;
rx.sdata = sta->sdata;
rx.link = &rx.sdata->deflink;
rx.local = sta->local;

rcu_read_lock();
Expand Down Expand Up @@ -4758,12 +4762,22 @@ static bool ieee80211_prepare_and_rx_handle(struct ieee80211_rx_data *rx,
if (!ieee80211_accept_frame(rx))
return false;

if (rx->link_id >= 0) {
link = rcu_dereference(rx->sdata->link[rx->link_id]);

/* we might race link removal */
if (!link)
return true;
rx->link = link;
} else {
rx->link = &sdata->deflink;
}

if (unlikely(!is_multicast_ether_addr(hdr->addr1) &&
rx->link_id >= 0 && rx->sta && rx->sta->sta.mlo)) {
link_sta = rcu_dereference(rx->sta->link[rx->link_id]);
link = rcu_dereference(rx->sdata->link[rx->link_id]);

if (WARN_ON_ONCE(!link_sta || !link))
if (WARN_ON_ONCE(!link_sta))
return true;
}

Expand Down Expand Up @@ -4833,6 +4847,7 @@ static void __ieee80211_rx_handle_8023(struct ieee80211_hw *hw,

rx.sta = container_of(pubsta, struct sta_info, sta);
rx.sdata = rx.sta->sdata;
rx.link = &rx.sdata->deflink;

fast_rx = rcu_dereference(rx.sta->fast_rx);
if (!fast_rx)
Expand Down

0 comments on commit 56057da

Please sign in to comment.