* [PATCH] sctp: don't compare hb_timer expire date before starting it
@ 2019-02-22 8:45 kwiecienmaciek
2019-02-22 10:03 ` Sverdlin, Alexander (Nokia - DE/Ulm)
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: kwiecienmaciek @ 2019-02-22 8:45 UTC (permalink / raw)
To: linux-sctp; +Cc: netdev, alexander.sverdlin, Maciej Kwiecien
From: Maciej Kwiecien <maciej.kwiecien@nokia.com>
hb_timer might not start at all for a particular transport because its
start is conditional. In a result a node is not sending heartbeats.
Function sctp_transport_reset_hb_timer has two roles:
- initial start of hb_timer for a given transport,
- update expire date of hb_timer for a given transport.
The function is optimized to update timer's expire only if it is before
a new calculated one but this comparison is invalid for a timer which
has not yet started. Such a timer has expire == 0 and if a new expire
value is bigger than (MAX_JIFFIES / 2 + 2) then "time_before" macro will
fail and timer will not start resulting in no heartbeat packets send by
the node.
This was found when association was initialized within first 5 mins
after system boot due to jiffies init value which is near to MAX_JIFFIES.
Test kernel version: 4.9.154 (ARCH=arm)
hb_timer.expire = 0; //initialized, not started timer
new_expire = MAX_JIFFIES / 2 + 2; //or more
time_before(hb_timer.expire, new_expire) == false
Fixes: ba6f5e33bdbb ("sctp: avoid refreshing heartbeat timer too often")
Reported-by: Marcin Stojek <marcin.stojek@nokia.com>
Tested-by: Marcin Stojek <marcin.stojek@nokia.com>
Signed-off-by: Maciej Kwiecien <maciej.kwiecien@nokia.com>
---
net/sctp/transport.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/net/sctp/transport.c b/net/sctp/transport.c
index 033696e6f74f..ad158d311ffa 100644
--- a/net/sctp/transport.c
+++ b/net/sctp/transport.c
@@ -207,7 +207,8 @@ void sctp_transport_reset_hb_timer(struct sctp_transport *transport)
/* When a data chunk is sent, reset the heartbeat interval. */
expires = jiffies + sctp_transport_timeout(transport);
- if (time_before(transport->hb_timer.expires, expires) &&
+ if ((time_before(transport->hb_timer.expires, expires) ||
+ !timer_pending(&transport->hb_timer)) &&
!mod_timer(&transport->hb_timer,
expires + prandom_u32_max(transport->rto)))
sctp_transport_hold(transport);
--
2.14.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] sctp: don't compare hb_timer expire date before starting it
2019-02-22 8:45 [PATCH] sctp: don't compare hb_timer expire date before starting it kwiecienmaciek
@ 2019-02-22 10:03 ` Sverdlin, Alexander (Nokia - DE/Ulm)
2019-02-22 12:49 ` Marcelo Ricardo Leitner
2019-02-22 19:22 ` David Miller
2 siblings, 0 replies; 4+ messages in thread
From: Sverdlin, Alexander (Nokia - DE/Ulm) @ 2019-02-22 10:03 UTC (permalink / raw)
To: kwiecienmaciek, linux-sctp; +Cc: netdev, Kwiecien, Maciej (Nokia - PL/Wroclaw)
On 22/02/2019 09:45, kwiecienmaciek@gmail.com wrote:
> From: Maciej Kwiecien <maciej.kwiecien@nokia.com>
>
> hb_timer might not start at all for a particular transport because its
> start is conditional. In a result a node is not sending heartbeats.
>
> Function sctp_transport_reset_hb_timer has two roles:
> - initial start of hb_timer for a given transport,
> - update expire date of hb_timer for a given transport.
> The function is optimized to update timer's expire only if it is before
> a new calculated one but this comparison is invalid for a timer which
> has not yet started. Such a timer has expire == 0 and if a new expire
> value is bigger than (MAX_JIFFIES / 2 + 2) then "time_before" macro will
> fail and timer will not start resulting in no heartbeat packets send by
> the node.
>
> This was found when association was initialized within first 5 mins
> after system boot due to jiffies init value which is near to MAX_JIFFIES.
>
> Test kernel version: 4.9.154 (ARCH=arm)
> hb_timer.expire = 0; //initialized, not started timer
> new_expire = MAX_JIFFIES / 2 + 2; //or more
> time_before(hb_timer.expire, new_expire) == false
>
> Fixes: ba6f5e33bdbb ("sctp: avoid refreshing heartbeat timer too often")
> Reported-by: Marcin Stojek <marcin.stojek@nokia.com>
> Tested-by: Marcin Stojek <marcin.stojek@nokia.com>
Reviewed-by: Alexander Sverdlin <alexander.sverdlin@nokia.com>
> Signed-off-by: Maciej Kwiecien <maciej.kwiecien@nokia.com>
> ---
> net/sctp/transport.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/net/sctp/transport.c b/net/sctp/transport.c
> index 033696e6f74f..ad158d311ffa 100644
> --- a/net/sctp/transport.c
> +++ b/net/sctp/transport.c
> @@ -207,7 +207,8 @@ void sctp_transport_reset_hb_timer(struct sctp_transport *transport)
>
> /* When a data chunk is sent, reset the heartbeat interval. */
> expires = jiffies + sctp_transport_timeout(transport);
> - if (time_before(transport->hb_timer.expires, expires) &&
> + if ((time_before(transport->hb_timer.expires, expires) ||
> + !timer_pending(&transport->hb_timer)) &&
> !mod_timer(&transport->hb_timer,
> expires + prandom_u32_max(transport->rto)))
> sctp_transport_hold(transport);
--
Best regards,
Alexander Sverdlin.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] sctp: don't compare hb_timer expire date before starting it
2019-02-22 8:45 [PATCH] sctp: don't compare hb_timer expire date before starting it kwiecienmaciek
2019-02-22 10:03 ` Sverdlin, Alexander (Nokia - DE/Ulm)
@ 2019-02-22 12:49 ` Marcelo Ricardo Leitner
2019-02-22 19:22 ` David Miller
2 siblings, 0 replies; 4+ messages in thread
From: Marcelo Ricardo Leitner @ 2019-02-22 12:49 UTC (permalink / raw)
To: kwiecienmaciek; +Cc: linux-sctp, netdev, alexander.sverdlin, Maciej Kwiecien
On Fri, Feb 22, 2019 at 09:45:26AM +0100, kwiecienmaciek@gmail.com wrote:
> From: Maciej Kwiecien <maciej.kwiecien@nokia.com>
>
> hb_timer might not start at all for a particular transport because its
> start is conditional. In a result a node is not sending heartbeats.
>
> Function sctp_transport_reset_hb_timer has two roles:
> - initial start of hb_timer for a given transport,
> - update expire date of hb_timer for a given transport.
> The function is optimized to update timer's expire only if it is before
> a new calculated one but this comparison is invalid for a timer which
> has not yet started. Such a timer has expire == 0 and if a new expire
> value is bigger than (MAX_JIFFIES / 2 + 2) then "time_before" macro will
> fail and timer will not start resulting in no heartbeat packets send by
> the node.
>
> This was found when association was initialized within first 5 mins
> after system boot due to jiffies init value which is near to MAX_JIFFIES.
>
> Test kernel version: 4.9.154 (ARCH=arm)
> hb_timer.expire = 0; //initialized, not started timer
> new_expire = MAX_JIFFIES / 2 + 2; //or more
> time_before(hb_timer.expire, new_expire) == false
>
> Fixes: ba6f5e33bdbb ("sctp: avoid refreshing heartbeat timer too often")
> Reported-by: Marcin Stojek <marcin.stojek@nokia.com>
> Tested-by: Marcin Stojek <marcin.stojek@nokia.com>
> Signed-off-by: Maciej Kwiecien <maciej.kwiecien@nokia.com>
Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
> ---
> net/sctp/transport.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/net/sctp/transport.c b/net/sctp/transport.c
> index 033696e6f74f..ad158d311ffa 100644
> --- a/net/sctp/transport.c
> +++ b/net/sctp/transport.c
> @@ -207,7 +207,8 @@ void sctp_transport_reset_hb_timer(struct sctp_transport *transport)
>
> /* When a data chunk is sent, reset the heartbeat interval. */
> expires = jiffies + sctp_transport_timeout(transport);
> - if (time_before(transport->hb_timer.expires, expires) &&
> + if ((time_before(transport->hb_timer.expires, expires) ||
> + !timer_pending(&transport->hb_timer)) &&
> !mod_timer(&transport->hb_timer,
> expires + prandom_u32_max(transport->rto)))
> sctp_transport_hold(transport);
> --
> 2.14.1
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] sctp: don't compare hb_timer expire date before starting it
2019-02-22 8:45 [PATCH] sctp: don't compare hb_timer expire date before starting it kwiecienmaciek
2019-02-22 10:03 ` Sverdlin, Alexander (Nokia - DE/Ulm)
2019-02-22 12:49 ` Marcelo Ricardo Leitner
@ 2019-02-22 19:22 ` David Miller
2 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2019-02-22 19:22 UTC (permalink / raw)
To: kwiecienmaciek; +Cc: linux-sctp, netdev, alexander.sverdlin, maciej.kwiecien
From: kwiecienmaciek@gmail.com
Date: Fri, 22 Feb 2019 09:45:26 +0100
> From: Maciej Kwiecien <maciej.kwiecien@nokia.com>
>
> hb_timer might not start at all for a particular transport because its
> start is conditional. In a result a node is not sending heartbeats.
>
> Function sctp_transport_reset_hb_timer has two roles:
> - initial start of hb_timer for a given transport,
> - update expire date of hb_timer for a given transport.
> The function is optimized to update timer's expire only if it is before
> a new calculated one but this comparison is invalid for a timer which
> has not yet started. Such a timer has expire == 0 and if a new expire
> value is bigger than (MAX_JIFFIES / 2 + 2) then "time_before" macro will
> fail and timer will not start resulting in no heartbeat packets send by
> the node.
>
> This was found when association was initialized within first 5 mins
> after system boot due to jiffies init value which is near to MAX_JIFFIES.
>
> Test kernel version: 4.9.154 (ARCH=arm)
> hb_timer.expire = 0; //initialized, not started timer
> new_expire = MAX_JIFFIES / 2 + 2; //or more
> time_before(hb_timer.expire, new_expire) == false
>
> Fixes: ba6f5e33bdbb ("sctp: avoid refreshing heartbeat timer too often")
> Reported-by: Marcin Stojek <marcin.stojek@nokia.com>
> Tested-by: Marcin Stojek <marcin.stojek@nokia.com>
> Signed-off-by: Maciej Kwiecien <maciej.kwiecien@nokia.com>
Applied and queued up for -stable, thank you.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-02-22 19:22 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-22 8:45 [PATCH] sctp: don't compare hb_timer expire date before starting it kwiecienmaciek
2019-02-22 10:03 ` Sverdlin, Alexander (Nokia - DE/Ulm)
2019-02-22 12:49 ` Marcelo Ricardo Leitner
2019-02-22 19:22 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).