Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Message-ID: <1526409864.9159.32.camel@codethink.co.uk>
Subject: Re: [PATCH 4.4 014/190] lockd: fix lockd shutdown race
From:   Ben Hutchings <ben.hutchings@codethink.co.uk>
To:     "J. Bruce Fields" <bfields@redhat.com>
Cc:     stable@vger.kernel.org, David Jeffery <djeffery@redhat.com>,
        Sasha Levin <alexander.levin@microsoft.com>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        LKML <linux-kernel@vger.kernel.org>
Date:   Tue, 15 May 2018 19:44:24 +0100
In-Reply-To: <20180411183550.916927223@linuxfoundation.org>
References: <20180411183550.114495991@linuxfoundation.org>
         <20180411183550.916927223@linuxfoundation.org>
Organization: Codethink Ltd.
Content-Type: text/plain; charset="UTF-8"
Mime-Version: 1.0
Content-Transfer-Encoding: 8bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Wed, 2018-04-11 at 20:34 +0200, Greg Kroah-Hartman wrote:
> 4.4-stable review patch.  If anyone has any objections, please let me know.
> 
> ------------------
> 
> From: "J. Bruce Fields" <bfields@redhat.com>
> 
> 
> [ Upstream commit efda760fe95ea15291853c8fa9235c32d319cd98 ]
[...]
> --- a/fs/lockd/svc.c
> +++ b/fs/lockd/svc.c
> @@ -129,6 +129,8 @@ lockd(void *vrqstp)
>  {
>  	int		err = 0;
>  	struct svc_rqst *rqstp = vrqstp;
> +	struct net *net = &init_net;
> +	struct lockd_net *ln = net_generic(net, lockd_net_id);
>  
>  	/* try_to_freeze() is called from svc_recv() */
>  	set_freezable();
> @@ -173,6 +175,8 @@ lockd(void *vrqstp)
>  	if (nlmsvc_ops)
>  		nlmsvc_invalidate_all();
> 	nlm_shutdown_hosts();
> +	cancel_delayed_work_sync(&ln->grace_period_end);
> +	locks_end_grace(&ln->lockd_manager);
>  	return 0;
>  }
>  
> @@ -267,8 +271,6 @@ static void lockd_down_net(struct svc_se
>  	if (ln->nlmsvc_users) {
>  		if (--ln->nlmsvc_users == 0) {
>  			nlm_shutdown_hosts_net(net);
> -			cancel_delayed_work_sync(&ln->grace_period_end);
> -			locks_end_grace(&ln->lockd_manager);

Aren't these statements still needed for non-initial namespaces?

Ben.

>  			svc_shutdown_net(serv, net);
>  			dprintk("lockd_down_net: per-net data destroyed; net=%p\n", net);
>  		}
> 
> 
> 
-- 
Ben Hutchings
Software Developer, Codethink Ltd.