Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6cf5b617 authored by Johannes Berg's avatar Johannes Berg Committed by Sasha Levin
Browse files

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



[ Upstream commit 22d3a3c829fa9ecdb493d1f1f2838d543f8d86a3 ]

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.

Cc: stable@vger.kernel.org
Reported-by: default avatarJean Trivelly <jean.trivelly@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent 1007d143

net/mac80211/ieee80211_i.h

+3 −0
Original line number Diff line number Diff line
@@ -204,6 +204,8 @@ enum ieee80211_packet_rx_flags { 
 * @IEEE80211_RX_CMNTR: received on cooked monitor already

 * @IEEE80211_RX_BEACON_REPORTED: This frame was already reported

 *	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

 * for a single frame.
@@ -211,6 +213,7 @@ enum ieee80211_packet_rx_flags { 
enum ieee80211_rx_flags {

	IEEE80211_RX_CMNTR		= BIT(0),

	IEEE80211_RX_BEACON_REPORTED	= BIT(1),

	IEEE80211_RX_REORDER_TIMER	= BIT(2),

};



struct ieee80211_rx_data {

net/mac80211/rx.c

+3 −2
Original line number Diff line number Diff line
@@ -2000,7 +2000,8 @@ ieee80211_deliver_skb(struct ieee80211_rx_data *rx) 
		/* deliver to local stack */

		skb->protocol = eth_type_trans(skb, dev);

		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);

		else

			netif_receive_skb(skb);
@@ -3070,7 +3071,7 @@ void ieee80211_release_reorder_timeout(struct sta_info *sta, int tid) 
		/* This is OK -- must be QoS data frame */

		.security_idx = tid,

		.seqno_idx = tid,

		.flags = 0,

		.flags = IEEE80211_RX_REORDER_TIMER,

	};

	struct tid_ampdu_rx *tid_agg_rx;