ipv6/sit: Do not allocate stats in the driver

With commit 34d21de99cea9 ("net: Move {l,t,d}stats allocation to core and
convert veth & vrf"), stats allocation could be done on net core
instead of this driver.

With this new approach, the driver doesn't have to bother with error
handling (allocation failure checking, making sure free happens in the
right spot, etc). This is core responsibility now.

Remove the allocation in the ipv6/sit driver and leverage the network
core allocation.

Signed-off-by: Breno Leitao <leitao@debian.org>
Reviewed-by: Simon Horman <horms@kernel.org>
Reviewed-by: David Ahern <dsahern@kernel.org>
Link: https://lore.kernel.org/r/20240221161732.3026127-1-leitao@debian.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index ed3a44aa1e9d857ceb626eb5c879bd74374d2315..5ad01480854d222329fc2f9a9042fce684b3c4d1 100644 (file)
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -1408,7 +1408,6 @@ static void ipip6_dev_free(struct net_device *dev)
        struct ip_tunnel *tunnel = netdev_priv(dev);
 
        dst_cache_destroy(&tunnel->dst_cache);
-       free_percpu(dev->tstats);
 }
 
 #define SIT_FEATURES (NETIF_F_SG          | \
@@ -1437,6 +1436,8 @@ static void ipip6_tunnel_setup(struct net_device *dev)
        dev->features           |= NETIF_F_LLTX;
        dev->features           |= SIT_FEATURES;
        dev->hw_features        |= SIT_FEATURES;
+       dev->pcpu_stat_type     = NETDEV_PCPU_STAT_TSTATS;
+
 }
 
 static int ipip6_tunnel_init(struct net_device *dev)
@@ -1449,16 +1450,11 @@ static int ipip6_tunnel_init(struct net_device *dev)
        strcpy(tunnel->parms.name, dev->name);
 
        ipip6_tunnel_bind_dev(dev);
-       dev->tstats = netdev_alloc_pcpu_stats(struct pcpu_sw_netstats);
-       if (!dev->tstats)
-               return -ENOMEM;
 
        err = dst_cache_init(&tunnel->dst_cache, GFP_KERNEL);
-       if (err) {
-               free_percpu(dev->tstats);
-               dev->tstats = NULL;
+       if (err)
                return err;
-       }
+
        netdev_hold(dev, &tunnel->dev_tracker, GFP_KERNEL);
        netdev_lockdep_set_classes(dev);
        return 0;