Received: by 2002:ad5:4acb:0:0:0:0:0 with SMTP id n11csp773509imw; Fri, 8 Jul 2022 11:25:22 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tr4AQpPFPl6BzXSrUJ6UMZNbMqD98jpaIRAhJVEgg0BptgOeBmEsId6vb3/6mE8a0N3elu X-Received: by 2002:a63:4c07:0:b0:40d:8b81:5638 with SMTP id z7-20020a634c07000000b0040d8b815638mr4248679pga.449.1657304722089; Fri, 08 Jul 2022 11:25:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657304722; cv=none; d=google.com; s=arc-20160816; b=05mI34eF0Teboj2Ca4QSSrDguxwwwigX5SgUwxyuG9oCoacC8z+gj88iTiuVb7Z8NE 3fv/Q1Ea7XriFI2oHZm1HpZgHqSffRM/5X9DeC0vzwPMnN34BscbEWFwMDJqI50jUlKN eZlyvrIPm7qlmTE8pvNup8JC9T/9hVl5fK78bMdWtKiWwWjGF4+frJ2ZqfQkWSGQe4uN U2WXvmIjqpOKKWYfpu+gI86+fLCAWdYZ7V2sDk+RpLVptw4k282AxCl2XEIUfXi7R/G4 FvzTg5GcfTcxvQIoD6V2wbf8qsRpFU/4nFmuT/6rNTTiuQgDmK/yAIfNQDLgEZkVhaSJ j6Zw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:cc:to:from :subject; bh=GIhHdJxNTWB7KzExHSYn+Sl/50pzAbpiuw6YQZB+r20=; b=NIjDPVNIAV0oEmP2nNwj8ToRftVRIxEy+OYC4qV4gWWWq2xk54kEko2tNhD/RHT08d In9ibgtaQ5/BCKuxX+wNNOZukyqiS4M4Z2aNNGZ2kVwiHnqqWxdCLIqLCLD7k91N7QoB psm6hj4uyA9LGPPtd5CuQZ5kBHXqWe44mhaCLwqPUy1o4dBAHuJGCI3EMZh3WsPlOqVO ac+j6oEH2K6JtR49GXT5EcvhgSpP7gth5tVCRnPhqm1DGTUuuskUCbsV2A6zMz0ylUh7 k7yc1wYHx4VUqQVXtbQybdECCryt6EdGOPHz0iBEI8wiOmiZaI1hNZFsJv7ZIUF3169p /KFw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=oracle.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f14-20020a056a001ace00b0051c306c363csi61411683pfv.143.2022.07.08.11.25.09; Fri, 08 Jul 2022 11:25:22 -0700 (PDT) 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; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239427AbiGHSYz (ORCPT + 99 others); Fri, 8 Jul 2022 14:24:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45590 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239432AbiGHSYy (ORCPT ); Fri, 8 Jul 2022 14:24:54 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0059282387; Fri, 8 Jul 2022 11:24:53 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 8F4A66259E; Fri, 8 Jul 2022 18:24:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9346BC341C0; Fri, 8 Jul 2022 18:24:52 +0000 (UTC) Subject: [PATCH v3 11/32] NFSD: Zero counters when the filecache is re-initialized From: Chuck Lever To: linux-nfs@vger.kernel.org, netdev@vger.kernel.org Cc: david@fromorbit.com, jlayton@redhat.com, tgraf@suug.ch Date: Fri, 08 Jul 2022 14:24:51 -0400 Message-ID: <165730469147.28142.10705393492354984904.stgit@klimt.1015granger.net> In-Reply-To: <165730437087.28142.6731645688073512500.stgit@klimt.1015granger.net> References: <165730437087.28142.6731645688073512500.stgit@klimt.1015granger.net> User-Agent: StGit/1.5.dev3+g9561319 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-6.7 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org If nfsd_file_cache_init() is called after a shutdown, be sure the stat counters are reset. Signed-off-by: Chuck Lever --- fs/nfsd/filecache.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/fs/nfsd/filecache.c b/fs/nfsd/filecache.c index 7b532449b93f..3055a04eeabe 100644 --- a/fs/nfsd/filecache.c +++ b/fs/nfsd/filecache.c @@ -830,6 +830,8 @@ nfsd_file_cache_shutdown_net(struct net *net) void nfsd_file_cache_shutdown(void) { + int i; + set_bit(NFSD_FILE_SHUTDOWN, &nfsd_file_lru_flags); lease_unregister_notifier(&nfsd_file_lease_notifier); @@ -853,6 +855,15 @@ nfsd_file_cache_shutdown(void) nfsd_file_hashtbl = NULL; destroy_workqueue(nfsd_filecache_wq); nfsd_filecache_wq = NULL; + + for_each_possible_cpu(i) { + per_cpu(nfsd_file_cache_hits, i) = 0; + per_cpu(nfsd_file_acquisitions, i) = 0; + per_cpu(nfsd_file_releases, i) = 0; + per_cpu(nfsd_file_total_age, i) = 0; + per_cpu(nfsd_file_pages_flushed, i) = 0; + per_cpu(nfsd_file_evictions, i) = 0; + } } static bool