net: sfc: use ethtool string helpers
Subsystems (4)
PATCH v2 1/1 net: sfc: use ethtool string helpers
The latter is the preferred way to copy ethtool strings.
Avoids manually incrementing the pointer. Cleans up the code quite well.
---
v2: cleaned up further with signature changes to make sure all increments get propagated.
drivers/net/ethernet/sfc/ef10.c | 2 +- drivers/net/ethernet/sfc/ef100_nic.c | 2 +- drivers/net/ethernet/sfc/ethtool_common.c | 46 ++++++++----------- drivers/net/ethernet/sfc/falcon/ethtool.c | 34 ++++++-------- drivers/net/ethernet/sfc/falcon/falcon.c | 2 +- drivers/net/ethernet/sfc/falcon/net_driver.h | 2 +- drivers/net/ethernet/sfc/falcon/nic.c | 9 ++-- drivers/net/ethernet/sfc/falcon/nic.h | 2 +- drivers/net/ethernet/sfc/net_driver.h | 2 +- drivers/net/ethernet/sfc/nic.c | 9 ++-- drivers/net/ethernet/sfc/nic_common.h | 2 +- drivers/net/ethernet/sfc/ptp.c | 2 +- drivers/net/ethernet/sfc/ptp.h | 2 +- .../net/ethernet/sfc/siena/ethtool_common.c | 46 ++++++++----------- drivers/net/ethernet/sfc/siena/net_driver.h | 2 +- drivers/net/ethernet/sfc/siena/nic.c | 14 +++--- drivers/net/ethernet/sfc/siena/nic_common.h | 5 +- drivers/net/ethernet/sfc/siena/ptp.c | 2 +- drivers/net/ethernet/sfc/siena/ptp.h | 2 +- drivers/net/ethernet/sfc/siena/siena.c | 2 +- 20 files changed, 83 insertions(+), 106 deletions(-)
drivers/net/ethernet/sfc/ef10.c +1 -1
@@ -1751,7 +1751,7 @@ static void efx_ef10_get_stat_mask(struct efx_nic *efx, unsigned long *mask)#endif } -static size_t efx_ef10_describe_stats (struct efx_nic *efx,u8 *names) +static size_t efx_ef10_describe_stats (struct efx_nic *efx,u8 **names) {DECLARE_BITMAP (mask,EF10_STAT_COUNT );
drivers/net/ethernet/sfc/ef100_nic.c +1 -1
@@ -583,7 +583,7 @@ static const struct efx_hw_stat_desc ef100_stat_desc[EF100_STAT_COUNT] = { EFX_GENERIC_SW_STAT(rx_noskb_drops), }; -static size_t ef100_describe_stats (struct efx_nic *efx,u8 *names) +static size_t ef100_describe_stats (struct efx_nic *efx,u8 **names) { DECLARE_BITMAP(mask, EF100_STAT_COUNT) = {};
drivers/net/ethernet/sfc/ethtool_common.c +20 -26
77 lines not on this page · raw message
drivers/net/ethernet/sfc/falcon/ethtool.c +14 -20
@@ -353,7 +353,7 @@ static int ef4_ethtool_fill_self_tests(struct ef4_nic *efx,return n; } -static size_t ef4_describe_per_queue_stats (struct ef4_nic *efx,u8 *strings) +static size_t ef4_describe_per_queue_stats (struct ef4_nic *efx,u8 **strings) {size_t n_stats =0 ;struct ef4_channel *channel;
@@ -361,24 +361,22 @@ static size_t ef4_describe_per_queue_stats(struct ef4_nic *efx, u8 *strings)ef4_for_each_channel (channel, efx) {if (ef4_channel_has_tx_queues (channel)) { n_stats++; -if (strings !=NULL ) { -snprintf (strings,ETH_GSTRING_LEN , -"tx-%u.tx_packets" , - channel->tx_queue[0 ].queue / -EF4_TXQ_TYPES ); +if (!strings) +continue ; - strings +=ETH_GSTRING_LEN ; - } +ethtool_sprintf (strings,"tx-%u.tx_packets" , + channel->tx_queue[0 ].queue / +EF4_TXQ_TYPES ); } }ef4_for_each_channel (channel, efx) {if (ef4_channel_has_rx_queue (channel)) { n_stats++; -if (strings !=NULL ) { -snprintf (strings,ETH_GSTRING_LEN , -"rx-%d.rx_packets" , channel->channel); - strings +=ETH_GSTRING_LEN ; - } +if (!strings) +continue ; + +ethtool_sprintf (strings,"rx-%d.rx_packets" , + channel->channel); } }return n_stats;
@@ -409,14 +407,10 @@ static void ef4_ethtool_get_strings(struct net_device *net_dev,switch (string_set) {case ETH_SS_STATS : - strings += (efx->type->describe_stats (efx, strings) * -ETH_GSTRING_LEN ); + efx->type->describe_stats (efx, &strings);for (i =0 ; i <EF4_ETHTOOL_SW_STAT_COUNT ; i++) -strscpy (strings + i *ETH_GSTRING_LEN , - ef4_sw_stat_desc[i].name,ETH_GSTRING_LEN ); - strings +=EF4_ETHTOOL_SW_STAT_COUNT *ETH_GSTRING_LEN ; - strings += (ef4_describe_per_queue_stats (efx, strings) * -ETH_GSTRING_LEN ); +ethtool_puts (&strings, ef4_sw_stat_desc[i].name); +ef4_describe_per_queue_stats (efx, &strings);break ;case ETH_SS_TEST :ef4_ethtool_fill_self_tests (efx,NULL , strings,NULL );
drivers/net/ethernet/sfc/falcon/falcon.c +1 -1
@@ -2564,7 +2564,7 @@ static void falcon_remove_nic(struct ef4_nic *efx) efx->nic_data =NULL ; } -static size_t falcon_describe_nic_stats (struct ef4_nic *efx,u8 *names) +static size_t falcon_describe_nic_stats (struct ef4_nic *efx,u8 **names) {return ef4_nic_describe_stats (falcon_stat_desc,FALCON_STAT_COUNT , falcon_stat_mask, names);
drivers/net/ethernet/sfc/falcon/net_driver.h +1 -1
@@ -1057,7 +1057,7 @@ struct ef4_nic_type {void (*finish_flush)(struct ef4_nic *efx);void (*prepare_flr)(struct ef4_nic *efx);void (*finish_flr)(struct ef4_nic *efx); -size_t (*describe_stats)(struct ef4_nic *efx,u8 *names); +size_t (*describe_stats)(struct ef4_nic *efx,u8 **names);size_t (*update_stats)(struct ef4_nic *efx,u64 *full_stats,struct rtnl_link_stats64 *core_stats);void (*start_stats)(struct ef4_nic *efx);
drivers/net/ethernet/sfc/falcon/nic.c +3 -6
@@ -444,18 +444,15 @@ void ef4_nic_get_regs(struct ef4_nic *efx, void *buf)* bits in the first @count bits of @mask for which a name is defined. */ size_t ef4_nic_describe_stats (const struct ef4_hw_stat_desc *desc,size_t count, -const unsigned long *mask,u8 *names) +const unsigned long *mask,u8 **names) {size_t visible =0 ;size_t index;for_each_set_bit (index, mask, count) {if (desc[index].name) { -if (names) { -strscpy (names, desc[index].name, -ETH_GSTRING_LEN ); - names +=ETH_GSTRING_LEN ; - } +if (names) +ethtool_puts (names, desc[index].name); ++visible; } }
drivers/net/ethernet/sfc/falcon/nic.h +1 -1
@@ -498,7 +498,7 @@ size_t ef4_nic_get_regs_len(struct ef4_nic *efx);void ef4_nic_get_regs (struct ef4_nic *efx,void *buf);size_t ef4_nic_describe_stats (const struct ef4_hw_stat_desc *desc,size_t count, -const unsigned long *mask,u8 *names); +const unsigned long *mask,u8 **names);void ef4_nic_update_stats (const struct ef4_hw_stat_desc *desc,size_t count,const unsigned long *mask,u64 *stats,const void *dma_buf,bool accumulate);
drivers/net/ethernet/sfc/net_driver.h +1 -1
@@ -1408,7 +1408,7 @@ struct efx_nic_type {int (*fini_dmaq)(struct efx_nic *efx);void (*prepare_flr)(struct efx_nic *efx);void (*finish_flr)(struct efx_nic *efx); -size_t (*describe_stats)(struct efx_nic *efx,u8 *names); +size_t (*describe_stats)(struct efx_nic *efx,u8 **names);size_t (*update_stats)(struct efx_nic *efx,u64 *full_stats,struct rtnl_link_stats64 *core_stats); size_t (*update_stats_atomic)(struct efx_nic *efx, u64 *full_stats,
drivers/net/ethernet/sfc/nic.c +3 -6
@@ -299,18 +299,15 @@ void efx_nic_get_regs(struct efx_nic *efx, void *buf)* bits in the first @count bits of @mask for which a name is defined. */ size_t efx_nic_describe_stats (const struct efx_hw_stat_desc *desc,size_t count, -const unsigned long *mask,u8 *names) +const unsigned long *mask,u8 **names) {size_t visible =0 ;size_t index;for_each_set_bit (index, mask, count) {if (desc[index].name) { -if (names) { -strscpy (names, desc[index].name, -ETH_GSTRING_LEN ); - names +=ETH_GSTRING_LEN ; - } +if (names) +ethtool_puts (names, desc[index].name); ++visible; } }
drivers/net/ethernet/sfc/nic_common.h +1 -1
@@ -241,7 +241,7 @@ void efx_nic_get_regs(struct efx_nic *efx, void *buf);#define EFX_MC_STATS_GENERATION_INVALID ((__force __le64)(-1))size_t efx_nic_describe_stats (const struct efx_hw_stat_desc *desc,size_t count, -const unsigned long *mask,u8 *names); +const unsigned long *mask,u8 **names);int efx_nic_copy_stats (struct efx_nic *efx,__le64 *dest); void efx_nic_update_stats(const struct efx_hw_stat_desc *desc, size_t count, const unsigned long *mask, u64 *stats,
drivers/net/ethernet/sfc/ptp.c +1 -1
@@ -399,7 +399,7 @@ static const unsigned long efx_ptp_stat_mask[] = { [0 ... BITS_TO_LONGS(PTP_STAT_COUNT) - 1] = ~0UL, }; -size_t efx_ptp_describe_stats (struct efx_nic *efx,u8 *strings) +size_t efx_ptp_describe_stats (struct efx_nic *efx,u8 **strings) {if (!efx->ptp_data)return 0 ;
drivers/net/ethernet/sfc/ptp.h +1 -1
@@ -31,7 +31,7 @@ int efx_ptp_change_mode(struct efx_nic *efx, bool enable_wanted, unsigned int new_mode);int efx_ptp_tx (struct efx_nic *efx,struct sk_buff *skb);void efx_ptp_event (struct efx_nic *efx,efx_qword_t *ev); -size_t efx_ptp_describe_stats (struct efx_nic *efx,u8 *strings); +size_t efx_ptp_describe_stats (struct efx_nic *efx,u8 **strings);size_t efx_ptp_update_stats (struct efx_nic *efx,u64 *stats);void efx_time_sync_event (struct efx_channel *channel,efx_qword_t *ev); void __efx_rx_skb_attach_timestamp(struct efx_channel *channel,
drivers/net/ethernet/sfc/siena/ethtool_common.c +20 -26
77 lines not on this page · raw message
drivers/net/ethernet/sfc/siena/net_driver.h +1 -1
@@ -1307,7 +1307,7 @@ struct efx_nic_type {void (*finish_flush)(struct efx_nic *efx);void (*prepare_flr)(struct efx_nic *efx);void (*finish_flr)(struct efx_nic *efx); -size_t (*describe_stats)(struct efx_nic *efx,u8 *names); +size_t (*describe_stats)(struct efx_nic *efx,u8 **names);size_t (*update_stats)(struct efx_nic *efx,u64 *full_stats,struct rtnl_link_stats64 *core_stats); size_t (*update_stats_atomic)(struct efx_nic *efx, u64 *full_stats,
drivers/net/ethernet/sfc/siena/nic.c +7 -7
@@ -449,20 +449,20 @@ void efx_siena_get_regs(struct efx_nic *efx, void *buf)* Returns the number of visible statistics, i.e. the number of set * bits in the first @count bits of @mask for which a name is defined. */ -size_t efx_siena_describe_stats (const struct efx_hw_stat_desc *desc,size_t count, -const unsigned long *mask,u8 *names) +size_t efx_siena_describe_stats (const struct efx_hw_stat_desc *desc, +size_t count,const unsigned long *mask, +u8 **names) {size_t visible =0 ;size_t index;for_each_set_bit (index, mask, count) {if (desc[index].name) { -if (names) { -strscpy (names, desc[index].name, -ETH_GSTRING_LEN ); - names +=ETH_GSTRING_LEN ; - } ++visible; +if (!names) +continue ; + +ethtool_puts (names, desc[index].name); } }
drivers/net/ethernet/sfc/siena/nic_common.h +3 -2
@@ -239,8 +239,9 @@ void efx_siena_get_regs(struct efx_nic *efx, void *buf);#define EFX_MC_STATS_GENERATION_INVALID ((__force __le64)(-1)) -size_t efx_siena_describe_stats (const struct efx_hw_stat_desc *desc,size_t count, -const unsigned long *mask,u8 *names); +size_t efx_siena_describe_stats (const struct efx_hw_stat_desc *desc, +size_t count,const unsigned long *mask, +u8 **names);void efx_siena_update_stats (const struct efx_hw_stat_desc *desc,size_t count,const unsigned long *mask,u64 *stats,const void *dma_buf,bool accumulate);
drivers/net/ethernet/sfc/siena/ptp.c +1 -1
@@ -393,7 +393,7 @@ static const unsigned long efx_ptp_stat_mask[] = { [0 ... BITS_TO_LONGS(PTP_STAT_COUNT) - 1] = ~0UL, }; -size_t efx_siena_ptp_describe_stats (struct efx_nic *efx,u8 *strings) +size_t efx_siena_ptp_describe_stats (struct efx_nic *efx,u8 **strings) {if (!efx->ptp_data)return 0 ;
drivers/net/ethernet/sfc/siena/ptp.h +1 -1
@@ -28,7 +28,7 @@ int efx_siena_ptp_change_mode(struct efx_nic *efx, bool enable_wanted, unsigned int new_mode);int efx_siena_ptp_tx (struct efx_nic *efx,struct sk_buff *skb);void efx_siena_ptp_event (struct efx_nic *efx,efx_qword_t *ev); -size_t efx_siena_ptp_describe_stats (struct efx_nic *efx,u8 *strings); +size_t efx_siena_ptp_describe_stats (struct efx_nic *efx,u8 **strings);size_t efx_siena_ptp_update_stats (struct efx_nic *efx,u64 *stats);void efx_siena_time_sync_event (struct efx_channel *channel,efx_qword_t *ev); void __efx_siena_rx_skb_attach_timestamp(struct efx_channel *channel,
drivers/net/ethernet/sfc/siena/siena.c +1 -1
@@ -545,7 +545,7 @@ static const unsigned long siena_stat_mask[] = { [0 ... BITS_TO_LONGS(SIENA_STAT_COUNT) - 1] = ~0UL, }; -static size_t siena_describe_nic_stats (struct efx_nic *efx,u8 *names) +static size_t siena_describe_nic_stats (struct efx_nic *efx,u8 **names) {return efx_siena_describe_stats (siena_stat_desc,SIENA_STAT_COUNT , siena_stat_mask, names);
Signature · 1 line
2.47.0
Quoted 5 lines · Rosen Penev
The latter is the preferred way to copy ethtool strings.
Avoids manually incrementing the pointer. Cleans up the code quite well.
Signed-off-by Rosen Penev <[email protected]>
I was initially curious why we still needed the 'n_stats++;' bits,
for the record it's for .get_sset_count(). (If you end up needing to respin for any reason, perhaps make that explicit in the commit message.)
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 21 lines · On Tue, 5 Nov 2024 15:18:55 -0800 you wrote:
The latter is the preferred way to copy ethtool strings.
Avoids manually incrementing the pointer. Cleans up the code quite well.
Signed-off-by Rosen Penev <[email protected]>---
v2: cleaned up further with signature changes to make sure all increments get propagated.drivers/net/ethernet/sfc/ef10.c | 2 +- drivers/net/ethernet/sfc/ef100_nic.c | 2 +- drivers/net/ethernet/sfc/ethtool_common.c | 46 ++++++++----------- drivers/net/ethernet/sfc/falcon/ethtool.c | 34 ++++++-------- drivers/net/ethernet/sfc/falcon/falcon.c | 2 +- drivers/net/ethernet/sfc/falcon/net_driver.h | 2 +- drivers/net/ethernet/sfc/falcon/nic.c | 9 ++-- drivers/net/ethernet/sfc/falcon/nic.h | 2 +- drivers/net/ethernet/sfc/net_driver.h | 2 +- drivers/net/ethernet/sfc/nic.c | 9 ++-- drivers/net/ethernet/sfc/nic_common.h | 2 +- drivers/net/ethernet/sfc/ptp.c | 2 +- drivers/net/ethernet/sfc/ptp.h | 2 +-
Quoted 8 lines
.../net/ethernet/sfc/siena/ethtool_common.c | 46 ++++++++----------- drivers/net/ethernet/sfc/siena/net_driver.h | 2 +- drivers/net/ethernet/sfc/siena/nic.c | 14 +++--- drivers/net/ethernet/sfc/siena/nic_common.h | 5 +- drivers/net/ethernet/sfc/siena/ptp.c | 2 +- drivers/net/ethernet/sfc/siena/ptp.h | 2 +- drivers/net/ethernet/sfc/siena/siena.c | 2 +- 20 files changed, 83 insertions(+), 106 deletions(-)
Here is the summary with links:
- [PATCHv2,net-next] net: sfc: use ethtool string helpers
https://git.kernel.org/netdev/net-next/c/9dae59210556
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html