| Message ID | 20240605-dstats-v1-1-1024396e1670@codeconstruct.com.au (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: core: Unify dstats with tstats and lstats, add generic collection helper | expand |
Hi Jeremy, kernel test robot noticed the following build warnings: [auto build test WARNING on 32f88d65f01bf6f45476d7edbe675e44fb9e1d58] url: https://github.com/intel-lab-lkp/linux/commits/Jeremy-Kerr/net-core-vrf-Change-pcpu_dstat-fields-to-u64_stats_t/20240605-143942 base: 32f88d65f01bf6f45476d7edbe675e44fb9e1d58 patch link: https://lore.kernel.org/r/20240605-dstats-v1-1-1024396e1670%40codeconstruct.com.au patch subject: [PATCH 1/3] net: core,vrf: Change pcpu_dstat fields to u64_stats_t config: i386-randconfig-062-20240607 (https://download.01.org/0day-ci/archive/20240607/202406070424.JtWImJfu-lkp@intel.com/config) compiler: gcc-10 (Ubuntu 10.5.0-1ubuntu1) 10.5.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240607/202406070424.JtWImJfu-lkp@intel.com/reproduce) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp@intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202406070424.JtWImJfu-lkp@intel.com/ sparse warnings: (new ones prefixed by >>) >> drivers/net/vrf.c:414:35: sparse: sparse: incorrect type in argument 1 (different address spaces) @@ expected struct u64_stats_t [usertype] *p @@ got struct u64_stats_t [noderef] __percpu * @@ drivers/net/vrf.c:414:35: sparse: expected struct u64_stats_t [usertype] *p drivers/net/vrf.c:414:35: sparse: got struct u64_stats_t [noderef] __percpu * drivers/net/vrf.c: note: in included file (through include/linux/smp.h, include/linux/alloc_tag.h, include/linux/percpu.h, ...): include/linux/list.h:83:21: sparse: sparse: self-comparison always evaluates to true vim +414 drivers/net/vrf.c 391 392 /* Local traffic destined to local address. Reinsert the packet to rx 393 * path, similar to loopback handling. 394 */ 395 static int vrf_local_xmit(struct sk_buff *skb, struct net_device *dev, 396 struct dst_entry *dst) 397 { 398 int len = skb->len; 399 400 skb_orphan(skb); 401 402 skb_dst_set(skb, dst); 403 404 /* set pkt_type to avoid skb hitting packet taps twice - 405 * once on Tx and again in Rx processing 406 */ 407 skb->pkt_type = PACKET_LOOPBACK; 408 409 skb->protocol = eth_type_trans(skb, dev); 410 411 if (likely(__netif_rx(skb) == NET_RX_SUCCESS)) 412 vrf_rx_stats(dev, len); 413 else > 414 u64_stats_inc(&dev->dstats->rx_drops); 415 416 return NETDEV_TX_OK; 417 } 418
diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c index 3a252ac5dd28..088732871b27 100644 --- a/drivers/net/vrf.c +++ b/drivers/net/vrf.c @@ -126,8 +126,8 @@ static void vrf_rx_stats(struct net_device *dev, int len) struct pcpu_dstats *dstats = this_cpu_ptr(dev->dstats); u64_stats_update_begin(&dstats->syncp); - dstats->rx_packets++; - dstats->rx_bytes += len; + u64_stats_inc(&dstats->rx_packets); + u64_stats_add(&dstats->rx_bytes, len); u64_stats_update_end(&dstats->syncp); } @@ -150,11 +150,11 @@ static void vrf_get_stats64(struct net_device *dev, dstats = per_cpu_ptr(dev->dstats, i); do { start = u64_stats_fetch_begin(&dstats->syncp); - tbytes = dstats->tx_bytes; - tpkts = dstats->tx_packets; - tdrops = dstats->tx_drops; - rbytes = dstats->rx_bytes; - rpkts = dstats->rx_packets; + tbytes = u64_stats_read(&dstats->tx_bytes); + tpkts = u64_stats_read(&dstats->tx_packets); + tdrops = u64_stats_read(&dstats->tx_drops); + rbytes = u64_stats_read(&dstats->rx_bytes); + rpkts = u64_stats_read(&dstats->rx_packets); } while (u64_stats_fetch_retry(&dstats->syncp, start)); stats->tx_bytes += tbytes; stats->tx_packets += tpkts; @@ -411,7 +411,7 @@ static int vrf_local_xmit(struct sk_buff *skb, struct net_device *dev, if (likely(__netif_rx(skb) == NET_RX_SUCCESS)) vrf_rx_stats(dev, len); else - this_cpu_inc(dev->dstats->rx_drops); + u64_stats_inc(&dev->dstats->rx_drops); return NETDEV_TX_OK; } @@ -599,19 +599,20 @@ static netdev_tx_t is_ip_tx_frame(struct sk_buff *skb, struct net_device *dev) static netdev_tx_t vrf_xmit(struct sk_buff *skb, struct net_device *dev) { + struct pcpu_dstats *dstats = this_cpu_ptr(dev->dstats); + int len = skb->len; netdev_tx_t ret = is_ip_tx_frame(skb, dev); + u64_stats_update_begin(&dstats->syncp); if (likely(ret == NET_XMIT_SUCCESS || ret == NET_XMIT_CN)) { - struct pcpu_dstats *dstats = this_cpu_ptr(dev->dstats); - u64_stats_update_begin(&dstats->syncp); - dstats->tx_packets++; - dstats->tx_bytes += len; - u64_stats_update_end(&dstats->syncp); + u64_stats_inc(&dstats->tx_packets); + u64_stats_add(&dstats->tx_bytes, len); } else { - this_cpu_inc(dev->dstats->tx_drops); + u64_stats_inc(&dstats->tx_drops); } + u64_stats_update_end(&dstats->syncp); return ret; } diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index d20c6c99eb88..f148a01dd1d1 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -2731,12 +2731,12 @@ struct pcpu_sw_netstats { } __aligned(4 * sizeof(u64)); struct pcpu_dstats { - u64 rx_packets; - u64 rx_bytes; - u64 rx_drops; - u64 tx_packets; - u64 tx_bytes; - u64 tx_drops; + u64_stats_t rx_packets; + u64_stats_t rx_bytes; + u64_stats_t rx_drops; + u64_stats_t tx_packets; + u64_stats_t tx_bytes; + u64_stats_t tx_drops; struct u64_stats_sync syncp; } __aligned(8 * sizeof(u64));
The pcpu_sw_netstats and pcpu_lstats structs both contain a set of u64_stats_t fields for individual stats, but pcpu_dstats uses u64s instead. Make this consistent by using u64_stats_t across all stats types. The per-cpu dstats are only used by the vrf driver at present, so update that driver as part of this change. Signed-off-by: Jeremy Kerr <jk@codeconstruct.com.au> --- drivers/net/vrf.c | 29 +++++++++++++++-------------- include/linux/netdevice.h | 12 ++++++------ 2 files changed, 21 insertions(+), 20 deletions(-)