86fd00b0fb
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.80 Removed upstreamed: generic/backport-6.6/819-v6.8-0002-nvmem-Create-a-header-for-internal-sharing.patch[1] generic/backport-6.6/819-v6.8-0003-nvmem-Simplify-the-add_cells-hook.patch[2] generic/backport-6.6/819-v6.8-0004-nvmem-Move-and-rename-fixup_cell_info.patch[3] All other patches automatically rebased. 1. https://web.git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.80&id=39dfc17a38f77b14f7cb2619bd3488a18d797d5d 2. https://web.git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.80&id=276dae17ad9757c3813d9e736a0210f05ccdf8b7 3. https://web.git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.80&id=a0ee898a5024f12572e4ce45202df9b149dadc05 Build system: x86/64 Build-tested: bcm27xx/bcm2712, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3 Run-tested: bcm27xx/bcm2712, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3 Signed-off-by: John Audia <therealgraysky@proton.me> Link: https://github.com/openwrt/openwrt/pull/18140 Signed-off-by: Robert Marko <robimarko@gmail.com>
30 lines
1.2 KiB
Diff
30 lines
1.2 KiB
Diff
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
|
|
@@ -10703,6 +10703,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);
|
|
}
|