From patchwork Mon Sep 3 15:29:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 10586069 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 8BCB713BB for ; Mon, 3 Sep 2018 15:30:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7D72529631 for ; Mon, 3 Sep 2018 15:30:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7214E29632; Mon, 3 Sep 2018 15:30:09 +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 298CE29664 for ; Mon, 3 Sep 2018 15:30:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727280AbeICTup (ORCPT ); Mon, 3 Sep 2018 15:50:45 -0400 Received: from mail-io0-f193.google.com ([209.85.223.193]:32843 "EHLO mail-io0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727247AbeICTup (ORCPT ); Mon, 3 Sep 2018 15:50:45 -0400 Received: by mail-io0-f193.google.com with SMTP id r196-v6so711383iod.0 for ; Mon, 03 Sep 2018 08:30:05 -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=afiygbvUg4kFoDZg9ZA7oXfKNeHy1BKoQpeR2ivyHHrK+gAvFl0+iA0U+yRcPF5rsm n44dToHX76HUVbvAlA0HUR29WlL8PvX98OsLz2ueIrjFeeKZq3txh9y4n0nsNefDtpOP fT9QZctF0B77Vg5C7RgpiONwD/SYeld0t0Bpjv3u2tdzLenypsfB37aGKj/unsqItl7L 7gugj4kkMdCNSzLLLUMBFQjRVBvxmi/WOqf3dgDYYm3YYRTogAuiX9FFrvJAUD5alxyf 6Iwb7MfA9zeTC26S2i+AZnwTFVgl07yYRUaLC56QslHTeJgGHNpXA43gQ13+bSCzFZjm 7o9g== 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=oClTtaUgyuJd4Y+MgGs78CoRsK4Jnpm6lSrbTDJFD5I/xrQrDHl1y2dY3Ha7nCPE2A 1rKjB8IVavhvZxIBlzKdabr5+dzi99d+yOIP7gPkP2ITj8WLbiTEI8K6cX3V+BKXDkY2 93eKd/VuoyppKnBom7D4lk2cTJWbFDEm6OS7OAuh/QKQo5Oti1V1hjnkuaSDCYbhwUCE rvlVUUtiMHcej2GqcWNGXtYHcx3MusYdlg6nVAhO9Z4t5Uu3QhZZTcEMsCcNS+XyIHxr 1PqZyhe2a4v0cqb6z/95kcG7flAV2qvQ802PMb2QnGKru23+yE2zQsUEqvmUsFenG1QV teQA== X-Gm-Message-State: APzg51D3dgCMM+hwN1ZwT+ximsBAm78AwnSsyCGTKNy3CsA+onvT7xsv XqZ3a4rjCJKHzZ6603CGpOZxJ6g= X-Google-Smtp-Source: ANB0VdZvF1LmDTIFeRCw/m3jVpfvR5ZtmCdcCbCXrajzH2hknNqJinpW7kfqabdB8voCc05J40OAnw== X-Received: by 2002:a6b:3fd4:: with SMTP id m203-v6mr19376279ioa.124.1535988605182; Mon, 03 Sep 2018 08:30:05 -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 c25-v6sm7040027iob.30.2018.09.03.08.30.04 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 03 Sep 2018 08:30:04 -0700 (PDT) From: Trond Myklebust X-Google-Original-From: Trond Myklebust To: linux-nfs@vger.kernel.org Subject: [PATCH 07/27] SUNRPC: Move reset of TCP state variables into the reconnect code Date: Mon, 3 Sep 2018 11:29:16 -0400 Message-Id: <20180903152936.24325-8-trond.myklebust@hammerspace.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180903152936.24325-7-trond.myklebust@hammerspace.com> References: <20180903152936.24325-1-trond.myklebust@hammerspace.com> <20180903152936.24325-2-trond.myklebust@hammerspace.com> <20180903152936.24325-3-trond.myklebust@hammerspace.com> <20180903152936.24325-4-trond.myklebust@hammerspace.com> <20180903152936.24325-5-trond.myklebust@hammerspace.com> <20180903152936.24325-6-trond.myklebust@hammerspace.com> <20180903152936.24325-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;