From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 17589D591AC for ; Mon, 18 Nov 2024 18:13:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5D8E96B0096; Mon, 18 Nov 2024 13:13:30 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 560316B0098; Mon, 18 Nov 2024 13:13:30 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3B2FC6B0099; Mon, 18 Nov 2024 13:13:30 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 1AF426B0096 for ; Mon, 18 Nov 2024 13:13:30 -0500 (EST) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id CBEF51603DE for ; Mon, 18 Nov 2024 18:13:29 +0000 (UTC) X-FDA: 82800011868.30.18EA3F1 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by imf09.hostedemail.com (Postfix) with ESMTP id C87BF140003 for ; Mon, 18 Nov 2024 18:12:53 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=linux.microsoft.com header.s=default header.b=WgQq6VDm; dmarc=pass (policy=none) header.from=linux.microsoft.com; spf=pass (imf09.hostedemail.com: domain of eahariha@linux.microsoft.com designates 13.77.154.182 as permitted sender) smtp.mailfrom=eahariha@linux.microsoft.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1731953474; a=rsa-sha256; cv=none; b=5Txvg/dz5GjhMnxSGEAJvdiBq8Ju3skPjJVe/TDm8jF/dk+4uLmoAJs9E6uBbgkTcEWpGL YMZFT2g5vQ6rqGiklCk+/JcI+Ge6YJnfxOQZws3SfkNM4o5okGp7IRvTzi6qmIWD/Ina9t QOSn7b6Vz684wW0n0KDri5Kv0qUIQCw= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=linux.microsoft.com header.s=default header.b=WgQq6VDm; dmarc=pass (policy=none) header.from=linux.microsoft.com; spf=pass (imf09.hostedemail.com: domain of eahariha@linux.microsoft.com designates 13.77.154.182 as permitted sender) smtp.mailfrom=eahariha@linux.microsoft.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1731953474; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=4rGKqWlJzIh5S6WJog1UbY+9wr2RIzuf6CA98XkvD9A=; b=8gu4jtnAWkRuINRwymaD4lwlKKrRbuqf/XALY0jXCFizVrKgh8PR+feLHWVJgoX8RSVZd1 /s9elZQHH+/HY9ZPs5rZPioyLwL7ljYtQR+89iDrMDB+CLMAgGRdA4Jjbrn5VZnVgBT4Un n9Iy1bqs0Jhu2UdDfpsn1Mk7oKNnvoE= Received: from [192.168.35.166] (c-73-118-245-227.hsd1.wa.comcast.net [73.118.245.227]) by linux.microsoft.com (Postfix) with ESMTPSA id 079B420B7D5F; Mon, 18 Nov 2024 10:13:24 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 079B420B7D5F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1731953606; bh=4rGKqWlJzIh5S6WJog1UbY+9wr2RIzuf6CA98XkvD9A=; h=Date:Cc:Subject:To:References:From:In-Reply-To:From; b=WgQq6VDmQPqDVd9HrdDJWYVeePI1o6O7aH2e5YK2i2MPTb79KOYC8kOEtCVdZyQyl eQBQq4Gru6AuE3dhO0MWMctvjnMle6WwOzCHVKzijDojX1XF1tLPvCR2mFqRKiKQA2 T8BTz//c1DSiW16jlJvFvYtwS5WkMEtzzK+2O4cI= Message-ID: Date: Mon, 18 Nov 2024 10:13:23 -0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Cc: Pablo Neira Ayuso , Jozsef Kadlecsik , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Julia Lawall , Nicolas Palix , Daniel Mack , Haojian Zhuang , Robert Jarzmik , Russell King , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Ofir Bitton , Oded Gabbay , Lucas De Marchi , =?UTF-8?Q?Thomas_Hellstr=C3=B6m?= , Rodrigo Vivi , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Jeroen de Borst , Praveen Kaligineedi , Shailend Chand , Andrew Lunn , James Smart , Dick Kennedy , "James E.J. Bottomley" , "Martin K. Petersen" , =?UTF-8?Q?Roger_Pau_Monn=C3=A9?= , Jens Axboe , Kalle Valo , Jeff Johnson , Catalin Marinas , Andrew Morton , Jack Wang , Marcel Holtmann , Johan Hedberg , Luiz Augusto von Dentz , Greg Kroah-Hartman , Florian Fainelli , Ray Jui , Scott Branden , Broadcom internal kernel review list , Xiubo Li , Ilya Dryomov , Josh Poimboeuf , Jiri Kosina , Miroslav Benes , Petr Mladek , Joe Lawrence , Jaroslav Kysela , Takashi Iwai , Lucas Stach , Russell King , Christian Gmeiner , Louis Peens , Michael Ellerman , Nicholas Piggin , Naveen N Rao , Madhavan Srinivasan , eahariha@linux.microsoft.com, netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, cocci@inria.fr, linux-arm-kernel@lists.infradead.org, linux-s390@vger.kernel.org, dri-devel@lists.freedesktop.org, intel-xe@lists.freedesktop.org, linux-scsi@vger.kernel.org, xen-devel@lists.xenproject.org, linux-block@vger.kernel.org, linux-wireless@vger.kernel.org, ath11k@lists.infradead.org, linux-mm@kvack.org, linux-bluetooth@vger.kernel.org, linux-staging@lists.linux.dev, linux-rpi-kernel@lists.infradead.org, ceph-devel@vger.kernel.org, live-patching@vger.kernel.org, linux-sound@vger.kernel.org, etnaviv@lists.freedesktop.org, oss-drivers@corigine.com, linuxppc-dev@lists.ozlabs.org, Anna-Maria Behnsen Subject: Re: [PATCH v2 01/21] netfilter: conntrack: Cleanup timeout definitions To: Christophe Leroy References: <20241115-converge-secs-to-jiffies-v2-0-911fb7595e79@linux.microsoft.com> <20241115-converge-secs-to-jiffies-v2-1-911fb7595e79@linux.microsoft.com> From: Easwar Hariharan Content-Language: en-US In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: C87BF140003 X-Stat-Signature: jzbpax5d33pbea6herbbybq7dfjzcjyx X-Rspam-User: X-Rspamd-Server: rspam05 X-HE-Tag: 1731953573-655866 X-HE-Meta: U2FsdGVkX1/PFoXBMJGJIxpGGcHkaj3JYkd3WiuInWHw3DAtXDWPb7857rfST/G7MxNpco/W/vASzBlOoCgh3LrzBrvyQ+cZSZ0Ennu6lMJ0EawjXnAVGsklNGvF49NFeenrBqDMGpE1bGShBK9Uu14mmNKj7zsXQ/cnzAFIRZwnXoRQWLYevAZSMb/f+3fzAkt/aXSERoZmNW+mvLq2uaq57a/JZ+b7VtykpAd+zcmKvhtDesEVM2qkKAhtw/XA54dtzoNDvQIyrrwlj6SyswZgiDuxcWylm8lq7q8AOjKyXd6TloSNAX6NH0qfiM7yPYqCkUVPGABtx5XMBhm7DJ/1ToNOJLa244FhzkfZXzNogz/qJMF7hzpRxLXaYl6TfhwlA1gDl3mkvakH63wyVi9XnvVot9En78mznVda3n/CxNFK8Rx1mC0hqlv5EFavrksdtDj86TpOqjWocI8GgWjAbgTXSVeAlRNcmQJJF6jawXFgjvjEPjArlASkUlxloYmpKPsZrqZ3UOPtgplt/kYD+/lhpJjhMH+EbSnuK1NGGyUKf15r4IPh7CyFuMArCSDbsZ740plaKXsB9EgvxdFcL0ycKwoxD2tgXhms8olzrn3sXu1FGIxgcgh15BdKQLNB77JFggRnSMLvz7rZLW7EpCrfm2FVkrVurxQOWpZN3sESwSbJbIwKpuOOlntbE840C+uKFi3Dw8U6+HgpUuHEPOSA20XWzc2ubr0YXBEc8AkhYylyxv7IndpoVEMa1gy26+mDaoD9H19FXp3QVJe6YEOtgXzum+DC2F+/I+gQ05kLjcwnO46p/kaRGKYjxCg6RE66eLB1o4836WYCsav/Socuuc6g21nFGHVelitBXzrOwAw2Vf0vLoSJ59V6treTG7MARokGFP0RreOm2jC+oSTU0B2U2vSQ3ZMQzvTX5uuc32wvVGawvBvtf8cSBUgTbJWKDMplamrnNCQ 0OpSrubd 2APF7yUruUFRErhbx4rcSWDZvvql7Npn8AymgGI7XDmHPMuBir8yW3nkY/PijBC+oziK9vFxAZ5LyX1lrSuV4YXCsyuinbU+kO8Lx0pRoevVw90pHh4+P5jn6GOa8SsDIWpx9Ybcnd93CCl8f9XYo2kZJAjwhW7tPT1NSoWoL2mw3KI8CVDAA+ogwobrmz/uqx2mXab0BjlKuUDEHTvpg4TarJYWom6Q4bv3O6NwE0SW7uO324CD3nok5XRE7mKIRNn2Va94Kz+gB5Qc4S42kQl1XehUdJcrJ34aRnNZPWhIXqC3VSWdBbvrQODOVPN/hvY5CS87l4iGZ2wtVRkcFVnXVHKe2zs2gOL/LgGVoDgBjiUucOEp47kM9eMJQom+PrusbwI57Xr/gTPYzIf6DQhm6pEXhPrGR8eCMtS5FUICc/plbVLeEjtJNbCxt2az8pL/2yrU1UFjOEj1FPUm0MUNTwpyiwqqTaKxR X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On 11/16/2024 1:40 AM, Christophe Leroy wrote: > > > Le 15/11/2024 à 22:26, Easwar Hariharan a écrit : >> [Vous ne recevez pas souvent de courriers de >> eahariha@linux.microsoft.com. Découvrez pourquoi ceci est important à >> https://aka.ms/LearnAboutSenderIdentification ] >> >> None of the higher order definitions are used anymore, so remove >> definitions for minutes, hours, and days timeouts. Convert the seconds >> denominated timeouts to secs_to_jiffies() > > There is very similar things with tcp_timeouts[] in > nf_conntrack_proto_tcp.c, why not convert it as well ? This patch happens to have been hand-modified and not by Coccinelle. I'll consider tcp_timeouts[] for v3, but that actually seems to have minute, hour, and days denominated timeouts, and replacing the 4 SECS timeouts may actually hinder readability in that file. > >> >> Signed-off-by: Easwar Hariharan >> --- >>   net/netfilter/nf_conntrack_proto_sctp.c | 21 ++++++++------------- >>   1 file changed, 8 insertions(+), 13 deletions(-) >> >> diff --git a/net/netfilter/nf_conntrack_proto_sctp.c b/net/netfilter/ >> nf_conntrack_proto_sctp.c >> index >> 4cc97f971264ed779434ab4597dd0162586b3736..6c95ac96fa42a39acafb5b88a7cf8898010e911c 100644 >> --- a/net/netfilter/nf_conntrack_proto_sctp.c >> +++ b/net/netfilter/nf_conntrack_proto_sctp.c >> @@ -39,20 +39,15 @@ static const char *const sctp_conntrack_names[] = { >>          [SCTP_CONNTRACK_HEARTBEAT_SENT]         = "HEARTBEAT_SENT", >>   }; >> >> -#define SECS  * HZ >> -#define MINS  * 60 SECS >> -#define HOURS * 60 MINS >> -#define DAYS  * 24 HOURS >> - >>   static const unsigned int sctp_timeouts[SCTP_CONNTRACK_MAX] = { >> -       [SCTP_CONNTRACK_CLOSED]                 = 10 SECS, >> -       [SCTP_CONNTRACK_COOKIE_WAIT]            = 3 SECS, >> -       [SCTP_CONNTRACK_COOKIE_ECHOED]          = 3 SECS, >> -       [SCTP_CONNTRACK_ESTABLISHED]            = 210 SECS, >> -       [SCTP_CONNTRACK_SHUTDOWN_SENT]          = 3 SECS, >> -       [SCTP_CONNTRACK_SHUTDOWN_RECD]          = 3 SECS, >> -       [SCTP_CONNTRACK_SHUTDOWN_ACK_SENT]      = 3 SECS, >> -       [SCTP_CONNTRACK_HEARTBEAT_SENT]         = 30 SECS, >> +       [SCTP_CONNTRACK_CLOSED]                 = secs_to_jiffies(10), >> +       [SCTP_CONNTRACK_COOKIE_WAIT]            = secs_to_jiffies(3), >> +       [SCTP_CONNTRACK_COOKIE_ECHOED]          = secs_to_jiffies(3), >> +       [SCTP_CONNTRACK_ESTABLISHED]            = secs_to_jiffies(210), >> +       [SCTP_CONNTRACK_SHUTDOWN_SENT]          = secs_to_jiffies(3), >> +       [SCTP_CONNTRACK_SHUTDOWN_RECD]          = secs_to_jiffies(3), >> +       [SCTP_CONNTRACK_SHUTDOWN_ACK_SENT]      = secs_to_jiffies(3), >> +       [SCTP_CONNTRACK_HEARTBEAT_SENT]         = secs_to_jiffies(3), > > Was 30 before, if you think it must be changed to 3 you must explain it > in the commit message, or maybe do another patch for that change. This one's a typo, I'll fix it in v3. Thanks, Easwar