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

Commit 79c892b8 authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: provide per-TID RX/TX MSDU counters 



Implement the new counters cfg80211 can now advertise to userspace.
The TX code is in the sequence number handler, which is a bit odd,
but that place already knows the TID and frame type, so it was
easiest and least impact there.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 6de39808

net/mac80211/rx.c

+9 −0
Original line number Diff line number Diff line
@@ -2314,6 +2314,15 @@ ieee80211_rx_h_data(struct ieee80211_rx_data *rx) 
	if (unlikely(!ieee80211_is_data_present(hdr->frame_control)))

		return RX_DROP_MONITOR;



	if (rx->sta) {

		/* The security index has the same property as needed

		 * for the rx_msdu field, i.e. it is IEEE80211_NUM_TIDS

		 * for non-QoS-data frames. Here we know it's a data

		 * frame, so count MSDUs.

		 */

		rx->sta->rx_msdu[rx->security_idx]++;

	}



	/*

	 * Send unexpected-4addr-frame event to hostapd. For older versions,

	 * also drop the frame to cooked monitor interfaces.

net/mac80211/sta_info.c

+31 −0
Original line number Diff line number Diff line
@@ -1843,6 +1843,37 @@ void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo) 
		sinfo->filled |= BIT(NL80211_STA_INFO_RX_BITRATE);

	}



	sinfo->filled |= BIT(NL80211_STA_INFO_TID_STATS);

	for (i = 0; i < IEEE80211_NUM_TIDS + 1; i++) {

		struct cfg80211_tid_stats *tidstats = &sinfo->pertid[i];



		if (!(tidstats->filled & BIT(NL80211_TID_STATS_RX_MSDU))) {

			tidstats->filled |= BIT(NL80211_TID_STATS_RX_MSDU);

			tidstats->rx_msdu = sta->rx_msdu[i];

		}



		if (!(tidstats->filled & BIT(NL80211_TID_STATS_TX_MSDU))) {

			tidstats->filled |= BIT(NL80211_TID_STATS_TX_MSDU);

			tidstats->tx_msdu = sta->tx_msdu[i];

		}



		if (!(tidstats->filled &

				BIT(NL80211_TID_STATS_TX_MSDU_RETRIES)) &&

		    local->hw.flags & IEEE80211_HW_REPORTS_TX_ACK_STATUS) {

			tidstats->filled |=

				BIT(NL80211_TID_STATS_TX_MSDU_RETRIES);

			tidstats->tx_msdu_retries = sta->tx_msdu_retries[i];

		}



		if (!(tidstats->filled &

				BIT(NL80211_TID_STATS_TX_MSDU_FAILED)) &&

		    local->hw.flags & IEEE80211_HW_REPORTS_TX_ACK_STATUS) {

			tidstats->filled |=

				BIT(NL80211_TID_STATS_TX_MSDU_FAILED);

			tidstats->tx_msdu_failed = sta->tx_msdu_failed[i];

		}

	}



	if (ieee80211_vif_is_mesh(&sdata->vif)) {

#ifdef CONFIG_MAC80211_MESH

		sinfo->filled |= BIT(NL80211_STA_INFO_LLID) |

net/mac80211/sta_info.h

+12 −0
Original line number Diff line number Diff line
@@ -346,6 +346,14 @@ struct ieee80211_tx_latency_stat { 
 * @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)

 * @tx_msdu: MSDUs transmitted to this station, using IEEE80211_NUM_TID

 *	entry for non-QoS frames

 * @tx_msdu_retries: MSDU retries for transmissions to to this station,

 *	using IEEE80211_NUM_TID entry for non-QoS frames

 * @tx_msdu_failed: MSDU failures for transmissions to to this station,

 *	using IEEE80211_NUM_TID entry for non-QoS frames

 * @rx_msdu: MSDUs received from this station, using IEEE80211_NUM_TID

 *	entry for non-QoS frames

 */

struct sta_info {

	/* General information, mostly static */
@@ -416,6 +424,10 @@ struct sta_info { 
	u32 last_rx_rate_vht_flag;

	u8 last_rx_rate_vht_nss;

	u16 tid_seq[IEEE80211_QOS_CTL_TID_MASK + 1];

	u64 tx_msdu[IEEE80211_NUM_TIDS + 1];

	u64 tx_msdu_retries[IEEE80211_NUM_TIDS + 1];

	u64 tx_msdu_failed[IEEE80211_NUM_TIDS + 1];

	u64 rx_msdu[IEEE80211_NUM_TIDS + 1];



	/*

	 * Aggregation information, locked with lock.

net/mac80211/status.c

+13 −2
Original line number Diff line number Diff line
@@ -730,6 +730,7 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb) 
	struct ieee80211_bar *bar;

	int rtap_len;

	int shift = 0;

	int tid = IEEE80211_NUM_TIDS;;



	rates_idx = ieee80211_tx_get_rates(hw, info, &retry_count);
@@ -773,7 +774,7 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb) 


		if ((info->flags & IEEE80211_TX_STAT_AMPDU_NO_BACK) &&

		    (ieee80211_is_data_qos(fc))) {

			u16 tid, ssn;

			u16 ssn;

			u8 *qc;



			qc = ieee80211_get_qos_ctl(hdr);
@@ -782,10 +783,14 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb) 
						& IEEE80211_SCTL_SEQ);

			ieee80211_send_bar(&sta->sdata->vif, hdr->addr1,

					   tid, ssn);

		} else if (ieee80211_is_data_qos(fc)) {

			u8 *qc = ieee80211_get_qos_ctl(hdr);



			tid = qc[0] & 0xf;

		}



		if (!acked && ieee80211_is_back_req(fc)) {

			u16 tid, control;

			u16 control;



			/*

			 * BAR failed, store the last SSN and retry sending
@@ -813,6 +818,12 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb) 
			if (!acked)

				sta->tx_retry_failed++;

			sta->tx_retry_count += retry_count;



			if (ieee80211_is_data_present(fc)) {

				if (!acked)

					sta->tx_msdu_failed[tid]++;

				sta->tx_msdu_retries[tid] += retry_count;

			}

		}



		rate_control_tx_status(local, sband, sta, skb);

net/mac80211/tx.c

+3 −0
Original line number Diff line number Diff line
@@ -815,6 +815,8 @@ ieee80211_tx_h_sequence(struct ieee80211_tx_data *tx) 
		/* for pure STA mode without beacons, we can do it */

		hdr->seq_ctrl = cpu_to_le16(tx->sdata->sequence_number);

		tx->sdata->sequence_number += 0x10;

		if (tx->sta)

			tx->sta->tx_msdu[IEEE80211_NUM_TIDS]++;

		return TX_CONTINUE;

	}
@@ -831,6 +833,7 @@ ieee80211_tx_h_sequence(struct ieee80211_tx_data *tx) 
	qc = ieee80211_get_qos_ctl(hdr);

	tid = *qc & IEEE80211_QOS_CTL_TID_MASK;

	seq = &tx->sta->tid_seq[tid];

	tx->sta->tx_msdu[tid]++;



	hdr->seq_ctrl = cpu_to_le16(*seq);