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 0CEF4C0218D for ; Wed, 29 Jan 2025 22:42:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1986428009A; Wed, 29 Jan 2025 17:42:35 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0D3E528008C; Wed, 29 Jan 2025 17:42:35 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E8F7C28009A; Wed, 29 Jan 2025 17:42:34 -0500 (EST) 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 C500C28008C for ; Wed, 29 Jan 2025 17:42:34 -0500 (EST) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 86CACAF6DD for ; Wed, 29 Jan 2025 22:42:34 +0000 (UTC) X-FDA: 83061965028.26.6B6AAE3 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) by imf02.hostedemail.com (Postfix) with ESMTP id B44B080007 for ; Wed, 29 Jan 2025 22:42:32 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=VRLdHBpn; spf=pass (imf02.hostedemail.com: domain of 3166aZwQKCOIJZHPKSSKPI.GSQPMRYb-QQOZEGO.SVK@flex--fvdl.bounces.google.com designates 209.85.216.74 as permitted sender) smtp.mailfrom=3166aZwQKCOIJZHPKSSKPI.GSQPMRYb-QQOZEGO.SVK@flex--fvdl.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738190552; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=NdaXvVKgkNqaabYpHFU5W/ymB41iIHIErbbYhcizrz0=; b=V18TpHQgcMIJTHactWatr88CkJgok9B/ah5PaTfnSfrDl+6kV3PR2NhHTUQhcL1C73BMB/ 5wlAna2l1c2bEF/1w8eEAMlVFPPJvxbpEH4h1UtYy31bcYfwneKAWr8JDl3qnc4RWeBJn6 p4VjaATylX+GZ63IftS9vira1WJ+p3Q= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738190552; a=rsa-sha256; cv=none; b=JhlrzTGdomJNwD0TZijpXYfMz6eZ8JxDUEqCnq29mjkH7HwiG6oDB6zoyaCop+jGCKrTjr ec4rvmHRqqtFQj1p0sg0wV5S7wBEOovUvMThy8B2LUpxvL8f4n2d2xo1V2L/upt8eZzTPd 3/2Gq2YKSqtOaeBdQGBxTG5DDM02t8Q= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=VRLdHBpn; spf=pass (imf02.hostedemail.com: domain of 3166aZwQKCOIJZHPKSSKPI.GSQPMRYb-QQOZEGO.SVK@flex--fvdl.bounces.google.com designates 209.85.216.74 as permitted sender) smtp.mailfrom=3166aZwQKCOIJZHPKSSKPI.GSQPMRYb-QQOZEGO.SVK@flex--fvdl.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-2ef79403c5eso377912a91.0 for ; Wed, 29 Jan 2025 14:42:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1738190551; x=1738795351; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=NdaXvVKgkNqaabYpHFU5W/ymB41iIHIErbbYhcizrz0=; b=VRLdHBpnzvWjRKyConlXU6Y/vVRcm9hHxoF+eB7nUS3OPYi4pNutS0CNBPvzWgnWng aSrw2/pD3YSRGMhxqKm/XNecA29/b76eh0Lirrr1dnce0kTwNWbSUyTJe2h+0xLnGgCM IPzVlfrPMTQZBw4x4Rd828+hz9qIygXCeVYWPrFbs0XH0GDwoAoNBsXol4PptnwsnQvq /WtnPMUGBmxtlMAoPZU+u/2iN0Kyt646ElSRAbCjSAaGKyMO6uctWO0c54ZyxSPnIy/i Sy+i2l75WiRZim4h7fDdT3jZcsTXg5GQnyx2gBVccmxI2rDuF/Vyrzu9bz1sTu9Ot4V9 AgSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738190551; x=1738795351; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=NdaXvVKgkNqaabYpHFU5W/ymB41iIHIErbbYhcizrz0=; b=mslWFfwbT+9oR+h1Hu6LANlaHEDE5P39DTgxdS+L9eU8FqKv53yUUHNcJ58xnNcVY+ H4n3CDSL3UiN/CpEprnhNOQuBl+gcRGCn0lhm0bKffplRK2kyIMXOCzHjzQkYl+JVN/D jbSgRnPCTM2BYjK08TJYWJ/mxqnElBK02K2OZ7MQsCaseT6vbqXPQNhJ4VUTXIIARAh0 bfoXsb1luQgZvW098WZe+YvDj7zDrEwF7v4b2ypII22YlqTYh0fOEzKkDXJOu8LRB+M3 3ktt35CiZmSHktJj0Rw9co0dFnVHF1dMgKn9bWrIef0YGAZQax4YWUfPbVSkX9xsfsos r2Ag== X-Forwarded-Encrypted: i=1; AJvYcCWeTh1O9mEJ/VqqoVVIAu96G82yPNLJAsaa2eWZV89WHcU6HeaQ0XXu8ziqFOW0AHPhLNagfWV/kw==@kvack.org X-Gm-Message-State: AOJu0YxwmstwPEdiLpy0387jhukG30zKeDyJ2u9oWC8ra4dlZnL3Zksj QVklp1knzzQ2L77kFmqP9VRZJoH1GecepfbrjxIPOVDLhUC7O1+PCaXYWX2f6vL7zM4U7A== X-Google-Smtp-Source: AGHT+IHw/wrvs6eYtSXxybbi6ZpEmFFHuoZkE0uX4Iwdoy1hJPle0E2kJ2J6Mh6qYpoJPyZfUbzKoCH1 X-Received: from pfxa13.prod.google.com ([2002:a05:6a00:1d0d:b0:725:d9ab:3f2e]) (user=fvdl job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:10d1:b0:72a:8b8f:a0f1 with SMTP id d2e1a72fcca58-72fd0c9460cmr6874234b3a.20.1738190551535; Wed, 29 Jan 2025 14:42:31 -0800 (PST) Date: Wed, 29 Jan 2025 22:41:38 +0000 In-Reply-To: <20250129224157.2046079-1-fvdl@google.com> Mime-Version: 1.0 References: <20250129224157.2046079-1-fvdl@google.com> X-Mailer: git-send-email 2.48.1.262.g85cc9f2d1e-goog Message-ID: <20250129224157.2046079-10-fvdl@google.com> Subject: [PATCH v2 09/28] x86/mm: make register_page_bootmem_memmap handle PTE mappings From: Frank van der Linden To: akpm@linux-foundation.org, muchun.song@linux.dev, linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: yuzhao@google.com, usamaarif642@gmail.com, joao.m.martins@oracle.com, roman.gushchin@linux.dev, Frank van der Linden , Dave Hansen , Andy Lutomirski , Peter Zijlstra Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: B44B080007 X-Stat-Signature: oeegnocf7ib8jw51x9tc8omzdc6hr67w X-Rspam-User: X-Rspamd-Server: rspam12 X-HE-Tag: 1738190552-520336 X-HE-Meta: U2FsdGVkX1+2F8AL60HVRyTWI4Usqdfv2pQJfqG/HqXtAA5m0/Osi/7gPBfayVL0isDBZdl5L7Opit5ZQhVjn7I+Eym36xjz3hzgHrbNinGARgsPeXhyPw52rUhkO5H1wOcuX3fFuTl3kgLp3T2xkDbXA1ohsrkx9vHXAnZTazeLGqf/g/zaCA+fFahugjO46zBTNzSNHzrx9YczHsRkuSSWGhE97qRXdLWdfL0QeTWxfp2yuMxXg+fIA6aZA2e4LWdfVsPxOIGW8fH4QLHRuoIsJIk1k4c4m19vGMVuiTwQgKaiZgkn3i8l+vL0REJB33RNjYpkFfHqjYkfUYb1te9iyyAFcje4E+HKWTTOjw2rU47Kd4VxyUblSkDx61ZOSPDDjzJMnQ7wpdggAyVCsIo2s4e2SPM2GLlYujZ5r8EuhpxZMCVDeKR3hM8MB4D6ajR8TSDlZLNR/KaIscFbPoBKfMv7+m8+PvIZmBaH3Qj7Vue0pFkH9DI+hcWalbJzpKh2mvc1nN9gww3sDlUADDzKc7aJjgf+VyUtg/pPgPzfHaABNkTdr3MbtvEPJ37BjnNHyd5LGJNH9qaDL6Kigk+QvUvM6ajOG8XO7DQ5sMDsEqmfGEtQODZrxK2tbsF7it6Yq7TQFiQD7qQp0/SJTMIkDzDBX/Wia4/AXnR94FrU/14COJYzcs84DRSi2hFbOM/qt1NLZBYB0Qk5yEvMBnVHBwI7fLRIrDRM2LCaGFKf5R64m+lYGXRaSxLEGkJ8XsjQIsqL3Nl9+gUMIht1A6fdPqi0LPqDI8d8u3egbyN7KHX+6r377/8I5IUlDmEBAWfOHIj1TAi4vQL9bv4bd2Tg181lwbU9BrMFA2W7X9qamO8x0Ll6LX9E+rW7D9CeHWHBeabHNUle6/dWQbLNbWM9Kx2I+QoXeb0Z2H3lpkZvtGB1EmRU9z0qxO53Bk0oqJPjrKSY9PFu1g2zVpc sNKrgWZi O/Y2oVvbGWSjbf4aPQamZS8YQijfVL6hESMavXCIWap5nuw5IXq+xpKiYcN1VDnb6+tmUgXif7mQym38DN8b/g4TIxxmYT98knceUVHfN+u6L8xKV6RViGs4gvj7T+DAGRPDjUInWlABtYkiyOd0esDpYE+f3Vw/K+e7W7N+BK2sHEnUo4FWzWlqh7pjji3SgBokV8gvKqYTDs+XxJabf2AZykQ9w9HsrqMUwnW5Mr9T+vjrZuJHaf+QWO94sNyKjuWNZTIWS5dR1kvgP+seXss5jwGKgGlRHVujfXC5UDqwDD+Z4ywulEHxYC+4NUrHqiBlDsgB9Qp/SFye44jjvCseE+IdB9CN4V6iCpBvkNDw9x0qAEQ/aCmU2qvyLAcL/bakskvaoVgGIxgLd3ojyTaKKPFHwzXq5bvLCEVlApb0YD95En1iFejbRg/IZqvX6oM9bCHRJySea/oPoS5L6OVGt02LhkAmZOrV190RtHUgxMGoLAUnhrDVzo939Qn7cz8KDP0v/yIx230o1QAek+2dhw/qkRvnSpUWgXkYDzMFP+dYKMSMx5OYUp6MxO21yB4QkgdA9GHI9gye7omr4ZKIbEbEW2J7eMygdy+iLF7zr7gQoBw1vK/AadLJri1kQUkzBGlqmaxw9vtSdJQwlf0cz8MiC+zzvW+/RWoLgFy5Fml2hr/QUqW19tQ== 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: register_page_bootmem_memmap expects that vmemmap pages handed to it are PMD-mapped, and that the number of pages to call get_page_bootmem on is PMD-aligned. This is currently a correct assumption, but will no longer be true once pre-HVO of hugetlb pages is implemented. Make it handle PTE-mapped vmemmap pages and a nr_pages argument that is not necessarily PAGES_PER_SECTION. Cc: Dave Hansen Cc: Andy Lutomirski Cc: Peter Zijlstra Signed-off-by: Frank van der Linden --- arch/x86/mm/init_64.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index 01ea7c6df303..e7572af639a4 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c @@ -1599,11 +1599,12 @@ void register_page_bootmem_memmap(unsigned long section_nr, } get_page_bootmem(section_nr, pud_page(*pud), MIX_SECTION_INFO); - if (!boot_cpu_has(X86_FEATURE_PSE)) { + pmd = pmd_offset(pud, addr); + if (pmd_none(*pmd)) + continue; + + if (!boot_cpu_has(X86_FEATURE_PSE) || !pmd_leaf(*pmd)) { next = (addr + PAGE_SIZE) & PAGE_MASK; - pmd = pmd_offset(pud, addr); - if (pmd_none(*pmd)) - continue; get_page_bootmem(section_nr, pmd_page(*pmd), MIX_SECTION_INFO); @@ -1614,12 +1615,7 @@ void register_page_bootmem_memmap(unsigned long section_nr, SECTION_INFO); } else { next = pmd_addr_end(addr, end); - - pmd = pmd_offset(pud, addr); - if (pmd_none(*pmd)) - continue; - - nr_pmd_pages = 1 << get_order(PMD_SIZE); + nr_pmd_pages = (next - addr) >> PAGE_SHIFT; page = pmd_page(*pmd); while (nr_pmd_pages--) get_page_bootmem(section_nr, page++, -- 2.48.1.262.g85cc9f2d1e-goog