netdev - Re: [PATCH 3/3] atl1: update statistics code

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <1389378566.2025.78.camel@bwh-desktop.uk.level5networks.com>
Date:	Fri, 10 Jan 2014 18:29:26 +0000
From:	Ben Hutchings <bhutchings@...arflare.com>
To:	Sabrina Dubroca <sd@...asysnail.net>
CC:	<davem@...emloft.net>, <netdev@...r.kernel.org>,
	<jcliburn@...il.com>, <chris.snook@...il.com>
Subject: Re: [PATCH 3/3] atl1: update statistics code

On Fri, 2014-01-10 at 17:08 +0100, Sabrina Dubroca wrote:
> As Ben Hutchings pointed out for the stats in alx, some
> hardware-specific stats aren't matched to the right net_device_stats
> field. Also fix the collision field and include errors in the total
> number of RX/TX packets.
> 
> Signed-off-by: Sabrina Dubroca <sd@...asysnail.net>
> ---
>  drivers/net/ethernet/atheros/atlx/atl1.c | 16 ++++++++--------
>  1 file changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/net/ethernet/atheros/atlx/atl1.c b/drivers/net/ethernet/atheros/atlx/atl1.c
> index 538211d..31d460a 100644
> --- a/drivers/net/ethernet/atheros/atlx/atl1.c
> +++ b/drivers/net/ethernet/atheros/atlx/atl1.c
[...]
> @@ -1718,23 +1718,18 @@ static void atl1_inc_smb(struct atl1_adapter *adapter)
>  	adapter->soft_stats.tx_trunc += smb->tx_trunc;
>  	adapter->soft_stats.tx_pause += smb->tx_pause;
>  
> -	netdev->stats.rx_packets = adapter->soft_stats.rx_packets;
> -	netdev->stats.tx_packets = adapter->soft_stats.tx_packets;
>  	netdev->stats.rx_bytes = adapter->soft_stats.rx_bytes;
>  	netdev->stats.tx_bytes = adapter->soft_stats.tx_bytes;
>  	netdev->stats.multicast = adapter->soft_stats.multicast;
>  	netdev->stats.collisions = adapter->soft_stats.collisions;
>  	netdev->stats.rx_errors = adapter->soft_stats.rx_errors;
> -	netdev->stats.rx_over_errors =
> -		adapter->soft_stats.rx_missed_errors;
>  	netdev->stats.rx_length_errors =
>  		adapter->soft_stats.rx_length_errors;
>  	netdev->stats.rx_crc_errors = adapter->soft_stats.rx_crc_errors;
>  	netdev->stats.rx_frame_errors =
>  		adapter->soft_stats.rx_frame_errors;
>  	netdev->stats.rx_fifo_errors = adapter->soft_stats.rx_fifo_errors;
> -	netdev->stats.rx_missed_errors =
> -		adapter->soft_stats.rx_missed_errors;

So adapter->soft_stats.rx_missed_errors is set (to something silly) and
then ignored...

> +	netdev->stats.rx_dropped = adapter->soft_stats.rx_rrd_ov;
>  	netdev->stats.tx_errors = adapter->soft_stats.tx_errors;
>  	netdev->stats.tx_fifo_errors = adapter->soft_stats.tx_fifo_errors;
>  	netdev->stats.tx_aborted_errors =
> @@ -1743,6 +1738,11 @@ static void atl1_inc_smb(struct atl1_adapter *adapter)
>  		adapter->soft_stats.tx_window_errors;
>  	netdev->stats.tx_carrier_errors =
>  		adapter->soft_stats.tx_carrier_errors;
> +
> +	netdev->stats.rx_packets = adapter->soft_stats.rx_packets +
> +				   netdev->stats.rx_errors;
> +	netdev->stats.tx_packets = adapter->soft_stats.tx_packets +
> +				   netdev->stats.tx_errors;

Given that adapter->soft_stats largely mirrors struct net_device_stats,
would it not make sense to do these additions there so that
adapter->soft_stats.{rx,tx}_packets include all packets?

I.e. you could do something like:

	delta_rx_errors = (smb->rx_frag + smb->rx_fcs_err +
			   smb->rx_len_err + smb->rx_sz_ov + smb->rx_rxf_ov +
			   smb->rx_rrd_ov + smb->rx_align_err);
	adapter->soft_stats.rx_errors += delta_rx_errors;
	adapter->soft_stats.rx_packets += delta_rx_errors;

(and similarly for TX).

Basically I think these changes belong further up the function.

Ben.

>  }
>  
>  static void atl1_update_mailbox(struct atl1_adapter *adapter)

-- 
Ben Hutchings, Staff Engineer, Solarflare
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html