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 2881FC83F07 for ; Mon, 7 Jul 2025 14:23:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BF4646B03FD; Mon, 7 Jul 2025 10:23:48 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BCC086B03FE; Mon, 7 Jul 2025 10:23:48 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B093C6B03FF; Mon, 7 Jul 2025 10:23:48 -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 9D6906B03FD for ; Mon, 7 Jul 2025 10:23:48 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 4E5F31D44CE for ; Mon, 7 Jul 2025 14:23:48 +0000 (UTC) X-FDA: 83637687336.03.48C5405 Received: from mout-p-102.mailbox.org (mout-p-102.mailbox.org [80.241.56.152]) by imf16.hostedemail.com (Postfix) with ESMTP id 76C0318000D for ; Mon, 7 Jul 2025 14:23:46 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=pankajraghav.com header.s=MBO0001 header.b=ffR+SWki; dmarc=pass (policy=quarantine) header.from=pankajraghav.com; spf=pass (imf16.hostedemail.com: domain of kernel@pankajraghav.com designates 80.241.56.152 as permitted sender) smtp.mailfrom=kernel@pankajraghav.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751898226; a=rsa-sha256; cv=none; b=TKo7F2RbeSa35pfPUl/5xZZ693ZE8ObHZl1jfKtEnXJwukPGt7lXgU5SK6Db7Fsa0jT9Bn tX2St215qZFZBxpM4os80gM++JfN2HdoS6VyBrgfPaoerhEDlOBEmJTJSbBLD3+KYk0bQk uV3yOWwwpj4phL8deQaBYWcp8WmWNfU= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=pankajraghav.com header.s=MBO0001 header.b=ffR+SWki; dmarc=pass (policy=quarantine) header.from=pankajraghav.com; spf=pass (imf16.hostedemail.com: domain of kernel@pankajraghav.com designates 80.241.56.152 as permitted sender) smtp.mailfrom=kernel@pankajraghav.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1751898226; 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=+6e+PcGOhziaHPv2fooE3Mhq4C1IPp18icg31JFqEy0=; b=kjv0bWJ62uVwjkCQ/4Jtr8txPCPscXCT8l1HioEczUQJwh2XlaZv3U57P2Sms+Q6qmdowq lWU8imbp5ECmTJzmVNOuPbBWYnp0aTDtEqVNE57POHI8EZdH2kBEzDWI2CbIYueratQGkF Dkw7daRCzurahXW9KG07UPk8mgoSIAU= Received: from smtp2.mailbox.org (smtp2.mailbox.org [10.196.197.2]) (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-102.mailbox.org (Postfix) with ESMTPS id 4bbRLQ4bdWz9t1B; Mon, 7 Jul 2025 16:23:42 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pankajraghav.com; s=MBO0001; t=1751898222; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+6e+PcGOhziaHPv2fooE3Mhq4C1IPp18icg31JFqEy0=; b=ffR+SWkiKB9WbWaNGhqMuxqsE52z254tpTUQZe5jFt8NBzuujnqJZw9d1+45vg6y7eMN92 OB9P13fXqYVzkwN4t1wJF0vB4a9wJRhy7WQ0Iiava1lotvj/tQNQE/PFq3GzAxu07Ly+z3 6nD8y9sDqHk2IeKXs8KJZUEz5/vvhQnKHAnbGgvVmZLwLaCWFsqYghnAjaf5cTKjxwSDlI ZQegm5oxr43vVDNZYEUtm7TZOiur6dkgIUuvQIpUhha6IrFcBbetxUWEOPY6vOHMfG4vVE YqL61VItf9ZnU9IXw8EcUiwV6XOEjBhjyl3ewfpjOKpQLUHJLAiLTuYmy+fHyQ== From: "Pankaj Raghav (Samsung)" To: Suren Baghdasaryan , Ryan Roberts , Baolin Wang , Borislav Petkov , Ingo Molnar , "H . Peter Anvin" , Vlastimil Babka , Zi Yan , Mike Rapoport , Dave Hansen , Michal Hocko , David Hildenbrand , Lorenzo Stoakes , Andrew Morton , Thomas Gleixner , Nico Pache , Dev Jain , "Liam R . Howlett" , Jens Axboe Cc: linux-kernel@vger.kernel.org, willy@infradead.org, linux-mm@kvack.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 v2 2/5] huge_memory: add huge_zero_page_shrinker_(init|exit) function Date: Mon, 7 Jul 2025 16:23:16 +0200 Message-ID: <20250707142319.319642-3-kernel@pankajraghav.com> In-Reply-To: <20250707142319.319642-1-kernel@pankajraghav.com> References: <20250707142319.319642-1-kernel@pankajraghav.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 76C0318000D X-Stat-Signature: hbb6yfufzdefpoheyfjtomm3qbenfg9n X-Rspam-User: X-HE-Tag: 1751898226-123307 X-HE-Meta: U2FsdGVkX1+GPYvRp8TuQ46lKuqx9QLEmG6WAkiikrTPjmpnKUwJG9MA2USF7pT4K9Uf0EVuJBZyVf4TrjGeZ+i2sDEdeT+BHhAnOZpCi+gabdp4XiOoIdofdEiOeZNv2nyCo1qTjP3Rn6MgIfKsDvWprT1Q0mlVxhREqDnG+zPrUz1c0QG0+Q6YbJR40GrPcYQ6NGYsJrLLOC4aZB0WgyknkwWKGAyVEf81lakYGaHOz1LiwCtdSoY90G8XTK7QAKJcavuisszNvb3b34DYIVSG1HIz59NMD7r0ILXF6ccbCeH8RNL5Jgk4M35SnEdlhI78avZLM9xfyuJwcLdx/hILfsHOJN8HyGqsrePkPDY309dXLh4eEkc3DUtnl1VBSGeAjI3RQueFG0zIwC1Kxq0mIF8MUfoB5Xcrky4Jcj2Lr1h6Mn9wdr81vvkMxdriodr3SCShn2ia6DxENF+sa4BMfxbNnZ8PuDb7j1rTDA4+Eu+JplrsQuss+gJ/6XKyH2HxyoKRRKnuV/jzRyplfZp3Gw6h+G240PIPzhNjJdzozZ3+RqzQWX7RHwwjcI6HntzkRgTK/oAdZmBhhH5P8VYd+KZCbUcRkWh/5Aftc4kppt/i7cEFaFAkIvtxvuQ+KhdGkiAqzpygbPwdpzF2lBTP4N/RE0pAVSx+Cqic3RwXjvvkiFVR8KEtdt5XCWfrrQTUwoJwwrRtNH80xZybftMtjNuvr3v1wIGNbxcuSenE/is9XCu8DvYXc5zHvE+xJxr9ezBomWh8iyrT9cb9n4S0SuBY/3THTq8yYKcBLaRMQIQ/4JHq6jBIckesHw5MwCtjdqfU/2jdJNQty4eZXT6eIbc7SKrVaaXbdDaqnDKForCeOJm9vUJ6TdT3v+Hz+ephXAdsVZba6b5V9RNB//ETJDDhnV/I6IlWgNDWoNMm+MPr5C3GK/eEGb7cxQFZQUx0PGILXC+DqEGJgzN jw8d69ZX sNTt0OcwULc+XBLbzgTn3QUCcVWBqophEHF9EAc7Y+DNaUNOPKd8JzDaxD+qddIGm0c+pW/yPpNDHumX6cZskkYsgMHtn2sbATTwnQyLlDJdooORQ8nCNKRYL3/u+hHMezkC+mzUZl/Z5IUhp7OcIpzcLBtKTKL7Vn4jZia/iK8PRm1PXBFl85MdFYGfYyDxIpg46oS2qk6CvGDIDU4hERJVbDrkK71+kq1FguI0/UBAj1PQ3dYrXAnSzZCDWqoBACDNqLtlagKF2d0vyA9cwlumNapZqoYdyAwkYqdvNbio4rMU1J0vA5kjt9tz+MFEbOuNjxYG4AWOLQTvjAGJ8+be8p7FMgzkf0DHeJq83qbxRzFUCX89dYAbrGYq/+v6vorCn 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: From: Pankaj Raghav 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