| 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
| ||
|
Date: Thu, 27 Jul 2017 12:03:32 +0100
From: kiki good <jqiaoulk@...il.com>
To: Florian Fainelli <f.fainelli@...il.com>
Cc: David Miller <davem@...emloft.net>, netdev@...r.kernel.org
Subject: Re: [PATCH v3 net-next] net: systemport: Support 64bit statistics
How about the changes below then ? of course, we need to remove
bcm_sysport_free_cb(cb) from bcm_sysport_tx_reclaim_one() as well.
u64_stats_update_begin(&stats64->syncp);
ring->bytes += len;
if (cb->skb)
{
ring->packets++;
+ bcm_sysport_free_cb(cb);
}
u64_stats_update_end(&stats64->syncp);
Thanks
Jmqiao
On Thu, Jul 27, 2017 at 1:44 AM, Florian Fainelli <f.fainelli@...il.com> wrote:
> On 07/26/2017 05:40 PM, Jianming.qiao wrote:
>> When using Broadcom Systemport device in 32bit Platform, ifconfig can
>> only report up to 4G tx,rx status, which will be wrapped to 0 when the
>> number of incoming or outgoing packets exceeds 4G, only taking
>> around 2 hours in busy network environment (such as streaming).
>> Therefore, it makes hard for network diagnostic tool to get reliable
>> statistical result, so the patch is used to add 64bit support for
>> Broadcom Systemport device in 32bit Platform.
>>
>> Signed-off-by: Jianming.qiao <kiki-good@...mail.com>
>> ---
>> drivers/net/ethernet/broadcom/bcmsysport.c | 71 ++++++++++++++++++++----------
>> drivers/net/ethernet/broadcom/bcmsysport.h | 9 +++-
>> 2 files changed, 55 insertions(+), 25 deletions(-)
>>
>> diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c
>> index 5274501..967221f 100644
>> --- a/drivers/net/ethernet/broadcom/bcmsysport.c
>> +++ b/drivers/net/ethernet/broadcom/bcmsysport.c
>> @@ -662,6 +662,7 @@ static int bcm_sysport_alloc_rx_bufs(struct bcm_sysport_priv *priv)
>> static unsigned int bcm_sysport_desc_rx(struct bcm_sysport_priv *priv,
>> unsigned int budget)
>> {
>> + struct bcm_sysport_stats *stats64 = &priv->stats64;
>> struct net_device *ndev = priv->netdev;
>> unsigned int processed = 0, to_process;
>> struct bcm_sysport_cb *cb;
>> @@ -765,6 +766,10 @@ static unsigned int bcm_sysport_desc_rx(struct bcm_sysport_priv *priv,
>> skb->protocol = eth_type_trans(skb, ndev);
>> ndev->stats.rx_packets++;
>> ndev->stats.rx_bytes += len;
>> + u64_stats_update_begin(&stats64->syncp);
>> + stats64->rx_packets++;
>> + stats64->rx_bytes += len;
>> + u64_stats_update_end(&stats64->syncp);
>>
>> napi_gro_receive(&priv->napi, skb);
>> next:
>> @@ -784,24 +789,31 @@ static void bcm_sysport_tx_reclaim_one(struct bcm_sysport_tx_ring *ring,
>> unsigned int *pkts_compl)
>> {
>> struct bcm_sysport_priv *priv = ring->priv;
>> + struct bcm_sysport_stats *stats64 = &priv->stats64;
>> struct device *kdev = &priv->pdev->dev;
>> + unsigned int len = 0;
>>
>> if (cb->skb) {
>> - ring->bytes += cb->skb->len;
>> - *bytes_compl += cb->skb->len;
>> + len = cb->skb->len;
>> + *bytes_compl += len;
>> dma_unmap_single(kdev, dma_unmap_addr(cb, dma_addr),
>> dma_unmap_len(cb, dma_len),
>> DMA_TO_DEVICE);
>> - ring->packets++;
>> (*pkts_compl)++;
>> bcm_sysport_free_cb(cb);
>> /* SKB fragment */
>> } else if (dma_unmap_addr(cb, dma_addr)) {
>> - ring->bytes += dma_unmap_len(cb, dma_len);
>> + len = dma_unmap_len(cb, dma_len);
>> dma_unmap_page(kdev, dma_unmap_addr(cb, dma_addr),
>> dma_unmap_len(cb, dma_len), DMA_TO_DEVICE);
>> dma_unmap_addr_set(cb, dma_addr, 0);
>> }
>> +
>> + u64_stats_update_begin(&stats64->syncp);
>> + ring->bytes += len;
>> + if (cb->skb)
>> + ring->packets++;
>
> How can this be safe now with bcm_sysport_free_cb() doing cb->skb =
> NULL? I know I recommended moving the 64-bit statistics update out of
> the if () else () clause before but still, it sounds like we are no
> longer able to count the ring packets here.
>
>> + u64_stats_update_end(&stats64->syncp);
>> }
>>
>> /* Reclaim queued SKBs for transmission completion, lockless version */
>> @@ -1671,24 +1683,6 @@ static int bcm_sysport_change_mac(struct net_device *dev, void *p)
>> return 0;
>> }
>>
>> -static struct net_device_stats *bcm_sysport_get_nstats(struct net_device *dev)
>> -{
>> - struct bcm_sysport_priv *priv = netdev_priv(dev);
>> - unsigned long tx_bytes = 0, tx_packets = 0;
>> - struct bcm_sysport_tx_ring *ring;
>> - unsigned int q;
>> -
>> - for (q = 0; q < dev->num_tx_queues; q++) {
>> - ring = &priv->tx_rings[q];
>> - tx_bytes += ring->bytes;
>> - tx_packets += ring->packets;
>> - }
>> -
>> - dev->stats.tx_bytes = tx_bytes;
>> - dev->stats.tx_packets = tx_packets;
>> - return &dev->stats;
>> -}
>> -
>> static void bcm_sysport_netif_start(struct net_device *dev)
>> {
>> struct bcm_sysport_priv *priv = netdev_priv(dev);
>> @@ -1923,6 +1917,37 @@ static int bcm_sysport_stop(struct net_device *dev)
>> return 0;
>> }
>>
>> +static void bcm_sysport_get_stats64(struct net_device *dev,
>> + struct rtnl_link_stats64 *stats)
>> +{
>> + struct bcm_sysport_priv *priv = netdev_priv(dev);
>> + struct bcm_sysport_stats *stats64 = &priv->stats64;
>> + struct bcm_sysport_tx_ring *ring;
>> + u64 tx_packets = 0, tx_bytes = 0;
>> + unsigned int start;
>> + unsigned int q;
>> +
>> + netdev_stats_to_stats64(stats, &dev->stats);
>> +
>> + for (q = 0; q < dev->num_tx_queues; q++) {
>> + ring = &priv->tx_rings[q];
>> + do {
>> + start = u64_stats_fetch_begin_irq(&stats64->syncp);
>> + tx_bytes += ring->bytes;
>> + tx_packets += ring->packets;
>> + } while (u64_stats_fetch_retry_irq(&stats64->syncp, start));
>> + }
>> +
>> + stats->tx_packets = tx_packets;
>> + stats->tx_bytes = tx_bytes;
>> +
>> + do {
>> + start = u64_stats_fetch_begin_irq(&stats64->syncp);
>> + stats->rx_packets = stats64->rx_packets;
>> + stats->rx_bytes = stats64->rx_bytes;
>> + } while (u64_stats_fetch_retry_irq(&stats64->syncp, start));
>> +}
>> +
>> static const struct ethtool_ops bcm_sysport_ethtool_ops = {
>> .get_drvinfo = bcm_sysport_get_drvinfo,
>> .get_msglevel = bcm_sysport_get_msglvl,
>> @@ -1950,7 +1975,7 @@ static int bcm_sysport_stop(struct net_device *dev)
>> #ifdef CONFIG_NET_POLL_CONTROLLER
>> .ndo_poll_controller = bcm_sysport_poll_controller,
>> #endif
>> - .ndo_get_stats = bcm_sysport_get_nstats,
>> + .ndo_get_stats64 = bcm_sysport_get_stats64,
>> };
>>
>> #define REV_FMT "v%2x.%02x"
>> diff --git a/drivers/net/ethernet/broadcom/bcmsysport.h b/drivers/net/ethernet/broadcom/bcmsysport.h
>> index 77a51c1..c03a176 100644
>> --- a/drivers/net/ethernet/broadcom/bcmsysport.h
>> +++ b/drivers/net/ethernet/broadcom/bcmsysport.h
>> @@ -657,6 +657,9 @@ struct bcm_sysport_stats {
>> enum bcm_sysport_stat_type type;
>> /* reg offset from UMAC base for misc counters */
>> u16 reg_offset;
>> + u64 rx_packets;
>> + u64 rx_bytes;
>> + struct u64_stats_sync syncp;
>> };
>>
>> /* Software house keeping helper structure */
>> @@ -693,8 +696,8 @@ struct bcm_sysport_tx_ring {
>> struct bcm_sysport_cb *cbs; /* Transmit control blocks */
>> struct dma_desc *desc_cpu; /* CPU view of the descriptor */
>> struct bcm_sysport_priv *priv; /* private context backpointer */
>> - unsigned long packets; /* packets statistics */
>> - unsigned long bytes; /* bytes statistics */
>> + u64 packets; /* packets statistics */
>> + u64 bytes; /* bytes statistics */
>> };
>>
>> /* Driver private structure */
>> @@ -743,5 +746,7 @@ struct bcm_sysport_priv {
>>
>> /* Ethtool */
>> u32 msg_enable;
>> + /* 64bit stats on 32bit/64bit Machine */
>> + struct bcm_sysport_stats stats64;
>> };
>> #endif /* __BCM_SYSPORT_H */
>>
>
>
> --
> Florian
Powered by blists - more mailing lists