Received: by 2002:a05:7412:bc1a:b0:d7:7d3a:4fe2 with SMTP id ki26csp637168rdb; Sat, 19 Aug 2023 17:34:14 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFeT+Fx5wj3utRcDyzIQlobdSLE19eMoVlAkLV/DsEc7V5F5rsfVTuTT/BswT2tGPUkP8BI X-Received: by 2002:a05:6a21:78aa:b0:132:ff57:7fab with SMTP id bf42-20020a056a2178aa00b00132ff577fabmr4976245pzc.2.1692491654430; Sat, 19 Aug 2023 17:34:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692491654; cv=none; d=google.com; s=arc-20160816; b=ejA7cffgs5TE2nb3Mycc6BKtrpWa9ncSy2JVYy5cBk0gOX9h+kY+yxfa+Cw+H9cXqx o8LspdDMe9Ry8eV8Y+Rgq/WFMWTvdn2remSL9RpvW9X2OI5cDl5/LVE6eMRveJfYdarr r33aIa1AokPg3w1ee5H7piRc4EDcgQ+KKOyVNZ9AdWHj3oytmfJ9CCqglhM2qVqqMQd4 BPcFSlV6u7pQTDZyavLCzckvFy6eFXleYvh3BfkZo7hvGXANQvgAsiqnAIl++DI8hVk5 A127LB9eCyMFI/80DoOXqBb5y2nsOymDRx+rB7uCFh+2w0CeY4LvNCwUWbeZCiN2kgNM eKLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=9TyiGwc2ZfbFR6pO2koL1iibOmbQHpgPMsyGn+farEs=; fh=fCSIe3MjmmvpTcO4md76JKuZjU/cxY+3my+jeGWNbGA=; b=Nq0B3aaSptFeu0alZmkfytlXOWp/N/6B8e3bwTKn9c+CL9NPhqjtkBMrLgKCzq2xtR kU8gue2sr6fdfGYhT/5lckENmeqfMfcECWydtJeBjYsR/5mCou7JR8D9l7WStBINRZp4 6oQjTYVZsUoKjg6yYOXGU14ev9JkWEN7WRtdU4ucbwIntMlbv1tSr7gLtw/x8X1sOE/z hO0kUdrLlj5bRL0djK6YDJ/fXs16l22rN9FDmDvmlABM5d+O+0+nOzaZTZ1uolO7jll6 0KX6Ye0roqfJkUVQk9mWfyp1f4TY5puraMahUVSOkowf6E34ximKXjUFTiJ+1mS3wfQ0 IrzQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=n5nWhf2e; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y33-20020a056a001ca100b0068a3200fb8bsi1307866pfw.358.2023.08.19.17.34.01; Sat, 19 Aug 2023 17:34:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=n5nWhf2e; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229580AbjHTAWQ (ORCPT + 99 others); Sat, 19 Aug 2023 20:22:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49152 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229878AbjHTAVk (ORCPT ); Sat, 19 Aug 2023 20:21:40 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 96847E28CA for ; Sat, 19 Aug 2023 14:39:14 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 3169461901 for ; Sat, 19 Aug 2023 21:39:14 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2F9B8C433C8; Sat, 19 Aug 2023 21:39:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1692481153; bh=8eHIRLLWEITf8NqTQbRpZXk03/aWt1++l3diAXcUgP8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=n5nWhf2eNIMAmpHjSupxxBuXK1jZvCo9TNw1XNjEsOzQ5YRWqpW5uZuiseDwzJC2t 132MY/tx+NH9iA/KCHYvnRMN+eiyUuGds/9vUVjGjtb9z0OmV0wzQxAV0gh3Is1hU2 4ADl5xZ+iqbaV/2MBRXAE9m7RDPrPOK/KJd8BdtZEVY3LQgx38tRnI5oUXkK7myH6W USIIu6X0GUh6bz7D7wXVC2a8WTqFHXnewZeNMxNR4hstC6eZU80S1dRvm63DBFOgi3 oTIwxxefu0UJP1pB+il++HCJqbyc8ShCafjjXvdWhhYa3k3j2vjsO4IThDq0Jk02// 0KdsCyttjWGhA== From: trondmy@kernel.org To: Anna Schumaker Cc: linux-nfs@vger.kernel.org Subject: [PATCH v2 1/5] SUNRPC: Set the TCP_SYNCNT to match the socket timeout Date: Sat, 19 Aug 2023 17:32:21 -0400 Message-ID: <20230819213225.731214-2-trondmy@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230819213225.731214-1-trondmy@kernel.org> References: <20230819213225.731214-1-trondmy@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: Trond Myklebust Set the TCP SYN count so that we abort the connection attempt at around the expected timeout value. Signed-off-by: Trond Myklebust --- net/sunrpc/xprtsock.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index 9f010369100a..47d0b6a8c32e 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c @@ -2230,9 +2230,13 @@ static void xs_tcp_set_socket_timeouts(struct rpc_xprt *xprt, struct socket *sock) { struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt); + struct net *net = sock_net(sock->sk); + unsigned long connect_timeout; + unsigned long syn_retries; unsigned int keepidle; unsigned int keepcnt; unsigned int timeo; + unsigned long t; spin_lock(&xprt->transport_lock); keepidle = DIV_ROUND_UP(xprt->timeout->to_initval, HZ); @@ -2250,6 +2254,16 @@ static void xs_tcp_set_socket_timeouts(struct rpc_xprt *xprt, /* TCP user timeout (see RFC5482) */ tcp_sock_set_user_timeout(sock->sk, timeo); + + /* Connect timeout */ + connect_timeout = max_t(unsigned long, + DIV_ROUND_UP(xprt->connect_timeout, HZ), 1); + syn_retries = max_t(unsigned long, + READ_ONCE(net->ipv4.sysctl_tcp_syn_retries), 1); + for (t = 0; t <= syn_retries && (1UL << t) < connect_timeout; t++) + ; + if (t <= syn_retries) + tcp_sock_set_syncnt(sock->sk, t - 1); } static void xs_tcp_set_connect_timeout(struct rpc_xprt *xprt, -- 2.41.0