From patchwork Fri Nov 15 21:22:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Easwar Hariharan X-Patchwork-Id: 13876900 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 B7098D68BDD for ; Fri, 15 Nov 2024 21:22:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2C1D76B0088; Fri, 15 Nov 2024 16:22:46 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 21FB66B0093; Fri, 15 Nov 2024 16:22:46 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 072416B0092; Fri, 15 Nov 2024 16:22:45 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id D1CCA6B0083 for ; Fri, 15 Nov 2024 16:22:45 -0500 (EST) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 835EF802B9 for ; Fri, 15 Nov 2024 21:22:45 +0000 (UTC) X-FDA: 82789601832.19.9C448CD Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by imf03.hostedemail.com (Postfix) with ESMTP id A98C42001E for ; Fri, 15 Nov 2024 21:22:22 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=linux.microsoft.com header.s=default header.b=TpPSBC6Q; spf=pass (imf03.hostedemail.com: domain of eahariha@linux.microsoft.com designates 13.77.154.182 as permitted sender) smtp.mailfrom=eahariha@linux.microsoft.com; dmarc=pass (policy=none) header.from=linux.microsoft.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1731705706; 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=Q64Lap8gGilYnZS8wBYuXVtg6CkDWFgIDR5hpRb/qKY=; b=dzcocibgY5ivEZDZEdtssJ1WXGAF+TATDqRvGnOhvjxC1HTAgctrPGPnEn3H2cT4Pdf6ff tdedYd450VaiLYrV/9je49BA6e9Y2J6P9ayKYkfV+2K6ie4wKdBS1LWrGFPeZVPDjqtP9j anzAgg8fK63kfGbN8+aoE+kG2Ask3q4= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1731705706; a=rsa-sha256; cv=none; b=kfbY+Qsmd6sbgEov5qvaeGn1/q36KI8T852gvF3OtOFy8ZWP5YfulwbB79XY6NdFZoYe8b r8ZXU2NSSSCUlQkgLPQ+NfllQ3+iy23MwJxlzEBafIUX5hsc9REflp77MFkNx1ZOBYl0lc WbNgmNKCTHQ2LHKB3axADrqo+8ve3Ew= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=linux.microsoft.com header.s=default header.b=TpPSBC6Q; spf=pass (imf03.hostedemail.com: domain of eahariha@linux.microsoft.com designates 13.77.154.182 as permitted sender) smtp.mailfrom=eahariha@linux.microsoft.com; dmarc=pass (policy=none) header.from=linux.microsoft.com Received: from eahariha-devbox.internal.cloudapp.net (unknown [40.91.112.99]) by linux.microsoft.com (Postfix) with ESMTPSA id 1682D206BCE4; Fri, 15 Nov 2024 13:22:42 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 1682D206BCE4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1731705762; bh=Q64Lap8gGilYnZS8wBYuXVtg6CkDWFgIDR5hpRb/qKY=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=TpPSBC6Q0pyCMIPKcOfsvZX/wWIHu4+ejmKY8xw+0GecDvIAUfgwshz01AoOkZ0WD k4gHIei/egZSo7W0NlMAlHYHatQ5bzRsbZtX1NOQvIcE9aFKMDcUHtqmglM484AIGB /3Fdhfw7EN1qT/zCvUp8095p9P9VmicZ+TZgDM0I= From: Easwar Hariharan Date: Fri, 15 Nov 2024 21:22:31 +0000 Subject: [PATCH 01/22] netfilter: conntrack: Cleanup timeout definitions MIME-Version: 1.0 Message-Id: <20241115-converge-secs-to-jiffies-v1-1-19aadc34941b@linux.microsoft.com> References: <20241115-converge-secs-to-jiffies-v1-0-19aadc34941b@linux.microsoft.com> In-Reply-To: <20241115-converge-secs-to-jiffies-v1-0-19aadc34941b@linux.microsoft.com> To: 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=B6?= =?utf-8?q?m?= , 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_Mon?= =?utf-8?q?n=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 , Christophe Leroy , Naveen N Rao , Madhavan Srinivasan Cc: 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 , Easwar Hariharan X-Mailer: b4 0.14.2 X-Stat-Signature: whtajnegtxisooce4mcwfepqgb3a16cz X-Rspam-User: X-Rspamd-Queue-Id: A98C42001E X-Rspamd-Server: rspam02 X-HE-Tag: 1731705742-551183 X-HE-Meta: U2FsdGVkX19q2I69/CgBZURD84WDOQMMinhf9nn1T9GZpYFOCXpaHyD/rp5PYHQi8ezlOOrkVHY7Fe9U2Ad44u2px7LQVO/FKk6cRicVcIFg2jYZ7UlnyNxEcEOeYL2Dn4dFst3YjNiD2h1/H5lMRALH0o86W48gd8YdEi9Q1VGDeELt44FHnUIAeDYq8OgVje1ubR6fbRT0HqU2VJs53OvlVjjU+hN3QfNwERAKiho1GnFxqsndyFz5aFtjAMLb+mJlGRE3Exz5ny1cdEugEz0D4SyLv1B3e3kigz2HhyR/KSbeJtmTlUk/5zgTHb9G7ZpsRBLFbUCH6JP+ZrIaynbecPQF3T750rBaMX9yXCFb+1EtbRjWKbInaRZA6vNbpJd2xaTs3OncGPaMyv2W4TthgEe1BAghMXpQxfnu388Gyx6Gq1DMqAHvlWCJLK7HfnwK5by6QEmDXdOJ7OUqq1ftZ7ZGGs8+NR6xfXH2PG1GxnXNpDi+BQASyVPYW1bFBGIRT+3IjiQ9JfuVV1/Gw/gpVgrIChiStgQWcDxw4e3smI7zaxYPVg51KZi5R801JkJetKRM/ZjdvfOInTT2xYR7uZrNXg9xU/+pHkWEGLX/zwVRbu9GqDNzbqNrt4q0IUoeui3lmUTZZhleTInMAsug+3BEiQIEmuvDHerblPL0bMmUeEz/JVq89L5SxhiNlN0FBZxBEJoq94ywp4KENFz6Krg+7hwDl58uOShDwmbpsaJYLy2/6Xu0XdRENme5zqp3y09GTDcknQ3OXY93WbQXWGCJD2ZvlyRQwH5fwv0DDlHLyfMsztGVF2XDCh1WsVyhHYvF7Ps1kThyg41x044pulOozOhIwscBKDXegBmj7ZPkpGIlWnujOwg1R9pJZ2ewd9YEzIpq9IRSvxw34W4w5CF7qyNH17JihjIwJprL/uWNz5LPERLl6R56vCUatMuFiSE42mB9OqeAXr4 mMEAY6NU BxEJynFr/Fy3ol7TCEXTZm3h7OyXG3xD4X5GKxwpMae4oz+mWQOB4yE/C0nqoqqKIjgTuADEPs9RzBAdcpfh/jkxXzvUaW+0eJGapINa3mfDN5i5XTzsCR9/7EWBxd1jYeQ2Wb8qkpdkiLIB2QsEzFokp8/lHdtnNQwtUtIixEkDWT9YzigCFZ9ibobisWdrk/wr/p0Qz0V0YV8lBiH1Lb+ricco06Rv7h3YGsEw5MwBk4cg7xxouvyPLRYRKgc7k6KI+wKz0SL4zKA1n0lhRSArJsRluovuHkH5ouNBaP6kwarvyiuUxaqkS36wP7SodE7jmU+JZVh3Il8mGVcbIbC4BUMDRUpOnmtvTSIZOvip88lku+lXQoK0mMTXjY9KuB5QKMwSFu0Zeyig= 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: 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() 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), }; #define SCTP_FLAG_HEARTBEAT_VTAG_FAILED 1