From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1923706-1516808970-2-12211252831348363060 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no ("Email failed DMARC policy for domain") X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, ME_NOAUTH 0.01, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES enro, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org' X-Spam-charsets: plain='us-ascii' X-IgnoreVacation: yes ("Email failed DMARC policy for domain") X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1516808969; b=VUUIkHLz2bnF88r713sj1tRa86Z+/MAwMCLIStcP0v96l07 WemhJb4WGiU0zkGmmX0Sc/pgZ2GUlnPzSBcES78lVI/VEbFH2IR5i35busGbv4L7 1JO32JQdIA8AUFI1cq1UeBjmrmn2L58N60lI5QJBHGPFKNlj6gtl6eCusR3Pt/Kv 0QBXRtfOSJ9BQEKThyvk9Ynat8PVOi6QIswQwmj61ppm2lENSlp9RNuPbj45WzGC qvhe6yJcxmYRHE2XXJfn+q40UcCjQhuw5HYU0H5VAHhi4A6GkLB1eENLRkHilIck EU0NZ7FLeSllJ3H9Ar/5GEMMt02Md27Fh36fOHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=date:from:to:cc:subject:message-id :references:mime-version:content-type:in-reply-to:sender :list-id; s=arctest; t=1516808969; bh=RYBMKoAZcLT/h7mpkXKR8Q4Qal iu8adEN2DFstDb4gc=; b=XljjIYkEKzlAPu5ClTOdipdzC/GQRUS/uFrLkzKbem WOiXpctYeS+1Rl5B+FHSHa8kCsdIiOjEEZ+fOTM7OY0IAMcZU2D25lAvI15KVhHA WnjJo6R9hA6xAS2p7eHICm2pQ8W6Q0wBCMptSjntQEtWAyoiInDR3/pAzuGnZIP9 4ymCQuiHLYTPWBIeAAMZrsv8dqsg9ifp2saIZLK8XeAyU3ZayFdU4YvRTt7Yx2qx BWfnEyE6b7WSLvtMxTMOBbgBGpAL5nCawXFLxW1i6UoZE0ibxua9RxfgsiMhPV17 Y/6VS1EF2C8CB8gofRQXnIh6SrXH7a4oQPX3x0d/ClQg== ARC-Authentication-Results: i=1; mx1.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=fail (p=none,has-list-id=yes,d=none) header.from=redhat.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=redhat.com header.result=pass header_is_org_domain=yes Authentication-Results: mx1.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=fail (p=none,has-list-id=yes,d=none) header.from=redhat.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=redhat.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934094AbeAXPrN (ORCPT ); Wed, 24 Jan 2018 10:47:13 -0500 Received: from mx1.redhat.com ([209.132.183.28]:12383 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934121AbeAXPrL (ORCPT ); Wed, 24 Jan 2018 10:47:11 -0500 Date: Wed, 24 Jan 2018 10:47:09 -0500 From: "J. Bruce Fields" To: Sasha Levin Cc: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" , Trond Myklebust Subject: Re: [PATCH AUTOSEL for 4.14 057/100] nfsd: Ensure we don't recognise lock stateids after freeing them Message-ID: <20180124154709.GB31619@parsley.fieldses.org> References: <20180124041414.32065-1-alexander.levin@microsoft.com> <20180124041414.32065-57-alexander.levin@microsoft.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180124041414.32065-57-alexander.levin@microsoft.com> User-Agent: Mutt/1.9.1 (2017-09-22) Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: Chuck Lever found this caused a regression, and Trond's fix hasn't hit Linus's tree yet. --b. On Wed, Jan 24, 2018 at 04:14:53AM +0000, Sasha Levin wrote: > From: Trond Myklebust > > [ Upstream commit 659aefb68eca28ba9aa482a9fc64de107332e256 ] > > In order to deal with lookup races, nfsd4_free_lock_stateid() needs > to be able to signal to other stateful functions that the lock stateid > is no longer valid. Right now, nfsd_lock() will check whether or not an > existing stateid is still hashed, but only in the "new lock" path. > > To ensure the stateid invalidation is also recognised by the "existing lock" > path, and also by a second call to nfsd4_free_lock_stateid() itself, we can > change the type to NFS4_CLOSED_STID under the stp->st_mutex. > > Signed-off-by: Trond Myklebust > Signed-off-by: J. Bruce Fields > Signed-off-by: Sasha Levin > --- > fs/nfsd/nfs4state.c | 19 ++++++++----------- > 1 file changed, 8 insertions(+), 11 deletions(-) > > diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c > index 61f38346ce9d..5ec0ca5cbc1e 100644 > --- a/fs/nfsd/nfs4state.c > +++ b/fs/nfsd/nfs4state.c > @@ -5099,7 +5099,9 @@ nfsd4_free_lock_stateid(stateid_t *stateid, struct nfs4_stid *s) > struct nfs4_ol_stateid *stp = openlockstateid(s); > __be32 ret; > > - mutex_lock(&stp->st_mutex); > + ret = nfsd4_lock_ol_stateid(stp); > + if (ret) > + goto out_put_stid; > > ret = check_stateid_generation(stateid, &s->sc_stateid, 1); > if (ret) > @@ -5110,11 +5112,13 @@ nfsd4_free_lock_stateid(stateid_t *stateid, struct nfs4_stid *s) > lockowner(stp->st_stateowner))) > goto out; > > + stp->st_stid.sc_type = NFS4_CLOSED_STID; > release_lock_stateid(stp); > ret = nfs_ok; > > out: > mutex_unlock(&stp->st_mutex); > +out_put_stid: > nfs4_put_stid(s); > return ret; > } > @@ -5683,6 +5687,8 @@ find_lock_stateid(struct nfs4_lockowner *lo, struct nfs4_file *fp) > lockdep_assert_held(&clp->cl_lock); > > list_for_each_entry(lst, &lo->lo_owner.so_stateids, st_perstateowner) { > + if (lst->st_stid.sc_type != NFS4_LOCK_STID) > + continue; > if (lst->st_stid.sc_file == fp) { > atomic_inc(&lst->st_stid.sc_count); > return lst; > @@ -5757,7 +5763,6 @@ lookup_or_create_lock_state(struct nfsd4_compound_state *cstate, > struct nfs4_lockowner *lo; > struct nfs4_ol_stateid *lst; > unsigned int strhashval; > - bool hashed; > > lo = find_lockowner_str(cl, &lock->lk_new_owner); > if (!lo) { > @@ -5780,15 +5785,7 @@ retry: > goto out; > } > > - mutex_lock(&lst->st_mutex); > - > - /* See if it's still hashed to avoid race with FREE_STATEID */ > - spin_lock(&cl->cl_lock); > - hashed = !list_empty(&lst->st_perfile); > - spin_unlock(&cl->cl_lock); > - > - if (!hashed) { > - mutex_unlock(&lst->st_mutex); > + if (nfsd4_lock_ol_stateid(lst) != nfs_ok) { > nfs4_put_stid(&lst->st_stid); > goto retry; > } > -- > 2.11.0