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 <[email protected]>
---
net/openvswitch/vport-internal_dev.c | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/net/openvswitch/vport-internal_dev.c b/net/openvswitch/vport-internal_dev.c
index 74c88a6baa43..7daba6ac6912 100644
--- a/net/openvswitch/vport-internal_dev.c
+++ b/net/openvswitch/vport-internal_dev.c
@@ -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();
}
--
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]>
---
net/openvswitch/vport-internal_dev.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/net/openvswitch/vport-internal_dev.c b/net/openvswitch/vport-internal_dev.c
index 7daba6ac6912..4b33133cbdff 100644
--- a/net/openvswitch/vport-internal_dev.c
+++ b/net/openvswitch/vport-internal_dev.c
@@ -85,7 +85,6 @@ static const struct net_device_ops internal_dev_netdev_ops = {
.ndo_stop = internal_dev_stop,
.ndo_start_xmit = internal_dev_xmit,
.ndo_set_mac_address = eth_mac_addr,
- .ndo_get_stats64 = dev_get_tstats64,
};
static struct rtnl_link_ops internal_dev_link_ops __read_mostly = {
--
2.43.0
Hi,
>-----Original Message-----
>From: Breno Leitao <[email protected]>
>Sent: Friday, May 31, 2024 4:46 PM
>To: Pravin B Shelar <[email protected]>; David S. Miller <[email protected]>;
>Eric Dumazet <[email protected]>; Jakub Kicinski <[email protected]>; Paolo
>Abeni <[email protected]>
>Cc: [email protected]; [email protected]; open list:OPENVSWITCH
><[email protected]>; open list <[email protected]>
>Subject: [EXTERNAL] [PATCH net-next 2/2] openvswitch: Remove generic
>.ndo_get_stats64
>
>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]>
Reviewed-by: Subbaraya Sundeep <[email protected]>
Thanks,
Sundeep
>---
> net/openvswitch/vport-internal_dev.c | 1 -
> 1 file changed, 1 deletion(-)
>
>diff --git a/net/openvswitch/vport-internal_dev.c b/net/openvswitch/vport-
>internal_dev.c
>index 7daba6ac6912..4b33133cbdff 100644
>--- a/net/openvswitch/vport-internal_dev.c
>+++ b/net/openvswitch/vport-internal_dev.c
>@@ -85,7 +85,6 @@ static const struct net_device_ops internal_dev_netdev_ops
>= {
> .ndo_stop = internal_dev_stop,
> .ndo_start_xmit = internal_dev_xmit,
> .ndo_set_mac_address = eth_mac_addr,
>- .ndo_get_stats64 = dev_get_tstats64,
> };
>
> static struct rtnl_link_ops internal_dev_link_ops __read_mostly = {
>--
>2.43.0
>
Hello:
This series was applied to netdev/net-next.git (main)
by Paolo Abeni <[email protected]>:
On Fri, 31 May 2024 04:15:49 -0700 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] openvswitch: Move stats allocation to core
https://git.kernel.org/netdev/net-next/c/8c3fdff2171c
- [net-next,2/2] openvswitch: Remove generic .ndo_get_stats64
https://git.kernel.org/netdev/net-next/c/2b438c5774cc
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html