Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35;
Message-ID: <07df60cee15b8c206365613364d4979330c31407.camel@kernel.org>
Subject: Re: [PATCH 3/5] nfsd: hold nfsd_mutex across entire netlink
 operation
From:   Jeff Layton <jlayton@kernel.org>
To:     NeilBrown <neilb@suse.de>, Chuck Lever <chuck.lever@oracle.com>
Cc:     linux-nfs@vger.kernel.org, Olga Kornievskaia <kolga@netapp.com>,
        Dai Ngo <Dai.Ngo@oracle.com>, Tom Talpey <tom@talpey.com>,
        Lorenzo Bianconi <lorenzo@kernel.org>
Date:   Mon, 30 Oct 2023 09:03:12 -0400
In-Reply-To: <20231030011247.9794-4-neilb@suse.de>
References: <20231030011247.9794-1-neilb@suse.de>
         <20231030011247.9794-4-neilb@suse.de>
Content-Type: text/plain; charset="ISO-8859-15"
Content-Transfer-Encoding: quoted-printable
User-Agent: Evolution 3.48.4 (3.48.4-1.fc38) 
MIME-Version: 1.0
Precedence: bulk

On Mon, 2023-10-30 at 12:08 +1100, NeilBrown wrote:
> Rather than using svc_get() and svc_put() to hold a stable reference to
> the nfsd_svc for netlink lookups, simply hold the mutex for the entire
> time.
>=20
> The "entire" time isn't very long, and the mutex is not often contented.
>=20
> This makes way for use to remove the refcounts of svc, which is more
> confusing than useful.
>=20
> Signed-off-by: NeilBrown <neilb@suse.de>
> ---
>  fs/nfsd/nfsctl.c | 9 +++------
>  1 file changed, 3 insertions(+), 6 deletions(-)
>=20
> diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
> index d78ae4452946..8f644f1d157c 100644
> --- a/fs/nfsd/nfsctl.c
> +++ b/fs/nfsd/nfsctl.c
> @@ -1515,11 +1515,10 @@ int nfsd_nl_rpc_status_get_start(struct netlink_c=
allback *cb)
>  	int ret =3D -ENODEV;
> =20
>  	mutex_lock(&nfsd_mutex);
> -	if (nn->nfsd_serv) {
> -		svc_get(nn->nfsd_serv);
> +	if (nn->nfsd_serv)
>  		ret =3D 0;
> -	}
> -	mutex_unlock(&nfsd_mutex);
> +	else
> +		mutex_unlock(&nfsd_mutex);
> =20
>  	return ret;
>  }
> @@ -1691,8 +1690,6 @@ int nfsd_nl_rpc_status_get_dumpit(struct sk_buff *s=
kb,
>   */
>  int nfsd_nl_rpc_status_get_done(struct netlink_callback *cb)
>  {
> -	mutex_lock(&nfsd_mutex);
> -	nfsd_put(sock_net(cb->skb->sk));
>  	mutex_unlock(&nfsd_mutex);
> =20
>  	return 0;

(cc'ing Lorenzo since he wrote this)

I think Lorenzo did it this way originally, and I convinced him to take
a reference instead. This should be fine though.

Reviewed-by: Jeff Layton <jlayton@kernel.org>