From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_PASS,USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 353D5C43387 for ; Wed, 19 Dec 2018 22:01:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F047B20869 for ; Wed, 19 Dec 2018 22:01:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728285AbeLSWBT (ORCPT ); Wed, 19 Dec 2018 17:01:19 -0500 Received: from mx1.redhat.com ([209.132.183.28]:51052 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728064AbeLSWBT (ORCPT ); Wed, 19 Dec 2018 17:01:19 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 08C56C0D2641; Wed, 19 Dec 2018 22:01:19 +0000 (UTC) Received: from coeurl.usersys.redhat.com (ovpn-125-147.rdu2.redhat.com [10.10.125.147]) by smtp.corp.redhat.com (Postfix) with ESMTP id D66835D756; Wed, 19 Dec 2018 22:01:18 +0000 (UTC) Received: by coeurl.usersys.redhat.com (Postfix, from userid 1000) id 79B042074C; Wed, 19 Dec 2018 17:01:18 -0500 (EST) Date: Wed, 19 Dec 2018 17:01:18 -0500 From: Scott Mayhew To: "J. Bruce Fields" Cc: jlayton@kernel.org, linux-nfs@vger.kernel.org Subject: Re: [PATCH v2 3/3] nfsd: keep a tally of RECLAIM_COMPLETE operations when using nfsdcld Message-ID: <20181219220118.GR27213@coeurl.usersys.redhat.com> References: <20181218142926.27933-1-smayhew@redhat.com> <20181218142926.27933-4-smayhew@redhat.com> <20181219182831.GB28626@fieldses.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20181219182831.GB28626@fieldses.org> User-Agent: Mutt/1.10.1 (2018-07-13) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Wed, 19 Dec 2018 22:01:19 +0000 (UTC) Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org On Wed, 19 Dec 2018, J. Bruce Fields wrote: > On Tue, Dec 18, 2018 at 09:29:26AM -0500, Scott Mayhew wrote: > > diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c > > index 89c2a27956d0..ae74814b2397 100644 > > --- a/fs/nfsd/nfs4recover.c > > +++ b/fs/nfsd/nfs4recover.c > > @@ -1251,6 +1251,7 @@ nfsd4_cld_grace_done(struct nfsd_net *nn) > > free_cld_upcall(cup); > > out_err: > > nfs4_release_reclaim(nn); > > + atomic_set(&nn->nr_reclaim_complete, 0); > > if (ret) > > printk(KERN_ERR "NFSD: Unable to end grace period: %d\n", ret); > > } > > @@ -1270,6 +1271,8 @@ nfs4_cld_state_init(struct net *net) > > for (i = 0; i < CLIENT_HASH_SIZE; i++) > > INIT_LIST_HEAD(&nn->reclaim_str_hashtbl[i]); > > nn->reclaim_str_hashtbl_size = 0; > > + nn->track_reclaim_completes = true; > > + atomic_set(&nn->nr_reclaim_complete, 0); > > > > return 0; > > } > ... > > @@ -1318,6 +1322,7 @@ nfsd4_cld_tracking_exit(struct net *net) > > struct nfsd_net *nn = net_generic(net, nfsd_net_id); > > > > nfs4_release_reclaim(nn); > > + atomic_set(&nn->nr_reclaim_complete, 0); > > nfsd4_remove_cld_pipe(net); > > nfs4_cld_state_shutdown(net); > > } > > We're initializing nr_reclaim_complete in 3 different places, probably > only one of those is really necessary? Yes, only the one in nfs4_cld_state_init() is really necessary. If the ability to put a running server into grace is ever added, then I think the counter would need to be reset there too. -Scott > > --b.