netdev - Re: [PATCH net-next-2.6] bnx2: 64 bit stats on all arches

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: <C27F8246C663564A84BB7AB3439772421B842BD250@IRVEXCHCCR01.corp.ad.broadcom.com>
Date:	Thu, 8 Jul 2010 07:00:37 -0700
From:	"Michael Chan" <mchan@...adcom.com>
To:	"'Eric Dumazet'" <eric.dumazet@...il.com>,
	"David Miller" <davem@...emloft.net>
cc:	netdev <netdev@...r.kernel.org>,
	"Matthew Carlson" <mcarlson@...adcom.com>
Subject: Re: [PATCH net-next-2.6] bnx2: 64 bit stats on all arches

Eric Dumazet wrote:

> Now core network is able to handle 64 bit netdevice stats on 32 bit
> arches, we can provide them for bnx2, since hardware maintains some 64
> bit counters.
>
> Signed-off-by: Eric Dumazet <eric.dumazet@...il.com>
> ---
>  drivers/net/bnx2.c |   22 +++++++---------------
>  1 file changed, 7 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
> index 22fa1e9..2975bf9 100644
> --- a/drivers/net/bnx2.c
> +++ b/drivers/net/bnx2.c
> @@ -6589,36 +6589,28 @@ bnx2_save_stats(struct bnx2 *bp)
>               temp_stats[i] += hw_stats[i];
>  }
>
> -#define GET_64BIT_NET_STATS64(ctr)                           \
> -     (unsigned long) ((unsigned long) (ctr##_hi) << 32) +    \
> -     (unsigned long) (ctr##_lo)
> +#define GET_64BIT_NET_STATS64(ctr)           \
> +     (((u64) (ctr##_hi) << 32) + (u64) (ctr##_lo))
>
>  #define GET_64BIT_NET_STATS32(ctr)                           \
>       (ctr##_lo)

It seems that GET_64BIT_NET_STATS32 is no longer needed.
Other than that,

Acked-by: Michael Chan <mchan@...adcom.com>

Thanks.

>
> -#if (BITS_PER_LONG == 64)
>  #define GET_64BIT_NET_STATS(ctr)                             \
>       GET_64BIT_NET_STATS64(bp->stats_blk->ctr) +             \
>       GET_64BIT_NET_STATS64(bp->temp_stats_blk->ctr)
> -#else
> -#define GET_64BIT_NET_STATS(ctr)                             \
> -     GET_64BIT_NET_STATS32(bp->stats_blk->ctr) +             \
> -     GET_64BIT_NET_STATS32(bp->temp_stats_blk->ctr)
> -#endif
>
>  #define GET_32BIT_NET_STATS(ctr)                             \
>       (unsigned long) (bp->stats_blk->ctr +                   \
>                        bp->temp_stats_blk->ctr)
>
> -static struct net_device_stats *
> -bnx2_get_stats(struct net_device *dev)
> +static struct rtnl_link_stats64 *
> +bnx2_get_stats64(struct net_device *dev, struct
> rtnl_link_stats64 *net_stats)
>  {
>       struct bnx2 *bp = netdev_priv(dev);
> -     struct net_device_stats *net_stats = &dev->stats;
>
> -     if (bp->stats_blk == NULL) {
> +     if (bp->stats_blk == NULL)
>               return net_stats;
> -     }
> +
>       net_stats->rx_packets =
>               GET_64BIT_NET_STATS(stat_IfHCInUcastPkts) +
>               GET_64BIT_NET_STATS(stat_IfHCInMulticastPkts) +
> @@ -8289,7 +8281,7 @@ static const struct net_device_ops
> bnx2_netdev_ops = {
>       .ndo_open               = bnx2_open,
>       .ndo_start_xmit         = bnx2_start_xmit,
>       .ndo_stop               = bnx2_close,
> -     .ndo_get_stats          = bnx2_get_stats,
> +     .ndo_get_stats64        = bnx2_get_stats64,
>       .ndo_set_rx_mode        = bnx2_set_rx_mode,
>       .ndo_do_ioctl           = bnx2_ioctl,
>       .ndo_validate_addr      = eth_validate_addr,
>
>
>
>

--
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