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 amt driver to leverage the core allocation.
Signed-off-by: Breno Leitao <[email protected]>
---
drivers/net/amt.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/drivers/net/amt.c b/drivers/net/amt.c
index 68e79b1272f6..cb31d1990660 100644
--- a/drivers/net/amt.c
+++ b/drivers/net/amt.c
@@ -3063,15 +3063,10 @@ static int amt_dev_init(struct net_device *dev)
int err;
amt->dev = dev;
- dev->tstats = netdev_alloc_pcpu_stats(struct pcpu_sw_netstats);
- if (!dev->tstats)
- return -ENOMEM;
err = gro_cells_init(&amt->gro_cells, dev);
- if (err) {
- free_percpu(dev->tstats);
+ if (err)
return err;
- }
return 0;
}
@@ -3081,7 +3076,6 @@ static void amt_dev_uninit(struct net_device *dev)
struct amt_dev *amt = netdev_priv(dev);
gro_cells_destroy(&amt->gro_cells);
- free_percpu(dev->tstats);
}
static const struct net_device_ops amt_netdev_ops = {
@@ -3111,6 +3105,7 @@ static void amt_link_setup(struct net_device *dev)
dev->hw_features |= NETIF_F_SG | NETIF_F_HW_CSUM;
dev->hw_features |= NETIF_F_FRAGLIST | NETIF_F_RXCSUM;
dev->hw_features |= NETIF_F_GSO_SOFTWARE;
+ dev->pcpu_stat_type = NETDEV_PCPU_STAT_TSTATS;
eth_hw_addr_random(dev);
eth_zero_addr(dev->broadcast);
ether_setup(dev);
--
2.43.0
Commit 3e2f544dd8a33 ("net: get stats64 if device if driver is
configured") moved the callback to dev_get_tstats64() to net core, so,
unless the driver is doing some custom stats collection, it does not
need to set .ndo_get_stats64.
Since this driver is now relying in NETDEV_PCPU_STAT_TSTATS, then, it
doesn't need to set the dev_get_tstats64() generic .ndo_get_stats64
function pointer.
Signed-off-by: Breno Leitao <[email protected]>
---
drivers/net/amt.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/net/amt.c b/drivers/net/amt.c
index cb31d1990660..6d15ab3bfbbc 100644
--- a/drivers/net/amt.c
+++ b/drivers/net/amt.c
@@ -3084,7 +3084,6 @@ static const struct net_device_ops amt_netdev_ops = {
.ndo_open = amt_dev_open,
.ndo_stop = amt_dev_stop,
.ndo_start_xmit = amt_dev_xmit,
- .ndo_get_stats64 = dev_get_tstats64,
};
static void amt_link_setup(struct net_device *dev)
--
2.43.0
On 3/9/24 1:26 AM, 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 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 amt driver to leverage the core allocation.
>
> Signed-off-by: Breno Leitao <[email protected]>
> ---
> drivers/net/amt.c | 9 ++-------
> 1 file changed, 2 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/net/amt.c b/drivers/net/amt.c
> index 68e79b1272f6..cb31d1990660 100644
> --- a/drivers/net/amt.c
> +++ b/drivers/net/amt.c
> @@ -3063,15 +3063,10 @@ static int amt_dev_init(struct net_device *dev)
> int err;
>
> amt->dev = dev;
> - dev->tstats = netdev_alloc_pcpu_stats(struct pcpu_sw_netstats);
> - if (!dev->tstats)
> - return -ENOMEM;
>
> err = gro_cells_init(&amt->gro_cells, dev);
> - if (err) {
> - free_percpu(dev->tstats);
> + if (err)
> return err;
> - }
>
> return 0;
> }
> @@ -3081,7 +3076,6 @@ static void amt_dev_uninit(struct net_device *dev)
> struct amt_dev *amt = netdev_priv(dev);
>
> gro_cells_destroy(&amt->gro_cells);
> - free_percpu(dev->tstats);
> }
>
> static const struct net_device_ops amt_netdev_ops = {
> @@ -3111,6 +3105,7 @@ static void amt_link_setup(struct net_device *dev)
> dev->hw_features |= NETIF_F_SG | NETIF_F_HW_CSUM;
> dev->hw_features |= NETIF_F_FRAGLIST | NETIF_F_RXCSUM;
> dev->hw_features |= NETIF_F_GSO_SOFTWARE;
> + dev->pcpu_stat_type = NETDEV_PCPU_STAT_TSTATS;
> eth_hw_addr_random(dev);
> eth_zero_addr(dev->broadcast);
> ether_setup(dev);
Reviewed-by: Taehee Yoo <[email protected]>
On 3/9/24 1:26 AM, Breno Leitao wrote:
> Commit 3e2f544dd8a33 ("net: get stats64 if device if driver is
> configured") moved the callback to dev_get_tstats64() to net core, so,
> unless the driver is doing some custom stats collection, it does not
> need to set .ndo_get_stats64.
>
> Since this driver is now relying in NETDEV_PCPU_STAT_TSTATS, then, it
> doesn't need to set the dev_get_tstats64() generic .ndo_get_stats64
> function pointer.
>
> Signed-off-by: Breno Leitao <[email protected]>
> ---
> drivers/net/amt.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/drivers/net/amt.c b/drivers/net/amt.c
> index cb31d1990660..6d15ab3bfbbc 100644
> --- a/drivers/net/amt.c
> +++ b/drivers/net/amt.c
> @@ -3084,7 +3084,6 @@ static const struct net_device_ops amt_netdev_ops = {
> .ndo_open = amt_dev_open,
> .ndo_stop = amt_dev_stop,
> .ndo_start_xmit = amt_dev_xmit,
> - .ndo_get_stats64 = dev_get_tstats64,
> };
>
> static void amt_link_setup(struct net_device *dev)
Hi Breno, Thanks a lot for this series!
Reviewed-by: Taehee Yoo <[email protected]>
Hello:
This series was applied to netdev/net-next.git (main)
by Jakub Kicinski <[email protected]>:
On Fri, 8 Mar 2024 08:26:04 -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 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/2] net: amt: Move stats allocation to core
https://git.kernel.org/netdev/net-next/c/2892956e93f7
- [net-next,2/2] net: amt: Remove generic .ndo_get_stats64
https://git.kernel.org/netdev/net-next/c/7598531c3aed
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html