From patchwork Mon Jul 24 09:43:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zheng X-Patchwork-Id: 13323754 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 3DA11C001E0 for ; Mon, 24 Jul 2023 09:48:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D194E900003; Mon, 24 Jul 2023 05:48:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CC99D6B007D; Mon, 24 Jul 2023 05:48:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B1C19900003; Mon, 24 Jul 2023 05:48:57 -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 A09006B007B for ; Mon, 24 Jul 2023 05:48:57 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 7AEAFB1FE2 for ; Mon, 24 Jul 2023 09:48:57 +0000 (UTC) X-FDA: 81046031514.02.629E6E7 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by imf27.hostedemail.com (Postfix) with ESMTP id AC60540008 for ; Mon, 24 Jul 2023 09:48:55 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=aydgK7bn; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf27.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.214.177 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1690192135; 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=hg2vi+2AAPCRuQsciRtLylYUMTgaXzyfBXLGSnv8etw=; b=rBx9X3IQVgnyZwf9uOS+ZZctoizkzuT1w3Xqy6Ys1YatkEqejRqaS9tJN5YP2dKeQ4RmHx XQr8SnjA6rv3yYoAcBGtWcVLaQRyW4oe0XJj9CJiDMtJ5Inyegn9vN6I48kP51gOgtQTnu iATUpu73OOKj3FZDLpULm7R1wiqLo1c= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=aydgK7bn; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf27.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.214.177 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1690192135; a=rsa-sha256; cv=none; b=eIRcSGnZJJ+7v9fEUO54EQsIxuppgI5w+TUwcCYdryyB4cyQS8BHLTMLRfrU5yVUNVGAd0 h3gs1uFoARNNhv8Dhu7VNxT2F7vTeqWGJnQ2/ZVbdMHOCXqcEQuP+BPQJD1Gu5Pz+xXXNc zozaKf/AqSt+bQhPE0Vw3DlaRGthBsQ= Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-1b867f9198dso8898085ad.0 for ; Mon, 24 Jul 2023 02:48:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1690192134; x=1690796934; 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=hg2vi+2AAPCRuQsciRtLylYUMTgaXzyfBXLGSnv8etw=; b=aydgK7bn0QggjlQydoxB8/wzzA4TXTh5kAH1HczgG5x53kEUfwsZTHfAy7Oll8B5Eb /u8m2Fx+yVNF796ZZc3s2XmC1YIubtCHa+WaPaj49PGcqhNB+vofNP25+pjGYzLsUBey s8mU5+/TbPuzYxlgD12Kt4jsZqhjhd4Zmfvq3eYOMY75uxvK9h6vyhatsfe9xzUUvBHR 65A0XriwgvV356EN5StwdT8HNZN8xypzwNZbI9gp5ddxZgA9hT9j3WwIFAc65w94K4S5 JlPP5IHsQz3xceBVdVld1V5OEs83EDOwKVmAaZghdPj/BNMPCYQ+scOGPe5A3YPCuRcv ewxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690192134; x=1690796934; 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=hg2vi+2AAPCRuQsciRtLylYUMTgaXzyfBXLGSnv8etw=; b=J9I83ism/nRPzt7NG6Z0o/t1cz3RSsiIUBYC6Mh8hbhvMYNYgkASItjoa0w+yZhzCl gQPnFhkcGelif2Gz7Hwm1crinVoDIss7Dll+0v2ifHlMqS2ACosUWoRzBOpqtNOQ5b6x 8TRw8TSJk6M0RP33DtDOCO4RKBTwsaTHZ8tKpJNFyfzV4n9lSHhgh/qbXt/oNRjoFK43 z2HR8TPguxFxoAt1KwX1gkoOeWOgtjsXhgLxzcK9+tzG68RL5CD865eazSgpFMvb3xbD ldKhsQjle9iDzfBliWxE1c/+y8k4XLt06xfFSRhmZ6eYKpNJlAHgHh/to806uv2MOQhN 5EKA== X-Gm-Message-State: ABy/qLaUbgTGQAoy4gLGuBevWlrkvIfojw5zMrj+TGKvmhdFyjvJrpni 4MyUuOJaSpMjRwes8NqjyEMbEg== X-Google-Smtp-Source: APBJJlFlbX7MjF6Gs1NiwvX/ojXDY5CFLHX7jflUqBVL6eloGiFWEtkN1YdVHiZpjmt9ZeBQxK8/kg== X-Received: by 2002:a17:902:ecd2:b0:1b8:b4f6:1327 with SMTP id a18-20020a170902ecd200b001b8b4f61327mr12294253plh.6.1690192134533; Mon, 24 Jul 2023 02:48:54 -0700 (PDT) Received: from C02DW0BEMD6R.bytedance.net ([203.208.167.147]) by smtp.gmail.com with ESMTPSA id d5-20020a170902c18500b001bb20380bf2sm8467233pld.13.2023.07.24.02.48.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jul 2023 02:48:54 -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, 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, Qi Zheng Subject: [PATCH v2 19/47] mm: thp: dynamically allocate the thp-related shrinkers Date: Mon, 24 Jul 2023 17:43:26 +0800 Message-Id: <20230724094354.90817-20-zhengqi.arch@bytedance.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20230724094354.90817-1-zhengqi.arch@bytedance.com> References: <20230724094354.90817-1-zhengqi.arch@bytedance.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: AC60540008 X-Stat-Signature: 6s4wbz7zcjhocywxahxbwqwejacmm6c3 X-HE-Tag: 1690192135-893414 X-HE-Meta: U2FsdGVkX18eVQ71Qz2TCJJWNB9TQkYaaoe49FYrB6VBUU4sgZ+vrMu3Oha1kW68sWhha2aidvxJhXLoXsUmQzKSIdGwXl+2vJAwm8SlfNAHRhgTa7W3rcVToDYA8+9grVE+AEej1xcedEwKleVs0xFjGRfQa4q1XK8rdM1bOQ/DirHIErDkFUUb9Lt7aqLL65+N+ZDtHZ4KAYbpUYYDVVtdtvkvz/ployEqZ07wFi54O/rzDQTDhssii3KUXDuXhinxc9yJUACbF9MSOCHKgEdbAeK4hD0llasxBXPlObeQvXY8S+uI/iKPkT6EoBzRnthJlkxoKXm4u0VEAEh8vIFCLsCvj3L4pEwlwy8GPhadcgIy0GBr7FMdnZCvV/Ofeh97zTPcbnGfqslT8v6yG9N13jToqv7KvyhNkeglR1J0aUhwwZKr7alL8cg/bVnRGZb4aoGN4aBF+pDsw5l3AcHLJWwBss8oGprFdGtKU49qDck7YqfErZvTwdgpGEdjJZ/DyzkPZcvlfBQR/RPPYEKNYq4UihWQNdga9xbRaESOoKM06VpCL8nQNqJ3brgqR+uYYuPfU2Q1oo88GRnTx9jsMGXkXI4Q5j8JM2F0Su4JiK4ayuVgvv/9wElcudIBnBXilXmA8i6/nsjWMX/ts6AJjmsdcjKPyTRVDREQ1DFeUzf0NPbfgrPZvCzwsWXn8BP0ggCgqa9w/oiBQvd7bE2+i+f3DRDZniM6lsIb7PXg+H7fyw3j2DS+zfjwagtJDSBjiTW9NYcq6Zxj2NA+F/9KGCbwdL++MwHcrCeDAGHzqIhi22yI6Wn02e8NgIqYl3/gkdNFw3SP56w2YoQbOKviUtlJFPP4Fs2CdWc7MfFPLBUG5N58G43XYJh60hLplJrdmjBcXkVGDgqhnXDWNblboTrkGyC+G2tIsiY81UncjkEh2yuneSxTsLP5bndHSV7eUArieMz/Y0JpK0P rCSTagEq KpsFqqrPLydE3WlCRxkGqaYOlv9bEp9w++Gq5fC+rhxvKButxqDe5ch+UbKF+z8ZmLXMfedeIrSz1iqcSl5xfhoiAeqibsgXqk/VuOd6R7Mrp0ihGbkEoGFiWfIa+CPf5pAspLJ1Nhc8MeSL/22vZcBDpOvZ7arEMHXR8vKQ+YgKd09byD8gjg0zPdoBdeqHL9Uxlo3CMALV0s7nz43/CxDLtViz5v1Ca+diTDaUfxpJtU199Vp0ifDWzqNvbJ/HdOw1Z0mzzFF2BVKUcAHCl4vN2SPWY05VZ1ZsZFGy0VQo59bcR4ktCo+ZaMvAlzslwtwvxriIm2x10Ep9ZTDsT05vSy1s6FJBAb9OtI4IZyUglyW85sBHrN9fzGvs3mqWfVOkzRvj4/fC0wCmc5omhDvThNgCSklGhqCs7 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 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<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) +{ + 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) {