From: Qi Zheng <zhengqi.arch@bytedance.com>
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 <zhengqi.arch@bytedance.com>
Subject: [PATCH v5 17/45] mm: thp: dynamically allocate the thp-related shrinkers
Date: Thu, 24 Aug 2023 11:42:36 +0800 [thread overview]
Message-ID: <20230824034304.37411-18-zhengqi.arch@bytedance.com> (raw)
In-Reply-To: <20230824034304.37411-1-zhengqi.arch@bytedance.com>
Use new APIs to dynamically allocate the thp-zero and thp-deferred_split
shrinkers.
Signed-off-by: Qi Zheng <zhengqi.arch@bytedance.com>
---
mm/huge_memory.c | 69 +++++++++++++++++++++++++++++++-----------------
1 file changed, 45 insertions(+), 24 deletions(-)
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 3e9443082035..3c9c692e3376 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -65,7 +65,11 @@ unsigned long transparent_hugepage_flags __read_mostly =
(1<<TRANSPARENT_HUGEPAGE_DEFRAG_KHUGEPAGED_FLAG)|
(1<<TRANSPARENT_HUGEPAGE_USE_ZERO_PAGE_FLAG);
-static struct shrinker deferred_split_shrinker;
+static struct shrinker *deferred_split_shrinker;
+static unsigned long deferred_split_count(struct shrinker *shrink,
+ struct shrink_control *sc);
+static unsigned long deferred_split_scan(struct shrinker *shrink,
+ struct shrink_control *sc);
static atomic_t huge_zero_refcount;
struct page *huge_zero_page __read_mostly;
@@ -229,11 +233,7 @@ static unsigned long shrink_huge_zero_page_scan(struct shrinker *shrink,
return 0;
}
-static struct shrinker huge_zero_page_shrinker = {
- .count_objects = shrink_huge_zero_page_count,
- .scan_objects = shrink_huge_zero_page_scan,
- .seeks = DEFAULT_SEEKS,
-};
+static struct shrinker *huge_zero_page_shrinker;
#ifdef CONFIG_SYSFS
static ssize_t enabled_show(struct kobject *kobj,
@@ -454,6 +454,40 @@ static inline void hugepage_exit_sysfs(struct kobject *hugepage_kobj)
}
#endif /* CONFIG_SYSFS */
+static int __init thp_shrinker_init(void)
+{
+ huge_zero_page_shrinker = shrinker_alloc(0, "thp-zero");
+ if (!huge_zero_page_shrinker)
+ return -ENOMEM;
+
+ deferred_split_shrinker = shrinker_alloc(SHRINKER_NUMA_AWARE |
+ SHRINKER_MEMCG_AWARE |
+ SHRINKER_NONSLAB,
+ "thp-deferred_split");
+ if (!deferred_split_shrinker) {
+ shrinker_free(huge_zero_page_shrinker);
+ return -ENOMEM;
+ }
+
+ huge_zero_page_shrinker->count_objects = shrink_huge_zero_page_count;
+ huge_zero_page_shrinker->scan_objects = shrink_huge_zero_page_scan;
+ huge_zero_page_shrinker->seeks = DEFAULT_SEEKS;
+ shrinker_register(huge_zero_page_shrinker);
+
+ deferred_split_shrinker->count_objects = deferred_split_count;
+ deferred_split_shrinker->scan_objects = deferred_split_scan;
+ deferred_split_shrinker->seeks = DEFAULT_SEEKS;
+ shrinker_register(deferred_split_shrinker);
+
+ return 0;
+}
+
+static void __init thp_shrinker_exit(void)
+{
+ shrinker_free(huge_zero_page_shrinker);
+ shrinker_free(deferred_split_shrinker);
+}
+
static int __init hugepage_init(void)
{
int err;
@@ -482,12 +516,9 @@ static int __init hugepage_init(void)
if (err)
goto err_slab;
- err = register_shrinker(&huge_zero_page_shrinker, "thp-zero");
- if (err)
- goto err_hzp_shrinker;
- err = register_shrinker(&deferred_split_shrinker, "thp-deferred_split");
+ err = thp_shrinker_init();
if (err)
- goto err_split_shrinker;
+ goto err_shrinker;
/*
* By default disable transparent hugepages on smaller systems,
@@ -505,10 +536,8 @@ static int __init hugepage_init(void)
return 0;
err_khugepaged:
- unregister_shrinker(&deferred_split_shrinker);
-err_split_shrinker:
- unregister_shrinker(&huge_zero_page_shrinker);
-err_hzp_shrinker:
+ thp_shrinker_exit();
+err_shrinker:
khugepaged_destroy();
err_slab:
hugepage_exit_sysfs(hugepage_kobj);
@@ -2828,7 +2857,7 @@ void deferred_split_folio(struct folio *folio)
#ifdef CONFIG_MEMCG
if (memcg)
set_shrinker_bit(memcg, folio_nid(folio),
- deferred_split_shrinker.id);
+ deferred_split_shrinker->id);
#endif
}
spin_unlock_irqrestore(&ds_queue->split_queue_lock, flags);
@@ -2902,14 +2931,6 @@ static unsigned long deferred_split_scan(struct shrinker *shrink,
return split;
}
-static struct shrinker deferred_split_shrinker = {
- .count_objects = deferred_split_count,
- .scan_objects = deferred_split_scan,
- .seeks = DEFAULT_SEEKS,
- .flags = SHRINKER_NUMA_AWARE | SHRINKER_MEMCG_AWARE |
- SHRINKER_NONSLAB,
-};
-
#ifdef CONFIG_DEBUG_FS
static void split_huge_pages_all(void)
{
--
2.30.2
next prev parent reply other threads:[~2023-08-24 3:46 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-24 3:42 [PATCH v5 00/45] use refcount+RCU method to implement lockless slab shrink Qi Zheng
2023-08-24 3:42 ` [PATCH v5 01/45] mm: shrinker: add infrastructure for dynamically allocating shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 02/45] kvm: mmu: dynamically allocate the x86-mmu shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 03/45] binder: dynamically allocate the android-binder shrinker Qi Zheng
2023-08-31 16:41 ` Carlos Llamas
2023-08-24 3:42 ` [PATCH v5 04/45] drm/ttm: dynamically allocate the drm-ttm_pool shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 05/45] xenbus/backend: dynamically allocate the xen-backend shrinker Qi Zheng
2023-08-24 6:00 ` Juergen Gross
2023-08-24 6:24 ` Qi Zheng
2023-08-24 3:42 ` [PATCH v5 06/45] erofs: dynamically allocate the erofs-shrinker Qi Zheng
2023-08-25 1:18 ` Chao Yu
2023-08-25 2:54 ` Gao Xiang
2023-08-24 3:42 ` [PATCH v5 07/45] f2fs: dynamically allocate the f2fs-shrinker Qi Zheng
2023-08-25 1:17 ` Chao Yu
2023-08-24 3:42 ` [PATCH v5 08/45] gfs2: dynamically allocate the gfs2-glock shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 09/45] gfs2: dynamically allocate the gfs2-qd shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 10/45] NFSv4.2: dynamically allocate the nfs-xattr shrinkers Qi Zheng
2023-08-24 3:42 ` [PATCH v5 11/45] nfs: dynamically allocate the nfs-acl shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 12/45] nfsd: dynamically allocate the nfsd-filecache shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 13/45] quota: dynamically allocate the dquota-cache shrinker Qi Zheng
2023-08-24 9:51 ` Jan Kara
2023-08-24 3:42 ` [PATCH v5 14/45] ubifs: dynamically allocate the ubifs-slab shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 15/45] rcu: dynamically allocate the rcu-lazy shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 16/45] rcu: dynamically allocate the rcu-kfree shrinker Qi Zheng
2023-08-24 3:42 ` Qi Zheng [this message]
2023-08-24 3:42 ` [PATCH v5 18/45] sunrpc: dynamically allocate the sunrpc_cred shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 19/45] mm: workingset: dynamically allocate the mm-shadow shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 20/45] drm/i915: dynamically allocate the i915_gem_mm shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 21/45] drm/msm: dynamically allocate the drm-msm_gem shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 22/45] drm/panfrost: dynamically allocate the drm-panfrost shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 23/45] dm: dynamically allocate the dm-bufio shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 24/45] dm zoned: dynamically allocate the dm-zoned-meta shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 25/45] md/raid5: dynamically allocate the md-raid5 shrinker Qi Zheng
2023-08-24 3:55 ` Song Liu
2023-08-24 3:42 ` [PATCH v5 26/45] bcache: dynamically allocate the md-bcache shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 27/45] vmw_balloon: dynamically allocate the vmw-balloon shrinker Qi Zheng
2023-08-24 15:28 ` Nadav Amit
2023-08-25 2:27 ` Qi Zheng
2023-08-24 3:42 ` [PATCH v5 28/45] virtio_balloon: dynamically allocate the virtio-balloon shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 29/45] mbcache: dynamically allocate the mbcache shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 30/45] ext4: dynamically allocate the ext4-es shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 31/45] jbd2,ext4: dynamically allocate the jbd2-journal shrinker Qi Zheng
2023-08-24 9:49 ` Jan Kara
2023-08-24 3:42 ` [PATCH v5 32/45] nfsd: dynamically allocate the nfsd-client shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 33/45] nfsd: dynamically allocate the nfsd-reply shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 34/45] xfs: dynamically allocate the xfs-buf shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 35/45] xfs: dynamically allocate the xfs-inodegc shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 36/45] xfs: dynamically allocate the xfs-qm shrinker Qi Zheng
2023-08-24 3:42 ` [PATCH v5 37/45] zsmalloc: dynamically allocate the mm-zspool shrinker Qi Zheng
2023-08-24 4:38 ` Sergey Senozhatsky
2023-08-24 3:42 ` [PATCH v5 38/45] fs: super: dynamically allocate the s_shrink Qi Zheng
2023-08-24 3:42 ` [PATCH v5 39/45] mm: shrinker: remove old APIs Qi Zheng
2023-08-24 3:42 ` [PATCH v5 40/45] mm: shrinker: add a secondary array for shrinker_info::{map, nr_deferred} Qi Zheng
2023-08-24 3:43 ` [PATCH v5 41/45] mm: shrinker: rename {prealloc|unregister}_memcg_shrinker() to shrinker_memcg_{alloc|remove}() Qi Zheng
2023-08-24 3:43 ` [PATCH v5 42/45] mm: shrinker: make global slab shrink lockless Qi Zheng
2023-08-24 3:43 ` [PATCH v5 43/45] mm: shrinker: make memcg " Qi Zheng
2023-08-24 3:43 ` [PATCH v5 44/45] mm: shrinker: hold write lock to reparent shrinker nr_deferred Qi Zheng
2023-08-24 3:43 ` [PATCH v5 45/45] mm: shrinker: convert shrinker_rwsem to mutex Qi Zheng
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230824034304.37411-18-zhengqi.arch@bytedance.com \
--to=zhengqi.arch@bytedance.com \
--cc=akpm@linux-foundation.org \
--cc=brauner@kernel.org \
--cc=cel@kernel.org \
--cc=david@fromorbit.com \
--cc=djwong@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=muchun.song@linux.dev \
--cc=paulmck@kernel.org \
--cc=roman.gushchin@linux.dev \
--cc=senozhatsky@chromium.org \
--cc=steven.price@arm.com \
--cc=tkhai@ya.ru \
--cc=tytso@mit.edu \
--cc=vbabka@suse.cz \
--cc=yujie.liu@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox