2022-04-27 11:48:57

by Volodymyr Mytnyk

Subject: [PATCH net] netfilter: conn: fix udp offload timeout sysctl

`nf_flowtable_udp_timeout` sysctl option is available only
if CONFIG_NFT_FLOW_OFFLOAD enabled. But infra for this flow
offload UDP timeout was added under CONFIG_NF_FLOW_TABLE
config option. So, if you have CONFIG_NFT_FLOW_OFFLOAD
disabled and CONFIG_NF_FLOW_TABLE enabled, the
`nf_flowtable_udp_timeout` is not present in sysfs.
Please note, that TCP flow offload timeout sysctl option
is present even CONFIG_NFT_FLOW_OFFLOAD is disabled.

I suppose it was a typo in commit that adds UDP flow offload
timeout and CONFIG_NF_FLOW_TABLE should be used instead.

Fixes: 975c57504da1 ("netfilter: conntrack: Introduce udp offload timeout configuration")
Signed-off-by: Volodymyr Mytnyk <[email protected]>
---
net/netfilter/nf_conntrack_standalone.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
index 3e1afd10a9b6..55aa55b252b2 100644
--- a/net/netfilter/nf_conntrack_standalone.c
+++ b/net/netfilter/nf_conntrack_standalone.c
@@ -823,7 +823,7 @@ static struct ctl_table nf_ct_sysctl_table[] = {
.mode = 0644,
.proc_handler = proc_dointvec_jiffies,
},
-#if IS_ENABLED(CONFIG_NFT_FLOW_OFFLOAD)
+#if IS_ENABLED(CONFIG_NF_FLOW_TABLE)
[NF_SYSCTL_CT_PROTO_TIMEOUT_UDP_OFFLOAD] = {
.procname = "nf_flowtable_udp_timeout",
.maxlen = sizeof(unsigned int),
--
2.7.4

2022-04-27 14:20:21

by Pablo Neira Ayuso

Subject: Re: [PATCH net] netfilter: conn: fix udp offload timeout sysctl

On Wed, Apr 27, 2022 at 02:09:00PM +0300, Volodymyr Mytnyk wrote:
> `nf_flowtable_udp_timeout` sysctl option is available only
> if CONFIG_NFT_FLOW_OFFLOAD enabled. But infra for this flow
> offload UDP timeout was added under CONFIG_NF_FLOW_TABLE
> config option. So, if you have CONFIG_NFT_FLOW_OFFLOAD
> disabled and CONFIG_NF_FLOW_TABLE enabled, the
> `nf_flowtable_udp_timeout` is not present in sysfs.
> Please note, that TCP flow offload timeout sysctl option
> is present even CONFIG_NFT_FLOW_OFFLOAD is disabled.
>
> I suppose it was a typo in commit that adds UDP flow offload
> timeout and CONFIG_NF_FLOW_TABLE should be used instead.

Applied, thanks