From patchwork Thu May 5 13:18:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artem Savkov X-Patchwork-Id: 12839545 X-Patchwork-Delegate: kuba@kernel.org 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BB45AC433EF for ; Thu, 5 May 2022 13:18:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1379029AbiEENWA (ORCPT ); Thu, 5 May 2022 09:22:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34068 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235022AbiEENV5 (ORCPT ); Thu, 5 May 2022 09:21:57 -0400 Received: from us-smtp-delivery-74.mimecast.com (us-smtp-delivery-74.mimecast.com [170.10.129.74]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id A9D3E2D1F5 for ; Thu, 5 May 2022 06:18:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1651756697; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bSE7VVBnWsfXxxTEbF0LrnB6UoyHMPPc7LdLn8ugniU=; b=VvD8kw0dqxdUh5h2n2uIDI7jEyzka4PdiczqbOCEY+aFHbJJhnZVpom3dTkGXEUG3Cvja+ n0N8plJ7CRukRJP5hNZErE5wu7W1uqUMuWhEsUn9JDJ1vYPd3zZeMHr5fWgesL9c/1W+3x WpmOcxhnDOSERhaetqchjkhNwg3idXo= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-139-JhhDd-uOM3eVMiD_xGdGGw-1; Thu, 05 May 2022 09:18:14 -0400 X-MC-Unique: JhhDd-uOM3eVMiD_xGdGGw-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 527CD1C05AF3; Thu, 5 May 2022 13:18:14 +0000 (UTC) Received: from shodan.usersys.redhat.com (unknown [10.43.17.22]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1589B463EC0; Thu, 5 May 2022 13:18:14 +0000 (UTC) Received: by shodan.usersys.redhat.com (Postfix, from userid 1000) id 04BE41C00FC; Thu, 5 May 2022 15:18:12 +0200 (CEST) From: Artem Savkov To: Thomas Gleixner , Josh Poimboeuf Cc: Anna-Maria Behnsen , "David S. Miller" , Hideaki YOSHIFUJI , David Ahern , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Artem Savkov Subject: [PATCH v5 1/2] timer: add a function to adjust timeouts to be upper bound Date: Thu, 5 May 2022 15:18:10 +0200 Message-Id: <20220505131811.3744503-2-asavkov@redhat.com> In-Reply-To: <20220505131811.3744503-1-asavkov@redhat.com> References: <87zgkwjtq2.ffs@tglx> <20220505131811.3744503-1-asavkov@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.10 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Current timer wheel implementation is optimized for performance and energy usage but lacks in precision. This, normally, is not a problem as most timers that use timer wheel are used for timeouts and thus rarely expire, instead they often get canceled or modified before expiration. Even when they don't, expiring a bit late is not an issue for timeout timers. TCP keepalive timer is a special case, it's aim is to prevent timeouts, so triggering earlier rather than later is desired behavior. In a reported case the user had a 3600s keepalive timer for preventing firewall disconnects (on a 3650s interval). They observed keepalive timers coming in up to four minutes late, causing unexpected disconnects. Add a new upper_bound_timeout() function that takes a relative timeout and adjusts it based on timer wheel granularity so that supplied value effectively becomes an upper bound for the timer. This was previously discussed here: https://lore.kernel.org/all/20210302001054.4qgrvnkltvkgikzr@treble/T/#u Suggested-by: Josh Poimboeuf Signed-off-by: Artem Savkov --- include/linux/timer.h | 1 + kernel/time/timer.c | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/include/linux/timer.h b/include/linux/timer.h index fda13c9d1256..b209d31d543f 100644 --- a/include/linux/timer.h +++ b/include/linux/timer.h @@ -168,6 +168,7 @@ static inline int timer_pending(const struct timer_list * timer) return !hlist_unhashed_lockless(&timer->entry); } +extern unsigned long upper_bound_timeout(unsigned long timeout); extern void add_timer_on(struct timer_list *timer, int cpu); extern int del_timer(struct timer_list * timer); extern int mod_timer(struct timer_list *timer, unsigned long expires); diff --git a/kernel/time/timer.c b/kernel/time/timer.c index 9dd2a39cb3b0..b087a481d06f 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -545,6 +545,20 @@ static int calc_wheel_index(unsigned long expires, unsigned long clk, return idx; } +/** + * upper_bound_timeout - return adjusted timeout + * @timeout: timeout value in jiffies + * + * This function return supplied timeout adjusted to timer wheel granularity + * effectively making supplied value an upper bound at which the timer will + * expire. + */ +unsigned long upper_bound_timeout(unsigned long timeout) +{ + return timeout - (timeout >> LVL_CLK_SHIFT); +} +EXPORT_SYMBOL(upper_bound_timeout); + static void trigger_dyntick_cpu(struct timer_base *base, struct timer_list *timer) { From patchwork Thu May 5 13:18:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artem Savkov X-Patchwork-Id: 12839544 X-Patchwork-Delegate: kuba@kernel.org 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C90FDC433F5 for ; Thu, 5 May 2022 13:18:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377195AbiEENV5 (ORCPT ); Thu, 5 May 2022 09:21:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34048 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235022AbiEENV4 (ORCPT ); Thu, 5 May 2022 09:21:56 -0400 Received: from us-smtp-delivery-74.mimecast.com (us-smtp-delivery-74.mimecast.com [170.10.133.74]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 09C612D1F5 for ; Thu, 5 May 2022 06:18:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1651756696; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dZYBN09igH8LtCAZWzaFJ4ayRRE7BNTVPZW2OM3YADI=; b=N3EFql2UWSuUO0yWrbgfQ7Ve9XbpFjg8ysgD5mZxuokOndUrMMzcBJYY1nqrBmIF4jXbqn SbeaKiTpeRjX5/km8enlxk9AKGBV7s+or3/vmjeJ8FSCh5J98lyVFPugZwp9HRoz3/pVkn kzpN84WfTwGEfAOHI8P/8j2EErfCPo8= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-668-Vc_JEwU5P8Oa5jz7d530gA-1; Thu, 05 May 2022 09:18:15 -0400 X-MC-Unique: Vc_JEwU5P8Oa5jz7d530gA-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5355C185A79C; Thu, 5 May 2022 13:18:14 +0000 (UTC) Received: from shodan.usersys.redhat.com (unknown [10.43.17.22]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 159057AE3; Thu, 5 May 2022 13:18:14 +0000 (UTC) Received: by shodan.usersys.redhat.com (Postfix, from userid 1000) id 105471C0242; Thu, 5 May 2022 15:18:13 +0200 (CEST) From: Artem Savkov To: Thomas Gleixner , Josh Poimboeuf Cc: Anna-Maria Behnsen , "David S. Miller" , Hideaki YOSHIFUJI , David Ahern , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Artem Savkov Subject: [PATCH v5 2/2] net: make tcp keepalive timer upper bound Date: Thu, 5 May 2022 15:18:11 +0200 Message-Id: <20220505131811.3744503-3-asavkov@redhat.com> In-Reply-To: <20220505131811.3744503-1-asavkov@redhat.com> References: <87zgkwjtq2.ffs@tglx> <20220505131811.3744503-1-asavkov@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org Make sure TCP keepalive timer does not expire late. Switching to upper bound timers means it can fire off early but in case of keepalive tcp_keepalive_timer() handler checks elapsed time and resets the timer if it was triggered early. This results in timer "cascading" to a higher precision and being just a couple of milliseconds off it's original mark. This adds minimal overhead as keepalive timers are never re-armed and are usually quite long. Signed-off-by: Artem Savkov Reviewed-by: Josh Poimboeuf --- net/ipv4/inet_connection_sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c index 1e5b53c2bb26..bb2dbfb6f5b5 100644 --- a/net/ipv4/inet_connection_sock.c +++ b/net/ipv4/inet_connection_sock.c @@ -589,7 +589,7 @@ EXPORT_SYMBOL(inet_csk_delete_keepalive_timer); void inet_csk_reset_keepalive_timer(struct sock *sk, unsigned long len) { - sk_reset_timer(sk, &sk->sk_timer, jiffies + len); + sk_reset_timer(sk, &sk->sk_timer, jiffies + upper_bound_timeout(len)); } EXPORT_SYMBOL(inet_csk_reset_keepalive_timer);