bareudp: Handle stats using NETDEV_PCPU_STAT_DSTATS.

Bareudp uses the TSTATS infrastructure (dev_sw_netstats_*()) for RX
packet counters. It was also recently converted to use the device core
stats (dev_core_stats_*()) for RX and TX drops (see commit 788d5d655bc9
("bareudp: Use pcpu stats to update rx_dropped counter.")).

Since core stats are to be avoided in drivers, and for consistency with
VXLAN and Geneve, let's convert packet stats handling to DSTATS, which
can handle RX/TX stats and packet drops. Statistics that don't fit
DSTATS are still updated atomically with DEV_STATS_INC().

Signed-off-by: Guillaume Nault <gnault@redhat.com>
Link: https://patch.msgid.link/0f4f8448db3ff449ac6e939872b28cf3f8982da7.1733313925.git.gnault@redhat.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/bareudp.c b/drivers/net/bareudp.c
index a2abfade82dd1cf3d849aba1ba9083a30993e132..70814303aab86079b8c86e7ed928bf1f1b0dfff2 100644 (file)
--- a/drivers/net/bareudp.c
+++ b/drivers/net/bareudp.c
@@ -84,7 +84,7 @@ static int bareudp_udp_encap_recv(struct sock *sk, struct sk_buff *skb)
 
                if (skb_copy_bits(skb, BAREUDP_BASE_HLEN, &ipversion,
                                  sizeof(ipversion))) {
-                       dev_core_stats_rx_dropped_inc(bareudp->dev);
+                       dev_dstats_rx_dropped(bareudp->dev);
                        goto drop;
                }
                ipversion >>= 4;
@@ -94,7 +94,7 @@ static int bareudp_udp_encap_recv(struct sock *sk, struct sk_buff *skb)
                } else if (ipversion == 6 && bareudp->multi_proto_mode) {
                        proto = htons(ETH_P_IPV6);
                } else {
-                       dev_core_stats_rx_dropped_inc(bareudp->dev);
+                       dev_dstats_rx_dropped(bareudp->dev);
                        goto drop;
                }
        } else if (bareudp->ethertype == htons(ETH_P_MPLS_UC)) {
@@ -108,7 +108,7 @@ static int bareudp_udp_encap_recv(struct sock *sk, struct sk_buff *skb)
                                   ipv4_is_multicast(tunnel_hdr->daddr)) {
                                proto = htons(ETH_P_MPLS_MC);
                        } else {
-                               dev_core_stats_rx_dropped_inc(bareudp->dev);
+                               dev_dstats_rx_dropped(bareudp->dev);
                                goto drop;
                        }
                } else {
@@ -124,7 +124,7 @@ static int bareudp_udp_encap_recv(struct sock *sk, struct sk_buff *skb)
                                   (addr_type & IPV6_ADDR_MULTICAST)) {
                                proto = htons(ETH_P_MPLS_MC);
                        } else {
-                               dev_core_stats_rx_dropped_inc(bareudp->dev);
+                               dev_dstats_rx_dropped(bareudp->dev);
                                goto drop;
                        }
                }
@@ -136,7 +136,7 @@ static int bareudp_udp_encap_recv(struct sock *sk, struct sk_buff *skb)
                                 proto,
                                 !net_eq(bareudp->net,
                                 dev_net(bareudp->dev)))) {
-               dev_core_stats_rx_dropped_inc(bareudp->dev);
+               dev_dstats_rx_dropped(bareudp->dev);
                goto drop;
        }
 
@@ -144,7 +144,7 @@ static int bareudp_udp_encap_recv(struct sock *sk, struct sk_buff *skb)
 
        tun_dst = udp_tun_rx_dst(skb, family, key, 0, 0);
        if (!tun_dst) {
-               dev_core_stats_rx_dropped_inc(bareudp->dev);
+               dev_dstats_rx_dropped(bareudp->dev);
                goto drop;
        }
        skb_dst_set(skb, &tun_dst->dst);
@@ -194,7 +194,7 @@ static int bareudp_udp_encap_recv(struct sock *sk, struct sk_buff *skb)
        len = skb->len;
        err = gro_cells_receive(&bareudp->gro_cells, skb);
        if (likely(err == NET_RX_SUCCESS))
-               dev_sw_netstats_rx_add(bareudp->dev, len);
+               dev_dstats_rx_add(bareudp->dev, len);
 
        return 0;
 drop:
@@ -589,7 +589,7 @@ static void bareudp_setup(struct net_device *dev)
        dev->priv_flags |= IFF_NO_QUEUE;
        dev->lltx = true;
        dev->flags = IFF_POINTOPOINT | IFF_NOARP | IFF_MULTICAST;
-       dev->pcpu_stat_type = NETDEV_PCPU_STAT_TSTATS;
+       dev->pcpu_stat_type = NETDEV_PCPU_STAT_DSTATS;
 }
 
 static int bareudp_validate(struct nlattr *tb[], struct nlattr *data[],