]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
net: macsec: Leverage core stats allocator
authorBreno Leitao <leitao@debian.org>
Tue, 5 Mar 2024 11:37:27 +0000 (03:37 -0800)
committerJakub Kicinski <kuba@kernel.org>
Thu, 7 Mar 2024 04:36:21 +0000 (20:36 -0800)
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 in 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 macsec driver and leverage the network
core allocation instead.

Signed-off-by: Breno Leitao <leitao@debian.org>
Reviewed-by: Simon Horman <horms@kernel.org>
Reviewed-by: Sabrina Dubroca <sd@queasysnail.net>
Link: https://lore.kernel.org/r/20240305113728.1974944-1-leitao@debian.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/macsec.c

index 4b5513c9c2befe42e054fee6ecdadc9aabb0ce19..0206b84284ab5e0c95981ff86fa4b2a2a14c5c51 100644 (file)
@@ -3519,18 +3519,13 @@ static int macsec_dev_init(struct net_device *dev)
        struct net_device *real_dev = macsec->real_dev;
        int err;
 
-       dev->tstats = netdev_alloc_pcpu_stats(struct pcpu_sw_netstats);
-       if (!dev->tstats)
-               return -ENOMEM;
-
        err = gro_cells_init(&macsec->gro_cells, dev);
-       if (err) {
-               free_percpu(dev->tstats);
+       if (err)
                return err;
-       }
 
        dev->features = real_dev->features & MACSEC_FEATURES;
        dev->features |= NETIF_F_LLTX | NETIF_F_GSO_SOFTWARE;
+       dev->pcpu_stat_type = NETDEV_PCPU_STAT_TSTATS;
 
        macsec_set_head_tail_room(dev);
 
@@ -3550,7 +3545,6 @@ static void macsec_dev_uninit(struct net_device *dev)
        struct macsec_dev *macsec = macsec_priv(dev);
 
        gro_cells_destroy(&macsec->gro_cells);
-       free_percpu(dev->tstats);
 }
 
 static netdev_features_t macsec_fix_features(struct net_device *dev,