Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <951265d3954621086aa00d27c275e1d50d3e9586.camel@kernel.org>
Subject: Re: [PATCH 3/4] nfsd: don't kill nfsd_files because of lease break
 error
From:   Jeff Layton <jlayton@kernel.org>
To:     chuck.lever@oracle.com
Cc:     linux-nfs@vger.kernel.org
Date:   Wed, 18 Jan 2023 12:54:36 -0500
In-Reply-To: <20230105121512.21484-4-jlayton@kernel.org>
References: <20230105121512.21484-1-jlayton@kernel.org>
         <20230105121512.21484-4-jlayton@kernel.org>
Content-Type: text/plain; charset="ISO-8859-15"
Content-Transfer-Encoding: quoted-printable
User-Agent: Evolution 3.46.3 (3.46.3-1.fc37) 
MIME-Version: 1.0
Precedence: bulk

On Thu, 2023-01-05 at 07:15 -0500, Jeff Layton wrote:
> An error from break_lease is non-fatal, so we needn't destroy the
> nfsd_file in that case. Just put the reference like we normally would
> and return the error.
>=20
> Signed-off-by: Jeff Layton <jlayton@kernel.org>
> ---
>  fs/nfsd/filecache.c | 29 +++++++++++++++--------------
>  1 file changed, 15 insertions(+), 14 deletions(-)
>=20
> diff --git a/fs/nfsd/filecache.c b/fs/nfsd/filecache.c
> index a67b22579c6e..f0ca9501edb2 100644
> --- a/fs/nfsd/filecache.c
> +++ b/fs/nfsd/filecache.c
> @@ -1113,7 +1113,7 @@ nfsd_file_do_acquire(struct svc_rqst *rqstp, struct=
 svc_fh *fhp,
>  	nf =3D nfsd_file_alloc(&key, may_flags);
>  	if (!nf) {
>  		status =3D nfserr_jukebox;
> -		goto out_status;
> +		goto out;
>  	}
> =20
>  	ret =3D rhashtable_lookup_insert_key(&nfsd_file_rhash_tbl,
> @@ -1122,13 +1122,11 @@ nfsd_file_do_acquire(struct svc_rqst *rqstp, stru=
ct svc_fh *fhp,
>  	if (likely(ret =3D=3D 0))
>  		goto open_file;
> =20
> -	nfsd_file_slab_free(&nf->nf_rcu);
> -	nf =3D NULL;
>  	if (ret =3D=3D -EEXIST)
>  		goto retry;
>  	trace_nfsd_file_insert_err(rqstp, key.inode, may_flags, ret);
>  	status =3D nfserr_jukebox;
> -	goto out_status;
> +	goto construction_err;
> =20
>  wait_for_construction:
>  	wait_on_bit(&nf->nf_flags, NFSD_FILE_PENDING, TASK_UNINTERRUPTIBLE);
> @@ -1138,28 +1136,24 @@ nfsd_file_do_acquire(struct svc_rqst *rqstp, stru=
ct svc_fh *fhp,
>  		trace_nfsd_file_cons_err(rqstp, key.inode, may_flags, nf);
>  		if (!open_retry) {
>  			status =3D nfserr_jukebox;
> -			goto out;
> +			goto construction_err;
>  		}
>  		open_retry =3D false;
> -		if (refcount_dec_and_test(&nf->nf_ref))
> -			nfsd_file_free(nf);
>  		goto retry;
>  	}
> -
>  	this_cpu_inc(nfsd_file_cache_hits);
> =20
>  	status =3D nfserrno(nfsd_open_break_lease(file_inode(nf->nf_file), may_=
flags));
> +	if (status !=3D nfs_ok) {
> +		nfsd_file_put(nf);
> +		nf =3D NULL;
> +	}
> +
>  out:
>  	if (status =3D=3D nfs_ok) {
>  		this_cpu_inc(nfsd_file_acquisitions);
>  		*pnf =3D nf;
> -	} else {
> -		if (refcount_dec_and_test(&nf->nf_ref))
> -			nfsd_file_free(nf);
> -		nf =3D NULL;
>  	}
> -
> -out_status:
>  	put_cred(key.cred);
>  	trace_nfsd_file_acquire(rqstp, key.inode, may_flags, nf, status);
>  	return status;
> @@ -1189,6 +1183,13 @@ nfsd_file_do_acquire(struct svc_rqst *rqstp, struc=
t svc_fh *fhp,
>  	if (status !=3D nfs_ok)
>  		nfsd_file_unhash(nf);
>  	clear_and_wake_up_bit(NFSD_FILE_PENDING, &nf->nf_flags);
> +	if (status =3D=3D nfs_ok)
> +		goto out;
> +
> +construction_err:
> +	if (refcount_dec_and_test(&nf->nf_ref))
> +		nfsd_file_free(nf);
> +	nf =3D NULL;
>  	goto out;
>  }
> =20

Chuck, ping?

You never responded to this patch and I don't see it in your tree. Any
thoughts?
--=20
Jeff Layton <jlayton@kernel.org>