mac80211: Support 65 tx-queues.
RFC 1/1 mac80211: Support 65 tx-queues.
From: Ben Greear <[email protected]>
ath10k wants to use one tx-queue per vdev, and I want to support up to 64 vdevs. One additional q is needed for off-channel work.
So, re-work mac80211 to allow 65 tx queues. This should have small run-time effect, but it will cause a fair bit more RAM usage in certain structs.
Signed-off-by Ben Greear <[email protected]>
--- include/net/mac80211.h | 8 +++-- net/mac80211/driver-ops.h | 13 ++++++-- net/mac80211/ieee80211_i.h | 9 ++++-- net/mac80211/tx.c | 9 ++++-- net/mac80211/util.c | 77 +++++++++++++++++++++++++++++++++------------- 5 files changed, 83 insertions(+), 33 deletions(-)
include/net/mac80211.h +5 -3
@@ -123,13 +123,15 @@ struct device;* enum ieee80211_max_queues - maximum number of queues * * @IEEE80211_MAX_QUEUES: Maximum number of regular device queues. -* @IEEE80211_MAX_QUEUE_MAP: bitmap with maximum queues set */ enum ieee80211_max_queues { -IEEE80211_MAX_QUEUES =16 , -IEEE80211_MAX_QUEUE_MAP =BIT (IEEE80211_MAX_QUEUES ) -1 , +IEEE80211_MAX_QUEUES =65 , }; +/* bitmap with maximum queues set */ +#define IEEE80211_MAX_QUEUE_MAP_CNT 3 +extern unsigned long IEEE80211_MAX_QUEUE_MAP [IEEE80211_MAX_QUEUE_MAP_CNT ]; +#define IEEE80211_INVAL_HW_QUEUE 0xff/**
net/mac80211/driver-ops.h +10 -3
@@ -789,7 +789,7 @@ static inline void drv_rfkill_poll(struct ieee80211_local *local)static inline void drv_flush (struct ieee80211_local *local,struct ieee80211_sub_if_data *sdata, -u32 queues,bool drop) +unsigned long *queues,bool drop) {struct ieee80211_vif *vif = sdata ? &sdata->vif :NULL ;
@@ -798,9 +798,16 @@ static inline void drv_flush(struct ieee80211_local *local,if (sdata && !check_sdata_in_driver (sdata))return ; -trace_drv_flush (local, queues, drop); +trace_drv_flush (local, queues[0 ], drop); +/* NOTE: Only ath10k might want more queues than fits in 32-bits, +* and currently it pays no attention to the queues argument. So, +* just passing first value here is safe. If other drivers ever +* do need to see the array, then can create a flushA member +* and use it if it exists, falling back to old flush() for +* other drivers. +*/ if (local->ops->flush) - local->ops->flush (&local->hw, vif, queues, drop); + local->ops->flush (&local->hw, vif, queues[0 ], drop);trace_drv_return_void (local); }
net/mac80211/ieee80211_i.h +6 -3
@@ -1910,9 +1910,12 @@ void ieee80211_sta_tx_notify(struct ieee80211_sub_if_data *sdata, struct ieee80211_hdr *hdr, bool ack, u16 tx_time);void ieee80211_wake_queues_by_reason (struct ieee80211_hw *hw, -unsigned long queues, +unsigned long *queues,enum queue_stop_reason reason,bool refcounted); +void ieee80211_get_vif_queues (struct ieee80211_local *local, +struct ieee80211_sub_if_data *sdata, +unsigned long *queues);void ieee80211_stop_vif_queues (struct ieee80211_local *local,struct ieee80211_sub_if_data *sdata,enum queue_stop_reason reason);
@@ -1920,7 +1923,7 @@ void ieee80211_wake_vif_queues(struct ieee80211_local *local,struct ieee80211_sub_if_data *sdata, enum queue_stop_reason reason);void ieee80211_stop_queues_by_reason (struct ieee80211_hw *hw, -unsigned long queues, +unsigned long *queues,enum queue_stop_reason reason,bool refcounted); void ieee80211_wake_queue_by_reason(struct ieee80211_hw *hw, int queue,
@@ -1938,7 +1941,7 @@ void ieee80211_flush_queues(struct ieee80211_local *local, struct ieee80211_sub_if_data *sdata, bool drop);void __ieee80211_flush_queues (struct ieee80211_local *local,struct ieee80211_sub_if_data *sdata, -unsigned int queues,bool drop); +unsigned long *queues,bool drop);static inline bool ieee80211_can_run_worker (struct ieee80211_local *local) {
net/mac80211/tx.c +7 -2
@@ -3819,7 +3819,10 @@ int ieee80211_reserve_tid(struct ieee80211_sta *pubsta, u8 tid)struct ieee80211_sub_if_data *sdata = sta->sdata;struct ieee80211_local *local = sdata->local;int ret; -u32 queues; +unsigned long queues[IEEE80211_MAX_QUEUE_MAP_CNT ] = {0 ,0 ,0 }; +int idx, bit; + +ieee80211_get_vif_queues (local, sdata, queues);lockdep_assert_held (&local->sta_mtx);
@@ -3860,7 +3863,9 @@ int ieee80211_reserve_tid(struct ieee80211_sta *pubsta, u8 tid) AGG_STOP_LOCAL_REQUEST); } - queues =BIT (sdata->vif.hw_queue[ieee802_1d_to_ac[tid]]); + idx = sdata->vif.hw_queue[ieee802_1d_to_ac[tid]] /BITS_PER_LONG ; + bit = sdata->vif.hw_queue[ieee802_1d_to_ac[tid]] - (idx *BITS_PER_LONG ); + queues[idx] =1L << bit;__ieee80211_flush_queues (local, sdata, queues, false); sta->reserved_tid = tid;
net/mac80211/util.c +55 -22
155 lines not on this page · raw message
Signature · 1 line
2.4.3