Commit 88584818 authored by Chuck Lever's avatar Chuck Lever Committed by J. Bruce Fields
Browse files

nfsd: Close race between nfsd4_release_lockowner and nfsd4_lock 



nfsd4_release_lockowner finds a lock owner that has no lock state,
and drops cl_lock. Then release_lockowner picks up cl_lock and
unhashes the lock owner.

During the window where cl_lock is dropped, I don't see anything
preventing a concurrent nfsd4_lock from finding that same lock owner
and adding lock state to it.

Move release_lockowner() into nfsd4_release_lockowner and hang onto
the cl_lock until after the lock owner's state cannot be found
again.

Found by inspection, we don't currently have a reproducer.

Fixes: 2c41beb0 ("nfsd: reduce cl_lock thrashing in ... ")
Reviewed-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent dd51db18

fs/nfsd/nfs4state.c

+17 −23
Original line number Diff line number Diff line
@@ -1200,27 +1200,6 @@ free_ol_stateid_reaplist(struct list_head *reaplist) 
	}

}



static void release_lockowner(struct nfs4_lockowner *lo)

{

	struct nfs4_client *clp = lo->lo_owner.so_client;

	struct nfs4_ol_stateid *stp;

	struct list_head reaplist;



	INIT_LIST_HEAD(&reaplist);



	spin_lock(&clp->cl_lock);

	unhash_lockowner_locked(lo);

	while (!list_empty(&lo->lo_owner.so_stateids)) {

		stp = list_first_entry(&lo->lo_owner.so_stateids,

				struct nfs4_ol_stateid, st_perstateowner);

		WARN_ON(!unhash_lock_stateid(stp));

		put_ol_stateid_locked(stp, &reaplist);

	}

	spin_unlock(&clp->cl_lock);

	free_ol_stateid_reaplist(&reaplist);

	nfs4_put_stateowner(&lo->lo_owner);

}



static void release_open_stateid_locks(struct nfs4_ol_stateid *open_stp,

				       struct list_head *reaplist)

{
@@ -5963,6 +5942,7 @@ nfsd4_release_lockowner(struct svc_rqst *rqstp, 
	__be32 status;

	struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id);

	struct nfs4_client *clp;

	LIST_HEAD (reaplist);



	dprintk("nfsd4_release_lockowner clientid: (%08x/%08x):\n",

		clid->cl_boot, clid->cl_id);
@@ -5993,9 +5973,23 @@ nfsd4_release_lockowner(struct svc_rqst *rqstp, 
		nfs4_get_stateowner(sop);

		break;

	}

	if (!lo) {

		spin_unlock(&clp->cl_lock);

	if (lo)

		release_lockowner(lo);

		return status;

	}



	unhash_lockowner_locked(lo);

	while (!list_empty(&lo->lo_owner.so_stateids)) {

		stp = list_first_entry(&lo->lo_owner.so_stateids,

				       struct nfs4_ol_stateid,

				       st_perstateowner);

		WARN_ON(!unhash_lock_stateid(stp));

		put_ol_stateid_locked(stp, &reaplist);

	}

	spin_unlock(&clp->cl_lock);

	free_ol_stateid_reaplist(&reaplist);

	nfs4_put_stateowner(&lo->lo_owner);



	return status;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE