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 wireguard driver and leverage the network
core allocation instead.
Signed-off-by: Breno Leitao <[email protected]>
--
Changelog:
v2:
* Setting dev->pcpu_stat_type was missing in v1 patch.
---
drivers/net/wireguard/device.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/drivers/net/wireguard/device.c b/drivers/net/wireguard/device.c
index deb9636b0ecf..6aa071469e1c 100644
--- a/drivers/net/wireguard/device.c
+++ b/drivers/net/wireguard/device.c
@@ -262,7 +262,6 @@ static void wg_destruct(struct net_device *dev)
rcu_barrier(); /* Wait for all the peers to be actually freed. */
wg_ratelimiter_uninit();
memzero_explicit(&wg->static_identity, sizeof(wg->static_identity));
- free_percpu(dev->tstats);
kvfree(wg->index_hashtable);
kvfree(wg->peer_hashtable);
mutex_unlock(&wg->device_update_lock);
@@ -297,6 +296,7 @@ static void wg_setup(struct net_device *dev)
dev->hw_enc_features |= WG_NETDEV_FEATURES;
dev->mtu = ETH_DATA_LEN - overhead;
dev->max_mtu = round_down(INT_MAX, MESSAGE_PADDING_MULTIPLE) - overhead;
+ dev->pcpu_stat_type = NETDEV_PCPU_STAT_TSTATS;
SET_NETDEV_DEVTYPE(dev, &device_type);
@@ -331,14 +331,10 @@ static int wg_newlink(struct net *src_net, struct net_device *dev,
if (!wg->index_hashtable)
goto err_free_peer_hashtable;
- dev->tstats = netdev_alloc_pcpu_stats(struct pcpu_sw_netstats);
- if (!dev->tstats)
- goto err_free_index_hashtable;
-
wg->handshake_receive_wq = alloc_workqueue("wg-kex-%s",
WQ_CPU_INTENSIVE | WQ_FREEZABLE, 0, dev->name);
if (!wg->handshake_receive_wq)
- goto err_free_tstats;
+ goto err_free_index_hashtable;
wg->handshake_send_wq = alloc_workqueue("wg-kex-%s",
WQ_UNBOUND | WQ_FREEZABLE, 0, dev->name);
@@ -397,8 +393,6 @@ static int wg_newlink(struct net *src_net, struct net_device *dev,
destroy_workqueue(wg->handshake_send_wq);
err_destroy_handshake_receive:
destroy_workqueue(wg->handshake_receive_wq);
-err_free_tstats:
- free_percpu(dev->tstats);
err_free_index_hashtable:
kvfree(wg->index_hashtable);
err_free_peer_hashtable:
--
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/wireguard/device.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/net/wireguard/device.c b/drivers/net/wireguard/device.c
index 6aa071469e1c..3feb36ee5bfb 100644
--- a/drivers/net/wireguard/device.c
+++ b/drivers/net/wireguard/device.c
@@ -237,7 +237,6 @@ static const struct net_device_ops netdev_ops = {
.ndo_open = wg_open,
.ndo_stop = wg_stop,
.ndo_start_xmit = wg_xmit,
- .ndo_get_stats64 = dev_get_tstats64
};
static void wg_destruct(struct net_device *dev)
--
2.43.0
On Fri, Mar 08, 2024 at 03:27:44AM -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 wireguard driver and leverage the network
> core allocation instead.
>
> Signed-off-by: Breno Leitao <[email protected]>
Reviewed-by: Simon Horman <[email protected]>
..
On Fri, Mar 08, 2024 at 03:27:45AM -0800, 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]>
Reviewed-by: Simon Horman <[email protected]>
..
I applied this series to the wireguard tree. Thanks for the patches.
Jason
On Wed, Mar 13, 2024 at 9:24 PM Jason A. Donenfeld <[email protected]> wrote:
>
> I applied this series to the wireguard tree. Thanks for the patches.
Actually, sorry, nevermind. 1/2 is fine, but 2/2 results in `ip -stats
link ...` returning all zeros.
Jason
On Wed, Mar 13, 2024 at 9:27 PM Jason A. Donenfeld <[email protected]> wrote:
>
> On Wed, Mar 13, 2024 at 9:24 PM Jason A. Donenfeld <[email protected]> wrote:
> >
> > I applied this series to the wireguard tree. Thanks for the patches.
>
> Actually, sorry, nevermind. 1/2 is fine, but 2/2 results in `ip -stats
> link ...` returning all zeros.
Ahh, okay, required some more commits from 6.8. Okay, seems to be
working. I'll let this cook a bit and then push it up in a while.
Jason
On Wed, Mar 13, 2024 at 09:35:43PM -0600, Jason A. Donenfeld wrote:
> On Wed, Mar 13, 2024 at 9:27 PM Jason A. Donenfeld <[email protected]> wrote:
> >
> > On Wed, Mar 13, 2024 at 9:24 PM Jason A. Donenfeld <[email protected]> wrote:
> > >
> > > I applied this series to the wireguard tree. Thanks for the patches.
> >
> > Actually, sorry, nevermind. 1/2 is fine, but 2/2 results in `ip -stats
> > link ...` returning all zeros.
>
> Ahh, okay, required some more commits from 6.8. Okay, seems to be
> working. I'll let this cook a bit and then push it up in a while.
Right, it requires the following commit, which is already in net-next
and 6.9 by now.
3e2f544dd8a33b2f6 ("net: get stats64 if device if driver is configured")
Thanks Jason!