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 D8DB3C021AF for ; Tue, 18 Feb 2025 18:17:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 191C6280176; Tue, 18 Feb 2025 13:17:23 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0F4566B009D; Tue, 18 Feb 2025 13:17:23 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DEBDA28017E; Tue, 18 Feb 2025 13:17:22 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id B8F3E280176 for ; Tue, 18 Feb 2025 13:17:22 -0500 (EST) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 3969A1203A4 for ; Tue, 18 Feb 2025 18:17:22 +0000 (UTC) X-FDA: 83133872724.04.531D708 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) by imf10.hostedemail.com (Postfix) with ESMTP id 5BB73C0010 for ; Tue, 18 Feb 2025 18:17:20 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=EVofUuP2; spf=pass (imf10.hostedemail.com: domain of 3r860ZwQKCGQHXFNIQQING.EQONKPWZ-OOMXCEM.QTI@flex--fvdl.bounces.google.com designates 209.85.214.201 as permitted sender) smtp.mailfrom=3r860ZwQKCGQHXFNIQQING.EQONKPWZ-OOMXCEM.QTI@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=1739902640; 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=LI59bwMf14K7zqmv7lidvyJaJYBmHXGc9XaKmUDK00o=; b=QtgD0aeRsFH9Ih0AGRfoqvJzOUMvPVZZ1XhYd5gP+7QLGkHI2slisxoVWCl38qKa6LkLSy nT9k1ZjhJPKu8X9u1cE8mZaFjDRwq9W0qQt1Mwf86HEbBdNtGTCqebcb0WnXGoUZcwUXCK Hum8rWqk5+ZNEBQmJ2C2yNKF2cWlo1M= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739902640; a=rsa-sha256; cv=none; b=ZHvID+hOb+zOISkMzrNrxNQenqnL+0xt7BDgRUyBkFzfbsSHXJc/8Ermn4yGrYdUwfNH/u T1BS6+LV7pubmYdcCRQrt1QznAsy4edwcBso9w19V0YSFEIihDz1ezHs7MOr1vW0bTAq7U KgStnioX/V7d0N939aWTtmz2qM2p/2Y= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=EVofUuP2; spf=pass (imf10.hostedemail.com: domain of 3r860ZwQKCGQHXFNIQQING.EQONKPWZ-OOMXCEM.QTI@flex--fvdl.bounces.google.com designates 209.85.214.201 as permitted sender) smtp.mailfrom=3r860ZwQKCGQHXFNIQQING.EQONKPWZ-OOMXCEM.QTI@flex--fvdl.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-220ec5c16e9so93241505ad.1 for ; Tue, 18 Feb 2025 10:17:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1739902639; x=1740507439; 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=LI59bwMf14K7zqmv7lidvyJaJYBmHXGc9XaKmUDK00o=; b=EVofUuP2ZzBtzZDy+LNWY7gYrr4/hCT8qN8QWBRVO1BhVoPr46/J6aZqNItCNrjZKE lyESeh+EK5QjV5UNOEs4m91EsyVrtOEaa74I3d6FBKcS9Lbbnxyt6qk4m0VcWKcBkKO1 BWK/8CTsdisjJ61APb6l3djX72wNvcvbnBKcVAmZhzsnEabrVD+aJX84CGBTXVhQWG7B cjoZAdlRUeXyT9o4Maod8Q3m12g0PCQEp26EjAvR9GlrRqowwj5kZ9TFf/qu61n8qYwQ O9P1rNwtqrsOXCEo8970ivT7P8jHEvLz5tKL7Dab0NKDxCuJGQ0jQMkARx04b9q5Bdwm T1vw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739902639; x=1740507439; 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=LI59bwMf14K7zqmv7lidvyJaJYBmHXGc9XaKmUDK00o=; b=VxfCwyX4X8mDIUW41m1HH8cXumeyUOEkFt5vw4NviWOHI5d9pHs6EMC07TyUgXbBBD BDtEySSqAhWcLE4Hs+lJLFSD9OBmNoLGrqo/7FWoxa1q0Z001xwrgQY+mDanLl0iZyRm K/TLg/fYxLqKC15qyavIBVrM//b3mXzxoT0xi52gly8+HXnZDaMtgDw76Oc5wxtqcbEm fkU+ET9crSqnYeG0g1RpeB2E1ftOwZ9grDApCCjhqs7r2hbibgwixAiznKHzIxJReScy tO9IZUy35VSL01yo6EkK62hvhy7Wd0cPq6cxlGLUjM6+RrRSsia7PwiMignxoRbH1lqa KNCg== X-Forwarded-Encrypted: i=1; AJvYcCUR6bb6qLfceMQdIF/eN4GWVFoeyJDlOv3h+SH6rAhR5XqK5Cnbal65K8c9xSwD9Kv8f6Lnt01gKA==@kvack.org X-Gm-Message-State: AOJu0YzjGokMSK0vwMboKTRwGXYuEqqd5t6lkAefg2DL7A/kMC3LsgLt MUuaFMXVeZ2wyPFFDG7jJIaiGvoXNihhYy+KKe3n0Xl4WUmy3Bd3H0PahqPI532r2O/QZQ== X-Google-Smtp-Source: AGHT+IG9foWIdjzRTrMdjif1U8LT9wkYyvNc0HI0vWqalqwP0zFxC1Vsnt6pOAwRi/AdmSVzfgrNzojU X-Received: from pfbcb13.prod.google.com ([2002:a05:6a00:430d:b0:730:8636:67d7]) (user=fvdl job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:1a89:b0:725:cfa3:bc6b with SMTP id d2e1a72fcca58-732617757c7mr27894680b3a.3.1739902639374; Tue, 18 Feb 2025 10:17:19 -0800 (PST) Date: Tue, 18 Feb 2025 18:16:36 +0000 In-Reply-To: <20250218181656.207178-1-fvdl@google.com> Mime-Version: 1.0 References: <20250218181656.207178-1-fvdl@google.com> X-Mailer: git-send-email 2.48.1.601.g30ceb7b040-goog Message-ID: <20250218181656.207178-9-fvdl@google.com> Subject: [PATCH v4 08/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, usamaarif642@gmail.com, joao.m.martins@oracle.com, roman.gushchin@linux.dev, Frank van der Linden , Dave Hansen , Andy Lutomirski , Peter Zijlstra , Dan Carpenter Content-Type: text/plain; charset="UTF-8" X-Rspam-User: X-Rspamd-Queue-Id: 5BB73C0010 X-Rspamd-Server: rspam07 X-Stat-Signature: xbmiiab8txoejcqq1txi4ydswpm46hgn X-HE-Tag: 1739902640-690013 X-HE-Meta: U2FsdGVkX18+kGCOrKAF85+6aKOZsN69MIPPU5VOjDO5cmodqFYtCZlNavIhAUs4dUcYc6u/QlP8TGWHvPtYJL81BaqOUQH7uJucns5BsoRCljUixZH4Ibho7hrYgSfet+P9qfj7YJSrxA3DiBhsVdqfWWKXfbJ5l5YXpDPBD/PpeDHReMHjjRBTrC3TnQOCz/A4UkE659h7buLuPMPY/NwNK6EkmducZYJItCPilbmrMZZMUtSgy5IJIvUUC8f6ohwEly5Wm3Xuy7zysj21e7W7AqkUrSOKk4h5/oLg7/tNOVJWbAsQrHkM8qq3rSNCc+VIMJGhCJ4KgzX4RPF6j+7Vu7KGuvUQV+Gk2gXMfSaQu8opK9olFHndzJkj3XYbtj/wm2x8bXmRJ/H6dWT/ccSCAjMmvfXiFpp8F9ZrlXBHz8dcN9Sa3Df38EbbKG0eQ3f+MZ2MWL0YmorlU1DOuu7m32vAfsg4UyhGE8Ue1GPBAVMuVzN7lR2/jRdnuMai5jHsiNPaz4lxqHlWu3MucziDlierY0H5p/fOAPWC41tH+CVGfHz2tpLBMF8sQDWBtBtIRaxuO4Sxjo45pfJjcxYbZ9ZPAXqH29jQu4Vkwougd+LTDb03hy7m5LJsX+MHgoWLsiSF+opzvxHABagQUHgjPMr1WhKG43Kuv5AV2XjdUkSv7Rz0ElmIhkAeRfqVjaZhbcJFLAd6U2VH6uyrvZ/Nnf8ASQf7rNCbrgA6mcIOQcxSCWle9JeZdoemL/aflcnbG90/YcW99TRZL/CyBPrSV0LZ5a0zlkrc2zSQEBD9wDXag+ufWjtY0oJ4W0EAFH8Jjx+rU4+Yf6bevprMCNNxMGgAXmWIT0Y7pLJs97ewNi8fKleXWX7twfO05zD5t7Bzk63SsU1j05XMpHwnV1JIzN5KkRZ30Kv6Lel51xhqNckFgI3wLUyD13kWqIOVtjJrB95BPNalIoGZdZy w08XNoDX YyXZlqqqWeuDU2PQXo6Fp/ATPWg7xgp/SjgghmT8kXC7+A5A993uF6prlW/mT0afrW8H8BrU9mi+Qg+MoEKpYn/Zo6evrtA5gAB4HsP4fue4G7655kRJoXOUqSB2bNJKxdMk5tsP7CZvC9GyVD3UMeuMyBil34GhGBSKrYoAEjzshp5uMdhTqydROsZbPxadeRFtV+UozrXsKZbV+n3/dZoVg2du5Wx/Xp90cujPGhgQcgnrZzA6YHUAAM9ebFsz76v1LIJE9WU51kYb3zCfKqel9TJmLmuBRdMIVOoNaqTkSbu1gjkTObXglcmhRD603Q3EACRorpUdTmKcdysSByRaJP9ONBQegUBobumQ0lGJ4cQ7xFy90ZbZOT9mXzKEeBZXZGeaZjA0SUgw4n2Z7ATFbsL2OjjRrGZQ2NJRm6cPVoIQTl6tuqETPZAug53DkxGsDdGbaue0PzznfcPMc6/2c5yAYVCy1NE2BlacRgsR93dEqkIYqpGVvfN/kF9BAcUf9bgm0FsVEctNAsfibIi+u/42SS3exIWIceH4ZJgcqK6jdgJLKnrQ2r2U+LtgSFBxDhOl/cdsH2Z2bDm0l39D4f0r8Pc/RbGwMewGc2cMvMaMjc2XyOusYh6j0Tt6T2tdNuptljDtDjTLZadMXDjD9Dlf6fzWEfVvokjcS0a9YS3pzso0h7pBcckOlRGeLYEuw0lVvz2LwGyJDM5Vc3CP1CDo84JEBlwAZhxMwc9qHX/A= 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 Cc: Dan Carpenter Signed-off-by: Frank van der Linden --- arch/x86/mm/init_64.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index 01ea7c6df303..6e8e4ef5312a 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c @@ -1599,11 +1599,14 @@ 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)) { + next = (addr + PAGE_SIZE) & PAGE_MASK; + 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 +1617,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.601.g30ceb7b040-goog