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 8F966C021A0 for ; Mon, 17 Feb 2025 09:44:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 299B5280044; Mon, 17 Feb 2025 04:44:35 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 24AF6280040; Mon, 17 Feb 2025 04:44:35 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 09D34280044; Mon, 17 Feb 2025 04:44:35 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id DF770280040 for ; Mon, 17 Feb 2025 04:44:34 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 8FE51122198 for ; Mon, 17 Feb 2025 09:44:34 +0000 (UTC) X-FDA: 83128951668.13.20C3EB7 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf05.hostedemail.com (Postfix) with ESMTP id 2CD1810000D for ; Mon, 17 Feb 2025 09:44:32 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=AXxYqG36; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf05.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739785472; a=rsa-sha256; cv=none; b=QgYY6cYSPipb12vNCt1ettZvZ7LNRYo8RiGZHnsBRB2mnwEmqYi6VjS8VzoZjMfSOOLpX9 iwvShbJy0ysN1Db+DDOsnhBQw7DYV11pA0nQ0bkBjrNtEaH3Uew4pgCqn9lFpoKU6l+37y KrfvwW+kTDjv1SQg4koSXfD77tcPu/8= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=AXxYqG36; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf05.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739785472; 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=zqDAUvAEeGP+kauicMXsQJdKxUNLdnbFg64inWAI/Iw=; b=Mrjugt1a6QLEXJNFf5wkCPOaNW0yY/wlnm4lVwCnWMJOhcL7vrLD4qR5VIknAdsYBOGOTX aOnkAhFc+HBlAhENLFYp927pk6VSKgPliUt71ycg7UwcwD9V6mwkHQ+sEmAHypXjTNVX2A OdK8/Vt8d22eWNsuAFiFZdp19PvyO5U= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739785471; 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:autocrypt:autocrypt; bh=zqDAUvAEeGP+kauicMXsQJdKxUNLdnbFg64inWAI/Iw=; b=AXxYqG36q1aCMIyv8jJzL9ioR7J9vyX9AABv0ztE4NYQD4P9VWbjE0u3VrB5psRYtgXnyG TTDYIzHwhECJgl4oB96jJxw2Gdo540RnkaDXMdNGxjGk+l9QsaE1SKggPX5TY6nvvlWVcT xACLJQCkbp2LJOM2O7PTiVuC/nuA66o= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-518-ZS9glxUxMmCurzCrvzjX_g-1; Mon, 17 Feb 2025 04:44:28 -0500 X-MC-Unique: ZS9glxUxMmCurzCrvzjX_g-1 X-Mimecast-MFC-AGG-ID: ZS9glxUxMmCurzCrvzjX_g_1739785468 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-38f39bd453bso1008461f8f.3 for ; Mon, 17 Feb 2025 01:44:28 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739785467; x=1740390267; h=content-transfer-encoding:in-reply-to:organization:autocrypt :content-language:from:references:cc:to:subject:user-agent :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=zqDAUvAEeGP+kauicMXsQJdKxUNLdnbFg64inWAI/Iw=; b=HOy0xmXQZmXRFn1xZ/B+I/ebIYBiokf+ByrYnik1nYj/SixbHs8WOY9UA8pF+pJApC DsErGtivnbc6XYtR0Xd1y01/CK0odDUQajrXSoBmxgh1VyVATa7OAvZPWM0M3QLr3h7o 7RMpnC/NFT1D/Yp9B6ET1Zr4LBSUvZIlMz9bi8oc9pSdAxtVHq08JwFMi2hLgau6k00k 5v6Y2RV110ZJcdQo2IeTp2C31SRmIH21olaY/9w7dojefVthu5tijbMAK2DbnDrDSODi gST/s1uwedBGs5hwuXb1DkQwDY21wG+ky0AAaQFSOp9A+ks+ta7yJhGqCI0ZFjiFkLMj Vw1g== X-Forwarded-Encrypted: i=1; AJvYcCXsNE0Dubtd5rvdpPryZRc4Swzm0QHRRG+QLtm+alCYZXYANhZIJGHNrUhUSX0ZJDAYxGVjl9YYCg==@kvack.org X-Gm-Message-State: AOJu0YxfX0PdEODov8N6l5dvBqZdm8qBcdWV6Yuz7rG7pTZ3C64H1P4F Dx5z5aQpCh7XKcxuopefq33HIGpZnGLF7Jcm9M2lebv9zhkbAvW0tFnLyaulo+SQvl66+0+kn2z X1j14ZqjdekfMjX7elWxd51RN+Rpwv/CnJP1gH5106McqLINy X-Gm-Gg: ASbGncvZa9uXereGQi5WE54lKDDzwT7xnMnn6AAYjQoP5b5/NBY63rxWBvhhcVW6MK6 JHGWJ49Gn4SXcFQZlG4gd4gS8AreIn0tu1yuVhQt0y3Y2n4oswWufojpkMAjLT/91OLoyO3BWyc YVLmDASkA2RtEbPFKF/HRzoXfl0ISNtb8IEB1f6P3e/5NRKTvOIsXPmX1AL9YqyNnoeosSZzKA8 DW2H009VlIqqX3tpediirJo2pwhMwdZGOMPEbJ696qCxziavtaCihKpBeonYxICqL7SoCPBzdJB h0KwxluH+cx3FWYaQrtBZMqie1zqErKJaVjiL7SiBQsCU4NrQDKsSl+sQJ6XOM8RQQC9Xf+q+sI qC8zN5E6fbNINRy3+6Z1RGDBUpnLaDw== X-Received: by 2002:a05:6000:1acb:b0:38d:b051:5a0e with SMTP id ffacd0b85a97d-38f33f5403emr9005238f8f.49.1739785467544; Mon, 17 Feb 2025 01:44:27 -0800 (PST) X-Google-Smtp-Source: AGHT+IGNgLkKR19H26t5bIeaj/kdxdOHxKJk3k2pdc8bDKMxYHqeL2D6C5+H/jLNeUyyltbMVaZIzw== X-Received: by 2002:a05:6000:1acb:b0:38d:b051:5a0e with SMTP id ffacd0b85a97d-38f33f5403emr9005196f8f.49.1739785467127; Mon, 17 Feb 2025 01:44:27 -0800 (PST) Received: from ?IPV6:2003:cb:c739:900:900f:3c9e:2f7b:5d0a? (p200300cbc7390900900f3c9e2f7b5d0a.dip0.t-ipconnect.de. [2003:cb:c739:900:900f:3c9e:2f7b:5d0a]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38f258eb141sm11538422f8f.41.2025.02.17.01.44.24 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 17 Feb 2025 01:44:25 -0800 (PST) Message-ID: <8c1578ed-cfef-4fba-a334-ebf5eac26d60@redhat.com> Date: Mon, 17 Feb 2025 10:44:23 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v7] arm64: mm: Populate vmemmap at the page level if not section aligned To: Zhenhua Huang , anshuman.khandual@arm.com, catalin.marinas@arm.com Cc: will@kernel.org, ardb@kernel.org, ryan.roberts@arm.com, mark.rutland@arm.com, joey.gouly@arm.com, dave.hansen@linux.intel.com, akpm@linux-foundation.org, chenfeiyang@loongson.cn, chenhuacai@kernel.org, linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, quic_tingweiz@quicinc.com References: <20250217092907.3474806-1-quic_zhenhuah@quicinc.com> From: David Hildenbrand Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: <20250217092907.3474806-1-quic_zhenhuah@quicinc.com> X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: xAIsWvevePkulCTWKYvwEAnu6G0DJW9KwwNHFZr-fTo_1739785468 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspam-User: X-Rspamd-Queue-Id: 2CD1810000D X-Rspamd-Server: rspam12 X-Stat-Signature: 897g4fxjtmufqfb88yn9a5st1k7h8kqj X-HE-Tag: 1739785472-287037 X-HE-Meta: U2FsdGVkX19cCgYhZAgXUM4s+yVpFAUL1Bmuqrkx2IoKzxT4LpR5V4pLT/xQaFT5+z87fDhmjnqguip+v5XqE8HQerYytuH7e2i+eaLT8tIkMB1lackNYK92jRtW+koCd2El/Q54quKOgY2oPgg2D8F6qZwHFE67NunYZbSh55PRtxw1JTJI76VLmBJ4wohBHVedpUSEx9N4m75oiJThaV8q88vOXcPw90BQTqVQ57PHOU5iWhE0/yP3Onwe8/dVDZfeEUGjRN8aBfIhPvXNnKltcca0kC++UrM3F4f/l8AhhOP2d3m1S45fOWFgfIgdEiA7bB96/tteNLeeylDmtSlrg9wJGt1vW0U6vPgv1jcw/+Bex90sOkeEMhob9Ifv00mOk02+9dUM6yU0MuXyIPl/CedjXXb8kT1Ye2DiTUNBVYQeaM1giA5FeYd67KrcE4YP7PilQlGfDBDJAmLdaqOM58W36cQdjWXTJTfYUO1Ou28fvvXMA8HTsSaPrO19VC8qiGFxyymfZ0AZaJVPaPYz3y8P2M5tnmpYexWlnyqAiavCxJFlv61D9xU51YrYdZBwtR1ME4Pse4IL5eddnCp1rwzmyyamQ5VwdFNX0u1y+Ad7awtSdedvTgKWasdxHdaVHa1P+hsvyQu6mgPEc+gXmC666ipbcM9OK2J9H9WNeUUpGS6fqhh9s58xKDeq6zm+s5mmJ/S15SIw+9ZGQGbmgJyYFGF/KwGVMBR5fdyHau23O319j9FiZc/04x08g8MapkNVPp4R9DtXr4m1aZVbtn/qZPulu5suvjt1yoaZpoiC7pFJA4Ma6yL1eq8uF1SpVcv24Hx7CL6PYb9MmHpwNiifEhwerW6jIio3fgPGoFFhesPo/aOtkrO/f9z3o/KuAN0hUzRuNZXImz+Oy0ZpA2hIOj4SnmS4N+Ykts4niNG+PIq/HzfXWu7gx2mFsVg22fQkb0ISZ1tstKc jwD8Zp3l oLgnRNUGrEH0JFB8CZl+fZ4TVIISqbIxwCdLi5Q0/1a+KDSaMwRQcr3dXrkpFCG2gAa5lmvuc5ZK318XeA8eQIFBzEywxHH2APuDjtsmHXTBfSAB0Vqj8cMMXffXcOXRT1aHLxzOEsAN6ejrRU64HNfv4F37FBmsh2SE2FyXkuj0+ydQmPMCVDY3iG1oh63h9KY/al31xiiVKCmx3JEdn+QDWw7psJBTIs2iqUoQ7+Aeq78iov6a5p0AOn0fu+xpmaWLgjl1SgBIZrKJVMlLnXDSI5bWKLdHyuLaIpjT45u88z0x9N4LDelex8XanAcRk9Qkg6MbHlLUkE/adY5Awb8j5mM66gbmUry/RlKEotvKm5LCuiGnUysSpK4hAdA09YHtonqK8ie/j1ug0sZABOgfeOIATw8mwNwid6TncH5NHxyKbiRsJw8QGAhr2fFB1+GYZI2PFleMbQbc= 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: On 17.02.25 10:29, Zhenhua Huang wrote: > On the arm64 platform with 4K base page config, SECTION_SIZE_BITS is set > to 27, making one section 128M. The related page struct which vmemmap > points to is 2M then. > Commit c1cc1552616d ("arm64: MMU initialisation") optimizes the > vmemmap to populate at the PMD section level which was suitable > initially since hot plug granule is always one section(128M). However, > commit ba72b4c8cf60 ("mm/sparsemem: support sub-section hotplug") > introduced a 2M(SUBSECTION_SIZE) hot plug granule, which disrupted the > existing arm64 assumptions. > > The first problem is that if start or end is not aligned to a section > boundary, such as when a subsection is hot added, populating the entire > section is wasteful. > > The Next problem is if we hotplug something that spans part of 128 MiB > section (subsections, let's call it memblock1), and then hotplug something > that spans another part of a 128 MiB section(subsections, let's call it > memblock2), and subsequently unplug memblock1, vmemmap_free() will clear > the entire PMD entry which also supports memblock2 even though memblock2 > is still active. > > Assuming hotplug/unplug sizes are guaranteed to be symmetric. Do the > fix similar to x86-64: populate to pages levels if start/end is not aligned > with section boundary. > > Signed-off-by: Zhenhua Huang > --- > arch/arm64/mm/mmu.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c > index b4df5bc5b1b8..eec1666da368 100644 > --- a/arch/arm64/mm/mmu.c > +++ b/arch/arm64/mm/mmu.c > @@ -1178,7 +1178,8 @@ int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node, > { > WARN_ON((start < VMEMMAP_START) || (end > VMEMMAP_END)); > > - if (!IS_ENABLED(CONFIG_ARM64_4K_PAGES)) > + if (!IS_ENABLED(CONFIG_ARM64_4K_PAGES) || > + (end - start < PAGES_PER_SECTION * sizeof(struct page))) > return vmemmap_populate_basepages(start, end, node, altmap); > else > return vmemmap_populate_hugepages(start, end, node, altmap); Yes, this does mimic what x86 does. That handling does look weird, because it doesn't care about any address alignments, only about the size, which is odd. I wonder if we could do better and move this handling into vmemmap_populate_hugepages(), where we already have a fallback to vmemmap_populate_basepages(). Something like: One thing that confuses me is the "altmap" handling in x86-64 code: in particular why it is ignored in some cases. So that might need a bit of thought / double-checking. diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index 01ea7c6df3036..57542313c0000 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c @@ -1546,10 +1546,10 @@ int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node, VM_BUG_ON(!PAGE_ALIGNED(start)); VM_BUG_ON(!PAGE_ALIGNED(end)); - if (end - start < PAGES_PER_SECTION * sizeof(struct page)) - err = vmemmap_populate_basepages(start, end, node, NULL); - else if (boot_cpu_has(X86_FEATURE_PSE)) + if (boot_cpu_has(X86_FEATURE_PSE)) err = vmemmap_populate_hugepages(start, end, node, altmap); + else + err = vmemmap_populate_basepages(start, end, node, NULL); else if (altmap) { pr_err_once("%s: no cpu support for altmap allocations\n", __func__); diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c index 3287ebadd167d..8b217265b25b1 100644 --- a/mm/sparse-vmemmap.c +++ b/mm/sparse-vmemmap.c @@ -300,6 +300,10 @@ int __weak __meminit vmemmap_check_pmd(pmd_t *pmd, int node, return 0; } +/* + * Try to populate PMDs, but fallback to populating base pages when ranges + * would only partially cover a PMD. + */ int __meminit vmemmap_populate_hugepages(unsigned long start, unsigned long end, int node, struct vmem_altmap *altmap) { @@ -313,6 +317,9 @@ int __meminit vmemmap_populate_hugepages(unsigned long start, unsigned long end, for (addr = start; addr < end; addr = next) { next = pmd_addr_end(addr, end); + if (!IS_ALIGNED(addr, PMD_SIZE) || !IS_ALIGNED(next, PMD_SIZE)) + goto fallback; + pgd = vmemmap_pgd_populate(addr, node); if (!pgd) return -ENOMEM; @@ -346,6 +353,7 @@ int __meminit vmemmap_populate_hugepages(unsigned long start, unsigned long end, } } else if (vmemmap_check_pmd(pmd, node, addr, next)) continue; +fallback: if (vmemmap_populate_basepages(addr, next, node, altmap)) return -ENOMEM; } -- Cheers, David / dhildenb