]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
openvswitch: Move stats allocation to core
authorBreno Leitao <leitao@debian.org>
Fri, 31 May 2024 11:15:49 +0000 (04:15 -0700)
committerPaolo Abeni <pabeni@redhat.com>
Tue, 4 Jun 2024 14:06:37 +0000 (16:06 +0200)
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.

Move openvswitch driver to leverage the core allocation.

Signed-off-by: Breno Leitao <leitao@debian.org>
Link: https://lore.kernel.org/r/20240531111552.3209198-1-leitao@debian.org
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
net/openvswitch/vport-internal_dev.c

index 74c88a6baa43a4995d92bff60588e09dd38f4549..7daba6ac6912429ca53d09e10884415453a2c2a5 100644 (file)
@@ -140,11 +140,7 @@ static struct vport *internal_dev_create(const struct vport_parms *parms)
                err = -ENOMEM;
                goto error_free_vport;
        }
-       vport->dev->tstats = netdev_alloc_pcpu_stats(struct pcpu_sw_netstats);
-       if (!vport->dev->tstats) {
-               err = -ENOMEM;
-               goto error_free_netdev;
-       }
+       dev->pcpu_stat_type = NETDEV_PCPU_STAT_TSTATS;
 
        dev_net_set(vport->dev, ovs_dp_get_net(vport->dp));
        dev->ifindex = parms->desired_ifindex;
@@ -169,8 +165,6 @@ static struct vport *internal_dev_create(const struct vport_parms *parms)
 
 error_unlock:
        rtnl_unlock();
-       free_percpu(dev->tstats);
-error_free_netdev:
        free_netdev(dev);
 error_free_vport:
        ovs_vport_free(vport);
@@ -186,7 +180,6 @@ static void internal_dev_destroy(struct vport *vport)
 
        /* unregister_netdevice() waits for an RCU grace period. */
        unregister_netdevice(vport->dev);
-       free_percpu(vport->dev->tstats);
        rtnl_unlock();
 }