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 AEA93C71136 for ; Thu, 12 Jun 2025 10:51:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 524DD6B0089; Thu, 12 Jun 2025 06:51:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4D6366B008A; Thu, 12 Jun 2025 06:51:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3C4F76B008C; Thu, 12 Jun 2025 06:51:28 -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 1F9D06B0089 for ; Thu, 12 Jun 2025 06:51:28 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id BEA9F160FEE for ; Thu, 12 Jun 2025 10:51:27 +0000 (UTC) X-FDA: 83546432214.16.59316F4 Received: from mout-p-101.mailbox.org (mout-p-101.mailbox.org [80.241.56.151]) by imf19.hostedemail.com (Postfix) with ESMTP id 1D1A81A0006 for ; Thu, 12 Jun 2025 10:51:25 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=none; spf=pass (imf19.hostedemail.com: domain of kernel@pankajraghav.com designates 80.241.56.151 as permitted sender) smtp.mailfrom=kernel@pankajraghav.com; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=samsung.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1749725486; 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; bh=7iAToVgqNn1NqsUniXHPvnXEwj9snn546OXEq3clBYk=; b=74ySNNxtI0bEvVgM9BkLkg/VGSlkcnNO8SJrDiLyiWG76FRrhJ0dnEMpt9s/kgXlDhWpAr FSwvLpXwR1TVp2eYzaewF+cYJdIf+VNzjKPlOv+pTzxsn+GpjWE/q72al+ZNXS9++y79HY EBsMRFYFka1uXHR8sdXau/Ve5FxGk+w= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=none; spf=pass (imf19.hostedemail.com: domain of kernel@pankajraghav.com designates 80.241.56.151 as permitted sender) smtp.mailfrom=kernel@pankajraghav.com; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=samsung.com (policy=none) ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1749725486; a=rsa-sha256; cv=none; b=8FbpSjnm1RrkqCUEzIb65uBeBA/JDXwczoOWQQRK52T2G9grjQMkA31qY2k042HkWLB0Vk IEXqRS/S2ON1GgMy9r2wl8z6wa4XnBYjQOKwZ+84bpfB+AV/TVIgODNpJC6F/Po6PGd/1J W6aq4djiX+EIbm72bZ6pb/O9Tgr3V4c= Received: from smtp202.mailbox.org (smtp202.mailbox.org [10.196.197.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4bHzpy5spkz9t8J; Thu, 12 Jun 2025 12:51:22 +0200 (CEST) From: Pankaj Raghav To: Suren Baghdasaryan , Ryan Roberts , Mike Rapoport , Michal Hocko , Thomas Gleixner , Nico Pache , Dev Jain , Baolin Wang , Borislav Petkov , Ingo Molnar , "H . Peter Anvin" , Vlastimil Babka , Zi Yan , Dave Hansen , David Hildenbrand , Lorenzo Stoakes , Andrew Morton , "Liam R . Howlett" , Jens Axboe Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, willy@infradead.org, x86@kernel.org, linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org, "Darrick J . Wong" , mcgrof@kernel.org, gost.dev@samsung.com, kernel@pankajraghav.com, hch@lst.de, Pankaj Raghav Subject: [PATCH 2/5] huge_memory: add huge_zero_page_shrinker_(init|exit) function Date: Thu, 12 Jun 2025 12:50:57 +0200 Message-ID: <20250612105100.59144-3-p.raghav@samsung.com> In-Reply-To: <20250612105100.59144-1-p.raghav@samsung.com> References: <20250612105100.59144-1-p.raghav@samsung.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 1D1A81A0006 X-Stat-Signature: utmpsnfa63e74nag6a96cykbi1d6izoe X-Rspam-User: X-HE-Tag: 1749725485-357189 X-HE-Meta: U2FsdGVkX18AhOXKNJZqkeuRcmojK/LR2XA4lxA/sCy/1K9zdaEr/7nd8Cr0OdA4rcyqahYmfUG5xBHfNKtnP8GcDatuG7doXgj0fqugLG6fzG0jRwPzMfXXIRWwH8IkWmlUN9JmfWm5sE1iBkhTYrk35GfvaW9mcjTvR9WV1snw+cC12z82sM888ap8S9SuIv3nfoEl5G6lBbleVVL5lbg7GheKpViWdiqj5X67FzJIrFwqtEExMN2puQPaZetAEtMUm5Q7/SiEUYYNXfvb4fzladKYzwAngWw+/rrtyqeAa7ActVlmK1Pomb3I2KHrrZeDcv+HN1uCnj5wsrxYhmeCsTkSxADivqGqhlwQWRuYfCfsSK7zxFm5xLaW0K8kkal7uC91EA7z9f6ckyExgb86HSqxFTnqXykwhmaoeODyOCn+ANaGY8YnYBRXGnCDNep1Jgyvy7cd/tI7fKnHdMQ9q8JKmTVdVRkivO0JmytFD1qPZnbhQQvX4gDcl1ukAgNE7nGjMaXv23TLh3ArSZyic7KElGH3oYG8JKk5FuyPze+Mh1NDAWyTlL6r9425OijNUaxQixD5fLbemBM10CsRJGy4Nu2xN7TK9CuNyU9VZGolNN83in3bnOTD5Dzb7tynYoOirTrCI5OXsiObS16FgEMVTZxkfo0bNFxUFXj0MScTcqiKAw9Qhcn4La85qpc86GTHJ3qso8K1lsiDSdQD/tKYvUplFmTkcmehD1Yr89Eh9owGXhxjC3yfBMnkiPSP/tNF0cxsOfdfzkjsEvIqL6shKEPZkWQZxikg7nFL7HOGSxjW3A6AzaSg5M6kGHFl8qIggeGFf44qFDXWvTOLDH/rFQ+lIMboihdUi1UftQUla4MoJLYsPPmvsMU5mCCdSMsSAipZVT8OZck22CdB8fEeXKC5ITmu/waFmaP/ssdG3EYayH0AMUovap6iZiDVw8qJwJKfbckuS+B JZPGuoD5 8FK1soeSL1HOo3wRrsozYaVwmkTUGP8AP9I4xhD123+ub7J+Y6m5JfXWNRtza0SUH37mPZz+uJEWM71fIhuvPTVm78Sra7Bgx+hEXQsZfQuGlgx/hHYx+JMlGvRd/xQ9XS42QUVLmlq7Tnq3PXY+9CwtumeYx/Kb6KyBu8EqhozyI/7QyR/jfivXP9FRwk2IkuiwHsxX3akdJQ+lUh1uwALVpy28ZpdvWWXggdiVmzGSPaT1gRWHgy61sbNBdtcOjZ6ha7SMmYO/VWld2DOeH/MnYwk46gBeYpuH9TCkVxTMU3gxlmz3HnjOLGylQtJlSyhpZOFJOMcyv0uDFQpHxBK38y6fYR3CavrCiG8T886nO+YmzTBzzP4DGZdvV9RScS9DczkbTOIfSksmBmmjionZkUX7jesOQ1T6E2m9S1SC/0D4= 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: List-Subscribe: List-Unsubscribe: Add huge_zero_page_shrinker_init() and huge_zero_page_shrinker_exit(). As shrinker will not be needed when static PMD zero page is enabled, these two functions can be a no-op. This is a preparation patch for static PMD zero page. No functional changes. Signed-off-by: Pankaj Raghav --- mm/huge_memory.c | 38 +++++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index d3e66136e41a..101b67ab2eb6 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -289,6 +289,24 @@ static unsigned long shrink_huge_zero_page_scan(struct shrinker *shrink, } static struct shrinker *huge_zero_page_shrinker; +static int huge_zero_page_shrinker_init(void) +{ + huge_zero_page_shrinker = shrinker_alloc(0, "thp-zero"); + if (!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; + shrinker_register(huge_zero_page_shrinker); + return 0; +} + +static void huge_zero_page_shrinker_exit(void) +{ + shrinker_free(huge_zero_page_shrinker); + return; +} + #ifdef CONFIG_SYSFS static ssize_t enabled_show(struct kobject *kobj, @@ -850,33 +868,31 @@ static inline void hugepage_exit_sysfs(struct kobject *hugepage_kobj) static int __init thp_shrinker_init(void) { - huge_zero_page_shrinker = shrinker_alloc(0, "thp-zero"); - if (!huge_zero_page_shrinker) - return -ENOMEM; + int ret = 0; 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); + if (!deferred_split_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; - shrinker_register(huge_zero_page_shrinker); deferred_split_shrinker->count_objects = deferred_split_count; deferred_split_shrinker->scan_objects = deferred_split_scan; shrinker_register(deferred_split_shrinker); + ret = huge_zero_page_shrinker_init(); + if (ret) { + shrinker_free(deferred_split_shrinker); + return ret; + } + return 0; } static void __init thp_shrinker_exit(void) { - shrinker_free(huge_zero_page_shrinker); + huge_zero_page_shrinker_exit(); shrinker_free(deferred_split_shrinker); } -- 2.49.0