Commit f59374eb authored by Sara Sharon's avatar Sara Sharon Committed by Johannes Berg
Browse files

mac80211: synchronize driver rx queues before removing a station 



Some devices, like iwlwifi, have RSS queues. This may cause a
situation where a disassociation is handled in control path and
results in station removal while there are prior RX frames
that were still not processed in other queues. When they will
be processed the station will be gone, and the frames will be
dropped.
Add a synchronization interface to avoid that. When driver returns
from the synchronization mac80211 may remove the station.

Signed-off-by: default avatarSara Sharon <sara.sharon@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 60854fd9

include/net/mac80211.h

+5 −0
Original line number Diff line number Diff line
@@ -3354,6 +3354,10 @@ enum ieee80211_reconfig_type { 
 *	the function call.

 *

 * @wake_tx_queue: Called when new packets have been added to the queue.

 * @sync_rx_queues: Process all pending frames in RSS queues. This is a

 *	synchronization which is needed in case driver has in its RSS queues

 *	pending frames that were received prior to the control path action

 *	currently taken (e.g. disassociation) but are not processed yet.

 */

struct ieee80211_ops {

	void (*tx)(struct ieee80211_hw *hw,
@@ -3591,6 +3595,7 @@ struct ieee80211_ops { 


	void (*wake_tx_queue)(struct ieee80211_hw *hw,

			      struct ieee80211_txq *txq);

	void (*sync_rx_queues)(struct ieee80211_hw *hw);

};



/**

net/mac80211/driver-ops.h

+15 −0
Original line number Diff line number Diff line 
/*

* Portions of this file

* Copyright(c) 2016 Intel Deutschland GmbH

*/



#ifndef __MAC80211_DRIVER_OPS

#define __MAC80211_DRIVER_OPS
@@ -29,6 +34,16 @@ static inline void drv_tx(struct ieee80211_local *local, 
	local->ops->tx(&local->hw, control, skb);

}



static inline void drv_sync_rx_queues(struct ieee80211_local *local,

				      struct sta_info *sta)

{

	if (local->ops->sync_rx_queues) {

		trace_drv_sync_rx_queues(local, sta->sdata, &sta->sta);

		local->ops->sync_rx_queues(&local->hw);

		trace_drv_return_void(local);

	}

}



static inline void drv_get_et_strings(struct ieee80211_sub_if_data *sdata,

				      u32 sset, u8 *data)

{

net/mac80211/sta_info.c

+8 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
 * Copyright 2002-2005, Instant802 Networks, Inc.

 * Copyright 2006-2007	Jiri Benc <jbenc@suse.cz>

 * Copyright 2013-2014  Intel Mobile Communications GmbH

 * Copyright (C) 2015 Intel Deutschland GmbH

 * Copyright (C) 2015 - 2016 Intel Deutschland GmbH

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as
@@ -875,6 +875,13 @@ static int __must_check __sta_info_destroy_part1(struct sta_info *sta) 
	set_sta_flag(sta, WLAN_STA_BLOCK_BA);

	ieee80211_sta_tear_down_BA_sessions(sta, AGG_STOP_DESTROY_STA);



	/*

	 * Before removing the station from the driver there might be pending

	 * rx frames on RSS queues sent prior to the disassociation - wait for

	 * all such frames to be processed.

	 */

	drv_sync_rx_queues(local, sta);



	ret = sta_info_hash_del(local, sta);

	if (WARN_ON(ret))

		return ret;

net/mac80211/trace.h

+12 −0
Original line number Diff line number Diff line 
/*

* Portions of this file

* Copyright(c) 2016 Intel Deutschland GmbH

*/



#if !defined(__MAC80211_DRIVER_TRACE) || defined(TRACE_HEADER_MULTI_READ)

#define __MAC80211_DRIVER_TRACE
@@ -899,6 +904,13 @@ DEFINE_EVENT(sta_event, drv_sta_pre_rcu_remove, 
	TP_ARGS(local, sdata, sta)

);



DEFINE_EVENT(sta_event, drv_sync_rx_queues,

	TP_PROTO(struct ieee80211_local *local,

		 struct ieee80211_sub_if_data *sdata,

		 struct ieee80211_sta *sta),

	TP_ARGS(local, sdata, sta)

);



DEFINE_EVENT(sta_event, drv_sta_rate_tbl_update,

	TP_PROTO(struct ieee80211_local *local,

		 struct ieee80211_sub_if_data *sdata,

CRA Git | Maintained and supported by SUSTech CRA and CCSE