Commit 62a8642b authored by Chuck Lever's avatar Chuck Lever
Browse files

NFSD: Fix nfsd4_shutdown_copy() 



nfsd4_shutdown_copy() is just this:

	while ((copy = nfsd4_get_copy(clp)) != NULL)
		nfsd4_stop_copy(copy);

nfsd4_get_copy() bumps @copy's reference count, preventing
nfsd4_stop_copy() from releasing @copy.

A while loop like this usually works by removing the first element
of the list, but neither nfsd4_get_copy() nor nfsd4_stop_copy()
alters the async_copies list.

Best I can tell, then, is that nfsd4_shutdown_copy() continues to
loop until other threads manage to remove all the items from this
list. The spinning loop blocks shutdown until these items are gone.

Possibly the reason we haven't seen this issue in the field is
because client_has_state() prevents __destroy_client() from calling
nfsd4_shutdown_copy() if there are any items on this list. In a
subsequent patch I plan to remove that restriction.

Fixes: e0639dc5 ("NFSD introduce async copy feature")
Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent a4452e66

fs/nfsd/nfs4proc.c

+5 −2
Original line number Diff line number Diff line
@@ -1293,7 +1293,7 @@ static void nfsd4_stop_copy(struct nfsd4_copy *copy) 
	nfs4_put_copy(copy);

}



static struct nfsd4_copy *nfsd4_get_copy(struct nfs4_client *clp)

static struct nfsd4_copy *nfsd4_unhash_copy(struct nfs4_client *clp)

{

	struct nfsd4_copy *copy = NULL;
@@ -1302,6 +1302,9 @@ static struct nfsd4_copy *nfsd4_get_copy(struct nfs4_client *clp) 
		copy = list_first_entry(&clp->async_copies, struct nfsd4_copy,

					copies);

		refcount_inc(&copy->refcount);

		copy->cp_clp = NULL;

		if (!list_empty(&copy->copies))

			list_del_init(&copy->copies);

	}

	spin_unlock(&clp->async_lock);

	return copy;
@@ -1311,7 +1314,7 @@ void nfsd4_shutdown_copy(struct nfs4_client *clp) 
{

	struct nfsd4_copy *copy;



	while ((copy = nfsd4_get_copy(clp)) != NULL)

	while ((copy = nfsd4_unhash_copy(clp)) != NULL)

		nfsd4_stop_copy(copy);

}

#ifdef CONFIG_NFSD_V4_2_INTER_SSC