[PATCH 2/2] ipv4: Namespaceify route/error_burst knob

From: cgel . zte
Date: Tue Aug 16 2022 - 03:02:00 EST


From: xu xin <xu.xin16@xxxxxxxxxx>

Different netns has different requirement on the setting of error_burst
sysctl which is used to limit the frequency of sending ICMP_DEST_UNREACH
packet.

Enable error_burst to be configured per network namespace.

Signed-off-by: xu xin <xu.xin16@xxxxxxxxxx>
---
include/net/netns/ipv4.h | 1 +
net/ipv4/route.c | 21 +++++++++++----------
2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
index 319395bbad3c..03d16cf32508 100644
--- a/include/net/netns/ipv4.h
+++ b/include/net/netns/ipv4.h
@@ -86,6 +86,7 @@ struct netns_ipv4 {
int ip_rt_mtu_expires;
int ip_rt_min_advmss;
int ip_rt_error_cost;
+ int ip_rt_error_burst;

struct local_ports ip_local_ports;

diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 0598393e03ac..4e40b667e3fc 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -114,11 +114,11 @@
#define DEFAULT_MIN_PMTU (512 + 20 + 20)
#define DEFAULT_MTU_EXPIRES (10 * 60 * HZ)
#define DEFAULT_MIN_ADVMSS 256
+#define DEFAULT_ERROR_BURST (5 * HZ)
static int ip_rt_max_size;
static int ip_rt_redirect_number __read_mostly = 9;
static int ip_rt_redirect_load __read_mostly = HZ / 50;
static int ip_rt_redirect_silence __read_mostly = ((HZ / 50) << (9 + 1));
-static int ip_rt_error_burst __read_mostly = 5 * HZ;

static int ip_rt_gc_timeout __read_mostly = RT_GC_TIMEOUT;

@@ -1001,8 +1001,8 @@ static int ip_error(struct sk_buff *skb)
if (peer) {
now = jiffies;
peer->rate_tokens += now - peer->rate_last;
- if (peer->rate_tokens > ip_rt_error_burst)
- peer->rate_tokens = ip_rt_error_burst;
+ if (peer->rate_tokens > net->ipv4.ip_rt_error_burst)
+ peer->rate_tokens = net->ipv4.ip_rt_error_burst;
peer->rate_last = now;
if (peer->rate_tokens >= net->ipv4.ip_rt_error_cost)
peer->rate_tokens -= net->ipv4.ip_rt_error_cost;
@@ -3534,13 +3534,6 @@ static struct ctl_table ipv4_route_table[] = {
.mode = 0644,
.proc_handler = proc_dointvec,
},
- {
- .procname = "error_burst",
- .data = &ip_rt_error_burst,
- .maxlen = sizeof(int),
- .mode = 0644,
- .proc_handler = proc_dointvec,
- },
{
.procname = "gc_elasticity",
.data = &ip_rt_gc_elasticity,
@@ -3589,6 +3582,13 @@ static struct ctl_table ipv4_route_netns_table[] = {
.mode = 0644,
.proc_handler = proc_dointvec,
},
+ {
+ .procname = "error_burst",
+ .data = &init_net.ipv4.ip_rt_error_burst,
+ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = proc_dointvec,
+ },
{ },
};

@@ -3653,6 +3653,7 @@ static __net_init int netns_ip_rt_init(struct net *net)
net->ipv4.ip_rt_mtu_expires = DEFAULT_MTU_EXPIRES;
net->ipv4.ip_rt_min_advmss = DEFAULT_MIN_ADVMSS;
net->ipv4.ip_rt_error_cost = HZ;
+ net->ipv4.ip_rt_error_burst = DEFAULT_ERROR_BURST;
return 0;
}

--
2.25.1