From patchwork Tue Sep 4 21:05:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 10587905 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 73CCA112B for ; Tue, 4 Sep 2018 21:06:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6456F29FCA for ; Tue, 4 Sep 2018 21:06:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5748D2A0FE; Tue, 4 Sep 2018 21:06:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 06D1A29FCA for ; Tue, 4 Sep 2018 21:06:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726339AbeIEBdJ (ORCPT ); Tue, 4 Sep 2018 21:33:09 -0400 Received: from mail-it0-f65.google.com ([209.85.214.65]:54760 "EHLO mail-it0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726284AbeIEBdJ (ORCPT ); Tue, 4 Sep 2018 21:33:09 -0400 Received: by mail-it0-f65.google.com with SMTP id f14-v6so7021835ita.4 for ; Tue, 04 Sep 2018 14:06:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=lE0nGhrOAMPuD082gwY2vYpiOauMbxYUZQCOI9LYVVI=; b=hlOxWViwL+0BUyBzoxUZ9afWC4reZgQGkYjeIEf29EW8dEn/7JnpvBMRr5SX1DxR3A cQgvE/wrkJMAVaBaxp4bPoknw3Ao66oq9CBIqucHw2/HN7v5YphQdcO2exRys71/xjco lwXBUPIriOW+3LbLbfWZij3vsEtn0GaEeFs8+t25+3tej6qm7uPInZympZppsGB9YhfV LoDFMf8lORYu+2tlEazU+MXI2vFDGwQKAPZEhs3JSvl9tcQo+NcakaXCGsqFa8KDrCt6 3JmG+O0WC1saHiXttCOh/ti7rrcprebJFqQuKu2okghqy0skHxgYsPA8fKnLvpcPSIQH n80w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lE0nGhrOAMPuD082gwY2vYpiOauMbxYUZQCOI9LYVVI=; b=bbCWX1qiJUu+dCGRW9JPufV0LGJIdSbgmBEPg56MVT7C+XHqfaXOjua2Z4Ker3YQcl FSF97EdxYNbVSOhdEGTX0nTKTSomN2+yND5gy8qX7FHBM80wvwfIJYVSaojY+I2QdnRo 4VyAKBUA2lLYU41lzdadcA04bDnJGHVjMgvv+8beYpjKiMRboptBhbupu7o7L6GSbLgn a47zcmsWfQ3nzvkIJhSyEeYcuXEYrXe2s7EJk7Hs9+dETqBdawQmfTRSvFgpBa4bB/l4 xv38dhKpaoHyzVi54wb35m5j5wTykmIUyyY7UrAWJbJzYAVpRWP/RLOaFZelj+UoJoL3 D+AA== X-Gm-Message-State: APzg51DWJNxAKCFDdNAU3TyhAoY1fsAam+s9zSpKgTlJ1i5tHt7UN3/6 Aek4TXRnmnK25kxdiVkjPajxKTQ= X-Google-Smtp-Source: ANB0Vdb2kvSqfNRnmJxjnlRdVitj+bOULF3MtxZhWz0FDrAYgONsGU2j/DR+Uj99DYIrDNSNpjyc4Q== X-Received: by 2002:a24:2ed4:: with SMTP id i203-v6mr8883927ita.114.1536095176891; Tue, 04 Sep 2018 14:06:16 -0700 (PDT) Received: from leira.trondhjem.org.localdomain (c-68-40-195-73.hsd1.mi.comcast.net. [68.40.195.73]) by smtp.gmail.com with ESMTPSA id t64-v6sm172860ita.13.2018.09.04.14.06.16 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Sep 2018 14:06:16 -0700 (PDT) From: Trond Myklebust X-Google-Original-From: Trond Myklebust To: linux-nfs@vger.kernel.org Subject: [PATCH v2 07/34] SUNRPC: Move reset of TCP state variables into the reconnect code Date: Tue, 4 Sep 2018 17:05:22 -0400 Message-Id: <20180904210549.81673-8-trond.myklebust@hammerspace.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180904210549.81673-7-trond.myklebust@hammerspace.com> References: <20180904210549.81673-1-trond.myklebust@hammerspace.com> <20180904210549.81673-2-trond.myklebust@hammerspace.com> <20180904210549.81673-3-trond.myklebust@hammerspace.com> <20180904210549.81673-4-trond.myklebust@hammerspace.com> <20180904210549.81673-5-trond.myklebust@hammerspace.com> <20180904210549.81673-6-trond.myklebust@hammerspace.com> <20180904210549.81673-7-trond.myklebust@hammerspace.com> MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Rather than resetting state variables in socket state_change() callback, do it in the sunrpc TCP connect function itself. Signed-off-by: Trond Myklebust --- net/sunrpc/xprtsock.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index cd7d093721ae..ec1e3f93e707 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c @@ -1600,13 +1600,6 @@ static void xs_tcp_state_change(struct sock *sk) case TCP_ESTABLISHED: spin_lock(&xprt->transport_lock); if (!xprt_test_and_set_connected(xprt)) { - - /* Reset TCP record info */ - transport->recv.offset = 0; - transport->recv.len = 0; - transport->recv.copied = 0; - transport->recv.flags = - TCP_RCV_COPY_FRAGHDR | TCP_RCV_COPY_XID; xprt->connect_cookie++; clear_bit(XPRT_SOCK_CONNECTING, &transport->sock_state); xprt_clear_connecting(xprt); @@ -2386,6 +2379,12 @@ static int xs_tcp_finish_connecting(struct rpc_xprt *xprt, struct socket *sock) xs_set_memalloc(xprt); + /* Reset TCP record info */ + transport->recv.offset = 0; + transport->recv.len = 0; + transport->recv.copied = 0; + transport->recv.flags = TCP_RCV_COPY_FRAGHDR | TCP_RCV_COPY_XID; + /* Tell the socket layer to start connecting... */ xprt->stat.connect_count++; xprt->stat.connect_start = jiffies;