Commit 6a0a9e88 authored by Trond Myklebust's avatar Trond Myklebust Committed by sanglipeng
Browse files

NFSv4: Fix a nfs4_state_manager() race 

stable inclusion
from stable-v5.10.198
commit 225cd4f67bd4c2c6541e7021dd4ebe0ca23d1994
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I987V5

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=225cd4f67bd4c2c6541e7021dd4ebe0ca23d1994



--------------------------------

[ Upstream commit ed1cc05a ]

If the NFS4CLNT_RUN_MANAGER flag got set just before we cleared
NFS4CLNT_MANAGER_RUNNING, then we might have won the race against
nfs4_schedule_state_manager(), and are responsible for handling the
recovery situation.

Fixes: aeabb3c9 ("NFSv4: Fix a NFSv4 state manager deadlock")
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent d6e48023

fs/nfs/nfs4state.c

+7 −0
Original line number Diff line number Diff line
@@ -2690,6 +2690,13 @@ static void nfs4_state_manager(struct nfs_client *clp) 
		nfs4_end_drain_session(clp);

		nfs4_clear_state_manager_bit(clp);



		if (test_bit(NFS4CLNT_RUN_MANAGER, &clp->cl_state) &&

		    !test_and_set_bit(NFS4CLNT_MANAGER_RUNNING,

				      &clp->cl_state)) {

			memflags = memalloc_nofs_save();

			continue;

		}



		if (!test_and_set_bit(NFS4CLNT_RECALL_RUNNING, &clp->cl_state)) {

			if (test_and_clear_bit(NFS4CLNT_DELEGRETURN, &clp->cl_state)) {

				nfs_client_return_marked_delegations(clp);