Skip to content

Commit

Permalink
mac80211: Support the new cfg80211 TXQ stats API
Browse files Browse the repository at this point in the history 
This adds support to mac80211 to export TXQ stats via the newly added
cfg80211 API.

Signed-off-by: Toke Høiland-Jørgensen <[email protected]>
Signed-off-by: Johannes Berg <[email protected]>
  • Loading branch information
@tohojo @jmberg-intel
tohojo authored and jmberg-intel committed May 8, 2018
1 parent 52539ca commit 2fe4a29
Show file tree
Hide file tree
Showing 5 changed files with 137 additions and 0 deletions.
99 changes: 99 additions & 0 deletions net/mac80211/cfg.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2376,6 +2376,11 @@ static int ieee80211_set_wiphy_params(struct wiphy *wiphy, u32 changed)
(WIPHY_PARAM_RETRY_SHORT | WIPHY_PARAM_RETRY_LONG))
ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_RETRY_LIMITS);

if (changed & (WIPHY_PARAM_TXQ_LIMIT |
WIPHY_PARAM_TXQ_MEMORY_LIMIT |
WIPHY_PARAM_TXQ_QUANTUM))
ieee80211_txq_set_params(local);

return 0;
}

Expand Down Expand Up @@ -3705,6 +3710,99 @@ static int ieee80211_set_multicast_to_unicast(struct wiphy *wiphy,
return 0;
}

void ieee80211_fill_txq_stats(struct cfg80211_txq_stats *txqstats,
struct txq_info *txqi)
{
if (!(txqstats->filled & BIT(NL80211_TXQ_STATS_BACKLOG_BYTES))) {
txqstats->filled |= BIT(NL80211_TXQ_STATS_BACKLOG_BYTES);
txqstats->backlog_bytes = txqi->tin.backlog_bytes;
}

if (!(txqstats->filled & BIT(NL80211_TXQ_STATS_BACKLOG_PACKETS))) {
txqstats->filled |= BIT(NL80211_TXQ_STATS_BACKLOG_PACKETS);
txqstats->backlog_packets = txqi->tin.backlog_packets;
}

if (!(txqstats->filled & BIT(NL80211_TXQ_STATS_FLOWS))) {
txqstats->filled |= BIT(NL80211_TXQ_STATS_FLOWS);
txqstats->flows = txqi->tin.flows;
}

if (!(txqstats->filled & BIT(NL80211_TXQ_STATS_DROPS))) {
txqstats->filled |= BIT(NL80211_TXQ_STATS_DROPS);
txqstats->drops = txqi->cstats.drop_count;
}

if (!(txqstats->filled & BIT(NL80211_TXQ_STATS_ECN_MARKS))) {
txqstats->filled |= BIT(NL80211_TXQ_STATS_ECN_MARKS);
txqstats->ecn_marks = txqi->cstats.ecn_mark;
}

if (!(txqstats->filled & BIT(NL80211_TXQ_STATS_OVERLIMIT))) {
txqstats->filled |= BIT(NL80211_TXQ_STATS_OVERLIMIT);
txqstats->overlimit = txqi->tin.overlimit;
}

if (!(txqstats->filled & BIT(NL80211_TXQ_STATS_COLLISIONS))) {
txqstats->filled |= BIT(NL80211_TXQ_STATS_COLLISIONS);
txqstats->collisions = txqi->tin.collisions;
}

if (!(txqstats->filled & BIT(NL80211_TXQ_STATS_TX_BYTES))) {
txqstats->filled |= BIT(NL80211_TXQ_STATS_TX_BYTES);
txqstats->tx_bytes = txqi->tin.tx_bytes;
}

if (!(txqstats->filled & BIT(NL80211_TXQ_STATS_TX_PACKETS))) {
txqstats->filled |= BIT(NL80211_TXQ_STATS_TX_PACKETS);
txqstats->tx_packets = txqi->tin.tx_packets;
}
}

static int ieee80211_get_txq_stats(struct wiphy *wiphy,
struct wireless_dev *wdev,
struct cfg80211_txq_stats *txqstats)
{
struct ieee80211_local *local = wiphy_priv(wiphy);
struct ieee80211_sub_if_data *sdata;
int ret = 0;

if (!local->ops->wake_tx_queue)
return 1;

spin_lock_bh(&local->fq.lock);
rcu_read_lock();

if (wdev) {
sdata = IEEE80211_WDEV_TO_SUB_IF(wdev);
if (!sdata->vif.txq) {
ret = 1;
goto out;
}
ieee80211_fill_txq_stats(txqstats, to_txq_info(sdata->vif.txq));
} else {
/* phy stats */
txqstats->filled |= BIT(NL80211_TXQ_STATS_BACKLOG_PACKETS) |
BIT(NL80211_TXQ_STATS_BACKLOG_BYTES) |
BIT(NL80211_TXQ_STATS_OVERLIMIT) |
BIT(NL80211_TXQ_STATS_OVERMEMORY) |
BIT(NL80211_TXQ_STATS_COLLISIONS) |
BIT(NL80211_TXQ_STATS_MAX_FLOWS);
txqstats->backlog_packets = local->fq.backlog;
txqstats->backlog_bytes = local->fq.memory_usage;
txqstats->overlimit = local->fq.overlimit;
txqstats->overmemory = local->fq.overmemory;
txqstats->collisions = local->fq.collisions;
txqstats->max_flows = local->fq.flows_cnt;
}

out:
rcu_read_unlock();
spin_unlock_bh(&local->fq.lock);

return ret;
}

