From patchwork Thu Aug 24 03:42: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: 13363443 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 23E0CC71145 for ; Thu, 24 Aug 2023 03:45:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BED60280080; Wed, 23 Aug 2023 23:45:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B9E1D8E0011; Wed, 23 Aug 2023 23:45:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A3EA6280080; Wed, 23 Aug 2023 23:45:19 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 9658B8E0011 for ; Wed, 23 Aug 2023 23:45:19 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 6B2A68018D for ; Thu, 24 Aug 2023 03:45:19 +0000 (UTC) X-FDA: 81157607958.12.B236048 Received: from mail-oi1-f178.google.com (mail-oi1-f178.google.com [209.85.167.178]) by imf11.hostedemail.com (Postfix) with ESMTP id AA0AC4000E for ; Thu, 24 Aug 2023 03:45:17 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b="O1jFqs/8"; spf=pass (imf11.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.167.178 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1692848717; 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=pHpuYVUzN3jckjN0g3IoL6/kLBn9YHZf3O2ocrsGP0s=; b=tlOt64o1Hg+FvIWEhYsu87y3uoyIDwq8jmzb9+sNzkiQvSHmHsQWJOweWsVJk8hVKH0j4T 4ZZYzDV2YxyitCxm5AxVykOtxFIK40cj1W2Xscd7cFMba64jh8gzalv98tz5sXDIJX/QCq NEIzHiGwk3oMjYLA5E5epSGD1NVAmbI= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1692848717; a=rsa-sha256; cv=none; b=niFMM8ZSDvsM2gOyLcqC96V0wm4RPIySiWza1QFzVNSHq/pCB3q7IJlreOjNAFEDZGRTFR HKW8NhXPwg5ovz7sLkJrghJ/P8nOPtBbe6qoik4MKEQdDEFA+zZztp/LBHmcwDTkpyjqep KmQLj/07F3ZtoOUle/hwUqZVTsW1h28= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b="O1jFqs/8"; spf=pass (imf11.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.167.178 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com Received: by mail-oi1-f178.google.com with SMTP id 5614622812f47-3a751bd3372so714114b6e.0 for ; Wed, 23 Aug 2023 20:45:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1692848717; x=1693453517; 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=pHpuYVUzN3jckjN0g3IoL6/kLBn9YHZf3O2ocrsGP0s=; b=O1jFqs/8oc1Zkuuh+RreIT00SzE0RITyrrR0tfPQWf0F03mOW3C+kR183ZUZbV19fg 1njT0pQF3MiRhEhbmKFe4hB4nORH/DqQUPz83nIj/BcfeWcOQTDvl3XWmeJPiDdxxNCj aSM8Wiu56btqgYfw8FalFa6mxnERxpSyhXdr0cY8BCFqcfkHplZglvPzfqSpSX5vNiS1 5kgWXHBkRzg/0siYnFHX8pUt3JbjLp78Al19cln4RC11Rnj2a0ej4lpfuA1lfNaC1BkD tGwbgv8uKluiKTT9ikc6KjEs76P7r8QiIzHs9sjQ/D2bIVhILICDiu7qdUt3X+KwvMRN y3RQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692848717; x=1693453517; 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=pHpuYVUzN3jckjN0g3IoL6/kLBn9YHZf3O2ocrsGP0s=; b=I6P+LoH8vBnj3VUogHf9tWUzXZm9eZE0rNewobko8etF/qGnS3+OTOi+bkGoDHiX3V n09k1ZU91Am2JSWvDzyWKmF5rHPFMJHPNYMjh7X/9TH6+o3MLZqnqphLX+2FeeL/Gevy oPCs7TKm8ptyWwFtEDjSI2qeCgPWNCaRtuSpHIR47XelwbfZUfSMuI0hPC82AviEDzva sTQ9/JqJnf6k6+dlEvFGUDoGeeR7g2u2sUGjr9+gicV9PSsCNYqjA5XNdpM8dBl2xqhb VidfMDTgPigSzqO92xlvnbLOGPRdL18V9LmASMjCWKoy9vE+RQMBQpwCkMV0h9E+4XY3 WnUw== X-Gm-Message-State: AOJu0YykorHS3SQRs5HZXii4nBEFQ56AcJzoVbp5uQiEVXn2cPIjXxzI 6vfooDE0W/p2mt/10MwuHktbLw== X-Google-Smtp-Source: AGHT+IECsy2xziAStlM4iQiBzrpyBsCTGG8fF9NVbEM0k1w/3hIKlU5v5nC6tO+zngn9Mp6S5RbEgA== X-Received: by 2002:a05:6808:2e93:b0:3a7:7366:7523 with SMTP id gt19-20020a0568082e9300b003a773667523mr16881965oib.3.1692848716943; Wed, 23 Aug 2023 20:45:16 -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.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Aug 2023 20:45:16 -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 10/45] NFSv4.2: dynamically allocate the nfs-xattr shrinkers Date: Thu, 24 Aug 2023 11:42:29 +0800 Message-Id: <20230824034304.37411-11-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: AA0AC4000E X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: j954roozunw3sxmf5izsd41hn3e8hodh X-HE-Tag: 1692848717-806084 X-HE-Meta: U2FsdGVkX18voYcCY+j/DtZTTIFWfDcbI30fnyTDUelKp5zywpUPt7oniIyq6lpsFCV1HwQ+GpwchHwkkmcI6ZjZiN7VSEJK/mnMHHaBYLStW1CxbHLZgTnZfztebtDqMmsW93RiNQ/YzIgqJ21YoxkvQ+aOi+KghrBJG8k1PmYP06LQiL+nIjFAz08PP6WdmmNTA/sOd0G5EMj4m9hyJt3YBW83PIuP21Sn/TnvufXLqnzW1x8A9BcytjGV+5kFsJZNc4UpmBbFV6gUQWZesPJ7t/GVa7JgGRsmirQAjKQfi28MVjy6zs18NtPbtwsuBpFF1q/itldueEJC2LmBATW7b1uQEkzrT/yi6at6P4fcg5ekGKBNIIfWIJ5eC0922L5+0OSAM/sjSylL8HP5If0PzF2itX4qldkLF9wMKR5YR0d4+bWIzz1/zLZvQVoiG7C3lbuoOxuB3+A8mKwAYRPHx9R1mpxQUOsnRarOTmFT5CuECUP8CpT6oih4yLEQ0z2tFGln6MRtKxfdjt+RVLN6YamwhQGk0dc2783y/wZfHEmaZupbxzMLa+VD89791ajE9KWM2nKEXry8zicJkN3qWxz5wKSabnX8Ev9HD7F/OotQvsAE7FBoXZCB/McBNvGztnKJjBN/A+Z+hM5Gaetz7DW7H4jbWWgET4pcTgnDGN89wEq2fIzVR0vtUKPzT1vgqmKkVd1SB0WGwrs6pBRuhQGo44R4e+1vfg+QngffkYZku09J4ZL+dNNYoaYiB77TmRavwZXQaTXuHD1vTEvFf19lbyEZ4D3630DKvL/80YgpA5NUDEV8QDCp5AILu3EtojBNTDTZ+Ed+0o9IYqLJJf5yrM0nA0kuZmMjTbDD024kj2uf8fWbd+GQbiFi/FxRRxBrpIT7ZeDPkNLU5UH9IVWufuelFccOcYFvh5fuc/Den6jYW8zAUvmPGRmYYsJspCCA14sUHx85TO6 ZXUdDhnx ZbsJOww3JPSBL0NXfVLXPOGCbLkJkOfo3w30IuZgcDadgN+UkUJWiHoYcvF5uUtMFa2Da5k42unZx/tq6IYX5SPfiEGhZroPp8JWsMPOdugca2VYFT5w+dxlgLlbX3oSOmSDSEEUkYHNY0Lr6EtNacRevWRCLiODRoi5cVgMYOmAEHO72vsK5U03k6S8MFEAGNcMDFPac9vxifE0U+CXy18D/IW3N4N1Qz/i5ObtwA25gpV7YhdMb76VNUB8ycBj57A3fT3e5AybieKmTL8OCVQv5WDA6s00dXZnAIU6+ux3khgZPwcQfTYIuO83BTi3rnm7CvVt0CvMOTeULv3sSyECGLxTfCF/TQyO3KsWsX19UmlByrLPDy/hyEXh6/FRlf7xfXKjrfiMMBnT5/+JVZSBnXwTBPuz2Cy1FaPr/EuWPTlagGiDwLU/huktcEAkbpyKkl/OcGFA9pQ+9Oe8mdsCWzLvo7tCIn+9H4KOjTvovWOFTsMK4fyXg7K7mqWUnBV5wEBKIU0NZnSwL+L1kaSO9wTglbMoaNUxU 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-xattr shrinkers. Signed-off-by: Qi Zheng Reviewed-by: Muchun Song CC: Trond Myklebust CC: Anna Schumaker CC: linux-nfs@vger.kernel.org --- fs/nfs/nfs42xattr.c | 87 +++++++++++++++++++++++---------------------- 1 file changed, 44 insertions(+), 43 deletions(-) diff --git a/fs/nfs/nfs42xattr.c b/fs/nfs/nfs42xattr.c index 911f634ba3da..2ad66a8922f4 100644 --- a/fs/nfs/nfs42xattr.c +++ b/fs/nfs/nfs42xattr.c @@ -796,28 +796,9 @@ static unsigned long nfs4_xattr_cache_scan(struct shrinker *shrink, static unsigned long nfs4_xattr_entry_scan(struct shrinker *shrink, struct shrink_control *sc); -static struct shrinker nfs4_xattr_cache_shrinker = { - .count_objects = nfs4_xattr_cache_count, - .scan_objects = nfs4_xattr_cache_scan, - .seeks = DEFAULT_SEEKS, - .flags = SHRINKER_MEMCG_AWARE, -}; - -static struct shrinker nfs4_xattr_entry_shrinker = { - .count_objects = nfs4_xattr_entry_count, - .scan_objects = nfs4_xattr_entry_scan, - .seeks = DEFAULT_SEEKS, - .batch = 512, - .flags = SHRINKER_MEMCG_AWARE, -}; - -static struct shrinker nfs4_xattr_large_entry_shrinker = { - .count_objects = nfs4_xattr_entry_count, - .scan_objects = nfs4_xattr_entry_scan, - .seeks = 1, - .batch = 512, - .flags = SHRINKER_MEMCG_AWARE, -}; +static struct shrinker *nfs4_xattr_cache_shrinker; +static struct shrinker *nfs4_xattr_entry_shrinker; +static struct shrinker *nfs4_xattr_large_entry_shrinker; static enum lru_status cache_lru_isolate(struct list_head *item, @@ -943,7 +924,7 @@ nfs4_xattr_entry_scan(struct shrinker *shrink, struct shrink_control *sc) struct nfs4_xattr_entry *entry; struct list_lru *lru; - lru = (shrink == &nfs4_xattr_large_entry_shrinker) ? + lru = (shrink == nfs4_xattr_large_entry_shrinker) ? &nfs4_xattr_large_entry_lru : &nfs4_xattr_entry_lru; freed = list_lru_shrink_walk(lru, sc, entry_lru_isolate, &dispose); @@ -971,7 +952,7 @@ nfs4_xattr_entry_count(struct shrinker *shrink, struct shrink_control *sc) unsigned long count; struct list_lru *lru; - lru = (shrink == &nfs4_xattr_large_entry_shrinker) ? + lru = (shrink == nfs4_xattr_large_entry_shrinker) ? &nfs4_xattr_large_entry_lru : &nfs4_xattr_entry_lru; count = list_lru_shrink_count(lru, sc); @@ -991,18 +972,34 @@ static void nfs4_xattr_cache_init_once(void *p) INIT_LIST_HEAD(&cache->dispose); } -static int nfs4_xattr_shrinker_init(struct shrinker *shrinker, - struct list_lru *lru, const char *name) +typedef unsigned long (*count_objects_cb)(struct shrinker *s, + struct shrink_control *sc); +typedef unsigned long (*scan_objects_cb)(struct shrinker *s, + struct shrink_control *sc); + +static int __init nfs4_xattr_shrinker_init(struct shrinker **shrinker, + struct list_lru *lru, const char *name, + count_objects_cb count, + scan_objects_cb scan, long batch, int seeks) { - int ret = 0; + int ret; - ret = register_shrinker(shrinker, name); - if (ret) + *shrinker = shrinker_alloc(SHRINKER_MEMCG_AWARE, name); + if (!*shrinker) + return -ENOMEM; + + ret = list_lru_init_memcg(lru, *shrinker); + if (ret) { + shrinker_free(*shrinker); return ret; + } - ret = list_lru_init_memcg(lru, shrinker); - if (ret) - unregister_shrinker(shrinker); + (*shrinker)->count_objects = count; + (*shrinker)->scan_objects = scan; + (*shrinker)->batch = batch; + (*shrinker)->seeks = seeks; + + shrinker_register(*shrinker); return ret; } @@ -1010,7 +1007,7 @@ static int nfs4_xattr_shrinker_init(struct shrinker *shrinker, static void nfs4_xattr_shrinker_destroy(struct shrinker *shrinker, struct list_lru *lru) { - unregister_shrinker(shrinker); + shrinker_free(shrinker); list_lru_destroy(lru); } @@ -1026,27 +1023,31 @@ int __init nfs4_xattr_cache_init(void) return -ENOMEM; ret = nfs4_xattr_shrinker_init(&nfs4_xattr_cache_shrinker, - &nfs4_xattr_cache_lru, - "nfs-xattr_cache"); + &nfs4_xattr_cache_lru, "nfs-xattr_cache", + nfs4_xattr_cache_count, + nfs4_xattr_cache_scan, 0, DEFAULT_SEEKS); if (ret) goto out1; ret = nfs4_xattr_shrinker_init(&nfs4_xattr_entry_shrinker, - &nfs4_xattr_entry_lru, - "nfs-xattr_entry"); + &nfs4_xattr_entry_lru, "nfs-xattr_entry", + nfs4_xattr_entry_count, + nfs4_xattr_entry_scan, 512, DEFAULT_SEEKS); if (ret) goto out2; ret = nfs4_xattr_shrinker_init(&nfs4_xattr_large_entry_shrinker, &nfs4_xattr_large_entry_lru, - "nfs-xattr_large_entry"); + "nfs-xattr_large_entry", + nfs4_xattr_entry_count, + nfs4_xattr_entry_scan, 512, 1); if (!ret) return 0; - nfs4_xattr_shrinker_destroy(&nfs4_xattr_entry_shrinker, + nfs4_xattr_shrinker_destroy(nfs4_xattr_entry_shrinker, &nfs4_xattr_entry_lru); out2: - nfs4_xattr_shrinker_destroy(&nfs4_xattr_cache_shrinker, + nfs4_xattr_shrinker_destroy(nfs4_xattr_cache_shrinker, &nfs4_xattr_cache_lru); out1: kmem_cache_destroy(nfs4_xattr_cache_cachep); @@ -1056,11 +1057,11 @@ int __init nfs4_xattr_cache_init(void) void nfs4_xattr_cache_exit(void) { - nfs4_xattr_shrinker_destroy(&nfs4_xattr_large_entry_shrinker, + nfs4_xattr_shrinker_destroy(nfs4_xattr_large_entry_shrinker, &nfs4_xattr_large_entry_lru); - nfs4_xattr_shrinker_destroy(&nfs4_xattr_entry_shrinker, + nfs4_xattr_shrinker_destroy(nfs4_xattr_entry_shrinker, &nfs4_xattr_entry_lru); - nfs4_xattr_shrinker_destroy(&nfs4_xattr_cache_shrinker, + nfs4_xattr_shrinker_destroy(nfs4_xattr_cache_shrinker, &nfs4_xattr_cache_lru); kmem_cache_destroy(nfs4_xattr_cache_cachep); }