| Message ID | 20240305121524.2254533-1-leitao@debian.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 660e5aaea11d5ffb6ff2e95f662e38bf1a9c88b9 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next,1/3] net: gtp: Leverage core stats allocator | expand |
On Tue, Mar 05, 2024 at 04:15:21AM -0800, Breno Leitao 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 gtp driver and leverage the network > core allocation instead. > > Signed-off-by: Breno Leitao <leitao@debian.org> Acked-by: Pablo Neira Ayuso <pablo@netfilter.org> Thanks, this was on my list.
Hello: This series was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Tue, 5 Mar 2024 04:15:21 -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,1/3] net: gtp: Leverage core stats allocator https://git.kernel.org/netdev/net-next/c/660e5aaea11d - [net-next,2/3] net: gtp: Remove generic .ndo_get_stats64 https://git.kernel.org/netdev/net-next/c/13957a0b0708 - [net-next,3/3] net: gtp: Move net_device assigned in setup https://git.kernel.org/netdev/net-next/c/81154bb83c44 You are awesome, thank you!
diff --git a/drivers/net/gtp.c b/drivers/net/gtp.c index 2b46b7398ade..facbfba5d77f 100644 --- a/drivers/net/gtp.c +++ b/drivers/net/gtp.c @@ -717,10 +717,6 @@ static int gtp_dev_init(struct net_device *dev) gtp->dev = dev; - dev->tstats = netdev_alloc_pcpu_stats(struct pcpu_sw_netstats); - if (!dev->tstats) - return -ENOMEM; - return 0; } @@ -729,7 +725,6 @@ static void gtp_dev_uninit(struct net_device *dev) struct gtp_dev *gtp = netdev_priv(dev); gtp_encap_disable(gtp); - free_percpu(dev->tstats); } static inline void gtp0_push_header(struct sk_buff *skb, struct pdp_ctx *pctx) @@ -970,6 +965,7 @@ static void gtp_link_setup(struct net_device *dev) dev->type = ARPHRD_NONE; dev->flags = IFF_POINTOPOINT | IFF_NOARP | IFF_MULTICAST; + dev->pcpu_stat_type = NETDEV_PCPU_STAT_TSTATS; dev->priv_flags |= IFF_NO_QUEUE; dev->features |= NETIF_F_LLTX; netif_keep_dst(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 gtp driver and leverage the network core allocation instead. Signed-off-by: Breno Leitao <leitao@debian.org> --- drivers/net/gtp.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)