From: Trond Myklebust <trond.myklebust@primarydata.com>
To: anna.schumaker@netapp.com
Cc: linux-nfs@vger.kernel.org, Oleg Drokin <green@linuxhacker.ru>
Subject: [PATCH v5 22/25] NFSv4: Fix a race when updating an open_stateid
Date: Sat, 17 Sep 2016 01:13:30 -0400 [thread overview]
Message-ID: <1474089213-104014-23-git-send-email-trond.myklebust@primarydata.com> (raw)
In-Reply-To: <1474089213-104014-22-git-send-email-trond.myklebust@primarydata.com>
If we're replacing an old stateid which has a different 'other' field,
then we probably need to free the old stateid.
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
---
fs/nfs/nfs4proc.c | 35 ++++++++++++++++++++++++++---------
1 file changed, 26 insertions(+), 9 deletions(-)
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 82449e578608..08c6e46c5b95 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -1399,11 +1399,12 @@ static void nfs_test_and_clear_all_open_stateid(struct nfs4_state *state)
}
static bool nfs_need_update_open_stateid(struct nfs4_state *state,
- nfs4_stateid *stateid)
+ const nfs4_stateid *stateid, nfs4_stateid *freeme)
{
if (test_and_set_bit(NFS_OPEN_STATE, &state->flags) == 0)
return true;
if (!nfs4_stateid_match_other(stateid, &state->open_stateid)) {
+ nfs4_stateid_copy(freeme, &state->open_stateid);
nfs_test_and_clear_all_open_stateid(state);
return true;
}
@@ -1467,7 +1468,9 @@ static void nfs_clear_open_stateid(struct nfs4_state *state,
nfs4_schedule_state_manager(state->owner->so_server->nfs_client);
}
-static void nfs_set_open_stateid_locked(struct nfs4_state *state, nfs4_stateid *stateid, fmode_t fmode)
+static void nfs_set_open_stateid_locked(struct nfs4_state *state,
+ const nfs4_stateid *stateid, fmode_t fmode,
+ nfs4_stateid *freeme)
{
switch (fmode) {
case FMODE_READ:
@@ -1479,14 +1482,18 @@ static void nfs_set_open_stateid_locked(struct nfs4_state *state, nfs4_stateid *
case FMODE_READ|FMODE_WRITE:
set_bit(NFS_O_RDWR_STATE, &state->flags);
}
- if (!nfs_need_update_open_stateid(state, stateid))
+ if (!nfs_need_update_open_stateid(state, stateid, freeme))
return;
if (test_bit(NFS_DELEGATED_STATE, &state->flags) == 0)
nfs4_stateid_copy(&state->stateid, stateid);
nfs4_stateid_copy(&state->open_stateid, stateid);
}
-static void __update_open_stateid(struct nfs4_state *state, nfs4_stateid *open_stateid, const nfs4_stateid *deleg_stateid, fmode_t fmode)
+static void __update_open_stateid(struct nfs4_state *state,
+ const nfs4_stateid *open_stateid,
+ const nfs4_stateid *deleg_stateid,
+ fmode_t fmode,
+ nfs4_stateid *freeme)
{
/*
* Protect the call to nfs4_state_set_mode_locked and
@@ -1499,16 +1506,22 @@ static void __update_open_stateid(struct nfs4_state *state, nfs4_stateid *open_s
set_bit(NFS_DELEGATED_STATE, &state->flags);
}
if (open_stateid != NULL)
- nfs_set_open_stateid_locked(state, open_stateid, fmode);
+ nfs_set_open_stateid_locked(state, open_stateid, fmode, freeme);
write_sequnlock(&state->seqlock);
update_open_stateflags(state, fmode);
spin_unlock(&state->owner->so_lock);
}
-static int update_open_stateid(struct nfs4_state *state, nfs4_stateid *open_stateid, nfs4_stateid *delegation, fmode_t fmode)
+static int update_open_stateid(struct nfs4_state *state,
+ const nfs4_stateid *open_stateid,
+ const nfs4_stateid *delegation,
+ fmode_t fmode)
{
+ struct nfs_server *server = NFS_SERVER(state->inode);
+ struct nfs_client *clp = server->nfs_client;
struct nfs_inode *nfsi = NFS_I(state->inode);
struct nfs_delegation *deleg_cur;
+ nfs4_stateid freeme = {0};
int ret = 0;
fmode &= (FMODE_READ|FMODE_WRITE);
@@ -1530,7 +1543,8 @@ static int update_open_stateid(struct nfs4_state *state, nfs4_stateid *open_stat
goto no_delegation_unlock;
nfs_mark_delegation_referenced(deleg_cur);
- __update_open_stateid(state, open_stateid, &deleg_cur->stateid, fmode);
+ __update_open_stateid(state, open_stateid, &deleg_cur->stateid,
+ fmode, &freeme);
ret = 1;
no_delegation_unlock:
spin_unlock(&deleg_cur->lock);
@@ -1538,11 +1552,14 @@ no_delegation:
rcu_read_unlock();
if (!ret && open_stateid != NULL) {
- __update_open_stateid(state, open_stateid, NULL, fmode);
+ __update_open_stateid(state, open_stateid, NULL, fmode, &freeme);
ret = 1;
}
if (test_bit(NFS_STATE_RECLAIM_NOGRACE, &state->flags))
- nfs4_schedule_state_manager(state->owner->so_server->nfs_client);
+ nfs4_schedule_state_manager(clp);
+ if (freeme.type != 0)
+ nfs4_test_and_free_stateid(server, &freeme,
+ state->owner->so_cred);
return ret;
}
--
2.7.4
next prev parent reply other threads:[~2016-09-17 5:13 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-17 5:13 [PATCH v5 00/25] Fix delegation behaviour when server revokes some state Trond Myklebust
2016-09-17 5:13 ` [PATCH v5 01/25] NFSv4.1: Don't deadlock the state manager on the SEQUENCE status flags Trond Myklebust
2016-09-17 5:13 ` [PATCH v5 02/25] NFSv4: Don't report revoked delegations as valid in nfs_have_delegation() Trond Myklebust
2016-09-17 5:13 ` [PATCH v5 03/25] NFSv4.1: Don't check delegations that are already marked as revoked Trond Myklebust
2016-09-17 5:13 ` [PATCH v5 04/25] NFSv4.1: Allow test_stateid to handle session errors without waiting Trond Myklebust
2016-09-17 5:13 ` [PATCH v5 05/25] NFSv4.1: Add a helper function to deal with expired stateids Trond Myklebust
2016-09-17 5:13 ` [PATCH v5 06/25] NFSv4.x: Allow callers of nfs_remove_bad_delegation() to specify a stateid Trond Myklebust
2016-09-17 5:13 ` [PATCH v5 07/25] NFSv4.1: Test delegation stateids when server declares "some state revoked" Trond Myklebust
2016-09-17 5:13 ` [PATCH v5 08/25] NFSv4.1: Deal with server reboots during delegation expiration recovery Trond Myklebust
2016-09-17 5:13 ` [PATCH v5 09/25] NFSv4.1: Don't recheck delegations that have already been checked Trond Myklebust
2016-09-17 5:13 ` [PATCH v5 10/25] NFSv4.1: Allow revoked stateids to skip the call to TEST_STATEID Trond Myklebust
2016-09-17 5:13 ` [PATCH v5 11/25] NFSv4.1: Ensure we always run TEST/FREE_STATEID on locks Trond Myklebust
2016-09-17 5:13 ` [PATCH v5 12/25] NFSv4.1: FREE_STATEID can be asynchronous Trond Myklebust
2016-09-17 5:13 ` [PATCH v5 13/25] NFSv4.1: Ensure we call FREE_STATEID if needed on close/delegreturn/locku Trond Myklebust
2016-09-17 5:13 ` [PATCH v5 14/25] NFSv4: Ensure we don't re-test revoked and freed stateids Trond Myklebust
2016-09-17 5:13 ` [PATCH v5 15/25] NFSv4: nfs_inode_find_delegation_state_and_recover() should check all stateids Trond Myklebust
2016-09-17 5:13 ` [PATCH v5 16/25] NFSv4: nfs4_do_handle_exception() handle revoke/expiry of a single stateid Trond Myklebust
2016-09-17 5:13 ` [PATCH v5 17/25] NFSv4: nfs4_handle_delegation_recall_error() handle expiration as revoke case Trond Myklebust
2016-09-17 5:13 ` [PATCH v5 18/25] NFSv4: nfs4_handle_setlk_error() " Trond Myklebust
2016-09-17 5:13 ` [PATCH v5 19/25] NFSv4.1: nfs4_layoutget_handle_exception handle revoked state Trond Myklebust
2016-09-17 5:13 ` [PATCH v5 20/25] NFSv4: Pass the stateid to the exception handler in nfs4_read/write_done_cb Trond Myklebust
2016-09-17 5:13 ` [PATCH v5 21/25] NFSv4: Fix a race in nfs_inode_reclaim_delegation() Trond Myklebust
2016-09-17 5:13 ` Trond Myklebust [this message]
2016-09-17 5:13 ` [PATCH v5 23/25] NFS: Always call nfs_inode_find_state_and_recover() when revoking a delegation Trond Myklebust
2016-09-17 5:13 ` [PATCH v5 24/25] NFSv4: Don't test open_stateid unless it is set Trond Myklebust
2016-09-17 5:13 ` [PATCH v5 25/25] NFSv4: Mark the lock and open stateids as invalid after freeing them Trond Myklebust
2016-09-17 18:04 ` [PATCH v5 00/25] Fix delegation behaviour when server revokes some state Oleg Drokin
2016-09-17 18:18 ` Trond Myklebust
2016-09-17 19:16 ` Oleg Drokin
2016-09-17 19:32 ` Trond Myklebust
2016-09-17 21:45 ` Trond Myklebust
2016-09-17 21:55 ` Oleg Drokin
2016-09-17 21:59 ` Trond Myklebust
2016-09-18 1:19 ` Oleg Drokin
2016-09-18 16:23 ` Oleg Drokin
2016-09-18 22:38 ` Trond Myklebust
2016-09-18 22:44 ` Oleg Drokin
2016-09-18 23:08 ` Trond Myklebust
2016-09-18 23:30 ` 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=1474089213-104014-23-git-send-email-trond.myklebust@primarydata.com \
--to=trond.myklebust@primarydata.com \
--cc=anna.schumaker@netapp.com \
--cc=green@linuxhacker.ru \
--cc=linux-nfs@vger.kernel.org \
/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).