From patchwork Thu Jul 27 08:04:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zheng X-Patchwork-Id: 13329204 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 79F1AC001E0 for ; Thu, 27 Jul 2023 08:09:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1A2446B0083; Thu, 27 Jul 2023 04:09:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1538F8D0001; Thu, 27 Jul 2023 04:09:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F36476B0088; Thu, 27 Jul 2023 04:09:07 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id E5F936B0083 for ; Thu, 27 Jul 2023 04:09:07 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id BC38E160FDE for ; Thu, 27 Jul 2023 08:09:07 +0000 (UTC) X-FDA: 81056666334.01.DC96007 Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by imf06.hostedemail.com (Postfix) with ESMTP id E8233180009 for ; Thu, 27 Jul 2023 08:09:05 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=f78FOiI4; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf06.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.210.170 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1690445346; a=rsa-sha256; cv=none; b=K92MMo2v/SFt0TzEJ5T/+FZ+n2wm1leWN87rkNVWEl7ybmQyv1u+TFTjdcDptXiratJspM c3mWTIbP7qHt6M1E/w3PUAoL2gVAQKeNWV3noacz6LcdkAxqSLSW28ANXp18bi5SMrbFCS mRgQ6Wsso9136ZY4g6r0OYGnpPCeY+4= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=f78FOiI4; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf06.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.210.170 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1690445346; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=XxxR7cKF9GXj8MC2HKPXqv6o5/ypcgPst5/afOqmqdU=; b=QOORO1JrwZ6RyI11aWtA3vJVynOiqr+k1OB/QIXxhSeC/mAqCqfsUD7UxC6q6ubQDpo/9l 1Q+I8u/n7ovt79skVgtL4fJO8+scjkqhLLLS/5IjXD4gMnJs1l2ZXnNmtiArgxUEbW0En9 FP06ti7t2Vr/I0dKLjuhr8rCYj+j10E= Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-682ae5d4184so170863b3a.1 for ; Thu, 27 Jul 2023 01:09:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1690445345; x=1691050145; 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=XxxR7cKF9GXj8MC2HKPXqv6o5/ypcgPst5/afOqmqdU=; b=f78FOiI4CNId+Ml2PzU7mY1IxHereBLlHPf7s7X8Gy+u8ge3z2zcNtZJbXgkJ1G/QR Bypsj3Qfs4NqFk8L9OHPUra+lfok5RS+DDluwPHI9kxnAJLSgVKbtyU1LC00kLM6jzmr VkgjJJoznrUMJZqGeb8qVz0Juy94c4XL4Hr58JZjfVBDwwW2089Gloj9mnDr01+e3vie ATN8u6YkhMkKc+i92NbP56LSIJl/sZe4eRd/+9U9Zz62iXDekK8cKEfr5HTH0aUYxIkr BT13YNvigorKsMJZpm5Ugf1VrzOLWJZerOzcVEByhulhpkn1iKJBA5Dz0oLwz2cUXQdL iC6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690445345; x=1691050145; 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=XxxR7cKF9GXj8MC2HKPXqv6o5/ypcgPst5/afOqmqdU=; b=M0/n7tlDk5SJTRMxFoMAu0h5buI//hJwKgUMmrTfu+5LqnYQgH2VTEp5z5Gc5QHrc+ yXRLl/cJt2HOTtnUL8KFDYPfCpEw7hKldAXpxpTrmPtLFu0AZm4XyI5UhBcf0fCb6zeJ ikzaC5BZAUV0b1xDIeCnntd5sv1kSozeQ0XoEs8tzU3zFfAd5FhUEsYfPnLBjDeBn38x DfJ2hDkfNVsEuCkZ4VhqkVqKzcwuBfUdKlDXibyo6wkg0ww/f59IEcbTFU2A1hu6sapZ 8keHmD/QFXuW6CHz5Wb7juU7KJFR682AYXyKAysPhbVTwbPbn9EREBU8WKxnwhWKtZoA XGlA== X-Gm-Message-State: ABy/qLYxPtQ5X9/dDi3DvN+gTigku5ADGGsUz23vuQlBXymq72stvUZW 4o2A7rMUjTIjFNmoy9iHV2Bxbw== X-Google-Smtp-Source: APBJJlFoKDsbKkERIQGnm+LFaFeLpxhRzI1EaDrRxfTAKZLr632PKwn78Yey2tH1KRLEMSWua5HIxg== X-Received: by 2002:a05:6a00:4a10:b0:686:b990:560f with SMTP id do16-20020a056a004a1000b00686b990560fmr4379620pfb.2.1690445344746; Thu, 27 Jul 2023 01:09:04 -0700 (PDT) Received: from C02DW0BEMD6R.bytedance.net ([203.208.167.147]) by smtp.gmail.com with ESMTPSA id j8-20020aa78d08000000b006828e49c04csm885872pfe.75.2023.07.27.01.08.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jul 2023 01:09:04 -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 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 v3 16/49] nfsd: dynamically allocate the nfsd-filecache shrinker Date: Thu, 27 Jul 2023 16:04:29 +0800 Message-Id: <20230727080502.77895-17-zhengqi.arch@bytedance.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20230727080502.77895-1-zhengqi.arch@bytedance.com> References: <20230727080502.77895-1-zhengqi.arch@bytedance.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: E8233180009 X-Stat-Signature: dk3s96ckxhjpijduqh69a8euryu4o34s X-HE-Tag: 1690445345-12922 X-HE-Meta: U2FsdGVkX191jVr8UhUDEAqMRqD4gGtd+JLJVFf8zLHLA7kLLSMKo3dDTeXop4/5lPnr5ztq+xneDGMNOcKivJvSU8rKGmhMiOSXNLo/KUt3aXL5X57iGzOztI8TuCoQS/T+PGzdIbOeL6myiBasdCNanTpOxQEKIiwym5v0GIa+o6qO8jpKZl0YmhsLlFpSb2xMiMezx7pfa7lPiBMwvoC73MWNwO1vLyguIDViP0sXTmVNHDZ3vYb5ghCvmFLomkYX/I80PIaPkpNE0GzkHd3B5BqfWW9t3uFEz3Yz9qp/umtJ63c9Hl6aebjcFN73zs1K6e7XFpb6OEJKOkWIdFAphOUHy6XBUi/k7vY9cVhu9o1awiVm5N76o7iGqw99dx0sJ7wLY2PNlLuXaJ2J9k9POhxXk27OqOh2BH7oeAL+KvLM/gKMV8ewap183ITtTDvYLBM3a9PxWUzEbsI3JNnbUKsdOY8HubIJzDPA1ueVro2YOnN5NNf2C+D50ccZ+kisOMtTCwApBqvxBsRqapLGfJZe4YSXVGuD9llzpANbDKBRzzrGTtOAXvlbklvVk48YD1lxn7ox63pqyPYSiKL7z0+2asblAsgniNlRI+CEYmwfZyRFoJ96qBK1HcUpS6TIlAGnr4nUpgZ080f4GfNN+QNMQ+54SgEdUMDCMTjwMkVYxVe3lPig35GeKdJp//1094uO3Z5L6mgv4sad+AENgHaLZ0GVIi1xKU/QQ9oFltV/dp0eFB0rPk9UMw8MH0RvxFM/7UOp7jErlGqsRf+8Ph7/+KjzLnFCrLq/j4s10qZJ8jvcbfk6mLqldliGfqbhOHXKoRNq8bhTgWNmmJ97nCc8UPD5hR3vAQQEVJYE1JJvcHMJaZfL9ktQGqAOW3jL5Jxd0tcOM8gh06rKWa+Fh+ucZiAGrz4UQfSA+bOCdnfPLVyAY2L9uBVlQZms7uJWlptDvcP6SuSrRS6 JM0pxdF/ lu0a+9vArWaGHZyQw0kwlr1/Qw28srzGFL6y6Tv1+NasUf5SFw/C0oowkcqyAsDQSFUlSg6X3l/EqmZBQ8Qqeke0fOUurCAZIBlNq56zRBhJpsVYuZ5jI6IwdEWoZCAoFJG/OSOmSfLWfVwda0uoBTmZXGFEBrskBYNgK6z19kL9qM8Xr6YKBV5SX6kg2pzHQHPB8A5Yu3fN9r6yDMhp2NKImZ/sdI8HooX5KHfPIXbs4CxpfA6dUDWiXO3yZgQe/hXfNPwvCuKqJUvyVmP72Po/PBlgHiBLKK6EikGVo0zc3jvEzGG85iUagJiGMZgtBjcVgYDzl3ZO8N3lNRrnmex26lLFIOmNeiXr4/WvEjTBkVVv1ca6MsFgXfSKeMQWb6Zbv3ZyUT+N7Q0fCilnJvj6Ln+Z3HCLWXOAR X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Use new APIs to dynamically allocate the nfsd-filecache shrinker. Signed-off-by: Qi Zheng Reviewed-by: Muchun Song --- fs/nfsd/filecache.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/fs/nfsd/filecache.c b/fs/nfsd/filecache.c index ee9c923192e0..872eb9501965 100644 --- a/fs/nfsd/filecache.c +++ b/fs/nfsd/filecache.c @@ -521,11 +521,7 @@ nfsd_file_lru_scan(struct shrinker *s, struct shrink_control *sc) return ret; } -static struct shrinker nfsd_file_shrinker = { - .scan_objects = nfsd_file_lru_scan, - .count_objects = nfsd_file_lru_count, - .seeks = 1, -}; +static struct shrinker *nfsd_file_shrinker; /** * nfsd_file_cond_queue - conditionally unhash and queue a nfsd_file @@ -746,12 +742,18 @@ nfsd_file_cache_init(void) goto out_err; } - ret = register_shrinker(&nfsd_file_shrinker, "nfsd-filecache"); - if (ret) { - pr_err("nfsd: failed to register nfsd_file_shrinker: %d\n", ret); + nfsd_file_shrinker = shrinker_alloc(0, "nfsd-filecache"); + if (!nfsd_file_shrinker) { + pr_err("nfsd: failed to allocate nfsd_file_shrinker\n"); goto out_lru; } + nfsd_file_shrinker->count_objects = nfsd_file_lru_count; + nfsd_file_shrinker->scan_objects = nfsd_file_lru_scan; + nfsd_file_shrinker->seeks = 1; + + shrinker_register(nfsd_file_shrinker); + ret = lease_register_notifier(&nfsd_file_lease_notifier); if (ret) { pr_err("nfsd: unable to register lease notifier: %d\n", ret); @@ -774,7 +776,7 @@ nfsd_file_cache_init(void) out_notifier: lease_unregister_notifier(&nfsd_file_lease_notifier); out_shrinker: - unregister_shrinker(&nfsd_file_shrinker); + shrinker_free(nfsd_file_shrinker); out_lru: list_lru_destroy(&nfsd_file_lru); out_err: @@ -891,7 +893,7 @@ nfsd_file_cache_shutdown(void) return; lease_unregister_notifier(&nfsd_file_lease_notifier); - unregister_shrinker(&nfsd_file_shrinker); + shrinker_free(nfsd_file_shrinker); /* * make sure all callers of nfsd_file_lru_cb are done before * calling nfsd_file_cache_purge