From patchwork Fri Mar 20 08:31:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kinglong Mee X-Patchwork-Id: 6054731 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B07119F399 for ; Fri, 20 Mar 2015 08:31:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C12F0204D1 for ; Fri, 20 Mar 2015 08:31:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A4705203E9 for ; Fri, 20 Mar 2015 08:31:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751316AbbCTIbn (ORCPT ); Fri, 20 Mar 2015 04:31:43 -0400 Received: from mail-pa0-f43.google.com ([209.85.220.43]:35579 "EHLO mail-pa0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751132AbbCTIbm (ORCPT ); Fri, 20 Mar 2015 04:31:42 -0400 Received: by pagj4 with SMTP id j4so11099203pag.2 for ; Fri, 20 Mar 2015 01:31:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:cc:subject :content-type:content-transfer-encoding; bh=Jsv31h3uyRAP2Sm64tJHxnFXBJgWpqq9rkSYX0Z/HBw=; b=htLGtMjAY5Tbfvq8OVkaNMeogKbsEL8y3fR9+EC/DL/PEAcAQEqCE3Cq8B+rH14Xgv OO8ftjvC9oj/pkLnvk2iPBbgkkzTD2g0aBXh3tuxbqBmZztPZWh4O8vpdWXTGYoRhihe FaHJELhmD+spF3gQVi5d4+goQquJxEZdN/xUB9TymvMfAhKoJQLHlGTHCQwyrVBouEhe DDEZ0dBQ7sasRDaq69xMd41iKwas/4tW/OCMn4cNRPelnYJb6QfmTn89DEdXmOpa8QbP cur/9v+zWOLQnpFFzK91jrByW6S1wDY4CoHgtyU0cSDhzlSeworoUWwSkIx+nOKtcsac V5uQ== X-Received: by 10.70.133.197 with SMTP id pe5mr185278344pdb.64.1426840301483; Fri, 20 Mar 2015 01:31:41 -0700 (PDT) Received: from [192.168.99.2] ([104.143.41.79]) by mx.google.com with ESMTPSA id kn4sm6806227pab.48.2015.03.20.01.31.37 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 20 Mar 2015 01:31:40 -0700 (PDT) Message-ID: <550BDAE0.2070409@gmail.com> Date: Fri, 20 Mar 2015 16:31:28 +0800 From: Kinglong Mee User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0 MIME-Version: 1.0 To: Trond Myklebust CC: Linux NFS Mailing List Subject: [PATCH] NFS4: Retry destroy session when getting -NFS4ERR_DELAY Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When umounting a client, it cost near ten seconds. Dump the request, got client server DELEGRETURN ----> DESTROY_SESSION ----> NFS4ERR_DELAY <---- DESTROY_SESSION reply NFS4_OK <---- DELEGRETURN reply DESTROY_CLIENTID ----> NFS4ERR_CLIENTID_BUSY <---- DESTROY_CLIENTID reply DESTROY_CLIENTID ----> NFS4ERR_CLIENTID_BUSY <---- DESTROY_CLIENTID reply ... .... ... ... There are ten DESTROY_CLIENTID requests. This patch retry DESTROY_SESSION when getting NFS4ERR_DELAY, try the best to destroy the session as destroy clientid. With this patch, only cost more than 1 seconds, as, client server DELEGRETURN ----> DESTROY_SESSION ----> NFS4ERR_DELAY <---- DESTROY_SESSION reply NFS4_OK <---- DELEGRETURN reply DESTROY_SESSION ----> NFS4_OK <---- DESTROY_SESSION reply DESTROY_CLIENTID ----> NFS4_OK <---- DESTROY_CLIENTID reply Signed-off-by: Kinglong Mee --- fs/nfs/nfs4proc.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 627f37c..2631dc2 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -7320,7 +7320,7 @@ out: * Issue the over-the-wire RPC DESTROY_SESSION. * The caller must serialize access to this routine. */ -int nfs4_proc_destroy_session(struct nfs4_session *session, +static int _nfs4_proc_destroy_session(struct nfs4_session *session, struct rpc_cred *cred) { struct rpc_message msg = { @@ -7332,10 +7332,6 @@ int nfs4_proc_destroy_session(struct nfs4_session *session, dprintk("--> nfs4_proc_destroy_session\n"); - /* session is still being setup */ - if (!test_and_clear_bit(NFS4_SESSION_ESTABLISHED, &session->session_state)) - return 0; - status = rpc_call_sync(session->clp->cl_rpcclient, &msg, RPC_TASK_TIMEOUT); trace_nfs4_destroy_session(session->clp, status); @@ -7347,6 +7343,26 @@ int nfs4_proc_destroy_session(struct nfs4_session *session, return status; } +int nfs4_proc_destroy_session(struct nfs4_session *session, + struct rpc_cred *cred) +{ + unsigned int loop; + int ret; + + /* session is still being setup */ + if (!test_and_clear_bit(NFS4_SESSION_ESTABLISHED, &session->session_state)) + return 0; + + for (loop = NFS4_MAX_LOOP_ON_RECOVER; loop != 0; loop--) { + ret = _nfs4_proc_destroy_session(session, cred); + if (ret != -NFS4ERR_DELAY) + break; + ssleep(1); + } + + return ret; +} + /* * Renew the cl_session lease. */