kevin/linux
1
Fork 0
Code

net: dsa: Leverage core stats allocator

Browse Source 
With commit 34d21de99c ("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 DSA user network device code and leverage
the network core allocation instead.

Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
Reviewed-by: Breno Leitao <leitao@debian.org>
Link: https://lore.kernel.org/r/20240306200416.2973179-1-florian.fainelli@broadcom.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Florian Fainelli 2024-03-06 12:04:09 -08:00 committed by Jakub Kicinski
parent c12264d3fd
commit 4f6473ad60
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/dsa/user.c
View File

@ -2625,11 +2625,7 @@ int dsa_user_create(struct dsa_port *port)
user_dev->vlan_features = conduit->vlan_features; user_dev->vlan_features = conduit->vlan_features;
p = netdev_priv(user_dev); p = netdev_priv(user_dev);
user_dev->tstats = netdev_alloc_pcpu_stats(struct pcpu_sw_netstats); user_dev->pcpu_stat_type = NETDEV_PCPU_STAT_TSTATS;
if (!user_dev->tstats) {
free_netdev(user_dev);
return -ENOMEM;
}
ret = gro_cells_init(&p->gcells, user_dev); ret = gro_cells_init(&p->gcells, user_dev);
if (ret) if (ret)
@ -2695,7 +2691,6 @@ out_phy:
out_gcells: out_gcells:
gro_cells_destroy(&p->gcells); gro_cells_destroy(&p->gcells);
out_free: out_free:
free_percpu(user_dev->tstats);
free_netdev(user_dev); free_netdev(user_dev);
port->user = NULL; port->user = NULL;
return ret; return ret;
@ -2716,7 +2711,6 @@ void dsa_user_destroy(struct net_device *user_dev)
dsa_port_phylink_destroy(dp); dsa_port_phylink_destroy(dp);
gro_cells_destroy(&p->gcells); gro_cells_destroy(&p->gcells);
free_percpu(user_dev->tstats);
free_netdev(user_dev); free_netdev(user_dev);
} }