Commit 01b8114b authored by Mingming Cao's avatar Mingming Cao Committed by Jakub Kicinski
Browse files

ibmvnic: Fix hardcoded NUM_RX_STATS/NUM_TX_STATS with dynamic sizeof 



The previous hardcoded definitions of NUM_RX_STATS and
NUM_TX_STATS were not updated when new fields were added
to the ibmvnic_{rx,tx}_queue_stats structures. Specifically,
commit 2ee73c54 ("ibmvnic: Add stat for tx direct vs tx
batched") added a fourth TX stat, but NUM_TX_STATS remained 3,
leading to a mismatch.

This patch replaces the static defines with dynamic sizeof-based
calculations to ensure the stat arrays are correctly sized.
This fixes incorrect indexing and prevents incomplete stat
reporting in tools like ethtool.

Fixes: 2ee73c54 ("ibmvnic: Add stat for tx direct vs tx batched")
Signed-off-by: default avatarMingming Cao <mmc@linux.ibm.com>
Reviewed-by: default avatarDave Marquardt <davemarq@linux.ibm.com>
Reviewed-by: default avatarHaren Myneni <haren@linux.ibm.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20250709153332.73892-1-mmc@linux.ibm.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 711c80f7

drivers/net/ethernet/ibm/ibmvnic.h

+6 −2
Original line number Diff line number Diff line
@@ -211,7 +211,6 @@ struct ibmvnic_statistics { 
	u8 reserved[72];

} __packed __aligned(8);



#define NUM_TX_STATS 3

struct ibmvnic_tx_queue_stats {

	u64 batched_packets;

	u64 direct_packets;
@@ -219,13 +218,18 @@ struct ibmvnic_tx_queue_stats { 
	u64 dropped_packets;

};



#define NUM_RX_STATS 3

#define NUM_TX_STATS \

	(sizeof(struct ibmvnic_tx_queue_stats) / sizeof(u64))



struct ibmvnic_rx_queue_stats {

	u64 packets;

	u64 bytes;

	u64 interrupts;

};



#define NUM_RX_STATS \

	(sizeof(struct ibmvnic_rx_queue_stats) / sizeof(u64))



struct ibmvnic_acl_buffer {

	__be32 len;

	__be32 version;