Commit 808de02a authored by Johannes Berg's avatar Johannes Berg Committed by Luis Henriques

mac80211: don't use napi_gro_receive() outside NAPI context

commit 22d3a3c8 upstream.

No matter how the driver manages its NAPI context, there's no way
sending frames to it from a timer can be correct, since it would
corrupt the internal GRO lists.

To avoid that, always use the non-NAPI path when releasing frames
from the timer.
Reported-by: default avatarJean Trivelly <jean.trivelly@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarLuis Henriques <luis.henriques@canonical.com>
parent f6d58ed7
...@@ -203,6 +203,8 @@ enum ieee80211_packet_rx_flags { ...@@ -203,6 +203,8 @@ enum ieee80211_packet_rx_flags {
* @IEEE80211_RX_CMNTR: received on cooked monitor already * @IEEE80211_RX_CMNTR: received on cooked monitor already
* @IEEE80211_RX_BEACON_REPORTED: This frame was already reported * @IEEE80211_RX_BEACON_REPORTED: This frame was already reported
* to cfg80211_report_obss_beacon(). * to cfg80211_report_obss_beacon().
* @IEEE80211_RX_REORDER_TIMER: this frame is released by the
* reorder buffer timeout timer, not the normal RX path
* *
* These flags are used across handling multiple interfaces * These flags are used across handling multiple interfaces
* for a single frame. * for a single frame.
...@@ -210,6 +212,7 @@ enum ieee80211_packet_rx_flags { ...@@ -210,6 +212,7 @@ enum ieee80211_packet_rx_flags {
enum ieee80211_rx_flags { enum ieee80211_rx_flags {
IEEE80211_RX_CMNTR = BIT(0), IEEE80211_RX_CMNTR = BIT(0),
IEEE80211_RX_BEACON_REPORTED = BIT(1), IEEE80211_RX_BEACON_REPORTED = BIT(1),
IEEE80211_RX_REORDER_TIMER = BIT(2),
}; };
struct ieee80211_rx_data { struct ieee80211_rx_data {
......
...@@ -1968,7 +1968,8 @@ ieee80211_deliver_skb(struct ieee80211_rx_data *rx) ...@@ -1968,7 +1968,8 @@ ieee80211_deliver_skb(struct ieee80211_rx_data *rx)
/* deliver to local stack */ /* deliver to local stack */
skb->protocol = eth_type_trans(skb, dev); skb->protocol = eth_type_trans(skb, dev);
memset(skb->cb, 0, sizeof(skb->cb)); memset(skb->cb, 0, sizeof(skb->cb));
if (rx->local->napi) if (!(rx->flags & IEEE80211_RX_REORDER_TIMER) &&
rx->local->napi)
napi_gro_receive(rx->local->napi, skb); napi_gro_receive(rx->local->napi, skb);
else else
netif_receive_skb(skb); netif_receive_skb(skb);
...@@ -3038,7 +3039,7 @@ void ieee80211_release_reorder_timeout(struct sta_info *sta, int tid) ...@@ -3038,7 +3039,7 @@ void ieee80211_release_reorder_timeout(struct sta_info *sta, int tid)
/* This is OK -- must be QoS data frame */ /* This is OK -- must be QoS data frame */
.security_idx = tid, .security_idx = tid,
.seqno_idx = tid, .seqno_idx = tid,
.flags = 0, .flags = IEEE80211_RX_REORDER_TIMER,
}; };
struct tid_ampdu_rx *tid_agg_rx; struct tid_ampdu_rx *tid_agg_rx;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment