From patchwork Fri Nov 3 16:53:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 10040733 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8C6E76032D for ; Fri, 3 Nov 2017 16:54:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7D0FE296ED for ; Fri, 3 Nov 2017 16:54:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 71333296F8; Fri, 3 Nov 2017 16:54:10 +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=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID 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 12279296ED for ; Fri, 3 Nov 2017 16:54:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756147AbdKCQyI (ORCPT ); Fri, 3 Nov 2017 12:54:08 -0400 Received: from mail-io0-f195.google.com ([209.85.223.195]:49112 "EHLO mail-io0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752968AbdKCQyH (ORCPT ); Fri, 3 Nov 2017 12:54:07 -0400 Received: by mail-io0-f195.google.com with SMTP id d66so7636453ioe.5 for ; Fri, 03 Nov 2017 09:54:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PKoM6xuJzcJATnvLsOKrvrrAEbmFG0Yq1P5huXSh15Q=; b=EDn9iuWP465AtW3cWiWmzo6WPgHLhZisPqSQq4xVbDToqHu8CYEbX/yCtH7o0vVen3 zCKZH1AooCyzxlbBO8Mu9q/IgvBma2t6YbMjFku2wsRy7904N0QKYpE1kM1GJkwG0uvt yXpRvEYVqyskQU95suPgttI5V/Zl7bBrAnuIUgmqduypEBXzEnS/SS7NXd08f4F8NMPy GCP1MGWziUPHjmQdDcKeO169g+Jjr4AYhhiWepKhVfv92Rm3oa14aBsHeMmvSTP61MHG Vykq9NyP0PIUHFXvOK4cnNhJbJZTuQyoEvEYsH9QUpy9gMkXyJd7NCmOts3IcxywhJP7 +h6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=PKoM6xuJzcJATnvLsOKrvrrAEbmFG0Yq1P5huXSh15Q=; b=Dpm5SJr/up0xfHFgr2pHWnoEFLlY/gWEpVast8SsLCDAI5AVP5XtezWUwfF3xXZ2vD qU4rMaUS3BODMNebiBZFya2/nFYk3pl5d7NvcJcu910QpHj4OstRmEJpMuafvJkylB+9 pAFadLtwyeQb/uArvbiJwkmflPOTU/EPJHb912gDSqaetltefI/rzp0dX5WKNb5RNZYF h8kFeREoZll+l7+KOunGm+Y8Z+3Muj7sQYQif+3ybxAG+dTwJk83fQ/zLOmP1ZUnf53W v5rJUBbiDJpq8Pmd+jLFPn34Sdpve70nnwRylkScIt9NmwWrUOmUJTYj+ATN7Ymg2e35 AsLw== X-Gm-Message-State: AJaThX64s14sEiMjU3ecDHZt3qby8RvuARXgX3WbL3Y7kFMa7NR6JbFm o4n8XhuBUSoC2Bomy5Q2Dw== X-Google-Smtp-Source: ABhQp+SugsjwW3zBhMmXbnBT91Nm7xytFwIy02vZwgU3oj3bsWg6X33un2T7lJbbomklmbX05bky1g== X-Received: by 10.36.205.198 with SMTP id l189mr566318itg.125.1509728046551; Fri, 03 Nov 2017 09:54:06 -0700 (PDT) Received: from localhost.localdomain (c-68-49-162-121.hsd1.mi.comcast.net. [68.49.162.121]) by smtp.gmail.com with ESMTPSA id j63sm2939862ioe.25.2017.11.03.09.54.05 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 03 Nov 2017 09:54:05 -0700 (PDT) From: Trond Myklebust To: Benjamin Coddington , Anna Schumaker Cc: linux-nfs@vger.kernel.org Subject: [PATCH v6 07/10] pNFS: Retry NFS4ERR_OLD_STATEID errors in layoutreturn-on-close Date: Fri, 3 Nov 2017 12:53:51 -0400 Message-Id: <20171103165354.15997-8-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171103165354.15997-7-trond.myklebust@primarydata.com> References: <20171103165354.15997-1-trond.myklebust@primarydata.com> <20171103165354.15997-2-trond.myklebust@primarydata.com> <20171103165354.15997-3-trond.myklebust@primarydata.com> <20171103165354.15997-4-trond.myklebust@primarydata.com> <20171103165354.15997-5-trond.myklebust@primarydata.com> <20171103165354.15997-6-trond.myklebust@primarydata.com> <20171103165354.15997-7-trond.myklebust@primarydata.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 If our layoutreturn on close operation returns an NFS4ERR_OLD_STATEID, then try to update the stateid and retry. We know that there should be no further LAYOUTGET requests being launched. Signed-off-by: Trond Myklebust --- fs/nfs/nfs4proc.c | 18 ++++++++++++++++-- fs/nfs/pnfs.c | 18 ++++++++++++++++++ fs/nfs/pnfs.h | 5 +++++ 3 files changed, 39 insertions(+), 2 deletions(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index fe4a855dc965..1bb0e405aa57 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -3165,11 +3165,18 @@ static void nfs4_close_done(struct rpc_task *task, void *data) calldata->arg.lr_args = NULL; calldata->res.lr_res = NULL; break; + case -NFS4ERR_OLD_STATEID: + if (nfs4_refresh_layout_stateid(&calldata->arg.lr_args->stateid, + calldata->inode)) { + calldata->res.lr_ret = 0; + rpc_restart_call_prepare(task); + return; + } + /* Fallthrough */ case -NFS4ERR_ADMIN_REVOKED: case -NFS4ERR_DELEG_REVOKED: case -NFS4ERR_EXPIRED: case -NFS4ERR_BAD_STATEID: - case -NFS4ERR_OLD_STATEID: case -NFS4ERR_UNKNOWN_LAYOUTTYPE: case -NFS4ERR_WRONG_CRED: calldata->arg.lr_args = NULL; @@ -5787,11 +5794,18 @@ static void nfs4_delegreturn_done(struct rpc_task *task, void *calldata) data->args.lr_args = NULL; data->res.lr_res = NULL; break; + case -NFS4ERR_OLD_STATEID: + if (nfs4_refresh_layout_stateid(&data->args.lr_args->stateid, + data->inode)) { + data->res.lr_ret = 0; + rpc_restart_call_prepare(task); + return; + } + /* Fallthrough */ case -NFS4ERR_ADMIN_REVOKED: case -NFS4ERR_DELEG_REVOKED: case -NFS4ERR_EXPIRED: case -NFS4ERR_BAD_STATEID: - case -NFS4ERR_OLD_STATEID: case -NFS4ERR_UNKNOWN_LAYOUTTYPE: case -NFS4ERR_WRONG_CRED: data->args.lr_args = NULL; diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index 3bcd669a3152..5e4cd6a7af66 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -355,6 +355,24 @@ pnfs_clear_lseg_state(struct pnfs_layout_segment *lseg, } /* + * Update the seqid of a layout stateid + */ +bool nfs4_refresh_layout_stateid(nfs4_stateid *dst, struct inode *inode) +{ + struct pnfs_layout_hdr *lo; + bool ret = false; + + spin_lock(&inode->i_lock); + lo = NFS_I(inode)->layout; + if (lo && nfs4_stateid_match_other(dst, &lo->plh_stateid)) { + dst->seqid = lo->plh_stateid.seqid; + ret = true; + } + spin_unlock(&inode->i_lock); + return ret; +} + +/* * Mark a pnfs_layout_hdr and all associated layout segments as invalid * * In order to continue using the pnfs_layout_hdr, a full recovery diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h index 87f144f14d1e..40159cb572c7 100644 --- a/fs/nfs/pnfs.h +++ b/fs/nfs/pnfs.h @@ -251,6 +251,7 @@ int pnfs_destroy_layouts_byfsid(struct nfs_client *clp, bool is_recall); int pnfs_destroy_layouts_byclid(struct nfs_client *clp, bool is_recall); +bool nfs4_refresh_layout_stateid(nfs4_stateid *dst, struct inode *inode); void pnfs_put_layout_hdr(struct pnfs_layout_hdr *lo); void pnfs_set_layout_stateid(struct pnfs_layout_hdr *lo, const nfs4_stateid *new, @@ -764,6 +765,10 @@ static inline void nfs4_pnfs_v3_ds_connect_unload(void) { } +bool nfs4_refresh_layout_stateid(nfs4_stateid *dst, struct inode *inode) +{ + return false; +} #endif /* CONFIG_NFS_V4_1 */ #if IS_ENABLED(CONFIG_NFS_V4_2)