| Message ID | 20240306200416.2973179-1-florian.fainelli@broadcom.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 4f6473ad60947c88c9eac21fe16233e795d3a2f3 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] net: dsa: Leverage core stats allocator | expand |
On Wed, Mar 06, 2024 at 12:04:09PM -0800, Florian Fainelli wrote: > 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 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>
Hello: This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Wed, 6 Mar 2024 12:04:09 -0800 you wrote: > 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. > > [...] Here is the summary with links: - [net-next] net: dsa: Leverage core stats allocator https://git.kernel.org/netdev/net-next/c/4f6473ad6094 You are awesome, thank you!
diff --git a/net/dsa/user.c b/net/dsa/user.c index 9c42a6edcdc8..16d395bb1a1f 100644 --- a/net/dsa/user.c +++ b/net/dsa/user.c @@ -2625,11 +2625,7 @@ int dsa_user_create(struct dsa_port *port) user_dev->vlan_features = conduit->vlan_features; p = netdev_priv(user_dev); - user_dev->tstats = netdev_alloc_pcpu_stats(struct pcpu_sw_netstats); - if (!user_dev->tstats) { - free_netdev(user_dev); - return -ENOMEM; - } + user_dev->pcpu_stat_type = NETDEV_PCPU_STAT_TSTATS; ret = gro_cells_init(&p->gcells, user_dev); if (ret) @@ -2695,7 +2691,6 @@ int dsa_user_create(struct dsa_port *port) out_gcells: gro_cells_destroy(&p->gcells); out_free: - free_percpu(user_dev->tstats); free_netdev(user_dev); port->user = NULL; return ret; @@ -2716,7 +2711,6 @@ void dsa_user_destroy(struct net_device *user_dev) dsa_port_phylink_destroy(dp); gro_cells_destroy(&p->gcells); - free_percpu(user_dev->tstats); free_netdev(user_dev); }
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 DSA user network device code and leverage the network core allocation instead. Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com> --- net/dsa/user.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)