From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DD804390CA6; Fri, 27 Mar 2026 12:00:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774612829; cv=none; b=kZMeEnPSEvE+rbFsW1HAO09qfrenlsT2ba+lWnV6lZN8mH4afHS6BITrDVYw32enrgwHbUFda60hoYwft7kbMH/1k/LS00IsrVz4AmMGVyp/A8NVffT56PlFRRKPAIuAU8inKYQvMD4oJQBTSQc6p70fNEwmeos0ASpwmHbYoBI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774612829; c=relaxed/simple; bh=K6PnORCCq0ANMh6DiQ07zPkveXI0Oz/8itkk2B4Xccw=; h=Message-ID:Subject:From:To:Cc:Date:In-Reply-To:References: Content-Type:MIME-Version; b=FWATffn1sldHChTqRTGSeRHjtffkavYgZsJPdvq7IXIg+kqMDU09VWA+AGj1CAsrYItQhMhciVS7gOcA9YnGkhLAAzpADRndIhRvevwAGF4m4E+MwFtVFLVv5UW//TKmuj1UORTZWJSRlFc88oqC5CAA1yuD+Vt/i7p8Jd4FOl8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=CXbSjgGz; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="CXbSjgGz" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B4E67C2BC86; Fri, 27 Mar 2026 12:00:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1774612829; bh=K6PnORCCq0ANMh6DiQ07zPkveXI0Oz/8itkk2B4Xccw=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=CXbSjgGzqM7wqDxBJvpQZrv4Ukjs9RsYQZQjvV/qDSJRIZivdIkheYbk0ILbfi9V2 w8DJEr4WsxSeZgvWOhqk6Us/Vln34XK5omdGP1NVY/AIAioveDYuhLW2rudTfWHojS hGB4j87/niGXd7JTN6+8FnsNdVIVOMHAQE5qOMOCv0TF4RfH/UKZ39ZUYMIm0hPKTr hwAafspLqZ51Ul3bcsH1MRdTlbaPo76XpAwVcHYm7BVE1Tu+lBuUoqjf4igwPeCtaa lgH+oZmsFgqigDyZ7zZ4boDX2BQjJ4ZJOcP/sCwKQn5wyiF7fSa7YxSa0ZYnUNzzPu J5xD7UweWX24w== Message-ID: <884708aef3b2cf3574b4c7db6cc9f82a53a66d9d.camel@kernel.org> Subject: Re: [PATCH v5 1/7] NFSD: Extract revoke_one_stid() utility function From: Jeff Layton To: Chuck Lever , NeilBrown , Olga Kornievskaia , Dai Ngo , Tom Talpey Cc: linux-nfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, Chuck Lever Date: Fri, 27 Mar 2026 08:00:26 -0400 In-Reply-To: <20260326-umount-kills-nfsv4-state-v5-1-d2ce071b3570@oracle.com> References: <20260326-umount-kills-nfsv4-state-v5-0-d2ce071b3570@oracle.com> <20260326-umount-kills-nfsv4-state-v5-1-d2ce071b3570@oracle.com> Autocrypt: addr=jlayton@kernel.org; prefer-encrypt=mutual; keydata=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 QZIQXVeAA+smfTT0tDrisj1U5x6ZB9b3nBg65kc= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.58.3 (3.58.3-1.fc43) Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 On Thu, 2026-03-26 at 13:55 -0400, Chuck Lever wrote: > From: Chuck Lever >=20 > The per-stateid revocation logic in nfsd4_revoke_states() handles > four stateid types in a deeply nested switch. Extract two helpers: >=20 > revoke_ol_stid() performs admin-revocation of an open or lock > stateid with st_mutex already held: marks the stateid as > SC_STATUS_ADMIN_REVOKED, closes POSIX locks for lock stateids, > and releases file access. >=20 > revoke_one_stid() dispatches by sc_type, acquires st_mutex with > the appropriate lockdep class for open and lock stateids, and > handles delegation unhash and layout close inline. >=20 > No functional change. Preparation for adding export-scoped state > revocation which reuses revoke_one_stid(). >=20 > Signed-off-by: Chuck Lever > --- > fs/nfsd/nfs4state.c | 137 ++++++++++++++++++++++++++--------------------= ------ > 1 file changed, 68 insertions(+), 69 deletions(-) >=20 > diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c > index 07df4511ba23..eb1bd1aae8f5 100644 > --- a/fs/nfsd/nfs4state.c > +++ b/fs/nfsd/nfs4state.c > @@ -1775,6 +1775,73 @@ static struct nfs4_stid *find_one_sb_stid(struct n= fs4_client *clp, > return stid; > } > =20 > +static void revoke_ol_stid(struct nfs4_client *clp, > + struct nfs4_ol_stateid *stp) > +{ > + struct nfs4_stid *stid =3D &stp->st_stid; > + > + lockdep_assert_held(&stp->st_mutex); > + spin_lock(&clp->cl_lock); > + if (stid->sc_status =3D=3D 0) { > + stid->sc_status |=3D SC_STATUS_ADMIN_REVOKED; > + atomic_inc(&clp->cl_admin_revoked); > + spin_unlock(&clp->cl_lock); > + if (stid->sc_type =3D=3D SC_TYPE_LOCK) { > + struct nfs4_lockowner *lo =3D > + lockowner(stp->st_stateowner); > + struct nfsd_file *nf; > + > + nf =3D find_any_file(stp->st_stid.sc_file); > + if (nf) { > + get_file(nf->nf_file); > + filp_close(nf->nf_file, (fl_owner_t)lo); > + nfsd_file_put(nf); > + } > + } > + release_all_access(stp); > + } else > + spin_unlock(&clp->cl_lock); > +} > + > +static void revoke_one_stid(struct nfs4_client *clp, struct nfs4_stid *s= tid) > +{ > + struct nfs4_ol_stateid *stp; > + struct nfs4_delegation *dp; > + > + switch (stid->sc_type) { > + case SC_TYPE_OPEN: > + stp =3D openlockstateid(stid); > + mutex_lock_nested(&stp->st_mutex, OPEN_STATEID_MUTEX); > + revoke_ol_stid(clp, stp); > + mutex_unlock(&stp->st_mutex); > + break; > + case SC_TYPE_LOCK: > + stp =3D openlockstateid(stid); > + mutex_lock_nested(&stp->st_mutex, LOCK_STATEID_MUTEX); > + revoke_ol_stid(clp, stp); > + mutex_unlock(&stp->st_mutex); > + break; > + case SC_TYPE_DELEG: > + /* > + * Extra reference guards against concurrent FREE_STATEID. > + */ > + refcount_inc(&stid->sc_count); > + dp =3D delegstateid(stid); > + spin_lock(&state_lock); > + if (!unhash_delegation_locked(dp, SC_STATUS_ADMIN_REVOKED)) > + dp =3D NULL; > + spin_unlock(&state_lock); > + if (dp) > + revoke_delegation(dp); > + else > + nfs4_put_stid(stid); > + break; > + case SC_TYPE_LAYOUT: > + nfsd4_close_layout(layoutstateid(stid)); > + break; > + } > +} > + > /** > * nfsd4_revoke_states - revoke all nfsv4 states associated with given f= ilesystem > * @nn: used to identify instance of nfsd (there is one per net namesp= ace) > @@ -1805,76 +1872,8 @@ void nfsd4_revoke_states(struct nfsd_net *nn, stru= ct super_block *sb) > struct nfs4_stid *stid =3D find_one_sb_stid(clp, sb, > sc_types); > if (stid) { > - struct nfs4_ol_stateid *stp; > - struct nfs4_delegation *dp; > - struct nfs4_layout_stateid *ls; > - > spin_unlock(&nn->client_lock); > - switch (stid->sc_type) { > - case SC_TYPE_OPEN: > - stp =3D openlockstateid(stid); > - mutex_lock_nested(&stp->st_mutex, > - OPEN_STATEID_MUTEX); > - > - spin_lock(&clp->cl_lock); > - if (stid->sc_status =3D=3D 0) { > - stid->sc_status |=3D > - SC_STATUS_ADMIN_REVOKED; > - atomic_inc(&clp->cl_admin_revoked); > - spin_unlock(&clp->cl_lock); > - release_all_access(stp); > - } else > - spin_unlock(&clp->cl_lock); > - mutex_unlock(&stp->st_mutex); > - break; > - case SC_TYPE_LOCK: > - stp =3D openlockstateid(stid); > - mutex_lock_nested(&stp->st_mutex, > - LOCK_STATEID_MUTEX); > - spin_lock(&clp->cl_lock); > - if (stid->sc_status =3D=3D 0) { > - struct nfs4_lockowner *lo =3D > - lockowner(stp->st_stateowner); > - struct nfsd_file *nf; > - > - stid->sc_status |=3D > - SC_STATUS_ADMIN_REVOKED; > - atomic_inc(&clp->cl_admin_revoked); > - spin_unlock(&clp->cl_lock); > - nf =3D find_any_file(stp->st_stid.sc_file); > - if (nf) { > - get_file(nf->nf_file); > - filp_close(nf->nf_file, > - (fl_owner_t)lo); > - nfsd_file_put(nf); > - } > - release_all_access(stp); > - } else > - spin_unlock(&clp->cl_lock); > - mutex_unlock(&stp->st_mutex); > - break; > - case SC_TYPE_DELEG: > - /* Extra reference guards against concurrent > - * FREE_STATEID; revoke_delegation() consumes > - * it, otherwise release it directly. > - */ > - refcount_inc(&stid->sc_count); > - dp =3D delegstateid(stid); > - spin_lock(&nn->deleg_lock); > - if (!unhash_delegation_locked( > - dp, SC_STATUS_ADMIN_REVOKED)) > - dp =3D NULL; > - spin_unlock(&nn->deleg_lock); > - if (dp) > - revoke_delegation(dp); > - else > - nfs4_put_stid(stid); > - break; > - case SC_TYPE_LAYOUT: > - ls =3D layoutstateid(stid); > - nfsd4_close_layout(ls); > - break; > - } > + revoke_one_stid(clp, stid); > nfs4_put_stid(stid); > spin_lock(&nn->client_lock); > if (clp->cl_minorversion =3D=3D 0) Nice little cleanup on its own. This could be merged ahead of the rest of the series. Reviewed-by: Jeff Layton