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 F3C4DC02194 for ; Thu, 6 Feb 2025 18:51:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DFDCF280009; Thu, 6 Feb 2025 13:51:34 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D85FB280002; Thu, 6 Feb 2025 13:51:34 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BAF34280009; Thu, 6 Feb 2025 13:51:34 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 92D38280002 for ; Thu, 6 Feb 2025 13:51:34 -0500 (EST) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 4A74D8130C for ; Thu, 6 Feb 2025 18:51:34 +0000 (UTC) X-FDA: 83090413308.17.4DD307A Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) by imf17.hostedemail.com (Postfix) with ESMTP id 5628C40012 for ; Thu, 6 Feb 2025 18:51:32 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=WfXlphAv; spf=pass (imf17.hostedemail.com: domain of 3swSlZwQKCJQ3J194CC492.0CA96BIL-AA8Jy08.CF4@flex--fvdl.bounces.google.com designates 209.85.216.74 as permitted sender) smtp.mailfrom=3swSlZwQKCJQ3J194CC492.0CA96BIL-AA8Jy08.CF4@flex--fvdl.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738867892; a=rsa-sha256; cv=none; b=k+C+gMnciAJ1ExsLQJpZZdTFrtBOF42V4+BAjrD9l1nOYU6zWG76714EeulXnHq0cM/FWO 4XFAtXoqA+/dcihK7MVBeaXwRyxcwrhF77SJM8y715sZ0nkdXaYNk6K4hdDMvWfqMGeYRX EchPYeWtv4G3iKMtlh7ffNKNVyL2hLw= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=WfXlphAv; spf=pass (imf17.hostedemail.com: domain of 3swSlZwQKCJQ3J194CC492.0CA96BIL-AA8Jy08.CF4@flex--fvdl.bounces.google.com designates 209.85.216.74 as permitted sender) smtp.mailfrom=3swSlZwQKCJQ3J194CC492.0CA96BIL-AA8Jy08.CF4@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=1738867892; 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=Avpy7BuEP02ffYq1Owfnvcdb9scYtoUfsZ01E274s1M=; b=C6t7VJtnMMmCS/mbCZS797O+ix3J5hXoKnL25FRqe2x8fT3PQq340QeObPiAqx5wibZDlc cmucdYv4mZXAxxrL8xN7eYXRZgS4/8AtLMFHYYklwlt7jzZAAEE3ssUce37E1seMfG4t9v per7zfEzXobEAK9aTVdf8X1wVcFBt8E= Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-2f9e3a00fcdso2787448a91.0 for ; Thu, 06 Feb 2025 10:51:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1738867891; x=1739472691; 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=Avpy7BuEP02ffYq1Owfnvcdb9scYtoUfsZ01E274s1M=; b=WfXlphAvczjiKEGntnA8/oFIDek19XgcioYxZjLN0vG0mzut8twDGnhDCtCBhvmNdz cU/PfMnYWdH0sRehuCjmSYnpitnpVY0zO5iX6zZfb75qgsgjDCFRHBgTTw1VZ80lP7Uf qHhZbETXaUNJAihjh3QU1JIZBxGcxEqDgmwBno/m9oE/GWfq2J0/t0pAV6gha90aBIt0 d9nMTVH0BNiiDSf+oJcaepgOn6swqVhptqCZYSCCUOsABhrteNWGqST7mvaPXSq8OXFa LO5O7/9Nvs07GozDbiKAtJFrGrhNszE83GbmbvAjXhmjFydv+iKUss0qi464XfPKjmim l81g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738867891; x=1739472691; 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=Avpy7BuEP02ffYq1Owfnvcdb9scYtoUfsZ01E274s1M=; b=QZLC7Q1u72559gBmca6hqCtGoLbenYwC0acirBNHhoSqwaJWnqvXZv5Fg4372IVddn ZJEgHBLHd58B8l988Kkj7HfJzWkvxE37+PTU/yAO7shZiAukYjn6RsVYqNaR4WaaVmED VYqUj62XZ9bfDLzVrvVVo/rK7eV36rpOiLthf/bTJmJIaCEW7AhRJO5dwPLsnmj0q2l+ 0XENTL5nHGKx8uu/VSBVuZetx6eh4l37xLLy3seZTmfVc0IeKnlF97rzqWN9gAKqO6Xv VQAQ688c2SXHnpGT30ukWBai0Q7ZuVOrZFYMqDDnUHGs/0n9ZU7BTpflxKkMaAjl0RLq 40Pw== X-Forwarded-Encrypted: i=1; AJvYcCWiGnIb3ECWu2iXqJVA6gvsWHVU7fNHPOJ6d23ANYdO1C5vVxD8szGr7clC8Ano92fNd0TlRQxf9g==@kvack.org X-Gm-Message-State: AOJu0YwDROuioI8Z+UBWEwcs5FlS7OFr7qt3FrFxfqjBCnlzxmeSj4JZ F7V5J0ssYwj4jCAoAWKBf4bKniZ0ngMlElityXDj7cE5eEH0xaLCdPcmig8fKK5GPlxKEQ== X-Google-Smtp-Source: AGHT+IFX3NvACBJ1xhrHGkex/mQRvyXzqKTeTXis5hJniSsUBBE3cj7dQzcaYViSr3/nKGrkfs3yIvZW X-Received: from pjbpq3.prod.google.com ([2002:a17:90b:3d83:b0:2ef:701e:21c1]) (user=fvdl job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:510e:b0:2ee:8430:b831 with SMTP id 98e67ed59e1d1-2fa23f55c3bmr201823a91.2.1738867891288; Thu, 06 Feb 2025 10:51:31 -0800 (PST) Date: Thu, 6 Feb 2025 18:50:49 +0000 In-Reply-To: <20250206185109.1210657-1-fvdl@google.com> Mime-Version: 1.0 References: <20250206185109.1210657-1-fvdl@google.com> X-Mailer: git-send-email 2.48.1.502.g6dc24dfdaf-goog Message-ID: <20250206185109.1210657-10-fvdl@google.com> Subject: [PATCH v3 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: 5628C40012 X-Stat-Signature: gceufqshbmkn8om8783xnf4szbjcjzse X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1738867892-739375 X-HE-Meta: U2FsdGVkX18MFzqDAsekDH3JIFpBwg8mCO3jS5f4uVpuwE78cs10hRiY5bcfGAjK6UQ1Ui1szzKh2eueEkd8VjY8fKyj2F2o90goXpPA2lOsMW50dzIW62Yllyr6HizfgkNFGkVntbMuF0qyMNukqbq/404ti8291G2tfTenxgxQz9bwqrYGeSaJtduOmPKj++xdzEG0E6eE43DUJjgEq0NWVEe/NaAsY8KQpBX4qoiygUle1tz+oZIY3+NHNHgB/OC4wRbN2tJn1De63tARWQSV4Ui2rETQViiZW43cLiVz4CCCd1bZY8oURHazIGWlQmVEdVsX/F0XQKVYd477MKgpolx7pm2ClzJGDSC4ETNZxsoCPFswLhGaNb6D1gcH/+xVenr3ffl1BdwH+gn0LquYDpbISEi1Rd6W4xOH/FuqYGWo++H0ueBpC5ZDbTZQfiHBRNS/6BC87zDQMc9YxHDpo8n0G5YtQBRbZHYkQnDOCjJ7GHsEd7cUsdtzb95I16N1HbotZbQiwR9ra0uRwuypG0grfYNRYLmQvqoaCc3KkjG1JytGQqVtXFW4lZpRPDWkU7DkUaSJyPrfB/YzCUeariMNCACXp7po2J0rxccGHdaqNAhLBdIBj8L58ca/DHpEXHXoT1L2/mQEJlS4XRiPT9bYlxAQgIv84+BuiUQsAmWMvyXdl+yUQkduHVoI3gSgOlDTS3YpKuLrURGmIo4u1Xsu/TDXm3Msj9sH1s/q17rIBVxytvRqgHqmdbkb7jKbl0S+3zMjj2rGqKY51fewTKkDXAM62eD4i7Um/LijuYy/UtFly+Nbv+UsRRp4TRoxwNwLmrV1wb/MqcIVNtXdxw8cqPUxIPUBWIuWI0funWjPQo3XxUoOfIJiKz199En5FZftQpp/DZDBA/otn+XBZXvzMhYtIbqxAqJ1GzQXUIosXJMCwEBJFFxe2hb+nR5W9/DM5/+vjCGHPmq MNb6Mrm7 C0osvkCgVTI1r8whngZ+MzMx0RsOUtjKgwv0ODlZpm9WbbvRGRybQXwPeVcH2dgqpDTNgeajSt8DgcW5166Dw+yxHxz4AZ91ELS7KqOPNSwgpdhd3UIkzVIpwHye5xN6fHC6eENewnvkL0VASRLi0z3YYp6Lo04cHdCnF3HZfyhHiYZcxKMcdzPD7HmTe/Z8/2npvcuv65SXYFW3NAu/GUqN2iTLgJ/MpcFPRLrKkoED6HHjzHesJCPojg5/Q/nObALtNAdDf1CaamgXEe70eJqDwKCs+pSvoPPICRtBupTNGylF+ugOaZnElyYwbE6/nHFCOuGupwVgT59Zg7rMYlqg1zrx3nh2G0D2dh+22fhsLEwR4CvyzvrBIH9K4DBO9EfcEsjB/aYEGxi9Xaq53MKofcT9BAkxzZhH45cRYwLXwgXSZul5g9oOlsmyuDYp1JXKhs9A2OFNAsv+IweeRtU0aGz5kX4PHnhfQl8iTgnNiuVxch/V5KQjKsGZ5xJflKL+KvqatXxO//YQP7SwJv4P1DwgPJGWeUoq7RkYpwjYUTURGagfCx72Yc+GyiS8+eW8zKeweJtOIZRsuZEl9ox93H7oesmcfWILkfDQKk/irtIjHLUl+k1CZmGqmIk9vHlJ6vAiiwLt2Z1bnShsGva0PP13Lr+AWlJG2k81YfPaYFGFqGsWK0QzrAA== 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.502.g6dc24dfdaf-goog