a stateid race and a cleanup
Subsystems (2)
PATCH v3 1/2 NFSv4: Fix a livelock when CLOSE pre-emptively bumps state sequence
In reply to Benjamin CoddingtonSince commit 0e0cb35b417f ("NFSv4: Handle NFS4ERR_OLD_STATEID in CLOSE/OPEN_DOWNGRADE") the following livelock may occur if a CLOSE races with the update of the nfs_state:
Process 1 Process 2 Server
========= ========= ========
OPEN file
OPEN file
Reply OPEN (1)
Reply OPEN (2)
Update state (1)
CLOSE file (1)
Reply OLD_STATEID (1)
CLOSE file (2)
Reply CLOSE (-1)
Update state (2)
wait for state change
OPEN file
wake
CLOSE file
OPEN file
wake
CLOSE file
...
...As long as the first process continues updating state, the second process will fail to exit the loop in nfs_set_open_stateid_locked(). This livelock has been observed in generic/168.
Fix this by detecting the case in nfs_need_update_open_stateid() and then exit the loop if:
- the state is NFS_OPEN_STATE, and
- the stateid sequence is > 1, and
- the stateid doesn't match the current open stateid
--- fs/nfs/nfs4proc.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
fs/nfs/nfs4proc.c +9 -7
@@ -1588,19 +1588,21 @@ static void nfs_test_and_clear_all_open_stateid(struct nfs4_state *state)static bool nfs_need_update_open_stateid (struct nfs4_state *state,const nfs4_stateid *stateid) { -if (test_bit (NFS_OPEN_STATE , &state->flags) ==0 || - !nfs4_stateid_match_other (stateid, &state->open_stateid)) { +if (test_bit (NFS_OPEN_STATE , &state->flags)) { +/* The common case - we're updating to a new sequence number */ +if (nfs4_stateid_match_other (stateid, &state->open_stateid) && +nfs4_stateid_is_newer (stateid, &state->open_stateid)) { +nfs_state_log_out_of_order_open_stateid (state, stateid); +return true; + } + }else { +/* This is the first OPEN */ if (stateid->seqid ==cpu_to_be32 (1 ))nfs_state_log_update_open_stateid (state);else set_bit (NFS_STATE_CHANGE_WAIT , &state->flags);return true; } - -if (nfs4_stateid_is_newer (stateid, &state->open_stateid)) { -nfs_state_log_out_of_order_open_stateid (state, stateid); -return true; - }return false; }
Signature · 1 line
2.20.1
PATCH v3 2/2 NFSv4: cleanup unused zero_stateid copy
In reply to Benjamin CoddingtonSince commit d9aba2b40de6 ("NFSv4: Don't use the zero stateid with layoutget") the zero stateid will never be used.
--- fs/nfs/nfs4state.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
fs/nfs/nfs4state.c +2 -6
@@ -1018,18 +1018,14 @@ static int nfs4_copy_lock_stateid(nfs4_stateid *dst,bool nfs4_copy_open_stateid (nfs4_stateid *dst,struct nfs4_state *state) {bool ret; -const nfs4_stateid *src;int seq;do { ret = false; - src = &zero_stateid; seq =read_seqbegin (&state->seqlock); -if (test_bit (NFS_OPEN_STATE , &state->flags)) { - src = &state->open_stateid; +if (test_bit (NFS_OPEN_STATE , &state->flags)) ret = true; - } -nfs4_stateid_copy (dst, src); +nfs4_stateid_copy (dst, &state->open_stateid); }while (read_seqretry (&state->seqlock, seq));return ret; }
Signature · 1 line
2.20.1
v3 cover a stateid race and a cleanup
v3: pull out unnecessary state match checks. V2 cover letter follows:
Cover letter this time explaining the v2: Anna helped me find that the first version's stable fix was wrong, but was fixed by the refactor patch that followed.
After putting in the logic to fix the stable version, it was messy enough that it made more sense to squash the two patches together. So, this time the first patch does rewrite nfs_need_update_open_stateid a bit more in order to handle both cases:
- where two OPENs race to NFS_OPEN_STATE and the second wins
- where an OPEN and CLOSE+1 race to update nfs4_state and CLOSE+1 wins
The end result is that these two patches are code-equivalent to the first three. (It is still getting one final run through my testing, but I haven't delayed posting for that).
Benjamin Coddington (2):
NFSv4: Fix a livelock when CLOSE pre-emptively bumps state sequence
NFSv4: cleanup unused zero_stateid copy
fs/nfs/nfs4proc.c | 16 +++++++++------- fs/nfs/nfs4state.c | 8 ++------ 2 files changed, 11 insertions(+), 13 deletions(-)
Signature · 1 line
2.20.1
Re: [PATCH 1/2 v3] NFSv4: Fix a livelock when CLOSE pre-emptively bumps state sequence
In reply to Benjamin CoddingtonQuoted 67 lines · Benjamin Coddington
Since commit
0e0cb35b417f("NFSv4: HandleNFS4ERR_OLD_STATEIDin CLOSE/OPEN_DOWNGRADE") the following livelock may occur if a CLOSE races
with the update of thenfs_state:Process 1 Process 2 Server ========= ========= ======== OPEN file OPEN file Reply OPEN (1) Reply OPEN (2) Update state (1) CLOSE file (1) Reply OLD_STATEID (1) CLOSE file (2) Reply CLOSE (-1) Update state (2) wait for state change OPEN file wake CLOSE file OPEN file wake CLOSE file ... ...As long as the first process continues updating state, the second process
will fail to exit the loop innfs_set_open_stateid_locked(). This livelock
has been observed in generic/168.Fix this by detecting the case in
nfs_need_update_open_stateid()and then exit the loop if:
- the state isNFS_OPEN_STATE, and
- the stateid sequence is > 1, and
- the stateid doesn't match the current open stateidFixes 0e0cb35b417f ("NFSv4: Handle NFS4ERR_OLD_STATEID inCLOSE/OPEN_DOWNGRADE")
Cc [email protected] # v5.4+Signed-off-by Benjamin Coddington <[email protected]>--- fs/nfs/nfs4proc.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)fs/nfs/nfs4proc.c +2
-2@@ -1588,19 +1588,21 @@ static void nfs_test_and_clear_all_open_stateid(struct nfs4_state *state) static bool nfs_need_update_open_stateid(struct nfs4_state *state,const nfs4_stateid *stateid) { -if (test_bit (NFS_OPEN_STATE , &state->flags) ==0 || - !nfs4_stateid_match_other (stateid, &state->open_stateid)) { +if (test_bit (NFS_OPEN_STATE , &state->flags)) { +/* The common case - we're updating to a new sequence number */
fs/nfs/nfs4proc.c +1
-0+ if (nfs4_stateid_match_other(stateid, &state-Quoted 1 line
open_stateid) &&fs/nfs/nfs4proc.c +1
-0+ nfs4_stateid_is_newer(stateid, &state-Quoted 1 line
open_stateid)) {fs/nfs/nfs4proc.c +1
-0+ nfs_state_log_out_of_order_open_stateid(state,stateid);
fs/nfs/nfs4proc.c static void nfs_test_and_clear_all_open_stateid(struct nfs4_state *state) · line 1603
Quoted 8 lines
fs/nfs/nfs4proc.c +4
-0+return true; + } + }else { +/* This is the first OPEN */ if (stateid->seqid ==cpu_to_be32 (1 ))nfs_state_log_update_open_stateid (state);else set_bit (NFS_STATE_CHANGE_WAIT , &state->flags);
Isn't this going to cause a reopen of the file on the client if it ends up processing the reply to the second OPEN after it processes the successful CLOSE?
Isn't the real problem here rather that the reply to CLOSE needs to be processed in order too?
Quoted 11 lines
fs/nfs/nfs4proc.c +0
-3return true; } - -if (nfs4_stateid_is_newer (stateid, &state->open_stateid)) { - nfs_state_log_out_of_order_open_stateid(state,stateid);
fs/nfs/nfs4proc.c +0
-2-return true; - }return false; }
Signature · 3 lines
Trond Myklebust Linux NFS client maintainer, Hammerspace [email protected]
Re: [PATCH 1/2 v3] NFSv4: Fix a livelock when CLOSE pre-emptively bumps state sequence
Quoted 66 lines · Trond Myklebust
Quoted 65 lines · Benjamin Coddington
Since commit
0e0cb35b417f("NFSv4: HandleNFS4ERR_OLD_STATEIDin CLOSE/OPEN_DOWNGRADE") the following livelock may occur if a CLOSE races
with the update of thenfs_state:Process 1 Process 2 Server ========= ========= ======== OPEN file OPEN file Reply OPEN (1) Reply OPEN (2) Update state (1) CLOSE file (1) Reply OLD_STATEID (1) CLOSE file (2) Reply CLOSE (-1) Update state (2) wait for state change OPEN file wake CLOSE file OPEN file wake CLOSE file ... ...As long as the first process continues updating state, the second process
will fail to exit the loop innfs_set_open_stateid_locked(). This livelock
has been observed in generic/168.Fix this by detecting the case in
nfs_need_update_open_stateid()and then exit the loop if:
- the state isNFS_OPEN_STATE, and
- the stateid sequence is > 1, and
- the stateid doesn't match the current open stateidFixes 0e0cb35b417f ("NFSv4: Handle NFS4ERR_OLD_STATEID inCLOSE/OPEN_DOWNGRADE")
Cc [email protected] # v5.4+Signed-off-by Benjamin Coddington <[email protected]>--- fs/nfs/nfs4proc.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)fs/nfs/nfs4proc.c +2
-2@@ -1588,19 +1588,21 @@ static void nfs_test_and_clear_all_open_stateid(struct nfs4_state *state) static bool nfs_need_update_open_stateid(struct nfs4_state *state,const nfs4_stateid *stateid) { -if (test_bit (NFS_OPEN_STATE , &state->flags) ==0 || - !nfs4_stateid_match_other (stateid, &state->open_stateid)) { +if (test_bit (NFS_OPEN_STATE , &state->flags)) { +/* The common case - we're updating to a new sequence number */
fs/nfs/nfs4proc.c +1
-0+ if (nfs4_stateid_match_other(stateid, &state-Quoted 1 line
open_stateid) &&fs/nfs/nfs4proc.c +1
-0+ nfs4_stateid_is_newer(stateid, &state-Quoted 1 line
open_stateid)) {
Quoted 14 lines
fs/nfs/nfs4proc.c static void nfs_test_and_clear_all_open_stateid(struct nfs4_state *state) · line 1603
Quoted 10 lines
fs/nfs/nfs4proc.c +1
-0+ nfs_state_log_out_of_order_open_stateid(state,stateid);
fs/nfs/nfs4proc.c +4
-0+return true; + } + }else { +/* This is the first OPEN */ if (stateid->seqid ==cpu_to_be32 (1 ))nfs_state_log_update_open_stateid (state);else set_bit (NFS_STATE_CHANGE_WAIT , &state->flags);Isn't this going to cause a reopen of the file on the client if it ends up processing the reply to the second OPEN after it processes the successful CLOSE?
Yes, that's true - but that's a different bug that I haven't noticed or considered. This patch isn't introducing it.
Quoted 2 lines
Isn't the real problem here rather that the reply to CLOSE needs to be processed in order too?
Not just the reply, the actual request as well. If we have a way to properly serialize procssing of CLOSE responses, we could just not send the CLOSE in the first place.
I'd rather not send the CLOSE if there's another OPEN in play, and if that's the barrier to getting this particular bug fixed, I'll work on that. What mechanism can be used? What if the client kept a separate "pending" stateid that could be updated before each operation that would attempt to predict what the server's resulting change would be?
Maybe better would be a counter that gets incremented for each transition to/from NFS_OPEN_STATE so we can check if the stateid is in the same generation and a counter for outstanding operations that are expected to bump the sequence.
Re: [PATCH 1/2 v3] NFSv4: Fix a livelock when CLOSE pre-emptively bumps state sequence
Quoted 111 lines · Benjamin Coddington
Quoted 70 lines · Trond Myklebust
Quoted 69 lines · Benjamin Coddington
Since commit
0e0cb35b417f("NFSv4: HandleNFS4ERR_OLD_STATEIDin CLOSE/OPEN_DOWNGRADE") the following livelock may occur if a CLOSE
races
with the update of thenfs_state:Process 1 Process 2 Server ========= ========= ======== OPEN file OPEN file Reply OPEN (1) Reply OPEN (2) Update state (1) CLOSE file (1) Reply OLD_STATEID (1) CLOSE file (2) Reply CLOSE (-1) Update state (2) wait for state change OPEN file wake CLOSE file OPEN file wake CLOSE file ... ...As long as the first process continues updating state, the second process
will fail to exit the loop innfs_set_open_stateid_locked(). This
livelock
has been observed in generic/168.Fix this by detecting the case in
nfs_need_update_open_stateid()and
then exit the loop if:
- the state isNFS_OPEN_STATE, and
- the stateid sequence is > 1, and
- the stateid doesn't match the current open stateidFixes 0e0cb35b417f ("NFSv4: Handle NFS4ERR_OLD_STATEID inCLOSE/OPEN_DOWNGRADE")
Cc [email protected] # v5.4+Signed-off-by Benjamin Coddington <[email protected]>--- fs/nfs/nfs4proc.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)fs/nfs/nfs4proc.c +2
-2@@ -1588,19 +1588,21 @@ static void nfs_test_and_clear_all_open_stateid(struct nfs4_state *state) static bool nfs_need_update_open_stateid(struct nfs4_state *state,const nfs4_stateid *stateid) { -if (test_bit (NFS_OPEN_STATE , &state->flags) ==0 || - !nfs4_stateid_match_other (stateid, &state->open_stateid)) { +if (test_bit (NFS_OPEN_STATE , &state->flags)) { +/* The common case - we're updating to a new sequence number */
fs/nfs/nfs4proc.c +1
-0+ if (nfs4_stateid_match_other(stateid, &state-Quoted 1 line
open_stateid) &&fs/nfs/nfs4proc.c +1
-0+ nfs4_stateid_is_newer(stateid, &state-Quoted 1 line
open_stateid)) {Quoted 15 lines
fs/nfs/nfs4proc.c static void nfs_test_and_clear_all_open_stateid(struct nfs4_state *state) · line 1603
Quoted 10 lines
fs/nfs/nfs4proc.c +1
-0+ nfs_state_log_out_of_order_open_stateid(state,stateid);
fs/nfs/nfs4proc.c +4
-0+return true; + } + }else { +/* This is the first OPEN */ if (stateid->seqid ==cpu_to_be32 (1 ))nfs_state_log_update_open_stateid (state);else set_bit (NFS_STATE_CHANGE_WAIT , &state->flags);Isn't this going to cause a reopen of the file on the client if it ends
up processing the reply to the second OPEN after it processes the successful CLOSE?Yes, that's true - but that's a different bug that I haven't noticed or
considered. This patch isn't introducing it.Quoted 3 lines
Isn't the real problem here rather that the reply to CLOSE needs to be
processed in order too?Not just the reply, the actual request as well. If we have a way to properly serialize procssing of CLOSE responses, we could just not send the
CLOSE in the first place.I'd rather not send the CLOSE if there's another OPEN in play, and if that's
the barrier to getting this particular bug fixed, I'll work on that. What
mechanism can be used? What if the client kept a separate "pending" stateid
that could be updated before each operation that would attempt to predict
what the server's resulting change would be?
Quoted 7 lines
Maybe better would be a counter that gets incremented for each transition
to/fromNFS_OPEN_STATEso we can check if the stateid is in the same generation and a counter for outstanding operations that are expected to
bump the sequence.
The client can't predict what is going to happen w.r.t. an OPEN call. If it does an open by name, it doesn't even know which file is going to get opened. That's why we have the wait loop
in nfs_set_open_stateid_locked(). Why should we not do the same in CLOSE and OPEN_DOWNGRADE? It's the same problem.
Signature · 3 lines
Trond Myklebust Linux NFS client maintainer, Hammerspace [email protected]
Re: [PATCH 1/2 v3] NFSv4: Fix a livelock when CLOSE pre-emptively bumps state sequence
Quoted 5 lines · Trond Myklebust
The client can't predict what is going to happen w.r.t. an OPEN call. If it does an open by name, it doesn't even know which file is going to get opened. That's why we have the wait loop
innfs_set_open_stateid_locked(). Why should we not do the same in CLOSE andOPEN_DOWNGRADE? It's the same problem.
I will give it a shot. In the meantime, please consider adding this patch which fixes a real bug today. Thank you for your excellent advice and time.
Ben
Re: [PATCH 1/2 v3] NFSv4: Fix a livelock when CLOSE pre-emptively bumps state sequence
Quoted 9 lines · Benjamin Coddington
Quoted 7 lines · Trond Myklebust
The client can't predict what is going to happen w.r.t. an OPEN call.
If it does an open by name, it doesn't even know which file is going to
get opened. That's why we have the wait loop
innfs_set_open_stateid_locked(). Why should we not do the same in CLOSE andOPEN_DOWNGRADE? It's the same problem.
Quoted 5 lines
I will give it a shot. In the meantime, please consider adding this patch
which fixes a real bug today. Thank you for your excellent advice and time.
I don't think we should take that patch, and certainly not as a stable patch. I'd prefer to wait for the real fix.
Signature · 3 lines
Trond Myklebust Linux NFS client maintainer, Hammerspace [email protected]