mac80211: synchronously reserve TID per station (b6da911b) · Commits · 戴 / test

include/net/mac80211.h

+37 −0

Original line number	Diff line number	Diff line
		@@ -5070,6 +5070,43 @@ void ieee80211_tdls_oper_request(struct ieee80211_vif vif, const u8 peer,
		enum nl80211_tdls_operation oper,
		u16 reason_code, gfp_t gfp);

		/**
		* ieee80211_reserve_tid - request to reserve a specific TID
		*
		* There is sometimes a need (such as in TDLS) for blocking the driver from
		* using a specific TID so that the FW can use it for certain operations such
		* as sending PTI requests. To make sure that the driver doesn't use that TID,
		* this function must be called as it flushes out packets on this TID and marks
		* it as blocked, so that any transmit for the station on this TID will be
		* redirected to the alternative TID in the same AC.
		*
		* Note that this function blocks and may call back into the driver, so it
		* should be called without driver locks held. Also note this function should
		* only be called from the driver's @sta_state callback.
		*
		* @sta: the station to reserve the TID for
		* @tid: the TID to reserve
		*
		* Returns: 0 on success, else on failure
		*/
		int ieee80211_reserve_tid(struct ieee80211_sta *sta, u8 tid);

		/**
		* ieee80211_unreserve_tid - request to unreserve a specific TID
		*
		* Once there is no longer any need for reserving a certain TID, this function
		* should be called, and no longer will packets have their TID modified for
		* preventing use of this TID in the driver.
		*
		* Note that this function blocks and acquires a lock, so it should be called
		* without driver locks held. Also note this function should only be called
		* from the driver's @sta_state callback.
		*
		* @sta: the station
		* @tid: the TID to unreserve
		*/
		void ieee80211_unreserve_tid(struct ieee80211_sta *sta, u8 tid);

		/**
		* ieee80211_ie_split - split an IE buffer according to ordering
		*

net/mac80211/agg-tx.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -509,6 +509,10 @@ int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid,
		struct tid_ampdu_tx *tid_tx;
		int ret = 0;

		if (WARN(sta->reserved_tid == tid,
		"Requested to start BA session on reserved tid=%d", tid))
		return -EINVAL;

		trace_api_start_tx_ba_session(pubsta, tid);

		if (WARN_ON_ONCE(!local->ops->ampdu_action))
		@@ -765,6 +769,9 @@ int ieee80211_stop_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid)
		goto unlock;
		}

		WARN(sta->reserved_tid == tid,
		"Requested to stop BA session on reserved tid=%d", tid);

		if (test_bit(HT_AGG_STATE_STOPPING, &tid_tx->state)) {
		/* already in progress stopping it */
		ret = 0;

net/mac80211/ieee80211_i.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -1011,6 +1011,7 @@ enum queue_stop_reason {
		IEEE80211_QUEUE_STOP_REASON_OFFCHANNEL,
		IEEE80211_QUEUE_STOP_REASON_FLUSH,
		IEEE80211_QUEUE_STOP_REASON_TDLS_TEARDOWN,
		IEEE80211_QUEUE_STOP_REASON_RESERVE_TID,

		IEEE80211_QUEUE_STOP_REASONS,
		};

net/mac80211/sta_info.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -351,6 +351,9 @@ struct sta_info sta_info_alloc(struct ieee80211_sub_if_data sdata,

		sta->sta_state = IEEE80211_STA_NONE;

		/* Mark TID as unreserved */
		sta->reserved_tid = IEEE80211_TID_UNRESERVED;

		ktime_get_ts(&uptime);
		sta->last_connected = uptime.tv_sec;
		ewma_init(&sta->avg_signal, 1024, 8);

net/mac80211/sta_info.h

+6 −0

Original line number	Diff line number	Diff line
		@@ -254,6 +254,9 @@ struct ieee80211_tx_latency_stat {
		u32 bin_count;
		};

		/* Value to indicate no TID reservation */
		#define IEEE80211_TID_UNRESERVED 0xff

		/**
		* struct sta_info - STA information
		*
		@@ -342,6 +345,7 @@ struct ieee80211_tx_latency_stat {
		* AP only.
		* @cipher_scheme: optional cipher scheme for this station
		* @last_tdls_pkt_time: holds the time in jiffies of last TDLS pkt ACKed
		* @reserved_tid: reserved TID (if any, otherwise IEEE80211_TID_UNRESERVED)
		*/
		struct sta_info {
		/* General information, mostly static */
		@@ -459,6 +463,8 @@ struct sta_info {
		/* TDLS timeout data */
		unsigned long last_tdls_pkt_time;

		u8 reserved_tid;

		/* keep last! */
		struct ieee80211_sta sta;
		};

Admin message