From: Anna Schumaker <Anna.Schumaker@netapp.com>
To: Trond Myklebust <trond.myklebust@primarydata.com>,
<anna.schumaker@netapp.com>
Cc: <linux-nfs@vger.kernel.org>, Oleg Drokin <green@linuxhacker.ru>
Subject: Re: [PATCH v6 12/29] NFSv4.1: Allow revoked stateids to skip the call to TEST_STATEID
Date: Wed, 21 Sep 2016 12:03:48 -0400 [thread overview]
Message-ID: <ad05aaa3-ac5d-eda2-9218-942423d43a0b@Netapp.com> (raw)
In-Reply-To: <1474390571-17106-13-git-send-email-trond.myklebust@primarydata.com>
Hi Trond,
On 09/20/2016 12:55 PM, Trond Myklebust wrote:
> In some cases (e.g. when the SEQ4_STATUS_EXPIRED_ALL_STATE_REVOKED sequence
> flag is set) we may already know that the stateid was revoked and that the
> only valid operation we can call is FREE_STATEID. In those cases, allow
> the stateid to carry the information in the type field, so that we skip
> the redundant call to TEST_STATEID.
Would you like to add a Signed-off-by to this patch? :)
Thanks,
Anna
> ---
> fs/nfs/nfs4proc.c | 32 +++++++++++++++++++++++---------
> include/linux/nfs4.h | 1 +
> 2 files changed, 24 insertions(+), 9 deletions(-)
>
> diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
> index 97a614370604..3c1b8cb7dd95 100644
> --- a/fs/nfs/nfs4proc.c
> +++ b/fs/nfs/nfs4proc.c
> @@ -2422,18 +2422,29 @@ static int nfs41_test_and_free_expired_stateid(struct nfs_server *server,
> {
> int status;
>
> - status = nfs41_test_stateid(server, stateid, cred);
> + switch (stateid->type) {
> + default:
> + break;
> + case NFS4_INVALID_STATEID_TYPE:
> + case NFS4_SPECIAL_STATEID_TYPE:
> + return -NFS4ERR_BAD_STATEID;
> + case NFS4_REVOKED_STATEID_TYPE:
> + goto out_free;
> + }
>
> + status = nfs41_test_stateid(server, stateid, cred);
> switch (status) {
> case -NFS4ERR_EXPIRED:
> case -NFS4ERR_ADMIN_REVOKED:
> case -NFS4ERR_DELEG_REVOKED:
> - /* Ack the revoked state to the server */
> - nfs41_free_stateid(server, stateid, cred);
> - case -NFS4ERR_BAD_STATEID:
> + break;
> + default:
> return status;
> }
> - return NFS_OK;
> +out_free:
> + /* Ack the revoked state to the server */
> + nfs41_free_stateid(server, stateid, cred);
> + return -NFS4ERR_EXPIRED;
> }
>
> static void nfs41_check_delegation_stateid(struct nfs4_state *state)
> @@ -2468,7 +2479,7 @@ static void nfs41_check_delegation_stateid(struct nfs4_state *state)
> rcu_read_unlock();
> status = nfs41_test_and_free_expired_stateid(server, &stateid, cred);
> trace_nfs4_test_delegation_stateid(state, NULL, status);
> - if (status != NFS_OK)
> + if (status == -NFS4ERR_EXPIRED || status == -NFS4ERR_BAD_STATEID)
> nfs_finish_clear_delegation_stateid(state, &stateid);
>
> put_rpccred(cred);
> @@ -2497,7 +2508,7 @@ static int nfs41_check_open_stateid(struct nfs4_state *state)
>
> status = nfs41_test_and_free_expired_stateid(server, stateid, cred);
> trace_nfs4_test_open_stateid(state, NULL, status);
> - if (status != NFS_OK) {
> + if (status == -NFS4ERR_EXPIRED || status == -NFS4ERR_BAD_STATEID) {
> clear_bit(NFS_O_RDONLY_STATE, &state->flags);
> clear_bit(NFS_O_WRONLY_STATE, &state->flags);
> clear_bit(NFS_O_RDWR_STATE, &state->flags);
> @@ -6124,7 +6135,7 @@ out:
> */
> static int nfs41_check_expired_locks(struct nfs4_state *state)
> {
> - int status, ret = -NFS4ERR_BAD_STATEID;
> + int status, ret = NFS_OK;
> struct nfs4_lock_state *lsp;
> struct nfs_server *server = NFS_SERVER(state->inode);
>
> @@ -6136,9 +6147,12 @@ static int nfs41_check_expired_locks(struct nfs4_state *state)
> &lsp->ls_stateid,
> cred);
> trace_nfs4_test_lock_stateid(state, lsp, status);
> - if (status != NFS_OK) {
> + if (status == -NFS4ERR_EXPIRED ||
> + status == -NFS4ERR_BAD_STATEID)
> clear_bit(NFS_LOCK_INITIALIZED, &lsp->ls_flags);
> + else if (status != NFS_OK) {
> ret = status;
> + break;
> }
> }
> };
> diff --git a/include/linux/nfs4.h b/include/linux/nfs4.h
> index c6564ada9beb..9094faf0699d 100644
> --- a/include/linux/nfs4.h
> +++ b/include/linux/nfs4.h
> @@ -67,6 +67,7 @@ struct nfs4_stateid_struct {
> NFS4_DELEGATION_STATEID_TYPE,
> NFS4_LAYOUT_STATEID_TYPE,
> NFS4_PNFS_DS_STATEID_TYPE,
> + NFS4_REVOKED_STATEID_TYPE,
> } type;
> };
>
>
next prev parent reply other threads:[~2016-09-21 16:05 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-20 16:55 [PATCH v6 00/29] Fix delegation behaviour when server revokes some state Trond Myklebust
2016-09-20 16:55 ` [PATCH v6 01/29] NFSv4.1: Don't deadlock the state manager on the SEQUENCE status flags Trond Myklebust
2016-09-20 16:55 ` [PATCH v6 02/29] NFS: Fix inode corruption in nfs_prime_dcache() Trond Myklebust
2016-09-20 16:55 ` [PATCH v6 03/29] NFSv4: Don't report revoked delegations as valid in nfs_have_delegation() Trond Myklebust
2016-09-20 16:55 ` [PATCH v6 04/29] NFSv4: nfs4_copy_delegation_stateid() must fail if the delegation is invalid Trond Myklebust
2016-09-20 16:55 ` [PATCH v6 05/29] NFSv4.1: Don't check delegations that are already marked as revoked Trond Myklebust
2016-09-20 16:55 ` [PATCH v6 06/29] NFSv4.1: Allow test_stateid to handle session errors without waiting Trond Myklebust
2016-09-20 16:55 ` [PATCH v6 07/29] NFSv4.1: Add a helper function to deal with expired stateids Trond Myklebust
2016-09-20 16:55 ` [PATCH v6 08/29] NFSv4.x: Allow callers of nfs_remove_bad_delegation() to specify a stateid Trond Myklebust
2016-09-20 16:55 ` [PATCH v6 09/29] NFSv4.1: Test delegation stateids when server declares "some state revoked" Trond Myklebust
2016-09-20 16:55 ` [PATCH v6 10/29] NFSv4.1: Deal with server reboots during delegation expiration recovery Trond Myklebust
2016-09-20 16:55 ` [PATCH v6 11/29] NFSv4.1: Don't recheck delegations that have already been checked Trond Myklebust
2016-09-20 16:55 ` [PATCH v6 12/29] NFSv4.1: Allow revoked stateids to skip the call to TEST_STATEID Trond Myklebust
2016-09-20 16:55 ` [PATCH v6 13/29] NFSv4.1: Ensure we always run TEST/FREE_STATEID on locks Trond Myklebust
2016-09-20 16:55 ` [PATCH v6 14/29] NFSv4.1: FREE_STATEID can be asynchronous Trond Myklebust
2016-09-20 16:55 ` [PATCH v6 15/29] NFSv4.1: Ensure we call FREE_STATEID if needed on close/delegreturn/locku Trond Myklebust
2016-09-20 16:55 ` [PATCH v6 16/29] NFSv4: Ensure we don't re-test revoked and freed stateids Trond Myklebust
2016-09-20 16:55 ` [PATCH v6 17/29] NFSv4: nfs_inode_find_delegation_state_and_recover() should check all stateids Trond Myklebust
2016-09-20 16:56 ` [PATCH v6 18/29] NFSv4: nfs4_handle_delegation_recall_error() handle expiration as revoke case Trond Myklebust
2016-09-20 16:56 ` [PATCH v6 19/29] NFSv4: nfs4_handle_setlk_error() " Trond Myklebust
2016-09-20 16:56 ` [PATCH v6 20/29] NFSv4.1: nfs4_layoutget_handle_exception handle revoked state Trond Myklebust
2016-09-20 16:56 ` [PATCH v6 21/29] NFSv4: Pass the stateid to the exception handler in nfs4_read/write_done_cb Trond Myklebust
2016-09-20 16:56 ` [PATCH v6 22/29] NFSv4: Fix a race in nfs_inode_reclaim_delegation() Trond Myklebust
2016-09-20 16:56 ` [PATCH v6 23/29] NFSv4: Fix a race when updating an open_stateid Trond Myklebust
2016-09-20 16:56 ` [PATCH v6 24/29] NFS: Always call nfs_inode_find_state_and_recover() when revoking a delegation Trond Myklebust
2016-09-20 16:56 ` [PATCH v6 25/29] NFSv4: nfs4_do_handle_exception() handle revoke/expiry of a single stateid Trond Myklebust
2016-09-20 16:56 ` [PATCH v6 26/29] NFSv4: Don't test open_stateid unless it is set Trond Myklebust
2016-09-20 16:56 ` [PATCH v6 27/29] NFSv4: Mark the lock and open stateids as invalid after freeing them Trond Myklebust
2016-09-20 16:56 ` [PATCH v6 28/29] NFSv4: Open state recovery must account for file permission changes Trond Myklebust
2016-09-20 16:56 ` [PATCH v6 29/29] NFSv4: Fix retry issues with nfs41_test/free_stateid Trond Myklebust
2016-09-21 16:03 ` Anna Schumaker [this message]
2016-09-21 16:39 ` [PATCH v6 12/29] NFSv4.1: Allow revoked stateids to skip the call to TEST_STATEID Trond Myklebust
2016-09-20 22:06 ` [PATCH v6 00/29] Fix delegation behaviour when server revokes some state Oleg Drokin
[not found] ` <104E1824-0235-41DF-AA9D-5C3F5560CA57@primarydata.com>
2016-09-21 1:07 ` Oleg Drokin
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=ad05aaa3-ac5d-eda2-9218-942423d43a0b@Netapp.com \
--to=anna.schumaker@netapp.com \
--cc=green@linuxhacker.ru \
--cc=linux-nfs@vger.kernel.org \
--cc=trond.myklebust@primarydata.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