From mboxrd@z Thu Jan 1 00:00:00 1970 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 DE732C001DC for ; Wed, 26 Jul 2023 07:10:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7A0EE8D0008; Wed, 26 Jul 2023 03:10:54 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 74EF98D0001; Wed, 26 Jul 2023 03:10:54 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 616D38D0008; Wed, 26 Jul 2023 03:10:54 -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 512C38D0001 for ; Wed, 26 Jul 2023 03:10:54 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 0CD35A0C92 for ; Wed, 26 Jul 2023 07:10:54 +0000 (UTC) X-FDA: 81052890828.27.7FA4D55 Received: from out-18.mta0.migadu.com (out-18.mta0.migadu.com [91.218.175.18]) by imf29.hostedemail.com (Postfix) with ESMTP id 28A1112001A for ; Wed, 26 Jul 2023 07:10:50 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=MJNzwcgK; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf29.hostedemail.com: domain of muchun.song@linux.dev designates 91.218.175.18 as permitted sender) smtp.mailfrom=muchun.song@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1690355451; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Jvc7jyiFGsEgqDLQ8SvDwKCvjECMcl21zak/YPsttTU=; b=SnznLpyZU/6rPF3lovkAAF41dJhm05+p+dbo/4boKvPHWNcLXmEbMwkXA70UI1nc7pDO2W uFbWNC7LOoKY1fUKo2R4BZzRbcsG6s9yy2MU9L9rvfAx9f1vViWRLLDH/Po5Bf5nw9Eouv yueWUXHmIBVGY7P5y4JwjiF0uDu6I4I= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=MJNzwcgK; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf29.hostedemail.com: domain of muchun.song@linux.dev designates 91.218.175.18 as permitted sender) smtp.mailfrom=muchun.song@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1690355451; a=rsa-sha256; cv=none; b=DQ6l11Uezbj9miZdanYToMTGQ4D+vQ3yI59EUX5nec8+ZV05a9k2kpulVFkGD0sqwyQ/HB oacckwO61Z8RL/nMXDugWUad5UjSSUNjdI9goNtaA286+cy40ppaDBwzrD0PpCCi4IDgYN NWNpV1adCKHgkhI2Jk15hNXZz7rU/HU= Message-ID: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1690355449; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Jvc7jyiFGsEgqDLQ8SvDwKCvjECMcl21zak/YPsttTU=; b=MJNzwcgKcI8WMs1vcHIk9odpFzXJXYJZkCEqMlLlvbf0FvKHK96bLJs5XTXQyUPcTsHXLS nIqAIZhilsKlD4q7ONNAKGG+YEnzT1SMJk3OhEOossreA6CsEZNAbhHhb/1A0W8D/Gm3Q3 yKiIjz335Q++bI56PmpRINRM4YbGaI0= Date: Wed, 26 Jul 2023 15:10:21 +0800 MIME-Version: 1.0 Subject: Re: [PATCH v2 19/47] mm: thp: dynamically allocate the thp-related shrinkers To: Qi Zheng 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, 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 References: <20230724094354.90817-1-zhengqi.arch@bytedance.com> <20230724094354.90817-20-zhengqi.arch@bytedance.com> X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Muchun Song In-Reply-To: <20230724094354.90817-20-zhengqi.arch@bytedance.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_OUT X-Rspamd-Queue-Id: 28A1112001A X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: 67ggcrk97nkouhaorxqy6gfxyxyqbx5u X-HE-Tag: 1690355450-738610 X-HE-Meta: U2FsdGVkX1+f0y40jzT9Z1PBp73S80ZQhVSkmi0NXRMSwXBLE3jAY1pYiRJvlAyDBSqdJN9oFq9ey1jnXTo9nBEw1tVpoeVOUsSYS/cI3KzxGLd8aGAH6tJ1otmHavnDOFXXfPctB323/CpDe2lpYkdrZkOqXNuEM1tg1dTMyXgFugaR1SHH8ER0/RT0UIFp2ADFYdXpRhR7uzIrJw6j6HA+hvltNSomXSZLObYnPxddZswtguCAU8/Fiy6VOdjmho1YjTCfojweCr7hzYwJn+Kxb37dE/BaDRayHI6Ng2QSs0Nt71joRoDFvZ9cxMu9iFXVQFwZTHxARNkIkp6qYeGjz3IR6F0yPXjnSDROdIoqbeB3ep0PNhLkqyG/WAlJ0mWwGT8aeCkZ+CbQnXUO8OgAWAzQ0i9SeenLZf0FxeAm1toBoMMikPTyPpLmQU9Bwig7bXsr/xDiiaWkWMfWkGEjgfxVQx5WBt4VD4DINUH/XuXrj0Fe36BAit9NCLbWYhLCKXZrnpmo/RtvzW5dQQO3CODoagNL5DG7i0cGfYl2c1MIlDiwU/Vkxe30LuPA9iY1uaNdzkBKbYY3I7u9VE0dEEfDN5yJTLf1b5x2hgecTL1Jyg48LUqOmC5X2OgG6jxlIENDyaGSSP5U/uhUbGXqftOHYZk2ql+Y94LBlFt7izvAz56AXLsFoMxwQG0SKDv5A2565ipbJ6mO/PGwP8QcR1fXaKqvleisLZXhAcjsHVRNxZttTsy0TTQVe4PPzQ0r9BbQlibsb8b5QYqEKZeJFe/4Q0lXnYBVX7NzRuDQTnmrP+xITWh8PzLjNZrKyKnMcPSBAlFwoV8I3vyKxZgqWe7X+i4yFs+3oYRRfnM+bpxPXc1k1PN5A8AXiOAoCIbEAZj2Vo1+kpj3C4zN47KCOLvgalAFhts3NY0FcoJA7exADrV3PtsNG3BmLq1/zgnJY8WGf4iuAsH2H+A k16Kl1SF DMJXhAbAIoPDjIOujZs2a7H3XVokAK9io8cdFh6nruTrk9koGA2umytU1/wb73ebbDssZc/reEYfU8BgE7zOwBMSlxs1dJz3nM19TJCnxoWgSU4/EWMziTxIJlLUENjh/9fXZoeYpHyTesypNAqhOgDbxHw== 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: On 2023/7/24 17:43, Qi Zheng wrote: > Use new APIs to dynamically allocate the thp-zero and thp-deferred_split > shrinkers. > > Signed-off-by: Qi Zheng > --- > 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 8c94b34024a2..4db5a1834d81 100644 > --- a/mm/huge_memory.c > +++ b/mm/huge_memory.c > @@ -65,7 +65,11 @@ unsigned long transparent_hugepage_flags __read_mostly = > (1< (1< > -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; Same as patch #17. > > #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 thp_shrinker_init(void) Better to declare it as __init. > +{ > + 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_non_registered(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 thp_shrinker_exit(void) Same as here. > +{ > + shrinker_unregister(huge_zero_page_shrinker); > + shrinker_unregister(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); > @@ -2851,7 +2880,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); > @@ -2925,14 +2954,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) > {