From nobody Tue Feb 10 00:22:29 2026 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3E7851DE4F6 for ; Mon, 27 Jan 2025 23:22:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738020160; cv=none; b=j055otoP+azjWJNyrdaFy3nN7lp3Ale4UQe1Qkj8XylwAFvGD9YPLLEW16fBOOVzTxF65iuaN3kR/FeCLMxmppvxJkDjxRkmRJvR1wygMU540RM5hgVmPyaBtY/cNrRXWDpWUBkN7ULGSo9Dt/q/5XSWzp/wtJcogOp9HHuMoNM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738020160; c=relaxed/simple; bh=w2N6ciGEMzDasE8zwLLcmma2BXE5QxdMUWrsHXmFKeU=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=oUmDew/AZorFTlSnZus91nsc1s0hBTkHw/HWd0YxEvNN3pcGFsxOphK8CtkZPZjw2vLlAFASlfFJ0SxHmBQO/aBEzZ5WR3UN2LGG7WeDKbGBIRegZV7n7d7dADEwD6m26xUlZXMlenEUxXqmL+2bmd50q3DO1a6S4YTq3nWR7zo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--fvdl.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=NoneCNwZ; arc=none smtp.client-ip=209.85.214.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--fvdl.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="NoneCNwZ" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-2166f9f52fbso155251575ad.2 for ; Mon, 27 Jan 2025 15:22:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1738020158; x=1738624958; darn=vger.kernel.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=NoneCNwZStvA+S2YvhVlho9OAunzH8bLixRw2TvlXvquaAt7jD1yYhAtrZFq52Q8J7 k3qr/a42S8uVpPyxypndsIj0rD8FILZcnn1PJbCzjnAUc+LxZrm7u4ssgh+2NqA76RGU xCd5e3bn1ZYurcIIYnOPZORkyUDPPwZrPj64SPQY9YlQkwwO00WRWW+VE0JR24gRG35u ggtKJfuZI6Y2pLRTlHCvoa8sRvvbYnfDwsbbZje8KEV+4jgZWeTenXLkOU9vKj8YlHYd zxLFC2L0PJvzA6B2hkYGHJa3FWgvHI/fsr5c+ptNflSl4mDztbmeeGAbJRiNHQBH15zO Iq6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738020158; x=1738624958; 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=S22D6U2tfvSdBXget58WGEnjiVCYiF52GBisBKol7Rh8G6lo3iw1YT9LfuIJoY2yUx Z+UN63t1hQSAfsteDaG/oZYNmCok3f8oU1V12lt7G/OIPJU5171a6QF8z94unysGyutT fFQS7pioX4dD1FmUeffiRpcbDiJ307WJIuXnHt8nhIR4pokXsBo3XL09saFoSIL0noNz XAczqJj7L9BhWSE1qli1XIH6NwtLT4S60tkFqNR8O1XmndHDS/ZoycS0eNRcAMsKcy6h OqgfjNak4aGsAeSRADpRpcgCGzyHIZZOshYKsL06mtnT45TmjpRLmK3oR2InziCe7e88 hSxQ== X-Forwarded-Encrypted: i=1; AJvYcCXO0QRY8yoiU8NSgY126xcXXycc9RlFZ26A20vlxeTK9ab0um+l3C9Bh3TtyoN2PODhi3EFj+vd9VOmJW8=@vger.kernel.org X-Gm-Message-State: AOJu0YwVJq6pd3/mnsRgT+7g2P9PIzY/yMHVS4CqE6aiFiG8tR8e+Uam FaEYkoQZYJmcvz+q04ypTTfEXlXaukXKQJ1zOk+1VTbI9Qt9wcrURaxnWrAvre4mmr50fw== X-Google-Smtp-Source: AGHT+IEp7V98ohakR/+V5+zDAOrMpSHiTTmivr5fT5EXSmUB8ro+KBq2mBzgl5YEyCdcO7NN4yKdnziK X-Received: from plle4.prod.google.com ([2002:a17:903:1664:b0:21d:cce6:c548]) (user=fvdl job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:da8b:b0:215:9642:4d7a with SMTP id d9443c01a7336-21c34cc9574mr630305645ad.0.1738020158507; Mon, 27 Jan 2025 15:22:38 -0800 (PST) Date: Mon, 27 Jan 2025 23:21:49 +0000 In-Reply-To: <20250127232207.3888640-1-fvdl@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250127232207.3888640-1-fvdl@google.com> X-Mailer: git-send-email 2.48.1.262.g85cc9f2d1e-goog Message-ID: <20250127232207.3888640-10-fvdl@google.com> Subject: [PATCH 09/27] 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, usama.arif@bytedance.com, joao.m.martins@oracle.com, roman.gushchin@linux.dev, Frank van der Linden , Dave Hansen , Andy Lutomirski , Peter Zijlstra Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 sec= tion_nr, } get_page_bootmem(section_nr, pud_page(*pud), MIX_SECTION_INFO); =20 - if (!boot_cpu_has(X86_FEATURE_PSE)) { + pmd =3D pmd_offset(pud, addr); + if (pmd_none(*pmd)) + continue; + + if (!boot_cpu_has(X86_FEATURE_PSE) || !pmd_leaf(*pmd)) { next =3D (addr + PAGE_SIZE) & PAGE_MASK; - pmd =3D pmd_offset(pud, addr); - if (pmd_none(*pmd)) - continue; get_page_bootmem(section_nr, pmd_page(*pmd), MIX_SECTION_INFO); =20 @@ -1614,12 +1615,7 @@ void register_page_bootmem_memmap(unsigned long sect= ion_nr, SECTION_INFO); } else { next =3D pmd_addr_end(addr, end); - - pmd =3D pmd_offset(pud, addr); - if (pmd_none(*pmd)) - continue; - - nr_pmd_pages =3D 1 << get_order(PMD_SIZE); + nr_pmd_pages =3D (next - addr) >> PAGE_SHIFT; page =3D pmd_page(*pmd); while (nr_pmd_pages--) get_page_bootmem(section_nr, page++, --=20 2.48.1.262.g85cc9f2d1e-goog