From: Olga Kornievskaia <aglo@umich.edu>
To: Trond Myklebust <trondmy@gmail.com>
Cc: Anna Schumaker <Anna.Schumaker@netapp.com>,
linux-nfs <linux-nfs@vger.kernel.org>
Subject: Re: [PATCH 9/9] NFSv4: Handle NFS4ERR_OLD_STATEID in LOCKU
Date: Mon, 16 Sep 2019 15:37:47 -0400 [thread overview]
Message-ID: <CAN-5tyGe3V-dAsrNwAVcqKA6dE747ry7C3bb72hGaFgUAGuCzQ@mail.gmail.com> (raw)
In-Reply-To: <20190909140104.78818-9-trond.myklebust@hammerspace.com>
Hi Trond,
I have a problem with this patch.
It sends an unlock with stateid of all zeros (gets a BAD_STATEID) and
then sends an unlock with a normal stateid. This can be seen running
nfstest_locking --nfsversion 4.1.
On Tue, Sep 10, 2019 at 4:09 AM Trond Myklebust <trondmy@gmail.com> wrote:
>
> If a LOCKU request receives a NFS4ERR_OLD_STATEID, then bump the
> seqid before resending. Ensure we only bump the seqid by 1.
>
> Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
> ---
> fs/nfs/nfs4proc.c | 47 +++++++++++++++++++++++++++++++++++++++++++----
> 1 file changed, 43 insertions(+), 4 deletions(-)
>
> diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
> index 49f301198008..ecfaf4b1ba5d 100644
> --- a/fs/nfs/nfs4proc.c
> +++ b/fs/nfs/nfs4proc.c
> @@ -6377,6 +6377,42 @@ static int nfs4_proc_getlk(struct nfs4_state *state, int cmd, struct file_lock *
> return err;
> }
>
> +/*
> + * Update the seqid of a lock stateid after receiving
> + * NFS4ERR_OLD_STATEID
> + */
> +static bool nfs4_refresh_lock_old_stateid(nfs4_stateid *dst,
> + struct nfs4_lock_state *lsp)
> +{
> + struct nfs4_state *state = lsp->ls_state;
> + bool ret = false;
> +
> + spin_lock(&state->state_lock);
> + if (!nfs4_stateid_match_other(dst, &lsp->ls_stateid))
> + goto out;
> + if (!nfs4_stateid_is_newer(&lsp->ls_stateid, dst))
> + nfs4_stateid_seqid_inc(dst);
> + else
> + dst->seqid = lsp->ls_stateid.seqid;
> + ret = true;
> +out:
> + spin_unlock(&state->state_lock);
> + return ret;
> +}
> +
> +static bool nfs4_sync_lock_stateid(nfs4_stateid *dst,
> + struct nfs4_lock_state *lsp)
> +{
> + struct nfs4_state *state = lsp->ls_state;
> + bool ret;
> +
> + spin_lock(&state->state_lock);
> + ret = !nfs4_stateid_match_other(dst, &lsp->ls_stateid);
> + nfs4_stateid_copy(dst, &lsp->ls_stateid);
> + spin_unlock(&state->state_lock);
> + return ret;
> +}
> +
> struct nfs4_unlockdata {
> struct nfs_locku_args arg;
> struct nfs_locku_res res;
> @@ -6448,10 +6484,14 @@ static void nfs4_locku_done(struct rpc_task *task, void *data)
> task->tk_msg.rpc_cred);
> /* Fall through */
> case -NFS4ERR_BAD_STATEID:
> - case -NFS4ERR_OLD_STATEID:
> case -NFS4ERR_STALE_STATEID:
> - if (!nfs4_stateid_match(&calldata->arg.stateid,
> - &calldata->lsp->ls_stateid))
> + if (nfs4_sync_lock_stateid(&calldata->arg.stateid,
> + calldata->lsp))
> + rpc_restart_call_prepare(task);
> + break;
> + case -NFS4ERR_OLD_STATEID:
> + if (nfs4_refresh_lock_old_stateid(&calldata->arg.stateid,
> + calldata->lsp))
> rpc_restart_call_prepare(task);
> break;
> default:
> @@ -6474,7 +6514,6 @@ static void nfs4_locku_prepare(struct rpc_task *task, void *data)
>
> if (nfs_wait_on_sequence(calldata->arg.seqid, task) != 0)
> goto out_wait;
> - nfs4_stateid_copy(&calldata->arg.stateid, &calldata->lsp->ls_stateid);
> if (test_bit(NFS_LOCK_INITIALIZED, &calldata->lsp->ls_flags) == 0) {
> /* Note: exit _without_ running nfs4_locku_done */
> goto out_no_action;
> --
> 2.21.0
>
next prev parent reply other threads:[~2019-09-16 19:38 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-09 14:00 [PATCH 1/9] pNFS: Ensure we do clear the return-on-close layout stateid on fatal errors Trond Myklebust
2019-09-09 14:00 ` [PATCH 2/9] NFSv4: Clean up pNFS return-on-close error handling Trond Myklebust
2019-09-09 14:00 ` [PATCH 3/9] NFSv4: Handle NFS4ERR_DELAY correctly in return-on-close Trond Myklebust
2019-09-09 14:00 ` [PATCH 4/9] NFSv4: Handle RPC level errors in LAYOUTRETURN Trond Myklebust
2019-09-09 14:01 ` [PATCH 5/9] NFSv4: Add a helper to increment stateid seqids Trond Myklebust
2019-09-09 14:01 ` [PATCH 6/9] pNFS: Handle NFS4ERR_OLD_STATEID on layoutreturn by bumping the state seqid Trond Myklebust
2019-09-09 14:01 ` [PATCH 7/9] NFSv4: Fix OPEN_DOWNGRADE error handling Trond Myklebust
2019-09-09 14:01 ` [PATCH 8/9] NFSv4: Handle NFS4ERR_OLD_STATEID in CLOSE/OPEN_DOWNGRADE Trond Myklebust
2019-09-09 14:01 ` [PATCH 9/9] NFSv4: Handle NFS4ERR_OLD_STATEID in LOCKU Trond Myklebust
2019-09-16 19:37 ` Olga Kornievskaia [this message]
2019-09-11 20:13 ` [PATCH 8/9] NFSv4: Handle NFS4ERR_OLD_STATEID in CLOSE/OPEN_DOWNGRADE Olga Kornievskaia
2019-09-11 20:56 ` Trond Myklebust
2019-09-12 15:01 ` Olga Kornievskaia
2019-09-12 15:04 ` Olga Kornievskaia
2019-09-16 19:39 ` Olga Kornievskaia
2019-09-12 15:14 ` [PATCH 6/9] pNFS: Handle NFS4ERR_OLD_STATEID on layoutreturn by bumping the state seqid Olga Kornievskaia
2019-09-12 16:29 ` Trond Myklebust
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAN-5tyGe3V-dAsrNwAVcqKA6dE747ry7C3bb72hGaFgUAGuCzQ@mail.gmail.com \
--to=aglo@umich.edu \
--cc=Anna.Schumaker@netapp.com \
--cc=linux-nfs@vger.kernel.org \
--cc=trondmy@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).