From patchwork Thu Aug 24 03:42:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zheng X-Patchwork-Id: 13363444 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 74406C88CB2 for ; Thu, 24 Aug 2023 03:45:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 054C6280083; Wed, 23 Aug 2023 23:45:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 004FB8E0011; Wed, 23 Aug 2023 23:45:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E3689280083; Wed, 23 Aug 2023 23:45:27 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id D7E428E0011 for ; Wed, 23 Aug 2023 23:45:27 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id B8D2BB1918 for ; Thu, 24 Aug 2023 03:45:27 +0000 (UTC) X-FDA: 81157608294.10.76A2B49 Received: from mail-oo1-f46.google.com (mail-oo1-f46.google.com [209.85.161.46]) by imf08.hostedemail.com (Postfix) with ESMTP id 08BF7160019 for ; Thu, 24 Aug 2023 03:45:25 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=jj5EOkZd; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf08.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.161.46 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=1692848726; 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=zhxSeDRYp3v7ieIpIfFPT9sZqK0EZ/0i4DDRxkd6a3g=; b=pZibhoq/jwLzY/eoLYpok00FThqcgl/CI0l2IDNZTZzc7UiGhQcxlwamNVzEST0smXlAhC tHuSJ1wuwNX38op/LPfnJv+3gvGaKcr277fQShHnFQrSBaUJZXoKINqhd7XiYN1ifS62oD 7umFu5IYOKCmzeiHFODj3gtyMMi9Jl8= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=jj5EOkZd; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf08.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.161.46 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1692848726; a=rsa-sha256; cv=none; b=wZIhp1wBv1x1U4Ie5CdReW3vaq3q8KjNYxde/yEZ/vvspx2hHvVV5z8gieic1Ep9eCp6S1 9qxVHisPqP1I4njF9Uj382OnXxh+PQx9iLRW5QdZ5hmMB8pjPaNOE6yCGj+i8dPr4plGcR pjGyYUkQ3hfo/Rxo4UAWxepm6nkNARY= Received: by mail-oo1-f46.google.com with SMTP id 006d021491bc7-5711d5dac14so204414eaf.0 for ; Wed, 23 Aug 2023 20:45:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1692848725; x=1693453525; 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=zhxSeDRYp3v7ieIpIfFPT9sZqK0EZ/0i4DDRxkd6a3g=; b=jj5EOkZd/1Viu3LIpqnqm+9TO83RfQntyjhfpth1xwPMMqC6IeHfbX02lMDFBj9m4i HwTZWXHIfgHNzPBXU+/GXlcEpfMhfZy5bJLefmYCesJViC/+68iG6xd5KwRidLyWJo2c eEBhhIGT0YiGdHQSzZe+BuRB0tQmPb1ArPNTjRXRpv6rdjsXFFFVPCyMT9LQb0O6vhjO X14FAywAN7vHefaxoyfwydq29V8F/tb3M5k7yl3IMC1b/p7T/xlSVAzbSclwGGOZcBEi 2UDep6iaZVsbDk0TcVqBKtj26LS1xCeJgHZxHJ9kz4PrRpNyq14TADCeaJlpJuB1QGAS NXUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692848725; x=1693453525; 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=zhxSeDRYp3v7ieIpIfFPT9sZqK0EZ/0i4DDRxkd6a3g=; b=ZPFMAs5a+uqxzAFs9b7RTOgy2SR0J8U2n+2hLMOxOT8DWzOnm3ugcWi6hZG3nIjEG4 l+u8jv8CFvqbdbjHpgocJPvCiAqCkNY+/CiIsghu/qbylZruEl9oud5vGq1yj9XswQf4 vovTKl+7UiEt4iBWiO2Bvy5t8IwAm3SNHkCoYch1TShyeAR9gKm949zBE6HH27bzoBYX B5cUSNcqiVrn754cuft35fPIT3xlhsujQf5fOVLaPk7/HfTr9pfOzyKnrLQOQIxISuKn gPV7b5nIS69Fyl2NX1iI9hTa1oHczpj7+9AifSyFhKtPFBXX7a3hGkx4zX43BrlYCIVf WR5A== X-Gm-Message-State: AOJu0Yxeaqy10jJU1kxbD1Xn6k1liUgnuUpFRquUrspwROInFHUPZOrb ZhsKnC0uBKjhwqU834DQqnLQAA== X-Google-Smtp-Source: AGHT+IFTBK/u0iko9Ps2VqzIjicgN2FMlf6qk5M/LKmT2/X3Ry0MSCtC++/3ldoynFepLPPQv6yobQ== X-Received: by 2002:a05:6808:152a:b0:3a7:72e2:3262 with SMTP id u42-20020a056808152a00b003a772e23262mr17146531oiw.5.1692848725311; Wed, 23 Aug 2023 20:45:25 -0700 (PDT) Received: from C02DW0BEMD6R.bytedance.net ([203.208.167.146]) by smtp.gmail.com with ESMTPSA id t6-20020a63b246000000b005579f12a238sm10533157pgo.86.2023.08.23.20.45.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Aug 2023 20:45:24 -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, linux-fsdevel@vger.kernel.org, Qi Zheng , Muchun Song , Trond Myklebust , Anna Schumaker , linux-nfs@vger.kernel.org Subject: [PATCH v5 11/45] nfs: dynamically allocate the nfs-acl shrinker Date: Thu, 24 Aug 2023 11:42:30 +0800 Message-Id: <20230824034304.37411-12-zhengqi.arch@bytedance.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20230824034304.37411-1-zhengqi.arch@bytedance.com> References: <20230824034304.37411-1-zhengqi.arch@bytedance.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 08BF7160019 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: jhn7c59jqrchnzz8xohcc4oors9mihs8 X-HE-Tag: 1692848725-649449 X-HE-Meta: U2FsdGVkX19g1QV/NmfihPYlQBFrVcGCIFrCj4ZKxZrVj7ap7fB6vKxveoExCFIyZJWvwWUQze+XrAGSAVIIG5wucgYK7YzquHzkdeCS8Sz7T/T4XDv340IzUhngvzaVa6JdM2I09p/cD6C2dyNgubgpLFp5GbF50pFiQ7xeDCIizx7Ao2G15md4ng5LFwnUzWskc9OkzHs+SRN7uS/n/MOI3POqPYdJnjmRsl3Osmuq4AHmPBtWtu2vy4g+a0vjR1iUAZRrmbtUVSzGKK0YTt6IxkibZCPoN7PHg+Ob/dvm6Hj3ie6/4Rj+ue6OLJTE4/QiCgb9FxQ7lZ0KDRHQS5XtN8Y3DhtmSxjjI1+/I4pX8vwjn9aq/V8SNZ3aSCWSlHz/qkxYGc7ecGNhhieaN2P2YihMMCsllJ9OuIv1NEnkiNJmET4T2DdwHCcaFkeUva2FgpEcZbNIlNBsVuylx/6HH0N0queVvW/QZsL2D9FNvafwjZ7uJFRL8XZxG+Z0v3yaLKrCtCGPasdQ9BB9XHqTOIVHrpyujl1EZEP2+Kqw8XklixUerqBnMh08Vok7KVs4ltizjbfDp5CZy4UhqDaxXyrs3yYI2wSdXSYT46Djh9EuQHfMq3SiVyz/zl+aE4Me97LgvTDcc5GRGwD7aMGDA5grpc6K/0Q7/Mr0QF4Lqy84Gv6KINYWIOZNsjYTnh5dgFqjnAJ8BTXugH0mmeltpwEIr0tR/N8VuFRmbMk5awDK7Dt42CJEYM8onsM52a+rcpc7KjkSPhy5xBlZlA+Yxe5nbC0wzq3ktq8vcvghj+5NrFJF8kYjLFtvRehq9x6HWJcCqZvj9DHSRhqCZKV9ESPFQgc0Jzd5YmBYG6qNlDoJc66we6f2Y/pqXm5D4OmvqsN3K8I17qLrDQIxdXkUCM3AWdZSRZX4DPctRzac2tuEQ0CfmQcCw8sqUd2EI4Oj9+hL9FINXuOzUuS hU6Z79lP 7kcxyN0TOIjz1si4TUkcHB6Asfd3aEsYuauW9J5CtpiHrUJJ714RtAed7TzV/Hwe9tFEet6HkrjINcLDydy00tqs4qR7R5S569pRqkmhsNn3GsQuiLH8/5AYHAKs8amc/FDS0q967IBPO+8xPzKV4inbuDVc00QwntLOj4KSmIMQXT0ujo2TgkLuPsvu37Ms640VrEqbflBH9wY0C8shji5cqwgK5DrGbmMd3JF3zGdPEtP8bVJzBjtutWb45Jre/rDoVoY4Gtv5zB7/qBGc2Tu0dQ/CSXfaoCBgD/FEdTN+kEQ9FO1n17Hb/zlYx2JOEFwuXnQFUkgZO01OdqcF1kJ5ZiSUbZYj1hBKt9ThJ6hDMscmcvUc4t58gkUnINKx9RhZhHI4iWA47LgvM6MqovQZ5RjRD7kHH7jywuSU8iLFWrGqmMM3jBXcyfinxYWTB0UmZNZMxXs9WpdTIP1h5lToIIUPso3AtjbCk094SN6gnGDnoAyQ+7ylqNLgxDyjQkTxilT8oGlDmKVRNhKOTCFsjEw== 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 nfs-acl shrinker. Signed-off-by: Qi Zheng Reviewed-by: Muchun Song CC: Trond Myklebust CC: Anna Schumaker CC: linux-nfs@vger.kernel.org --- 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