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 61591C43334 for ; Mon, 20 Jun 2022 07:47:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D52C86B0071; Mon, 20 Jun 2022 03:47:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D0DC76B0073; Mon, 20 Jun 2022 03:47:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BA2E76B0074; Mon, 20 Jun 2022 03:47:35 -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 A9ADD6B0071 for ; Mon, 20 Jun 2022 03:47:35 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 77EC660B56 for ; Mon, 20 Jun 2022 07:47:35 +0000 (UTC) X-FDA: 79597834470.20.02C7749 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf26.hostedemail.com (Postfix) with ESMTP id E56CC1400AC for ; Mon, 20 Jun 2022 07:47:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1655711254; h=from:from: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; bh=Swx0F31MzBfg+ngtrAShbFu1C4KdMojB34uimCkyvcw=; b=gsdeYSrFpquTpcca4jRzM4hUudd8RU8UfAYYa/5egOoYKP8dTN0AC1JX2w0nowwe61NVkP 9zXnFP/We0AtefOHcZxTOaOfRqKMra5s07tORbriS1BJiFhp1gIOGYMOvztuZpMvQbGAqh H3mjTy1ZelNusJfSC6J2Sop+5dl5KIs= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-662-4EjfvPKpN-iRa0-EKCfX7w-1; Mon, 20 Jun 2022 03:47:25 -0400 X-MC-Unique: 4EjfvPKpN-iRa0-EKCfX7w-1 Received: by mail-wr1-f69.google.com with SMTP id n7-20020adfc607000000b0021a37d8f93aso2192068wrg.21 for ; Mon, 20 Jun 2022 00:47:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:organization:in-reply-to :content-transfer-encoding; bh=Swx0F31MzBfg+ngtrAShbFu1C4KdMojB34uimCkyvcw=; b=P1DUM1SQDJYPra5VPL5WA6+1D/6HK8A5DPLKO2CEd5kuQfDQUBcfRBJ//fftVzD4/K b7/SHymdPvZ8JYDwSDchIiYqd1F6p0fwH0bLZDHnNsLEyVjOEJayLV5dowOXYjDpAsO0 sfncCPRwz9+rwJwuPq7/koIKFSxBniuueZkJYPWWZiqjdOxkYqDvbiY3pscAX7tqyC9A xmA1Nmes6xFndSKo6w9Yj0h3QfFegmT0bThBXsbfKKl3plTZl1HaMtgABrOq61Lel9Vp m4k5OmvthW6RCQzfcwR2oY++Ou8Q0qv3AEfb4s9sC7RInh4CelSb+UEhc5wqQmbjGHBU MgLQ== X-Gm-Message-State: AJIora87tmIcsIz61CkxE+5IdAFSbdXW/eOocJPZO7089DowvCfVbxi2 i0z+6eY9uxNMR7idRBAhUqbpMITpNuO/kktop4Sk5d0+V6d7G1yah9Fpq2TyVU04iTmn9PF1n9C 0wUGABxWZuC8= X-Received: by 2002:a7b:c392:0:b0:39c:4d27:e698 with SMTP id s18-20020a7bc392000000b0039c4d27e698mr23209897wmj.57.1655711244193; Mon, 20 Jun 2022 00:47:24 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tZHngIz1nmDGjViDYq8dx9T6leMNpILDajZ78iuXxNfTEeSi93ba+gl4fuGlsgBS4IGwA1KA== X-Received: by 2002:a7b:c392:0:b0:39c:4d27:e698 with SMTP id s18-20020a7bc392000000b0039c4d27e698mr23209868wmj.57.1655711243813; Mon, 20 Jun 2022 00:47:23 -0700 (PDT) Received: from ?IPV6:2003:d8:2f04:2500:cdb0:9b78:d423:43f? (p200300d82f042500cdb09b78d423043f.dip0.t-ipconnect.de. [2003:d8:2f04:2500:cdb0:9b78:d423:43f]) by smtp.gmail.com with ESMTPSA id c12-20020adffb0c000000b0021b9100b844sm1447006wrr.91.2022.06.20.00.47.23 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 20 Jun 2022 00:47:23 -0700 (PDT) Message-ID: <226243a9-b4f5-182e-1a5b-7b8d5c28f3b3@redhat.com> Date: Mon, 20 Jun 2022 09:47:22 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.0 Subject: Re: [PATCH v4 2/2] mm: memory_hotplug: make hugetlb_optimize_vmemmap compatible with memmap_on_memory To: Muchun Song , akpm@linux-foundation.org, corbet@lwn.net, mike.kravetz@oracle.com, osalvador@suse.de, paulmck@kernel.org Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, duanxiongchun@bytedance.com, smuchun@gmail.com References: <20220619133851.68184-1-songmuchun@bytedance.com> <20220619133851.68184-3-songmuchun@bytedance.com> From: David Hildenbrand Organization: Red Hat In-Reply-To: X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1655711255; a=rsa-sha256; cv=none; b=S9IBDZT4cDMoXr/XBEuBhhntSfjcdb4bqRfFxy4Qa1YUfwzkzwNkbICTIG6gxRvGhg/j+X geQIL/+6c2c1qHx59M6VgNywi74wdxBZVhjl3HHVQGhA+azRBE+NiuGeVuPLAkJPNzZ1LH TscKagxz76myM91huEJ9HZ5v3LEmigM= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=gsdeYSrF; dmarc=pass (policy=none) header.from=redhat.com; spf=none (imf26.hostedemail.com: domain of david@redhat.com has no SPF policy when checking 170.10.133.124) smtp.mailfrom=david@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1655711255; 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=Swx0F31MzBfg+ngtrAShbFu1C4KdMojB34uimCkyvcw=; b=kkzJ56lJxLbUUVHIVVQJeQhaw3cc24/kcVAg2bI+yz7glht0m41DvzTKACKUeqIYdJn7/8 RLDjPUiCHrh30FKJdxGk5+UUuo+HHsQd4cMuBkGGPmTIx2lx/jvzKgvaG5xN9KrzdTfeU1 Ax+U377LkEAUz86gnCT7BA6xgW/mDus= Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=gsdeYSrF; dmarc=pass (policy=none) header.from=redhat.com; spf=none (imf26.hostedemail.com: domain of david@redhat.com has no SPF policy when checking 170.10.133.124) smtp.mailfrom=david@redhat.com X-Stat-Signature: y7etknqfr69gxa8gsbukncsxutniuxxx X-Rspamd-Queue-Id: E56CC1400AC X-Rspam-User: X-Rspamd-Server: rspam03 X-HE-Tag: 1655711254-417415 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 20.06.22 09:22, Muchun Song wrote: > On Sun, Jun 19, 2022 at 09:38:51PM +0800, Muchun Song wrote: >> For now, the feature of hugetlb_free_vmemmap is not compatible with the >> feature of memory_hotplug.memmap_on_memory, and hugetlb_free_vmemmap >> takes precedence over memory_hotplug.memmap_on_memory. However, someone >> wants to make memory_hotplug.memmap_on_memory takes precedence over >> hugetlb_free_vmemmap since memmap_on_memory makes it more likely to >> succeed memory hotplug in close-to-OOM situations. So the decision >> of making hugetlb_free_vmemmap take precedence is not wise and elegant. >> The proper approach is to have hugetlb_vmemmap.c do the check whether >> the section which the HugeTLB pages belong to can be optimized. If >> the section's vmemmap pages are allocated from the added memory block >> itself, hugetlb_free_vmemmap should refuse to optimize the vmemmap, >> otherwise, do the optimization. Then both kernel parameters are >> compatible. So this patch introduces VmemmapSelfHosted to mask any >> non-optimizable vmemmap pages. The hugetlb_vmemmap can use this flag >> to detect if a vmemmap page can be optimized. >> >> Signed-off-by: Muchun Song >> Co-developed-by: Oscar Salvador >> Signed-off-by: Oscar Salvador >> --- >> Documentation/admin-guide/kernel-parameters.txt | 22 +++++------ >> Documentation/admin-guide/sysctl/vm.rst | 5 +-- >> include/linux/memory_hotplug.h | 9 ----- >> include/linux/page-flags.h | 11 ++++++ >> mm/hugetlb_vmemmap.c | 52 +++++++++++++++++++++---- >> mm/memory_hotplug.c | 27 ++++++------- >> 6 files changed, 79 insertions(+), 47 deletions(-) >> >> diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt >> index 8090130b544b..d740e2ed0e61 100644 >> --- a/Documentation/admin-guide/kernel-parameters.txt >> +++ b/Documentation/admin-guide/kernel-parameters.txt >> @@ -1722,9 +1722,11 @@ >> Built with CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP_DEFAULT_ON=y, >> the default is on. >> >> - This is not compatible with memory_hotplug.memmap_on_memory. >> - If both parameters are enabled, hugetlb_free_vmemmap takes >> - precedence over memory_hotplug.memmap_on_memory. >> + Note that the vmemmap pages may be allocated from the added >> + memory block itself when memory_hotplug.memmap_on_memory is >> + enabled, those vmemmap pages cannot be optimized even if this >> + feature is enabled. Other vmemmap pages not allocated from >> + the added memory block itself do not be affected. >> >> hung_task_panic= >> [KNL] Should the hung task detector generate panics. >> @@ -3069,10 +3071,12 @@ >> [KNL,X86,ARM] Boolean flag to enable this feature. >> Format: {on | off (default)} >> When enabled, runtime hotplugged memory will >> - allocate its internal metadata (struct pages) >> - from the hotadded memory which will allow to >> - hotadd a lot of memory without requiring >> - additional memory to do so. >> + allocate its internal metadata (struct pages, >> + those vmemmap pages cannot be optimized even >> + if hugetlb_free_vmemmap is enabled) from the >> + hotadded memory which will allow to hotadd a >> + lot of memory without requiring additional >> + memory to do so. >> This feature is disabled by default because it >> has some implication on large (e.g. GB) >> allocations in some configurations (e.g. small >> @@ -3082,10 +3086,6 @@ >> Note that even when enabled, there are a few cases where >> the feature is not effective. >> >> - This is not compatible with hugetlb_free_vmemmap. If >> - both parameters are enabled, hugetlb_free_vmemmap takes >> - precedence over memory_hotplug.memmap_on_memory. >> - >> memtest= [KNL,X86,ARM,M68K,PPC,RISCV] Enable memtest >> Format: >> default : 0 >> diff --git a/Documentation/admin-guide/sysctl/vm.rst b/Documentation/admin-guide/sysctl/vm.rst >> index 5c9aa171a0d3..d7374a1e8ac9 100644 >> --- a/Documentation/admin-guide/sysctl/vm.rst >> +++ b/Documentation/admin-guide/sysctl/vm.rst >> @@ -565,9 +565,8 @@ See Documentation/admin-guide/mm/hugetlbpage.rst >> hugetlb_optimize_vmemmap >> ======================== >> >> -This knob is not available when memory_hotplug.memmap_on_memory (kernel parameter) >> -is configured or the size of 'struct page' (a structure defined in >> -include/linux/mm_types.h) is not power of two (an unusual system config could >> +This knob is not available when the size of 'struct page' (a structure defined >> +in include/linux/mm_types.h) is not power of two (an unusual system config could >> result in this). >> >> Enable (set to 1) or disable (set to 0) the feature of optimizing vmemmap pages >> diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h >> index 20d7edf62a6a..e0b2209ab71c 100644 >> --- a/include/linux/memory_hotplug.h >> +++ b/include/linux/memory_hotplug.h >> @@ -351,13 +351,4 @@ void arch_remove_linear_mapping(u64 start, u64 size); >> extern bool mhp_supports_memmap_on_memory(unsigned long size); >> #endif /* CONFIG_MEMORY_HOTPLUG */ >> >> -#ifdef CONFIG_MHP_MEMMAP_ON_MEMORY >> -bool mhp_memmap_on_memory(void); >> -#else >> -static inline bool mhp_memmap_on_memory(void) >> -{ >> - return false; >> -} >> -#endif >> - >> #endif /* __LINUX_MEMORY_HOTPLUG_H */ >> diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h >> index e66f7aa3191d..2aa5dcbfe468 100644 >> --- a/include/linux/page-flags.h >> +++ b/include/linux/page-flags.h >> @@ -193,6 +193,11 @@ enum pageflags { >> >> /* Only valid for buddy pages. Used to track pages that are reported */ >> PG_reported = PG_uptodate, >> + >> +#ifdef CONFIG_MEMORY_HOTPLUG >> + /* For self-hosted memmap pages */ >> + PG_vmemmap_self_hosted = PG_owner_priv_1, >> +#endif >> }; >> >> #define PAGEFLAGS_MASK ((1UL << NR_PAGEFLAGS) - 1) >> @@ -628,6 +633,12 @@ PAGEFLAG_FALSE(SkipKASanPoison, skip_kasan_poison) >> */ >> __PAGEFLAG(Reported, reported, PF_NO_COMPOUND) >> >> +#ifdef CONFIG_MEMORY_HOTPLUG >> +PAGEFLAG(VmemmapSelfHosted, vmemmap_self_hosted, PF_ANY) >> +#else >> +PAGEFLAG_FALSE(VmemmapSelfHosted, vmemmap_self_hosted) >> +#endif >> + >> /* >> * On an anonymous page mapped into a user virtual memory area, >> * page->mapping points to its anon_vma, not to a struct address_space; >> diff --git a/mm/hugetlb_vmemmap.c b/mm/hugetlb_vmemmap.c >> index 1089ea8a9c98..73bfbb47f6a4 100644 >> --- a/mm/hugetlb_vmemmap.c >> +++ b/mm/hugetlb_vmemmap.c >> @@ -10,7 +10,7 @@ >> */ >> #define pr_fmt(fmt) "HugeTLB: " fmt >> >> -#include >> +#include >> #include "hugetlb_vmemmap.h" >> >> /* >> @@ -97,18 +97,54 @@ int hugetlb_vmemmap_alloc(struct hstate *h, struct page *head) >> return ret; >> } >> >> +static unsigned int vmemmap_optimizable_pages(struct hstate *h, >> + struct page *head) >> +{ >> + if (READ_ONCE(vmemmap_optimize_mode) == VMEMMAP_OPTIMIZE_OFF) >> + return 0; >> + >> + if (IS_ENABLED(CONFIG_MEMORY_HOTPLUG)) { >> + unsigned long pfn = page_to_pfn(head); >> + >> + /* >> + * Due to HugeTLB alignment requirements and the vmemmap pages >> + * being at the start of the hotplugged memory region in >> + * memory_hotplug.memmap_on_memory case. Checking the first >> + * vmemmap page's vmemmap if it is marked as VmemmapSelfHosted >> + * is sufficient. >> + * >> + * [ hotplugged memory ] >> + * [ section ][...][ section ] >> + * [ vmemmap ][ usable memory ] >> + * ^ | | | >> + * +---+ | | >> + * ^ | | >> + * +-------+ | >> + * ^ | >> + * +-------------------------------------------+ >> + * >> + * Hotplugged memory block never has non-present sections, while >> + * boot memory block can have one or more. So pfn_valid() is >> + * used to filter out the non-present section which also cannot >> + * be memmap_on_memory. >> + */ >> + pfn = ALIGN_DOWN(pfn, PHYS_PFN(memory_block_size_bytes())); >> + if (pfn_valid(pfn) && PageVmemmapSelfHosted(pfn_to_page(pfn))) > > Although it works, I think PageVmemmapSelfHosted() check for the 1st pfn's > vmemmap page is not always reliable. Since we reused PG_owner_priv_1 > as PG_vmemmap_self_hosted, the test is noly reliable for vmemmap page's > vmemmap page. Other non-vmemmap page can be flagged with PG_owner_priv_1. > So this check can be false-positive. Maybe the following code snippet is > the solution. How could that happen for pages used for backing a vmemmap? > > Any thoughts? Oscar or David. First of all, I think you should really avoid using memory_block_size_bytes(); when using memory_block_size_bytes(), you wouldn't need PageVmemmapSelfHosted(), you can just check if the vmemmap of the page is itself. But I think we should try making this independent of the memory block size. If virt_to_page(page) doesn't work, maybe just traverse the direct map to find the page backing page directly? -- Thanks, David / dhildenb