Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18;
From:   Volodymyr Mytnyk <volodymyr.mytnyk@plvision.eu>
To:     netdev@vger.kernel.org
Cc:     Taras Chornyi <taras.chornyi@plvision.eu>,
        Serhiy Pshyk <serhiy.pshyk@plvision.eu>,
        Volodymyr Mytnyk <volodymyr.mytnyk@plvision.eu>,
        Oz Shlomo <ozsh@nvidia.com>,
        Pablo Neira Ayuso <pablo@netfilter.org>,
        Jozsef Kadlecsik <kadlec@netfilter.org>,
        Florian Westphal <fw@strlen.de>,
        "David S. Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        Paul Blakey <paulb@nvidia.com>,
        netfilter-devel@vger.kernel.org, coreteam@netfilter.org,
        linux-kernel@vger.kernel.org
Subject: [PATCH net] netfilter: conn: fix udp offload timeout sysctl
Date:   Wed, 27 Apr 2022 14:09:00 +0300
Message-Id: <1651057740-12713-1-git-send-email-volodymyr.mytnyk@plvision.eu>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Eytp46/UYuH9OHEhns6FrVkwVWzNYwq4JC0mo4hHpY2Y7XqE62RJSGUHNc+F?=
 =?us-ascii?Q?nQ2/1OZqZcfd8irfC6Jir/Rkw72NCMDiqjw+ci0Dg2Mos/DrlalaKLyEmYRe?=
 =?us-ascii?Q?pw5xJaiyrSwXc4ZLnqU1OV2gRE8UpHJJX7erP2yemGYpQR/QvZ2mFBKxhZ0S?=
 =?us-ascii?Q?V3Xb7V/xDNrlJliv7GF7S0usJOhgHhofPmd+ApD3GNqpk7rR99QrujkWE+sF?=
 =?us-ascii?Q?YIcaNDSMI/RqgpeRjoZYvrZ9VXFfFPFmmKdX2CAUsBIQUsThISKMU8YpHgjP?=
 =?us-ascii?Q?btywB5olE09DZ2Ju+k/GZQQbAMetAGwfzqEDWfXOfBWp6i7FTpmHJuaT9kYR?=
 =?us-ascii?Q?AgJfig6TJiZs63ghflTeMCwkpgR4nWpL0mqa3Am1kFXvkg56loaW1t4iEjYn?=
 =?us-ascii?Q?TRxSSj5N/7j4c5EvykeeyofCHhXsAh5HGOKDpk7pHYPPdAl4mqZu5XlfOxDk?=
 =?us-ascii?Q?t3YbUXEDonCSSKnJE4zpqhKCglfnQNT5eolz83IUKpajiNvTvxaFxWIqL8tY?=
 =?us-ascii?Q?Ip0gSpVejiErU6Qzo90PmweCikbXoTf5rl94yAl0UvKep85IMYuN9RhDW5Zz?=
 =?us-ascii?Q?HVwDaEnThqbiz04GtZ2NAz/YgAzKuePCcoxVu7PuedwRIUCvVQcePFI92KTf?=
 =?us-ascii?Q?kwyXPKPVcDWdewvesjuNPifSi631MuH09rr+fB4yD5nJYW/b3vFoFG09krmT?=
 =?us-ascii?Q?qmeulcopO9sY6nmxq0ooPgXLLBpX0Xk0YzMNs4YzJ7F02S/XAfqMgeFeh4Qd?=
 =?us-ascii?Q?VfvVacG3oW04y2aISua8GsaTtgSjSxGpOsUUxThkyiXvo3FXH4LXfuGo/slE?=
 =?us-ascii?Q?NHwTKfWog7jNVaJ4yxlSTVxU25M2iBUkb4EJm5clI2IlIqDEaJQHfur+ja28?=
 =?us-ascii?Q?cRQFYuq4345Ob+nSmVfGN7bMj4vHAqWdMKQQuhUsc9QevmBMUcvykjlMs0cI?=
 =?us-ascii?Q?ixGGcWNcMOBWpPmthpM4rgneqAEw4Xsogbmn8k9ZOWtNRu12r82vokT/nkbg?=
 =?us-ascii?Q?+rgh6c4vXx5f1CrrgcS4ubqf29jF7jNFbGBeTXg7WymjGsgFkNfE842j9hBL?=
 =?us-ascii?Q?JcLC+3tn3FRj1Lmzhd+8cKmvMVRj8EszIhFOMXzD6RegQeRdlVw0HqfYpach?=
 =?us-ascii?Q?6cczdg0UgSGPFPRCWQx2vlqUcSYYUsXMoqt7u6StfJoKcjJDKf6/Q6YmfeW4?=
 =?us-ascii?Q?rRL1gcZGebyu4+HPwCCBBgm73mqLoAOVJoiOCNM1ePiVGcnWTll8yQukWwSm?=
 =?us-ascii?Q?0fjhTR558o+6joGHTPSvg1R5556sjRzypibstXAC64pfc2qLyRezL3ezEv9N?=
 =?us-ascii?Q?OzlGeW86udwfNXPvQMOSyjS5jNonsbcOV35uIv6YMPcB6WRKNdDFtKwV3Gsg?=
 =?us-ascii?Q?2YkV7KCpW13/7DnUdY0wkWm5bVwaanU9G1sAVG4Jb2d6wK+4dZRJDiRd0mgK?=
 =?us-ascii?Q?SbeeT3MAdWbl1i6SklS1vHq/0siJT+Ry5k26wVmDhmV4UvbYROv9Aqq4qqY1?=
 =?us-ascii?Q?uD5I67bJNOWbvJHu1MCg2VUNh7lpxN3jsOoNhOprsfaV1Mk+zKrovDoGANPH?=
 =?us-ascii?Q?E10KyAGNRXXiNFdvkaRXYq1fIvtxOexVgkOmggDlPOtmI66A2287qvaYz4Ys?=
 =?us-ascii?Q?OHd8Iv4K5VXD9iyBkkFXGhJcQH6WQuGgSqVcsfNxbFVcehSY9wa/1NOrFbED?=
 =?us-ascii?Q?up/r3AJNofobNi/2B6q9vEG/enX+4903H0/C3jLKOoOpy042ScK3JiusGYer?=
 =?us-ascii?Q?ZvyUpOFq2r0HwVxPLuDt9wDHdYkG0Ww=3D?=
X-OriginatorOrg: plvision.eu
X-MS-Exchange-CrossTenant-Network-Message-Id: ff056cc4-19b0-44f7-a8f2-08da283e6442
X-MS-Exchange-CrossTenant-AuthSource: DB9P190MB1963.EURP190.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Apr 2022 11:09:26.3394
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 03707b74-30f3-46b6-a0e0-ff0a7438c9c4
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: h3b8lvFCyPjcLkmHITgjKE/DF8HGafz2J+IjgCAOgyCZF5eA1Xg0AKgdypsgaUEoNDXv03K88NUWgX0GNFbWj9NQONTuxY4Y47AfmVgndzE=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8P190MB0929
X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE autolearn=no
	autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
	lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

`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 <volodymyr.mytnyk@plvision.eu>
---
 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