Commit 23ff5f6f authored by Sarika Sharma's avatar Sarika Sharma Committed by Johannes Berg
Browse files

wifi: cfg80211: reorg sinfo structure elements for mesh 



Currently, as multi-link operation(MLO) is not supported for mesh,
reorganize the sinfo structure for mesh-specific fields and embed
mesh related NL attributes together in organized view.
This will allow for the simplified reorganization of sinfo structure
for link level in a subsequent patch to add support for MLO station
statistics.
No functionality changes added.

Pahole summary before the reorg of sinfo structure:
 - size: 256, cachelines: 4, members: 50
 - sum members: 239, holes: 4, sum holes: 17
 - paddings: 2, sum paddings: 2
 - forced alignments: 1, forced holes: 1, sum forced holes: 1

Pahole summary after the reorg of sinfo structure:
 - size: 248, cachelines: 4, members: 50
 - sum members: 239, holes: 4, sum holes: 9
 - paddings: 2, sum paddings: 2
 - forced alignments: 1, last cacheline: 56 bytes

Signed-off-by: default avatarSarika Sharma <quic_sarishar@quicinc.com>
Link: https://patch.msgid.link/20250213171632.1646538-2-quic_sarishar@quicinc.com


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

include/net/cfg80211.h

+21 −22
Original line number Diff line number Diff line
@@ -2045,9 +2045,6 @@ struct cfg80211_tid_stats { 
 * @assoc_at: bootime (ns) of the last association

 * @rx_bytes: bytes (size of MPDUs) received from this station

 * @tx_bytes: bytes (size of MPDUs) transmitted to this station

 * @llid: mesh local link id

 * @plid: mesh peer link id

 * @plink_state: mesh peer link state

 * @signal: The signal strength, type depends on the wiphy's signal_type.

 *	For CFG80211_SIGNAL_TYPE_MBM, value is expressed in _dBm_.

 * @signal_avg: Average signal strength, type depends on the wiphy's signal_type.
@@ -2067,14 +2064,20 @@ struct cfg80211_tid_stats { 
 *	This number should increase every time the list of stations

 *	changes, i.e. when a station is added or removed, so that

 *	userspace can tell whether it got a consistent snapshot.

 * @beacon_loss_count: Number of times beacon loss event has triggered.

 * @assoc_req_ies: IEs from (Re)Association Request.

 *	This is used only when in AP mode with drivers that do not use

 *	user space MLME/SME implementation. The information is provided for

 *	the cfg80211_new_sta() calls to notify user space of the IEs.

 * @assoc_req_ies_len: Length of assoc_req_ies buffer in octets.

 * @sta_flags: station flags mask & values

 * @beacon_loss_count: Number of times beacon loss event has triggered.

 * @t_offset: Time offset of the station relative to this host.

 * @llid: mesh local link id

 * @plid: mesh peer link id

 * @plink_state: mesh peer link state

 * @connected_to_gate: true if mesh STA has a path to mesh gate

 * @connected_to_as: true if mesh STA has a path to authentication server

 * @airtime_link_metric: mesh airtime link metric.

 * @local_pm: local mesh STA power save mode

 * @peer_pm: peer mesh STA power save mode

 * @nonpeer_pm: non-peer mesh STA power save mode
@@ -2083,7 +2086,6 @@ struct cfg80211_tid_stats { 
 * @rx_beacon: number of beacons received from this peer

 * @rx_beacon_signal_avg: signal strength average (in dBm) for beacons received

 *	from this peer

 * @connected_to_gate: true if mesh STA has a path to mesh gate

 * @rx_duration: aggregate PPDU duration(usecs) for all the frames from a peer

 * @tx_duration: aggregate PPDU duration(usecs) for all the frames to a peer

 * @airtime_weight: current airtime scheduling weight
@@ -2097,8 +2099,6 @@ struct cfg80211_tid_stats { 
 * @fcs_err_count: number of packets (MPDUs) received from this station with

 *	an FCS error. This counter should be incremented only when TA of the

 *	received packet with an FCS error matches the peer MAC address.

 * @airtime_link_metric: mesh airtime link metric.

 * @connected_to_as: true if mesh STA has a path to authentication server

 * @mlo_params_valid: Indicates @assoc_link_id and @mld_addr fields are filled

 *	by driver. Drivers use this only in cfg80211_new_sta() calls when AP

 *	MLD's MLME/SME is offload to driver. Drivers won't fill this
@@ -2125,9 +2125,6 @@ struct station_info { 
	u64 assoc_at;

	u64 rx_bytes;

	u64 tx_bytes;

	u16 llid;

	u16 plid;

	u8 plink_state;

	s8 signal;

	s8 signal_avg;
@@ -2147,36 +2144,38 @@ struct station_info { 


	int generation;



	u32 beacon_loss_count;



	const u8 *assoc_req_ies;

	size_t assoc_req_ies_len;



	u32 beacon_loss_count;

	s64 t_offset;

	u16 llid;

	u16 plid;

	u8 plink_state;

	u8 connected_to_gate;

	u8 connected_to_as;

	u32 airtime_link_metric;

	enum nl80211_mesh_power_mode local_pm;

	enum nl80211_mesh_power_mode peer_pm;

	enum nl80211_mesh_power_mode nonpeer_pm;



	u32 expected_throughput;



	u64 tx_duration;

	u64 rx_duration;

	u64 rx_beacon;

	u8 rx_beacon_signal_avg;

	u8 connected_to_gate;

	u16 airtime_weight;



	struct cfg80211_tid_stats *pertid;

	s8 ack_signal;

	s8 avg_ack_signal;

	struct cfg80211_tid_stats *pertid;



	u16 airtime_weight;

	u64 tx_duration;

	u64 rx_duration;

	u64 rx_beacon;

	u8 rx_beacon_signal_avg;



	u32 rx_mpdu_count;

	u32 fcs_err_count;



	u32 airtime_link_metric;



	u8 connected_to_as;



	bool mlo_params_valid;

	u8 assoc_link_id;

	u8 mld_addr[ETH_ALEN] __aligned(2);

net/wireless/nl80211.c

+6 −5
Original line number Diff line number Diff line
@@ -6750,9 +6750,6 @@ static int nl80211_send_station(struct sk_buff *msg, u32 cmd, u32 portid, 








	PUT_SINFO_U64(RX_BYTES64, rx_bytes);









	PUT_SINFO_U64(TX_BYTES64, tx_bytes);









	PUT_SINFO(LLID, llid, u16);









	PUT_SINFO(PLID, plid, u16);









	PUT_SINFO(PLINK_STATE, plink_state, u8);









	PUT_SINFO_U64(RX_DURATION, rx_duration);









	PUT_SINFO_U64(TX_DURATION, tx_duration);
















@@ -6796,13 +6793,18 @@ static int nl80211_send_station(struct sk_buff *msg, u32 cmd, u32 portid,







	PUT_SINFO(TX_RETRIES, tx_retries, u32);









	PUT_SINFO(TX_FAILED, tx_failed, u32);









	PUT_SINFO(EXPECTED_THROUGHPUT, expected_throughput, u32);









	PUT_SINFO(AIRTIME_LINK_METRIC, airtime_link_metric, u32);









	PUT_SINFO(BEACON_LOSS, beacon_loss_count, u32);

















	PUT_SINFO(LLID, llid, u16);









	PUT_SINFO(PLID, plid, u16);









	PUT_SINFO(PLINK_STATE, plink_state, u8);









	PUT_SINFO(AIRTIME_LINK_METRIC, airtime_link_metric, u32);









	PUT_SINFO(LOCAL_PM, local_pm, u32);









	PUT_SINFO(PEER_PM, peer_pm, u32);









	PUT_SINFO(NONPEER_PM, nonpeer_pm, u32);









	PUT_SINFO(CONNECTED_TO_GATE, connected_to_gate, u8);









	PUT_SINFO(CONNECTED_TO_AS, connected_to_as, u8);









	PUT_SINFO_U64(T_OFFSET, t_offset);

















	if (sinfo->filled & BIT_ULL(NL80211_STA_INFO_BSS_PARAM)) {









		bss_param = nla_nest_start_noflag(msg,








@@ -6830,7 +6832,6 @@ static int nl80211_send_station(struct sk_buff *msg, u32 cmd, u32 portid,







		    &sinfo->sta_flags))









		goto nla_put_failure;

















	PUT_SINFO_U64(T_OFFSET, t_offset);









	PUT_SINFO_U64(RX_DROP_MISC, rx_dropped_misc);









	PUT_SINFO_U64(BEACON_RX, rx_beacon);









	PUT_SINFO(BEACON_SIGNAL_AVG, rx_beacon_signal_avg, u8);