bareudp: Fix device stats updates.

[ Upstream commit 4963d2343af81f493519f9c3ea9f2169eaa7353a ]

Bareudp devices update their stats concurrently.
Therefore they need proper atomic increments.

Fixes: 571912c69f0e ("net: UDP tunnel encapsulation module for tunnelling different protocols like MPLS, IP, NSH etc.")
Signed-off-by: Guillaume Nault <gnault@redhat.com>
Reviewed-by: Willem de Bruijn <willemb@google.com>
Link: https://patch.msgid.link/04b7b9d0b480158eb3ab4366ec80aa2ab7e41fcb.1725031794.git.gnault@redhat.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/bareudp.c b/drivers/net/bareudp.c
index 683203f87ae2b290e27e7a74c5653712084abc96..277493e41b0723e7b9f92b4cf7c23d43df501fcd 100644 (file)
--- a/drivers/net/bareudp.c
+++ b/drivers/net/bareudp.c
@@ -82,7 +82,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))) {
-                       bareudp->dev->stats.rx_dropped++;
+                       DEV_STATS_INC(bareudp->dev, rx_dropped);
                        goto drop;
                }
                ipversion >>= 4;
@@ -92,7 +92,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 {
-                       bareudp->dev->stats.rx_dropped++;
+                       DEV_STATS_INC(bareudp->dev, rx_dropped);
                        goto drop;
                }
        } else if (bareudp->ethertype == htons(ETH_P_MPLS_UC)) {
@@ -106,7 +106,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 {
-                               bareudp->dev->stats.rx_dropped++;
+                               DEV_STATS_INC(bareudp->dev, rx_dropped);
                                goto drop;
                        }
                } else {
@@ -122,7 +122,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 {
-                               bareudp->dev->stats.rx_dropped++;
+                               DEV_STATS_INC(bareudp->dev, rx_dropped);
                                goto drop;
                        }
                }
@@ -134,12 +134,12 @@ static int bareudp_udp_encap_recv(struct sock *sk, struct sk_buff *skb)
                                 proto,
                                 !net_eq(bareudp->net,
                                 dev_net(bareudp->dev)))) {
-               bareudp->dev->stats.rx_dropped++;
+               DEV_STATS_INC(bareudp->dev, rx_dropped);
                goto drop;
        }
        tun_dst = udp_tun_rx_dst(skb, family, TUNNEL_KEY, 0, 0);
        if (!tun_dst) {
-               bareudp->dev->stats.rx_dropped++;
+               DEV_STATS_INC(bareudp->dev, rx_dropped);
                goto drop;
        }
        skb_dst_set(skb, &tun_dst->dst);
@@ -165,8 +165,8 @@ static int bareudp_udp_encap_recv(struct sock *sk, struct sk_buff *skb)
                                                     &((struct ipv6hdr *)oiph)->saddr);
                }
                if (err > 1) {
-                       ++bareudp->dev->stats.rx_frame_errors;
-                       ++bareudp->dev->stats.rx_errors;
+                       DEV_STATS_INC(bareudp->dev, rx_frame_errors);
+                       DEV_STATS_INC(bareudp->dev, rx_errors);
                        goto drop;
                }
        }
@@ -462,11 +462,11 @@ tx_error:
        dev_kfree_skb(skb);
 
        if (err == -ELOOP)
-               dev->stats.collisions++;
+               DEV_STATS_INC(dev, collisions);
        else if (err == -ENETUNREACH)
-               dev->stats.tx_carrier_errors++;
+               DEV_STATS_INC(dev, tx_carrier_errors);
 
-       dev->stats.tx_errors++;
+       DEV_STATS_INC(dev, tx_errors);
        return NETDEV_TX_OK;
 }