Skip to contentSkip to conversation

netfilter: nf_defrag_ipv6: allow nf_conntrack_frag6_high_thresh increases

PATCH Applied Eric Dumazet 2 participants 2 messages Aug 23, 2022 – Aug 24, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 netfilter: nf_defrag_ipv6: allow nf_conntrack_frag6_high_thresh increases

From: Eric Dumazet <[email protected]>

Currently, net.netfilter.nf_conntrack_frag6_high_thresh can only be lowered.

I found this issue while investigating a probable kernel issue causing flakes in tools/testing/selftests/net/ip_defrag.sh

In particular, these sysctl changes were ignored:

	ip netns exec "${NETNS}" sysctl -w net.netfilter.nf_conntrack_frag6_high_thresh=9000000 >/dev/null 2>&1
	ip netns exec "${NETNS}" sysctl -w net.netfilter.nf_conntrack_frag6_low_thresh=7000000  >/dev/null 2>&1

This change is inline with commit 836196239298 ("net/ipfrag: let ip[6]frag_high_thresh in ns be higher than in init_net")

Fixes 8db3d41569bb ("netfilter: nf_defrag_ipv6: use net_generic infra")
---
 net/ipv6/netfilter/nf_conntrack_reasm.c | 1 -
 1 file changed, 1 deletion(-)
net/ipv6/netfilter/nf_conntrack_reasm.c +0 -1
index 7dd3629dd19e71a6db2add2265ca49ab9cceaf63..38db0064d6613a8472ec2835afdbf80071c1fcc2 100644
@@ -86,7 +86,6 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
 	table[1].extra2	= &nf_frag->fqdir->high_thresh;
 	table[2].data	= &nf_frag->fqdir->high_thresh;
 	table[2].extra1	= &nf_frag->fqdir->low_thresh;
-	table[2].extra2	= &nf_frag->fqdir->high_thresh;
 
 	hdr = register_net_sysctl(net, "net/netfilter", table);
 	if (hdr == NULL)
Signature · 1 line
2.37.1.595.g718a3a8f04-goog
maintainer Applied
#1 lore raw
Quoted 7 lines · Eric Dumazet

From: Eric Dumazet <[email protected]>

Currently, net.netfilter.nf_conntrack_frag6_high_thresh can only be lowered.

I found this issue while investigating a probable kernel issue causing flakes in tools/testing/selftests/net/ip_defrag.sh

Quoted 6 lines

In particular, these sysctl changes were ignored:

	ip netns exec "${NETNS}" sysctl -w net.netfilter.nf_conntrack_frag6_high_thresh=9000000 >/dev/null 2>&1
	ip netns exec "${NETNS}" sysctl -w net.netfilter.nf_conntrack_frag6_low_thresh=7000000  >/dev/null 2>&1

This change is inline with commit 836196239298 ("net/ipfrag: let ip[6]frag_high_thresh in ns be higher than in init_net")

Applied, thanks