kernel: backport upstream commit that allows leaving out .ndo_get_stats64

Fixes mac80211 backport device statistics.

Fixes: #16642
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/target/linux/generic/backport-6.6/612-v6.9-net-get-stats64-if-device-if-driver-is-configured.patch b/target/linux/generic/backport-6.6/612-v6.9-net-get-stats64-if-device-if-driver-is-configured.patch
new file mode 100644 (file)
index 0000000..871154e
--- /dev/null
+++ b/target/linux/generic/backport-6.6/612-v6.9-net-get-stats64-if-device-if-driver-is-configured.patch
@@ -0,0 +1,29 @@
+From: Breno Leitao <leitao@debian.org>
+Date: Wed, 28 Feb 2024 03:31:21 -0800
+Subject: [PATCH] net: get stats64 if device if driver is configured
+
+If the network driver is relying in the net core to do stats allocation,
+then we want to dev_get_tstats64() instead of netdev_stats_to_stats64(),
+since there are per-cpu stats that needs to be taken in consideration.
+
+This will also simplify the drivers in regard to statistics. Once the
+driver sets NETDEV_PCPU_STAT_TSTATS, it doesn't not need to allocate the
+stacks, neither it needs to set `.ndo_get_stats64 = dev_get_tstats64`
+for the generic stats collection function anymore.
+
+Signed-off-by: Breno Leitao <leitao@debian.org>
+Reviewed-by: Simon Horman <horms@kernel.org>
+Signed-off-by: Paolo Abeni <pabeni@redhat.com>
+---
+
+--- a/net/core/dev.c
++++ b/net/core/dev.c
+@@ -10658,6 +10658,8 @@ struct rtnl_link_stats64 *dev_get_stats(
+               ops->ndo_get_stats64(dev, storage);
+       } else if (ops->ndo_get_stats) {
+               netdev_stats_to_stats64(storage, ops->ndo_get_stats(dev));
++      } else if (dev->pcpu_stat_type == NETDEV_PCPU_STAT_TSTATS) {
++              dev_get_tstats64(dev, storage);
+       } else {
+               netdev_stats_to_stats64(storage, &dev->stats);
+       }

diff --git a/target/linux/generic/backport-6.6/900-v6.11-net-free_netdev-exit-earlier-if-dummy.patch b/target/linux/generic/backport-6.6/900-v6.11-net-free_netdev-exit-earlier-if-dummy.patch
index 31beb11d54c98b70ae3a97c05d58b31a8acd1d1a..53f313044a5ceea8f944f6f0c41ecee83fffd6a8 100644 (file)
--- a/target/linux/generic/backport-6.6/900-v6.11-net-free_netdev-exit-earlier-if-dummy.patch
+++ b/target/linux/generic/backport-6.6/900-v6.11-net-free_netdev-exit-earlier-if-dummy.patch
@@ -23,7 +23,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/net/core/dev.c
 +++ b/net/core/dev.c
-@@ -10966,7 +10966,8 @@ void free_netdev(struct net_device *dev)
+@@ -10968,7 +10968,8 @@ void free_netdev(struct net_device *dev)
        dev->xdp_bulkq = NULL;
  
        /*  Compatibility with error handling in drivers */