summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJakub Kicinski <kuba@kernel.org>2025-09-08 18:06:24 -0700
committerJakub Kicinski <kuba@kernel.org>2025-09-08 18:06:24 -0700
commit144d0b1c45ea382c9ff6d7d9c6dfe609ae1ef169 (patch)
tree3f52cc0cfd573c0377da492345ef63fc0bb475a1 /include
parentabcf9f662bc7ec72b3591d785eccd7dd8c239365 (diff)
parent20d3d26815441d03a9a15114729faaa54957baba (diff)
Merge branch 'ipv6-snmp-avoid-performance-issue-with-ratelimithost'
Eric Dumazet says: ==================== ipv6: snmp: avoid performance issue with RATELIMITHOST Addition of ICMP6_MIB_RATELIMITHOST in commit d0941130c9351 ("icmp: Add counters for rate limits") introduced a performance drop in case of DOS (like receiving UDP packets to closed ports). Per netns ICMP6_MIB_RATELIMITHOST tracking uses per-cpu storage and is enough, we do not need per-device and slow tracking for this metric. In v2 of this series, I completed the removal of SNMP_MIB_SENTINEL in all the kernel for consistency. v1: https://lore.kernel.org/20250904092432.113c4940@kernel.org ==================== Link: https://patch.msgid.link/20250905165813.1470708-1-edumazet@google.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'include')
-rw-r--r--include/net/ip.h9
-rw-r--r--include/net/snmp.h5
2 files changed, 5 insertions, 9 deletions
diff --git a/include/net/ip.h b/include/net/ip.h
index 6dbd2bf8fa9c..380afb691c41 100644
--- a/include/net/ip.h
+++ b/include/net/ip.h
@@ -326,11 +326,12 @@ static inline u64 snmp_fold_field64(void __percpu *mib, int offt, size_t syncp_o
}
#endif
-#define snmp_get_cpu_field64_batch(buff64, stats_list, mib_statistic, offset) \
+#define snmp_get_cpu_field64_batch_cnt(buff64, stats_list, cnt, \
+ mib_statistic, offset) \
{ \
int i, c; \
for_each_possible_cpu(c) { \
- for (i = 0; stats_list[i].name; i++) \
+ for (i = 0; i < cnt; i++) \
buff64[i] += snmp_get_cpu_field64( \
mib_statistic, \
c, stats_list[i].entry, \
@@ -338,11 +339,11 @@ static inline u64 snmp_fold_field64(void __percpu *mib, int offt, size_t syncp_o
} \
}
-#define snmp_get_cpu_field_batch(buff, stats_list, mib_statistic) \
+#define snmp_get_cpu_field_batch_cnt(buff, stats_list, cnt, mib_statistic) \
{ \
int i, c; \
for_each_possible_cpu(c) { \
- for (i = 0; stats_list[i].name; i++) \
+ for (i = 0; i < cnt; i++) \
buff[i] += snmp_get_cpu_field( \
mib_statistic, \
c, stats_list[i].entry); \
diff --git a/include/net/snmp.h b/include/net/snmp.h
index 4cb4326dfebe..584e70742e9b 100644
--- a/include/net/snmp.h
+++ b/include/net/snmp.h
@@ -36,11 +36,6 @@ struct snmp_mib {
.entry = _entry, \
}
-#define SNMP_MIB_SENTINEL { \
- .name = NULL, \
- .entry = 0, \
-}
-
/*
* We use unsigned longs for most mibs but u64 for ipstats.
*/