From patchwork Mon Sep 17 13:02:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 10602663 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 54092157B for ; Mon, 17 Sep 2018 13:04:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4A00D299A8 for ; Mon, 17 Sep 2018 13:04:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3E56F29B63; Mon, 17 Sep 2018 13:04:07 +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 E5BE4299A8 for ; Mon, 17 Sep 2018 13:04:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728121AbeIQSbU (ORCPT ); Mon, 17 Sep 2018 14:31:20 -0400 Received: from mail-qt0-f193.google.com ([209.85.216.193]:41411 "EHLO mail-qt0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728095AbeIQSbU (ORCPT ); Mon, 17 Sep 2018 14:31:20 -0400 Received: by mail-qt0-f193.google.com with SMTP id t39-v6so15113130qtc.8 for ; Mon, 17 Sep 2018 06:04: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=sSq/vCaV9M8k23tFPOeG6deQNmMLHFRMvMxJsLOw+EK2rdKtYawqc5lE9IVAEGF27D kkDQusmcwj05jBvMGsyWdQpeGxL8khtOzSW9olbqDC+xxgT7Auh5JBGM0W2KFCN9kRq6 T+ppTNonrkNmhdF3/N+Dje4jR/8tO4QzBX7dkRu1ZGZegJ2JZtXS6koDvLyOA1J+vVqu W00O7FTdZPk8FILfh6HbXL8+Nueh3ZTUR60sK8FN0mR0MF4LOd9XVN/F5lWiEZgE9Sep xe+7YBW7gf+j89jvHQvA3Lil5gssdxiISXVLcz++t0NlUxnrV6y/0fqG0rkO9Z4XbSad BQIg== 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=uah6fruQlnVKo+IBXmgPrI2i47WwpFGS77BTK0XvzzdFDjkD/0F0llWjDpnO0dAVXy KEq2QZi6o6aZiYoZ/RhYuuR6CJeOeMVwYTJNq5qQo+ieTsLNUo3lDH9yzWpGDpHSBq0X M4MICbs7aaLFOwrpC+fzVnUvNnlMNvQf7ycmP6sY5FP/F6EP8Ewnb5Sheygfv0WuXwpD SHYLMKHg4rnA/6PjDS2lXNBvLaqdQcHTDPP54HGu1Rg+uHNeSJNeRfkplIa9sfoS2K4+ xG6mjMweNu10s+cB00zDJz8KgyaeDMqhwkKWfcbxw2wNLeMUGTvOVUt50Ojd2YZiDeqI uqQQ== X-Gm-Message-State: APzg51B/aRlGZk1gO050k/AYwDgRRue8QgWXTWsOm3Qml8gFvPIj8swF QnrUMM0LvjzJP4BSaCjnak6oca0= X-Google-Smtp-Source: ANB0VdZnbQmfBG5B++d3iOrvV944TaYZPAHmzAM7nsqufMZlCg0G2O5L6fhLZr5CgIfEqSR75ByNZQ== X-Received: by 2002:ac8:28bb:: with SMTP id i56-v6mr17415130qti.140.1537189444505; Mon, 17 Sep 2018 06:04:04 -0700 (PDT) Received: from leira.trondhjem.org.localdomain ([66.187.232.65]) by smtp.gmail.com with ESMTPSA id q1-v6sm10499607qkl.31.2018.09.17.06.04.03 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 17 Sep 2018 06:04:03 -0700 (PDT) From: Trond Myklebust X-Google-Original-From: Trond Myklebust To: linux-nfs@vger.kernel.org Subject: [PATCH v3 07/44] SUNRPC: Move reset of TCP state variables into the reconnect code Date: Mon, 17 Sep 2018 09:02:58 -0400 Message-Id: <20180917130335.112832-8-trond.myklebust@hammerspace.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180917130335.112832-7-trond.myklebust@hammerspace.com> References: <20180917130335.112832-1-trond.myklebust@hammerspace.com> <20180917130335.112832-2-trond.myklebust@hammerspace.com> <20180917130335.112832-3-trond.myklebust@hammerspace.com> <20180917130335.112832-4-trond.myklebust@hammerspace.com> <20180917130335.112832-5-trond.myklebust@hammerspace.com> <20180917130335.112832-6-trond.myklebust@hammerspace.com> <20180917130335.112832-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;