Commit 42745e03 authored by Vladimir Kondratiev's avatar Vladimir Kondratiev Committed by Johannes Berg
Browse files

cfg80211: expand per-station byte counters to 64bit 



In per-station statistics, present 32bit counters are too small
for practical purposes - with gigabit speeds, it get overlapped
every few seconds.

Expand counters in the struct station_info to be 64-bit.
Driver can still fill only 32-bit and indicate in @filled
only bits like STATION_INFO_[TR]X_BYTES; in case driver provides
full 64-bit counter, it should also set in @filled
bit STATION_INFO_[TR]RX_BYTES64

Netlink sends both 32-bit and 64-bit counters, if present, to not
break userspace.

Signed-off-by: default avatarVladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
[change to also have 32-bit counters if driver advertises 64-bit]
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 682bd38b

include/net/cfg80211.h

+8 −4
Original line number Diff line number Diff line
@@ -672,8 +672,10 @@ struct station_parameters { 
 * @STATION_INFO_SIGNAL: @signal filled

 * @STATION_INFO_TX_BITRATE: @txrate fields are filled

 *  (tx_bitrate, tx_bitrate_flags and tx_bitrate_mcs)

 * @STATION_INFO_RX_PACKETS: @rx_packets filled

 * @STATION_INFO_TX_PACKETS: @tx_packets filled

 * @STATION_INFO_RX_PACKETS: @rx_packets filled with 32-bit value

 * @STATION_INFO_TX_PACKETS: @tx_packets filled with 32-bit value

 * @STATION_INFO_RX_PACKETS64: @rx_packets filled with 64-bit value

 * @STATION_INFO_TX_PACKETS64: @tx_packets filled with 64-bit value

 * @STATION_INFO_TX_RETRIES: @tx_retries filled

 * @STATION_INFO_TX_FAILED: @tx_failed filled

 * @STATION_INFO_RX_DROP_MISC: @rx_dropped_misc filled
@@ -714,6 +716,8 @@ enum station_info_flags { 
	STATION_INFO_LOCAL_PM		= 1<<21,

	STATION_INFO_PEER_PM		= 1<<22,

	STATION_INFO_NONPEER_PM		= 1<<23,

	STATION_INFO_RX_BYTES64		= 1<<24,

	STATION_INFO_TX_BYTES64		= 1<<25,

};



/**
@@ -835,8 +839,8 @@ struct station_info { 
	u32 filled;

	u32 connected_time;

	u32 inactive_time;

	u32 rx_bytes;

	u32 tx_bytes;

	u64 rx_bytes;

	u64 tx_bytes;

	u16 llid;

	u16 plid;

	u8 plink_state;

include/uapi/linux/nl80211.h

+4 −0
Original line number Diff line number Diff line
@@ -1857,6 +1857,8 @@ enum nl80211_sta_bss_param { 
 * @NL80211_STA_INFO_INACTIVE_TIME: time since last activity (u32, msecs)

 * @NL80211_STA_INFO_RX_BYTES: total received bytes (u32, from this station)

 * @NL80211_STA_INFO_TX_BYTES: total transmitted bytes (u32, to this station)

 * @NL80211_STA_INFO_RX_BYTES64: total received bytes (u64, from this station)

 * @NL80211_STA_INFO_TX_BYTES64: total transmitted bytes (u64, to this station)

 * @NL80211_STA_INFO_SIGNAL: signal strength of last received PPDU (u8, dBm)

 * @NL80211_STA_INFO_TX_BITRATE: current unicast tx rate, nested attribute

 * 	containing info as possible, see &enum nl80211_rate_info
@@ -1909,6 +1911,8 @@ enum nl80211_sta_info { 
	NL80211_STA_INFO_LOCAL_PM,

	NL80211_STA_INFO_PEER_PM,

	NL80211_STA_INFO_NONPEER_PM,

	NL80211_STA_INFO_RX_BYTES64,

	NL80211_STA_INFO_TX_BYTES64,



	/* keep last */

	__NL80211_STA_INFO_AFTER_LAST,

net/wireless/nl80211.c

+13 −3
Original line number Diff line number Diff line
@@ -3057,12 +3057,22 @@ static int nl80211_send_station(struct sk_buff *msg, u32 portid, u32 seq, 
	    nla_put_u32(msg, NL80211_STA_INFO_INACTIVE_TIME,

			sinfo->inactive_time))

		goto nla_put_failure;

	if ((sinfo->filled & STATION_INFO_RX_BYTES) &&

	if ((sinfo->filled & (STATION_INFO_RX_BYTES |

			      STATION_INFO_RX_BYTES64)) &&

	    nla_put_u32(msg, NL80211_STA_INFO_RX_BYTES,

			sinfo->rx_bytes))

			(u32)sinfo->rx_bytes))

		goto nla_put_failure;

	if ((sinfo->filled & STATION_INFO_TX_BYTES) &&

	if ((sinfo->filled & (STATION_INFO_TX_BYTES |

			      NL80211_STA_INFO_TX_BYTES64)) &&

	    nla_put_u32(msg, NL80211_STA_INFO_TX_BYTES,

			(u32)sinfo->tx_bytes))

		goto nla_put_failure;

	if ((sinfo->filled & STATION_INFO_RX_BYTES64) &&

	    nla_put_u64(msg, NL80211_STA_INFO_RX_BYTES64,

			sinfo->rx_bytes))

		goto nla_put_failure;

	if ((sinfo->filled & STATION_INFO_TX_BYTES64) &&

	    nla_put_u64(msg, NL80211_STA_INFO_TX_BYTES64,

			sinfo->tx_bytes))

		goto nla_put_failure;

	if ((sinfo->filled & STATION_INFO_LLID) &&

CRA Git | Maintained and supported by SUSTech CRA and CCSE