const struct cfg80211_ops mac80211_config_ops = {
.add_virtual_intf = ieee80211_add_iface,
.del_virtual_intf = ieee80211_del_iface,
Expand Down Expand Up @@ -3798,4 +3896,5 @@ const struct cfg80211_ops mac80211_config_ops = {
.del_nan_func = ieee80211_del_nan_func,
.set_multicast_to_unicast = ieee80211_set_multicast_to_unicast,
.tx_control_port = ieee80211_tx_control_port,
.get_txq_stats = ieee80211_get_txq_stats,
};
3 changes: 3 additions & 0 deletions net/mac80211/ieee80211_i.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2012,6 +2012,7 @@ static inline bool ieee80211_can_run_worker(struct ieee80211_local *local)
}

int ieee80211_txq_setup_flows(struct ieee80211_local *local);
void ieee80211_txq_set_params(struct ieee80211_local *local);
void ieee80211_txq_teardown_flows(struct ieee80211_local *local);
void ieee80211_txq_init(struct ieee80211_sub_if_data *sdata,
struct sta_info *sta,
Expand All @@ -2020,6 +2021,8 @@ void ieee80211_txq_purge(struct ieee80211_local *local,
struct txq_info *txqi);
void ieee80211_txq_remove_vlan(struct ieee80211_local *local,
struct ieee80211_sub_if_data *sdata);
void ieee80211_fill_txq_stats(struct cfg80211_txq_stats *txqstats,
struct txq_info *txqi);
void ieee80211_send_auth(struct ieee80211_sub_if_data *sdata,
u16 transaction, u16 auth_alg, u16 status,
const u8 *extra, size_t extra_len, const u8 *bssid,
Expand Down
3 changes: 3 additions & 0 deletions net/mac80211/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -565,6 +565,9 @@ struct ieee80211_hw *ieee80211_alloc_hw_nm(size_t priv_data_len,
if (!ops->set_key)
wiphy->flags |= WIPHY_FLAG_IBSS_RSN;

if (ops->wake_tx_queue)
wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_TXQS);

wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_RRM);

wiphy->bss_priv_size = sizeof(struct ieee80211_bss);
Expand Down
12 changes: 12 additions & 0 deletions net/mac80211/sta_info.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2052,6 +2052,18 @@ static void sta_set_tidstats(struct sta_info *sta,
tidstats->filled |= BIT(NL80211_TID_STATS_TX_MSDU_FAILED);
tidstats->tx_msdu_failed = sta->status_stats.msdu_failed[tid];
}

if (local->ops->wake_tx_queue && tid < IEEE80211_NUM_TIDS) {
spin_lock_bh(&local->fq.lock);
rcu_read_lock();

tidstats->filled |= BIT(NL80211_TID_STATS_TXQ_STATS);
ieee80211_fill_txq_stats(&tidstats->txq_stats,
to_txq_info(sta->sta.txq[tid]));

rcu_read_unlock();
spin_unlock_bh(&local->fq.lock);
}
}

static inline u64 sta_get_stats_bytes(struct ieee80211_sta_rx_stats *rxstats)
Expand Down
20 changes: 20 additions & 0 deletions net/mac80211/tx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1459,6 +1459,24 @@ void ieee80211_txq_purge(struct ieee80211_local *local,
ieee80211_purge_tx_queue(&local->hw, &txqi->frags);
}

void ieee80211_txq_set_params(struct ieee80211_local *local)
{
if (local->hw.wiphy->txq_limit)
local->fq.limit = local->hw.wiphy->txq_limit;
else
local->hw.wiphy->txq_limit = local->fq.limit;

if (local->hw.wiphy->txq_memory_limit)
local->fq.memory_limit = local->hw.wiphy->txq_memory_limit;
else
local->hw.wiphy->txq_memory_limit = local->fq.memory_limit;

if (local->hw.wiphy->txq_quantum)
local->fq.quantum = local->hw.wiphy->txq_quantum;
else
local->hw.wiphy->txq_quantum = local->fq.quantum;
}

int ieee80211_txq_setup_flows(struct ieee80211_local *local)
{
struct fq *fq = &local->fq;
Expand Down Expand Up @@ -1508,6 +1526,8 @@ int ieee80211_txq_setup_flows(struct ieee80211_local *local)
for (i = 0; i < fq->flows_cnt; i++)
codel_vars_init(&local->cvars[i]);

ieee80211_txq_set_params(local);

return 0;
}

Expand Down

0 comments on commit 2fe4a29

Please sign in to comment.