| Message ID | 20241115-converge-secs-to-jiffies-v2-1-911fb7595e79@linux.microsoft.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Johannes Berg |
| Headers | show |
| Series | Converge on using secs_to_jiffies() | expand |
Hi Easwar, On Fri, 15 Nov 2024 21:26:18 +0000 Easwar Hariharan <eahariha@linux.microsoft.com> wrote: > > 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), You have changed this last timeout from 30 seconds to 3 (presumably just a copy and paste error).
On 11/15/2024 2:34 PM, Stephen Rothwell wrote: > Hi Easwar, > > On Fri, 15 Nov 2024 21:26:18 +0000 Easwar Hariharan <eahariha@linux.microsoft.com> wrote: >> >> 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), > > You have changed this last timeout from 30 seconds to 3 (presumably > just a copy and paste error). > Will fix in v3.
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
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 <eahariha@linux.microsoft.com> --- net/netfilter/nf_conntrack_proto_sctp.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-)