From patchwork Mon Aug 7 11:09:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zheng X-Patchwork-Id: 131945 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp1435333vqr; Mon, 7 Aug 2023 06:09:08 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF42LJjo/DRer3iwreBGToEfZGqBI0vxs/KjVBZ6xOrtZoqV82ZhQn5Wy1XqnkBPdJkV1E0 X-Received: by 2002:a05:6e02:1b88:b0:345:fbdc:bb78 with SMTP id h8-20020a056e021b8800b00345fbdcbb78mr14110723ili.29.1691413747755; Mon, 07 Aug 2023 06:09:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691413747; cv=none; d=google.com; s=arc-20160816; b=kgs8jH6Ielu+TQUCvCaQ6kjs9ytfEJMeu6/A4zCDbRma4HByKsxw1JKJfMQY4p06SR EPI+cNZhFqEjkLVQd85u9NwxgF5yflbInTCjA8ehKCAW8usrYovUHa5ElYG8zF8c0IGM eqwnJ4nzothOOmlL5YnxH2fAbmUvz0sWzlEU8yXokabeJPpaKCmHwdWKAuRji7qjNwo1 UiP2mqlyfJ6mu1sXMwjQBtQzj4uW5RK7vhhCF+3d2IMT175SUzxh5EiJqNnYwszYRld0 cv94YvhJsRqTMi9+jm5ptLjY7TlMOyyFr8uUN16gKQbed/AppoU8fJWURRdnu0AK3jVH fwbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=UfFRGPeE2ZLo8C9JFiR7wWvNCzDdrS4O9P7I0rwozQE=; fh=LQnZnJgbwA2rofRvgLxtxvFjbWmQSZR0bRTgn+flB4A=; b=tPx12alwDS2OCFdBgKKV2z0sdJZqQdC4A5HA0dWZFU6huZN/Eg0wJhBZAb8m3wBdU8 lJ0nH1gQZ0peJQSYGMQi7wUnL0y804RwRNNy7lqz/YTfHRQY11rcGBwsEO6KV5nqgYpz 0wP5vhTj7JImFfSbuybJwJ5Xmbrx2Fvn2tvMZZLLaRPAJ/7ywOrX+yqaOEkK6+ld1CIm S75Bm/jA57E54VcnrOVKwku7HMMjf1qHDpeLOnGH96C+YDzaj4bmaT0/Jy1gp1TY2gSb qMVi174CKeC5qGO29inZ9dTgj1RDbsxy2Q/2baQRR4TcXSBiao719bg+7Dz2d7XsBZ06 h3Ug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bytedance.com header.s=google header.b="N8zdbs/p"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=bytedance.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r20-20020a6560d4000000b00563e0be1de6si5507430pgv.824.2023.08.07.06.08.52; Mon, 07 Aug 2023 06:09:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@bytedance.com header.s=google header.b="N8zdbs/p"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=bytedance.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232771AbjHGL3t (ORCPT + 99 others); Mon, 7 Aug 2023 07:29:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37160 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232743AbjHGL3f (ORCPT ); Mon, 7 Aug 2023 07:29:35 -0400 Received: from mail-qv1-xf2f.google.com (mail-qv1-xf2f.google.com [IPv6:2607:f8b0:4864:20::f2f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 19676173E for ; Mon, 7 Aug 2023 04:26:46 -0700 (PDT) Received: by mail-qv1-xf2f.google.com with SMTP id 6a1803df08f44-63d4f1cb5a9so11710306d6.1 for ; Mon, 07 Aug 2023 04:26:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1691407534; x=1692012334; 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=UfFRGPeE2ZLo8C9JFiR7wWvNCzDdrS4O9P7I0rwozQE=; b=N8zdbs/pRD0qXDGB+MPerQoEPyvReHER5GyXU+TDsH0KotZQCSMVMObROXe7Q2numc B9RKkzLT31KXco4GRtIZUNqkssSnYyielS4MpDR50Sj6HzDoFzpkcvmQmgkG4YVhR4Gb FU5dgtcCehwFJFE9nq4V//tbfd5NDTDvc7VbV49hc4BdiySLUxCyYGX002imcmxmaHE/ UA3i3P4p5vXL6Ss9yaWGjYf8tPATLvF8MDKpDlW9ZZbLVx9pvJ7n4AVP68w7S+7bjA6l 66AtBEWkRJ8nzBktRJXiyZiUqh70CwUzY5M9lAccsZnoSD4Rz7VK+MJck1rZt1T8XR0S TDaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691407534; x=1692012334; 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=UfFRGPeE2ZLo8C9JFiR7wWvNCzDdrS4O9P7I0rwozQE=; b=gZ+ZKCmX236Xu7sJe3QvNd/dhP7F3KgZrZH38CBe99kj0MppclbsAU/BRoTmCDT5+W FltGttHRBI5kkfKTtyfqtQH9AC9LU+oO4mQV5t1AWH15wwDjWoC3sQDipg97uvZMAIqk +PMSnU/V7Gep9W4XeppqN3ytR7rYJrI93H8IpwgOZwn9qqWWNNll6okBf0lNvQnOYPOQ H92dIwWXQXoiaJ7xATMyIYM3dP8sN/1MZkCZjUkQXVkxLK4I01EmjGF58hEh8brqlmtQ iv6u8RYTl9+7s3+nmWvRm28EvrfiJmvSJKRbDhr4SOWnWX05iwT0geZpWJfS2siwf6O/ uLkw== X-Gm-Message-State: AOJu0Yx/l6gPC48ULy8ZJpS/0XE2xdX+s1wM7hyxxSim96omh/4cec+Z 03TAjv2j9FfDYMXR9L87U1y7YYzv6aEMafsSZ2E= X-Received: by 2002:a17:902:d503:b0:1bb:83ec:832 with SMTP id b3-20020a170902d50300b001bb83ec0832mr32625772plg.2.1691406854020; Mon, 07 Aug 2023 04:14:14 -0700 (PDT) Received: from C02DW0BEMD6R.bytedance.net ([203.208.167.146]) by smtp.gmail.com with ESMTPSA id y13-20020a17090aca8d00b0025be7b69d73sm5861191pjt.12.2023.08.07.04.14.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Aug 2023 04:14:13 -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, simon.horman@corigine.com, dlemoal@kernel.org 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 v4 20/48] mm: thp: dynamically allocate the thp-related shrinkers Date: Mon, 7 Aug 2023 19:09:08 +0800 Message-Id: <20230807110936.21819-21-zhengqi.arch@bytedance.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20230807110936.21819-1-zhengqi.arch@bytedance.com> References: <20230807110936.21819-1-zhengqi.arch@bytedance.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773575861942505248 X-GMAIL-MSGID: 1773575861942505248 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 947001a7cd42..5d0c7a0b651c 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 __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); @@ -2834,7 +2863,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); @@ -2908,14 +2937,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) {