From patchwork Mon Aug 7 11:09:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zheng X-Patchwork-Id: 131951 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp1437301vqr; Mon, 7 Aug 2023 06:11:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEX+JNHrsnw+CQfQ4SbTjY4cRc7MoLpg5iX+nZlk0S2046GRJVnMB6X8DjMRWQASokZaUHh X-Received: by 2002:a17:902:c14a:b0:1bc:48dc:d880 with SMTP id 10-20020a170902c14a00b001bc48dcd880mr6368039plj.13.1691413897639; Mon, 07 Aug 2023 06:11:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691413897; cv=none; d=google.com; s=arc-20160816; b=AyyptYTnQhi0x1uwFCa4yDPMcfm1CHKr02gBISQ/dQv/r3deBtiUOZW1WNRxWauW58 Psbhj3Mye3p6eUVXhvEOD2ZNGHOa6NLE0pFoDzlj3F71t7Ks8IXzu9fn2bYRURUImGcI 48oyFPc0iBjtjzOn4lTT79pjzixNRKU4jsNmsl/ZR66y8afMywQbgD46+bYbvCnR1c82 eg48zOGeLu8YLLxIL99vFLLVm6scHivuxuY9w0/IwNnmQkK7qWs7epsoeepgue7DArtk +vI/0zrdBFCdqNMgQnbcD0gLBoXVfgtCflNjak8edpZcxt3oDOqZvcQjeg8HmG+6GRQV FqAw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=iXZOOFmuwv6/pQ9jzhgVENlSQpZ5agnqrhquB4Bsoao=; fh=JwrRg0ndXrpURY0vwDVMB2JxbP/kKK+/sa4yghEeBpo=; b=tBstMMM4QdEtaV0gRWJG55+VM+rOa297ggT17cfaofoykJiygqlLuG1yHhHdm5pwUe I4RN6z5mFDycRk7qP26ywvkitH6zaVy9bvejz054AlyF/YEspkIN6VI5BNWSQrzTVNRT uy58IArc+ivA4ijXGIVKRIT1ql7czFEG60rLVMMW79w4c2sOSgPXYTwh4jwu5U0Xla86 5z+VEu8Hn2eXiIE+TM8F4ac+TNFbR9S5AS8I/Q5C5fy+JgI7M67qakClLQtF6RwVI04R FU1T6zCZGI2VYZ8eOfkdXNE8xqLY/W7InIl5CTEK8eyEaptRAy88+kqnNpi9whEk5RMo q3nQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bytedance.com header.s=google header.b=X1A5Je21; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=bytedance.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n3-20020a170903404300b001b8a998c2ebsi5400583pla.363.2023.08.07.06.11.24; Mon, 07 Aug 2023 06:11:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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; dkim=pass header.i=@bytedance.com header.s=google header.b=X1A5Je21; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=bytedance.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232296AbjHGLZR (ORCPT + 99 others); Mon, 7 Aug 2023 07:25:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60610 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232438AbjHGLYV (ORCPT ); Mon, 7 Aug 2023 07:24:21 -0400 Received: from mail-io1-xd29.google.com (mail-io1-xd29.google.com [IPv6:2607:f8b0:4864:20::d29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 74155211F for ; Mon, 7 Aug 2023 04:21:53 -0700 (PDT) Received: by mail-io1-xd29.google.com with SMTP id ca18e2360f4ac-7748ca56133so28539439f.0 for ; Mon, 07 Aug 2023 04:21:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1691407261; x=1692012061; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=iXZOOFmuwv6/pQ9jzhgVENlSQpZ5agnqrhquB4Bsoao=; b=X1A5Je21Bgm8MxSmGNmoSpt+cAG8TrvOcyAe99IBNPsVsaAfPzpUFmHcgnUm1XBzY9 JRnK5blZM10iA3LY/sHyJmBSeHXhvXIB8l1TI7D1Lr42y4HotdCfelkpSL3dxrY2KXAn scMjlcjDUYsfPYKpUKuBtG/5NIbmQQVkj4S2E50bGqfznwIi+lsL9BImuz3IUIJbpP8m /1XCfWPjtkTdktQrofUk5KJ6DhFcXgsJxWzRr6RxMlg4gGLjp3JieoQkMwBPRtuRobD5 8Y4nB1l8z4VpBVpgRmGce3vitZITzFmTNd+nGlSKqJ10j5p80Xm6LD/xQTkaUktaPYgm WW+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691407261; x=1692012061; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=iXZOOFmuwv6/pQ9jzhgVENlSQpZ5agnqrhquB4Bsoao=; b=Pyx5Pa8E7tZx6scsHbDpYXeUgVSusUex93cUMrNXwfzz+TJmg734jFQ9LPRg30tKt/ hLun1yt1GMd3KYXl40fIuPCUHV2fGNzNWKy+bdjHqv1BhltX2CaRBZ15vnmYzo5ZIzUN lPRYRzFWLtwcaO8+wvFMvn1ALf5irQbcTtyGxGxHlY3jMHml1wy8UVjOGyJwm/XmWQZS sTOY7sblF+QhvY/6tnBL3eq8Ha0YObvH/0Ec5i7akQqWwfhbJj8kM9NWt41m0z7LlNNv NQEzW/719c0Kjaj/7Ym2RhcX/W/SDBBHj6tXDiiM08EJHEUqQ6DeDFg3sUM1XUIN4qkh s2Hg== X-Gm-Message-State: AOJu0YxG7KV327HQL3aO4ufnJb+Jnd4NetVtnY+qNTFju8R7Ft/j3BZK RX7/1Idv/+zpE+2SOv/WxSElA0wPWKaVHixHtNc= X-Received: by 2002:a17:902:f688:b0:1bb:d7d4:e2b with SMTP id l8-20020a170902f68800b001bbd7d40e2bmr33138766plg.0.1691406778592; Mon, 07 Aug 2023 04:12:58 -0700 (PDT) Received: from C02DW0BEMD6R.bytedance.net ([203.208.167.146]) by smtp.gmail.com with ESMTPSA id y13-20020a17090aca8d00b0025be7b69d73sm5861191pjt.12.2023.08.07.04.12.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Aug 2023 04:12:58 -0700 (PDT) From: Qi Zheng To: akpm@linux-foundation.org, david@fromorbit.com, tkhai@ya.ru, vbabka@suse.cz, roman.gushchin@linux.dev, djwong@kernel.org, brauner@kernel.org, paulmck@kernel.org, tytso@mit.edu, steven.price@arm.com, cel@kernel.org, senozhatsky@chromium.org, yujie.liu@intel.com, gregkh@linuxfoundation.org, muchun.song@linux.dev, simon.horman@corigine.com, dlemoal@kernel.org Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, x86@kernel.org, kvm@vger.kernel.org, xen-devel@lists.xenproject.org, linux-erofs@lists.ozlabs.org, linux-f2fs-devel@lists.sourceforge.net, cluster-devel@redhat.com, linux-nfs@vger.kernel.org, linux-mtd@lists.infradead.org, rcu@vger.kernel.org, netdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, dm-devel@redhat.com, linux-raid@vger.kernel.org, linux-bcache@vger.kernel.org, virtualization@lists.linux-foundation.org, linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, linux-xfs@vger.kernel.org, linux-btrfs@vger.kernel.org, Qi Zheng , Muchun Song Subject: [PATCH v4 14/48] nfs: dynamically allocate the nfs-acl shrinker Date: Mon, 7 Aug 2023 19:09:02 +0800 Message-Id: <20230807110936.21819-15-zhengqi.arch@bytedance.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20230807110936.21819-1-zhengqi.arch@bytedance.com> References: <20230807110936.21819-1-zhengqi.arch@bytedance.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS 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-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773576018713867092 X-GMAIL-MSGID: 1773576018713867092 Use new APIs to dynamically allocate the nfs-acl shrinker. Signed-off-by: Qi Zheng Reviewed-by: Muchun Song --- fs/nfs/super.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/fs/nfs/super.c b/fs/nfs/super.c index 2284f749d892..1b5cd0444dda 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c @@ -129,11 +129,7 @@ static void nfs_ssc_unregister_ops(void) } #endif /* CONFIG_NFS_V4_2 */ -static struct shrinker acl_shrinker = { - .count_objects = nfs_access_cache_count, - .scan_objects = nfs_access_cache_scan, - .seeks = DEFAULT_SEEKS, -}; +static struct shrinker *acl_shrinker; /* * Register the NFS filesystems @@ -153,9 +149,19 @@ int __init register_nfs_fs(void) ret = nfs_register_sysctl(); if (ret < 0) goto error_2; - ret = register_shrinker(&acl_shrinker, "nfs-acl"); - if (ret < 0) + + acl_shrinker = shrinker_alloc(0, "nfs-acl"); + if (!acl_shrinker) { + ret = -ENOMEM; goto error_3; + } + + acl_shrinker->count_objects = nfs_access_cache_count; + acl_shrinker->scan_objects = nfs_access_cache_scan; + acl_shrinker->seeks = DEFAULT_SEEKS; + + shrinker_register(acl_shrinker); + #ifdef CONFIG_NFS_V4_2 nfs_ssc_register_ops(); #endif @@ -175,7 +181,7 @@ int __init register_nfs_fs(void) */ void __exit unregister_nfs_fs(void) { - unregister_shrinker(&acl_shrinker); + shrinker_free(acl_shrinker); nfs_unregister_sysctl(); unregister_nfs4_fs(); #ifdef CONFIG_NFS_V4_2