ibmvnic: use ethtool string helpers

[PATCH net-next] ibmvnic: use ethtool string helpers

Posted by Rosen Penev 1 year, 3 months ago

They are the prefered way to copy ethtool strings.

Avoids manually incrementing the data pointer.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 drivers/net/ethernet/ibm/ibmvnic.c | 30 +++++++++---------------------
 1 file changed, 9 insertions(+), 21 deletions(-)

diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index cca2ed6ad289..e95ae0d39948 100644
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -3808,32 +3808,20 @@ static void ibmvnic_get_strings(struct net_device *dev, u32 stringset, u8 *data)
 	if (stringset != ETH_SS_STATS)
 		return;
 
-	for (i = 0; i < ARRAY_SIZE(ibmvnic_stats); i++, data += ETH_GSTRING_LEN)
-		memcpy(data, ibmvnic_stats[i].name, ETH_GSTRING_LEN);
+	for (i = 0; i < ARRAY_SIZE(ibmvnic_stats); i++)
+		ethtool_puts(&data, ibmvnic_stats[i].name);
 
 	for (i = 0; i < adapter->req_tx_queues; i++) {
-		snprintf(data, ETH_GSTRING_LEN, "tx%d_batched_packets", i);
-		data += ETH_GSTRING_LEN;
-
-		snprintf(data, ETH_GSTRING_LEN, "tx%d_direct_packets", i);
-		data += ETH_GSTRING_LEN;
-
-		snprintf(data, ETH_GSTRING_LEN, "tx%d_bytes", i);
-		data += ETH_GSTRING_LEN;
-
-		snprintf(data, ETH_GSTRING_LEN, "tx%d_dropped_packets", i);
-		data += ETH_GSTRING_LEN;
+		ethtool_sprintf(&data, "tx%d_batched_packets", i);
+		ethtool_sprintf(&data, "tx%d_direct_packets", i);
+		ethtool_sprintf(&data, "tx%d_bytes", i);
+		ethtool_sprintf(&data, "tx%d_dropped_packets", i);
 	}
 
 	for (i = 0; i < adapter->req_rx_queues; i++) {
-		snprintf(data, ETH_GSTRING_LEN, "rx%d_packets", i);
-		data += ETH_GSTRING_LEN;
-
-		snprintf(data, ETH_GSTRING_LEN, "rx%d_bytes", i);
-		data += ETH_GSTRING_LEN;
-
-		snprintf(data, ETH_GSTRING_LEN, "rx%d_interrupts", i);
-		data += ETH_GSTRING_LEN;
+		ethtool_sprintf(&data, "rx%d_packets", i);
+		ethtool_sprintf(&data, "rx%d_bytes", i);
+		ethtool_sprintf(&data, "rx%d_interrupts", i);
 	}
 }
 
-- 
2.47.0

Re: [PATCH net-next] ibmvnic: use ethtool string helpers

Posted by Simon Horman 1 year, 3 months ago

On Tue, Oct 22, 2024 at 01:32:40PM -0700, Rosen Penev wrote:
> They are the prefered way to copy ethtool strings.
> 
> Avoids manually incrementing the data pointer.
> 
> Signed-off-by: Rosen Penev <rosenp@gmail.com>

Reviewed-by: Simon Horman <horms@kernel.org>

Re: [PATCH net-next] ibmvnic: use ethtool string helpers

Posted by Nick Child 1 year, 3 months ago


On 10/22/24 15:32, Rosen Penev wrote:
> They are the prefered way to copy ethtool strings.
> 
> Avoids manually incrementing the data pointer.
> 
> Signed-off-by: Rosen Penev <rosenp@gmail.com>
> ---
>   drivers/net/ethernet/ibm/ibmvnic.c | 30 +++++++++---------------------
>   1 file changed, 9 insertions(+), 21 deletions(-)
> 
> diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
> index cca2ed6ad289..e95ae0d39948 100644
> --- a/drivers/net/ethernet/ibm/ibmvnic.c
> +++ b/drivers/net/ethernet/ibm/ibmvnic.c
> @@ -3808,32 +3808,20 @@ static void ibmvnic_get_strings(struct net_device *dev, u32 stringset, u8 *data)
>   	if (stringset != ETH_SS_STATS)
>   		return;
>   
> -	for (i = 0; i < ARRAY_SIZE(ibmvnic_stats); i++, data += ETH_GSTRING_LEN)
> -		memcpy(data, ibmvnic_stats[i].name, ETH_GSTRING_LEN);
> +	for (i = 0; i < ARRAY_SIZE(ibmvnic_stats); i++)
> +		ethtool_puts(&data, ibmvnic_stats[i].name);
>   
>   	for (i = 0; i < adapter->req_tx_queues; i++) {
> -		snprintf(data, ETH_GSTRING_LEN, "tx%d_batched_packets", i);
> -		data += ETH_GSTRING_LEN;
> -
> -		snprintf(data, ETH_GSTRING_LEN, "tx%d_direct_packets", i);
> -		data += ETH_GSTRING_LEN;
> -
> -		snprintf(data, ETH_GSTRING_LEN, "tx%d_bytes", i);
> -		data += ETH_GSTRING_LEN;
> -
> -		snprintf(data, ETH_GSTRING_LEN, "tx%d_dropped_packets", i);
> -		data += ETH_GSTRING_LEN;
> +		ethtool_sprintf(&data, "tx%d_batched_packets", i);
> +		ethtool_sprintf(&data, "tx%d_direct_packets", i);
> +		ethtool_sprintf(&data, "tx%d_bytes", i);
> +		ethtool_sprintf(&data, "tx%d_dropped_packets", i);
>   	}
>   
>   	for (i = 0; i < adapter->req_rx_queues; i++) {
> -		snprintf(data, ETH_GSTRING_LEN, "rx%d_packets", i);
> -		data += ETH_GSTRING_LEN;
> -
> -		snprintf(data, ETH_GSTRING_LEN, "rx%d_bytes", i);
> -		data += ETH_GSTRING_LEN;
> -
> -		snprintf(data, ETH_GSTRING_LEN, "rx%d_interrupts", i);
> -		data += ETH_GSTRING_LEN;
> +		ethtool_sprintf(&data, "rx%d_packets", i);
> +		ethtool_sprintf(&data, "rx%d_bytes", i);
> +		ethtool_sprintf(&data, "rx%d_interrupts", i);
>   	}
>   }
>   

Tested-by: Nick Child <nnac123@linux.ibm.com>