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 C8AF1C41513 for ; Wed, 26 Jul 2023 09:28:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5E1BE6B0071; Wed, 26 Jul 2023 05:28:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 591FC8D0001; Wed, 26 Jul 2023 05:28:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 45BBE6B0075; Wed, 26 Jul 2023 05:28:05 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 352136B0071 for ; Wed, 26 Jul 2023 05:28:05 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 017351C83F9 for ; Wed, 26 Jul 2023 09:28:04 +0000 (UTC) X-FDA: 81053236530.04.4B53416 Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by imf14.hostedemail.com (Postfix) with ESMTP id F012C10001C for ; Wed, 26 Jul 2023 09:28:02 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=VrX61tol; spf=pass (imf14.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.210.172 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1690363683; 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=3q/836hkNQMpcz/8YX2aFfQHacV0FqcsnRX2KDKmGK4=; b=GgTQbOcYzlaMTxNfZ1MKmVtnPC0J2FboxsFSKlTmZttAyd69vEOHNIKGfxWE5pHUCiGWQs TcXOmwklVE9SDu/e2HHXU3u/e3Jha4Xu0J+SfKh3Sk21PFHQsrWvoTiNd8JZK1iUgQBhVf WziSWodFmNESL3nQXUCAN4KgsKARTIo= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1690363683; a=rsa-sha256; cv=none; b=tqQvE4BWmQ/Nh7CZ/qtoCBulIdTTRx/qvTGok2gggOwSrPPXpzzBdK5sGJG6HxFJnhglGQ +y4qXm7gLILFlxiOn9ERLYHG1rOYAgpaPqxdIAC71A7TZj9Nth4Qje2Wn0nTuNZ2xc89k0 dFsZ5CGdMBXLV1lpBRVTZOeMnh2iT+w= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=VrX61tol; spf=pass (imf14.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.210.172 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-6864c144897so1488719b3a.1 for ; Wed, 26 Jul 2023 02:28:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1690363681; x=1690968481; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=3q/836hkNQMpcz/8YX2aFfQHacV0FqcsnRX2KDKmGK4=; b=VrX61tolI6lx5cf13TzjBUi7Jr7lyRI0PErux25Ugwzya6Gr7la8Z5mF2+cskv3TWz UBVd0Z5Poj3PRTux8odPv45l8gQzAXnTFOr3Tf8UDx7d9uUEKzN37AEVIKYy6agrhmgA YruSiWL83SB/lZ95d/ocS5Ez1ClN1w8sLcjpu26a2KNj8aWhEC89NaIXAD4IQeJcJzfH uYL7oLGt6F17I0XKTtTRSbeLX7ktBDSzYJstMwVG/599hz7kBf24kzbOMqBXrGbap2ZR iYE22Dihl4RYEd6b6MxzHd9sXrRhtrB75dhklT8m88pkRrstmkcW4eCpJX3cURQ8vJOi rydw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690363681; x=1690968481; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=3q/836hkNQMpcz/8YX2aFfQHacV0FqcsnRX2KDKmGK4=; b=cdYbftVZYDplwe2X3v6LtxgQ9qmjFJyu1rmIWA5tjeCruyaizGbEBiW8axNl1IPulj mhsdJA/mBWg4sS+u1Pql69EWcZOzGFHH+F65HrU5ejSCv8CcjMT6OxXKl/GfQLU25AON sLfm49zI2SW8ApRj2aIAXkkfhIp56Q7dMmzEffcrqVUVbBXDlmiuDvkhfKh2XrMXYxj1 Q9+4Pune92fMUwSk8bnSCNcfx3ZqUPmEqH6rU7HjaHibsQ2Jelqz41UEig1O1SEx/Wxu 2ip7iAjwOG7K33a5A/0hB8yIo5s6X2/koFITS1ISL4NxNMdixVXuAkA1DFZ9bOqvvSCg znsA== X-Gm-Message-State: ABy/qLayhRL13DD0dL8+aNJFjnip+MwQv2JT2Ii7XTtKmapZI0+h2+mn L1ChTFKCdF5c3XQN6P2RUnVunw== X-Google-Smtp-Source: APBJJlFbGXVT1jvZWB8OqMMjwV1wWa8tPHrXXzsgQ/SF73jQ8jhDFJz/C4eSTJgkpJW81UF91auuJQ== X-Received: by 2002:a05:6a20:3c90:b0:134:d4d3:f0a5 with SMTP id b16-20020a056a203c9000b00134d4d3f0a5mr1941746pzj.2.1690363681365; Wed, 26 Jul 2023 02:28:01 -0700 (PDT) Received: from [10.70.252.135] ([203.208.167.147]) by smtp.gmail.com with ESMTPSA id l73-20020a633e4c000000b00563da87a52dsm1901427pga.40.2023.07.26.02.27.49 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 26 Jul 2023 02:28:01 -0700 (PDT) Message-ID: <665ccd89-8434-fc45-4813-c6412ef80c10@bytedance.com> Date: Wed, 26 Jul 2023 17:27:47 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 Subject: Re: [PATCH v2 19/47] mm: thp: dynamically allocate the thp-related shrinkers Content-Language: en-US To: Muchun Song 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> From: Qi Zheng In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: F012C10001C X-Rspam-User: X-Stat-Signature: kq6wwh575nc318ad49r6hq1nb743yk77 X-Rspamd-Server: rspam03 X-HE-Tag: 1690363682-504564 X-HE-Meta: U2FsdGVkX1+Ey5OESDFl/NNWGnNr1YvcnUBUMQSsGN8fb2MFJ/48B/vDvGuRi4NVCkMPhdB56TiXuoBemuxVyvF4ptfBG9dFJWlIjgOidWID3iZfZveHZO0VRkF5Bea88zmHWr+Nj6x1g1OP/pHREcPzbtN0uFxn6jq0IQAgS3pEszfi+/CdYh6Lr2nMILZWhBB54djPyofopiU+bmmX5wzfxRoWDn4EmZwwiLA79loRYLLudS5H/FOmwUtGDMndzuO55LlXSIWwRLsxLHyjmXobL0RxVcKJLTH4rYQfQBLhaoqhizXgNxPOI2mifUStIN7pz3FSa90WVUU5jgxEUsLGtEl8HAlq6arTDFDf24MicRmbczrEOKOdXx14iHXRUA4f/BroOYtLXQUr5s56ZUaJsW09k8NeKNe8cnFpSHYW3Eqj+6AYy6+yBLXHyiV2XZTMW/NkVVJVtn8Xz6NdopCuQK2YXlL2FbBbv47EGpOgAuAjfaef/5degXiW/PRRdylJfyvF+ENzxOCTcsB6Fc65okkq/DeoT68n27TxuhMheBeAYHTcLJ0MFGK3FW2Qbkw6JHPZdST3N/00lNKnndLCUNgo38qgg/5b0d5yIeSTozjMULZ4KI//xOpGZemAEW2V7qhxh55arMHkhqJPzARFHJtul+l53Yh6S6qKuiP0ZV8IFfbb38flZB2R+0QFIOPsgq1MKPFEJQnMC+fhUVMBGT3NLwrpGBxq6TVTsFE0oD6yUry+cw4QUqkfFuzwbJ52R4jk5EsKbgavVaah4cu/qetjkOn6TCGytNGP4Yr+rgTgJ0ct+BzsDzlKop3oRa62W/bqsJ9Bg7HiwJfgAPdhfeCfcjZOuGOjZWi8XpVqZ8EDOxtSf2+lECgY/lpv1fgTGAihWLqw/xsFdX0FhZAicbAyqA7FhDsaeU5Jfg2nIf3SHkHiSMVXNVb97CMVPfrVm9EpWME0UMGRARQ +SpnzxOz q2fI8Hs71i692wqwi7WDS9r4tV1oH+ZAFzrtX3OyL+QTNPE1JPrYlvXjiZmvepQqnOJmWHa5augxue3hUg0rjPJKK3HbS0jf2o7Dtz/C+bDYgaw+fm14L7mLYuCNINQEVdhNxKFMnfwb4zteu6uRgFInKMqALin+RGCyCxe08guoTYCUmx7hiMVwcjIao0GB7xrtHL3AdtH0ENlcgHkSz5MV9v/FH+ck4PI9PPLW0V0eon8CnwdSoeQuhg0E2RgFAtvQIJWO/1WJwHxgdVbsHrOAZQ6kfv5CybgBBPmtohFdBGqXSjYMrUv0jXLQk2NTVLolVJWsLSBeRhrDtN64Unlkop7YoHHTb2H0MHPj2M8NR5hk9dCkhGBsSSpRmwFZ2vJnG90CbDG5R1Oonhz0XZV7JpXxuqf2Hdy/RKyY6vJ8NCp8= 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/26 15:10, Muchun Song wrote: > > > 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. OK, will do. > >>   #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. Will do. > >> +{ >> +    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. Will do. > >> +{ >> +    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) >>   { >