From nobody Sun Jun 14 04:08:50 2026 Received: from mail-wr1-f73.google.com (mail-wr1-f73.google.com [209.85.221.73]) (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 923AB3C1960 for ; Sun, 3 May 2026 13:05:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777813502; cv=none; b=hV+JxDqjRedUww+Zi4e4WDBbeDv3uYdGwDuAcIR8beekuFRAMVQl9d1EH3qtwfFVMxCb6yyXwG8C7DnPQQyBxjoxmNUpMjkcwZpHLoz3j29KhQQSKq3NFIYLvJjUhYC+a/I9o+i4rgXZ+ACr471wrt4Pnq/2cewcvLHEFAdp3+M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777813502; c=relaxed/simple; bh=LmnJHwmYrctWcSRvA4jSbtSCZcxac8sMHyhc7V+wdaw=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=MrTC7wUWR1vd1324qO/0ON7wZcfwLTRpuT9GanrUGoOGuA3PfUY1OVKsYWPmXBQ6TJFdTaemf5PKHKh6jh4qiwAyAddj2iyAlLdz2QXAWM420jXoM5MuR6uVnnZbFllCCtvc4ye5AEkmYC5fFwcYoV1e9SsIIaekpLFigaSSzFU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--jackmanb.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=U/JOMoyn; arc=none smtp.client-ip=209.85.221.73 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--jackmanb.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="U/JOMoyn" Received: by mail-wr1-f73.google.com with SMTP id ffacd0b85a97d-44d9ace59efso228243f8f.1 for ; Sun, 03 May 2026 06:05:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1777813499; x=1778418299; 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=tWy1TTd9buQTYV2GohGlIVlAiwHntOQ7yKetYcNVu+E=; b=U/JOMoynUie7BGkHuhf7FWtQ2ScR9kYstIF11HX3uKtUg4Z8rs/2/qXX4lk3injlrf VTywpQI7+ly+5Jqj02txpsg25YYwWp5CsYGOZrWp+zHLw+14ispmeYummRxhkUIbNkx5 bLJTU6MxCft1cal9MrN8anL0R06QblLIPqZwHVh79xOiQOBJ5L8WW7ZMFewaKG/hlVVi eMMNvS+uPuBn/EBM7OxLVoDU92oDGRqlaUmYdYVqi9rvIqOECiD3dSi5i5cAEgjuz8pq RKXBI8YHnUdx5k1JAkuClvy5ar8m1NhYy5LbxJjbTVCMZGMtNo+Y9VevdqnyTcingaRr N5Iw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777813499; x=1778418299; 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=tWy1TTd9buQTYV2GohGlIVlAiwHntOQ7yKetYcNVu+E=; b=rO9kHHGtVPUhU2LDQfSL5/5PnaHa+3H1N80ohqXdNeoA3NCUvvhBNxrtBGWssrZmhr yRd7vwqIkfLdhfmz2M1aKE0Zkm6Y5ZPYSH/XxbqlOyYIJbQro6oD5eztsfSTPrqer4Z6 fu3hsZOG1/CEwdh98+s6Poia6DXo0DfK0gMveLflPSB2ztCQJdxHVYKhsU3lGWAqbmkO kpIK2F6JizmYJ0LQ8DLZYo5LZwL95xvZAl8HEEOl2/GqvNA53hMEQzKBpfb0gv5V/I/S 98xzlDhdIyFeTRUnOCh5uiSxU3BHWVktZQrJm5j/6tIOwOv+d3Ghu4LTgZIr2AkHWFU3 vjhA== X-Gm-Message-State: AOJu0YxG7kaY1WU6l3tahTMnFsFRTZ0DurAeiljgaIYjqd22VGLddLLs QSicp4qyp3EzMhTQ8g4X6cEL5odZl5p6aZDMW/WcrokGaj403eRLUQvSZ5hJvfDqDG9nXsP8sNK FXMWf9IB2QUGPBA== X-Received: from wroc15.prod.google.com ([2002:adf:ed8f:0:b0:44d:d5cb:c96]) (user=jackmanb job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6000:1a8b:b0:441:362c:39c1 with SMTP id ffacd0b85a97d-44bb65e0293mr9485934f8f.33.1777813498660; Sun, 03 May 2026 06:04:58 -0700 (PDT) Date: Sun, 03 May 2026 13:04:54 +0000 In-Reply-To: <20260503-x86-init-cleanup-v2-0-bb690bd2477c@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260503-x86-init-cleanup-v2-0-bb690bd2477c@google.com> X-Mailer: b4 0.14.3 Message-ID: <20260503-x86-init-cleanup-v2-1-bb690bd2477c@google.com> Subject: [PATCH v2 1/3] x86/mm: drop unused return from init_memory_mapping() From: Brendan Jackman To: Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Andy Lutomirski , Peter Zijlstra , Thomas Gleixner Cc: linux-kernel@vger.kernel.org, Brendan Jackman Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable None of the callers look at the return value. Signed-off-by: Brendan Jackman Reviewed-by: Dave Hansen --- arch/x86/include/asm/pgtable.h | 3 +-- arch/x86/mm/init.c | 16 +++++++--------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h index 2187e9cfcefa1..eb09fa7840b49 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h @@ -1170,8 +1170,7 @@ extern int direct_gbpages; void init_mem_mapping(void); void early_alloc_pgt_buf(void); void __init poking_init(void); -unsigned long init_memory_mapping(unsigned long start, - unsigned long end, pgprot_t prot); +void init_memory_mapping(unsigned long start, unsigned long end, pgprot_t = prot); =20 #ifdef CONFIG_X86_64 extern pgd_t trampoline_pgd_entry; diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c index fb67217fddcd3..ae3e9e0820153 100644 --- a/arch/x86/mm/init.c +++ b/arch/x86/mm/init.c @@ -531,11 +531,11 @@ bool pfn_range_is_mapped(unsigned long start_pfn, uns= igned long end_pfn) * This runs before bootmem is initialized and gets pages directly from * the physical memory. To access them they are temporarily mapped. */ -unsigned long __ref init_memory_mapping(unsigned long start, - unsigned long end, pgprot_t prot) +void __ref init_memory_mapping(unsigned long start, + unsigned long end, pgprot_t prot) { struct map_range mr[NR_RANGE_MR]; - unsigned long ret =3D 0; + unsigned long paddr_last =3D 0; int nr_range, i; =20 pr_debug("init_memory_mapping: [mem %#010lx-%#010lx]\n", @@ -545,13 +545,11 @@ unsigned long __ref init_memory_mapping(unsigned long= start, nr_range =3D split_mem_range(mr, 0, start, end); =20 for (i =3D 0; i < nr_range; i++) - ret =3D kernel_physical_mapping_init(mr[i].start, mr[i].end, - mr[i].page_size_mask, - prot); + paddr_last =3D kernel_physical_mapping_init(mr[i].start, mr[i].end, + mr[i].page_size_mask, + prot); =20 - add_pfn_range_mapped(start >> PAGE_SHIFT, ret >> PAGE_SHIFT); - - return ret >> PAGE_SHIFT; + add_pfn_range_mapped(start >> PAGE_SHIFT, paddr_last >> PAGE_SHIFT); } =20 /* --=20 2.51.2 From nobody Sun Jun 14 04:08:50 2026 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) (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 AC32A3C5DCD for ; Sun, 3 May 2026 13:05:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777813503; cv=none; b=ad0IlpOKnqsLxYxiku9w7SfZ9LCmeOP050YAk7JDQI1f9SKpeCEzvu++VMZZ+iocOZVbD6EjgJcwIFXzgQyXVptJ+MPVe0S+Vk0Ab/brnSROtdd8vuokdH/P0++abrZWAhrKHcU2vX1oPBmivK1gofgB4B8mP2r+StjfpEMFjwg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777813503; c=relaxed/simple; bh=tz3Smt4MfPJxXlMmESkiLoO+p437pcVgN4FL5vEftSU=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=h1rFiQ3ymMFqO+JZzGok7xhfazhKPwO02JHJkF8PN6ASEZ/+0r/AFiZ8ojk+aIqH8bZSF00JwWaQ5tcB6ZFeRoRZ5cqtOdPOPPz4CR5alG+JJX9wGkqUq2s19CQIjninPZzGiwHbZsxhssOdbDK6Y3s695bIRyQJS7BmhNE6aZU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--jackmanb.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=QXABrkNE; arc=none smtp.client-ip=209.85.128.73 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--jackmanb.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="QXABrkNE" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-4891f97aef0so19686285e9.2 for ; Sun, 03 May 2026 06:05:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1777813500; x=1778418300; 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=vUhNTnWV2U5f0Nlg04U+WVLumqSQoI2o7LO9Bxvhcho=; b=QXABrkNEqUhb66OYKKzTRNc/CK4i9RbQb/Ak/srE5FHgQFDK7Y+easPj62FWI9b7pf x7fDquXEMU8vdKxlivVEgeC2UDMG4Gml3kCCORGTZ2osExmBMBBtuO1XJZam1788KxRK 6ayOTYd+KGVelCPC8B2J6q4dPVqVGdVeOC5cTs3bM6AP54Y0YmB1fj9flDOw8vNDVIX7 5zwxweI2h6It/ncMg+EhpyvRwtEgG3pcdB34YN6xXiOwODtw23RSFmocKhIxb3HLYEuB 3/FzTRrEQkfylFYLIFpjbg+JLd0kHEXmkSkGegLvsoUAGOsWopVE9DX4FZuptJ/jpGN0 +15Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777813500; x=1778418300; 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=vUhNTnWV2U5f0Nlg04U+WVLumqSQoI2o7LO9Bxvhcho=; b=r8o1jkXx64RUaFiNJZxItdulUGYa1DJ4gx1M7qXt+aHfFgG5m2kFKzSiI7+tXQmlUi q2f0o01EBoizmQDjFrxos/gONylUecR0+hzgANJ7BJwpbSCMlcxv9pXbHKOBf+n8AOma LuHI/h65gzL8keixC63aE8OcYvC7HGNBqAbHsuhplS5tkdyJ1XI661NxUmN4obK83hQj F8uvXDqE14hGNyZTDSRZBAsOilehiaU8/FvqHfhUiwgRH8BhZpaZphDmUK+MkC6cDx8Y bAl0A4muh69nBJHDP86M7iUnKs2P1IofTeSemqQA0E0N4l9wAS36h/PxfPrqlaQ8UIbl Zi4A== X-Gm-Message-State: AOJu0YyvlaNEIJFXNTbFdbyWfdjSJtsCwvYL21RncQKM1SrOY/CZo5ZO hLW2wtA7uCOaf4dXaaDHexBBvQNZ37eau8dVX/d22RhwER6nKLU+79iDSGSgyzwYsj6UJ6GyLg/ 8HMawhOJOB9l1FQ== X-Received: from wmg19.prod.google.com ([2002:a05:600c:22d3:b0:483:509d:729b]) (user=jackmanb job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:608c:b0:48a:8905:a500 with SMTP id 5b1f17b1804b1-48a986429e9mr99628815e9.12.1777813500099; Sun, 03 May 2026 06:05:00 -0700 (PDT) Date: Sun, 03 May 2026 13:04:55 +0000 In-Reply-To: <20260503-x86-init-cleanup-v2-0-bb690bd2477c@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260503-x86-init-cleanup-v2-0-bb690bd2477c@google.com> X-Mailer: b4 0.14.3 Message-ID: <20260503-x86-init-cleanup-v2-2-bb690bd2477c@google.com> Subject: [PATCH v2 2/3] x86/mm: simplify calculation of max_pfn_mapped From: Brendan Jackman To: Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Andy Lutomirski , Peter Zijlstra , Thomas Gleixner Cc: linux-kernel@vger.kernel.org, Brendan Jackman Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The phys_*_init()s return the "last physical address mapped". The exact definition of this is pretty fiddly, but only in these conditions: 1. There is a mismatch between the alignment of the requested range and the page sizes allowed by page_size_mask 2. The range ends in a region that is not mapped according to e820. 3. The range ends in a region that was already mapped (note this case is particularly fiddly because the return value depends on what level the existing mapping is at. This is probably a bug, see [0] for discussion). Luckily, init_memory_mapping() avoids all these conditions. In that case, the return value is just paddr_end. And that value is already present, no need to depend on the confusing return value. [0]: https://lore.kernel.org/all/84b2e7a3-7115-45fe-89ff-db8ee46729f2@intel= .com/ Signed-off-by: Brendan Jackman --- arch/x86/mm/init.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c index ae3e9e0820153..1a6a6fc700bb5 100644 --- a/arch/x86/mm/init.c +++ b/arch/x86/mm/init.c @@ -544,10 +544,11 @@ void __ref init_memory_mapping(unsigned long start, memset(mr, 0, sizeof(mr)); nr_range =3D split_mem_range(mr, 0, start, end); =20 - for (i =3D 0; i < nr_range; i++) - paddr_last =3D kernel_physical_mapping_init(mr[i].start, mr[i].end, - mr[i].page_size_mask, - prot); + for (i =3D 0; i < nr_range; i++) { + kernel_physical_mapping_init(mr[i].start, mr[i].end, + mr[i].page_size_mask, prot); + paddr_last =3D mr[i].end; + } =20 add_pfn_range_mapped(start >> PAGE_SHIFT, paddr_last >> PAGE_SHIFT); } --=20 2.51.2 From nobody Sun Jun 14 04:08:50 2026 Received: from mail-ej1-f73.google.com (mail-ej1-f73.google.com [209.85.218.73]) (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 45AF23C455F for ; Sun, 3 May 2026 13:05:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777813505; cv=none; b=CAto3qMynkjtLUR1T/aD7E6s87pG6TOGHzOX3Ux9pwos0/16IRjWG8xdJ3LmQtSt9EPIVwVbmfkrR6PqFIIc3wBDNuxLIK/lVl/6djz4AfS6JepsruqkCVWlNLpLizYng0h/QNLbePIAIsCmtT6TYiXTNopV1DdVQ7puT0N4U9k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777813505; c=relaxed/simple; bh=ym/Joi6X213plggmDPayjvB0+wkdTiXwkQq9gw1aNDw=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=fO4tARSXMsihkvr+MGyjYBu++8E5EFnnEQ5iFIIVTvuD6Odz4qFD8ZKqahcLBlBXQOkzQ5lUqTJkkHQMe+7x5i80PjFpF4cd2GtU4RhG9GAfZsLyckdCJOaMC0viT9tMLoX386B+meouY2P2Ij+yHNbJTIGFwdwlSzxPxQzJ8ns= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--jackmanb.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=XMFE6ZKs; arc=none smtp.client-ip=209.85.218.73 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--jackmanb.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="XMFE6ZKs" Received: by mail-ej1-f73.google.com with SMTP id a640c23a62f3a-ba5520bee9dso256102666b.1 for ; Sun, 03 May 2026 06:05:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1777813501; x=1778418301; 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=Kei7oZgQGZcRJ7k95kDl+H7tCLur3Tzob7YN4Ew6W5Q=; b=XMFE6ZKsr6gKdL+W6EHly3cAt2dENkkoilwgmSKb24dcZdkfU/nIv6GdJ0waHNUB7d eMPI/O25vItHXTZFL5flLmF3ymPM2jWk8v0CMfGTwzajMN8Ip8PFzbzKJNoYw1/qcXmJ bzy+Iy4wUqbnvsWbyMpqxQSs0sZ8B+LkDZiDebWvswIpcMGhOxYPpgJFJg1jEynOZz2d 9H3B6ff7iZ8NaoURsrirmTBqld7E9Og1an/JZpRp+4fc/+zw4C4gs6BBmTFEOcOfCJbU HzsnxRLqLr/jVa5a16shkfMwuIi286gi9xOJ8iY72+1dYD3turg+iuZV91VtOhPYFKKW 1T7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777813501; x=1778418301; 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=Kei7oZgQGZcRJ7k95kDl+H7tCLur3Tzob7YN4Ew6W5Q=; b=RFIDjWfAU8Swo0EljdiqCqxYFYXEMQf7se1l7XM5vE3dTv1zEn7W8nVwjdlTvEZ3XO kZamkFWwXJ+dyIaZeUcw3XwNwMu0rlbksg6MFor/xPDz3qMpMUNz2u4vBU+a1nmJbNl9 R6tNXs6asvS61E1H0z2MJPBOxKIFoqVArL1fX/8qIjzyeLmT46sukDTWV4ZqhsNdAwqu G8jtHcrq7DMmPmEhZpBBWFiiX3MR9cxGp2tUGb8ONOM/Rakut7zmQOW4ROQIsrYwyFTJ D0BLp3W6eQ58MypvopVX+gODoj7Ajw+DLCXO5+ve3aTw+Y6dZsHPPr1mzVIQN/MACMcK JrSA== X-Gm-Message-State: AOJu0Yxr7KCO7sXmST0qoQx+Bndl4q3lN6I10od31XOY8/TcHU8wv9rd 8pKeM87Fv/1V51IUiTP/Xy+8hSt73bTdTozA4pts3+EHwGHpZwe6QVUYLFcJg5L19cvtrhgQcZQ i08iMmaTNGEVCwg== X-Received: from ejcqw11.prod.google.com ([2002:a17:906:6a0b:b0:ba2:62ad:29f6]) (user=jackmanb job=prod-delivery.src-stubby-dispatcher) by 2002:a17:907:94d5:b0:baa:f6c9:51b2 with SMTP id a640c23a62f3a-bbffc47f49cmr285074566b.23.1777813501110; Sun, 03 May 2026 06:05:01 -0700 (PDT) Date: Sun, 03 May 2026 13:04:56 +0000 In-Reply-To: <20260503-x86-init-cleanup-v2-0-bb690bd2477c@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260503-x86-init-cleanup-v2-0-bb690bd2477c@google.com> X-Mailer: b4 0.14.3 Message-ID: <20260503-x86-init-cleanup-v2-3-bb690bd2477c@google.com> Subject: [PATCH v2 3/3] x86/mm: drop unused returns from direct map setup functions From: Brendan Jackman To: Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Andy Lutomirski , Peter Zijlstra , Thomas Gleixner Cc: linux-kernel@vger.kernel.org, Brendan Jackman Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Nothing looks at these return values. Furthermore, as discussed in [0], it seems like in the case of a pre-existing 4K mapping, the return value of kernel_physical_mapping_init() is wrong anyway. So, just stop returning a value. Signed-off-by: Brendan Jackman Reviewed-by: Dave Hansen --- arch/x86/mm/init_32.c | 5 +-- arch/x86/mm/init_64.c | 96 ++++++++++++++++---------------------------= ---- arch/x86/mm/mm_internal.h | 11 ++---- 3 files changed, 38 insertions(+), 74 deletions(-) diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c index 0908c44d51e6f..05c456dc9855f 100644 --- a/arch/x86/mm/init_32.c +++ b/arch/x86/mm/init_32.c @@ -245,14 +245,13 @@ static inline int is_x86_32_kernel_text(unsigned long= addr) * of max_low_pfn pages, by creating page tables starting from address * PAGE_OFFSET: */ -unsigned long __init +void __init kernel_physical_mapping_init(unsigned long start, unsigned long end, unsigned long page_size_mask, pgprot_t prot) { int use_pse =3D page_size_mask =3D=3D (1<> PAGE_SHIFT, prot), init); - paddr_last =3D (paddr & PAGE_MASK) + PAGE_SIZE; } =20 update_page_count(PG_LEVEL_4K, pages); - - return paddr_last; } =20 /* * Create PMD level page table mapping for physical addresses. The virtual * and physical address have to be aligned at this level. - * It returns the last physical address mapped. */ -static unsigned long __meminit +static void __meminit phys_pmd_init(pmd_t *pmd_page, unsigned long paddr, unsigned long paddr_en= d, unsigned long page_size_mask, pgprot_t prot, bool init) { unsigned long pages =3D 0, paddr_next; - unsigned long paddr_last =3D paddr_end; =20 int i =3D pmd_index(paddr); =20 @@ -548,9 +539,7 @@ phys_pmd_init(pmd_t *pmd_page, unsigned long paddr, uns= igned long paddr_end, if (!pmd_leaf(*pmd)) { spin_lock(&init_mm.page_table_lock); pte =3D (pte_t *)pmd_page_vaddr(*pmd); - paddr_last =3D phys_pte_init(pte, paddr, - paddr_end, prot, - init); + phys_pte_init(pte, paddr, paddr_end, prot, init); spin_unlock(&init_mm.page_table_lock); continue; } @@ -569,7 +558,6 @@ phys_pmd_init(pmd_t *pmd_page, unsigned long paddr, uns= igned long paddr_end, if (page_size_mask & (1 << PG_LEVEL_2M)) { if (!after_bootmem) pages++; - paddr_last =3D paddr_next; continue; } new_prot =3D pte_pgprot(pte_clrhuge(*(pte_t *)pmd)); @@ -582,33 +570,29 @@ phys_pmd_init(pmd_t *pmd_page, unsigned long paddr, u= nsigned long paddr_end, pfn_pmd(paddr >> PAGE_SHIFT, prot_sethuge(prot)), init); spin_unlock(&init_mm.page_table_lock); - paddr_last =3D paddr_next; continue; } =20 pte =3D alloc_low_page(); - paddr_last =3D phys_pte_init(pte, paddr, paddr_end, new_prot, init); + phys_pte_init(pte, paddr, paddr_end, new_prot, init); =20 spin_lock(&init_mm.page_table_lock); pmd_populate_kernel_init(&init_mm, pmd, pte, init); spin_unlock(&init_mm.page_table_lock); } update_page_count(PG_LEVEL_2M, pages); - return paddr_last; } =20 /* * Create PUD level page table mapping for physical addresses. The virtual * and physical address do not have to be aligned at this level. KASLR can * randomize virtual addresses up to this level. - * It returns the last physical address mapped. */ -static unsigned long __meminit +static void __meminit phys_pud_init(pud_t *pud_page, unsigned long paddr, unsigned long paddr_en= d, unsigned long page_size_mask, pgprot_t _prot, bool init) { unsigned long pages =3D 0, paddr_next; - unsigned long paddr_last =3D paddr_end; unsigned long vaddr =3D (unsigned long)__va(paddr); int i =3D pud_index(vaddr); =20 @@ -634,10 +618,8 @@ phys_pud_init(pud_t *pud_page, unsigned long paddr, un= signed long paddr_end, if (!pud_none(*pud)) { if (!pud_leaf(*pud)) { pmd =3D pmd_offset(pud, 0); - paddr_last =3D phys_pmd_init(pmd, paddr, - paddr_end, - page_size_mask, - prot, init); + phys_pmd_init(pmd, paddr, paddr_end, + page_size_mask, prot, init); continue; } /* @@ -655,7 +637,6 @@ phys_pud_init(pud_t *pud_page, unsigned long paddr, uns= igned long paddr_end, if (page_size_mask & (1 << PG_LEVEL_1G)) { if (!after_bootmem) pages++; - paddr_last =3D paddr_next; continue; } prot =3D pte_pgprot(pte_clrhuge(*(pte_t *)pud)); @@ -668,13 +649,11 @@ phys_pud_init(pud_t *pud_page, unsigned long paddr, u= nsigned long paddr_end, pfn_pud(paddr >> PAGE_SHIFT, prot_sethuge(prot)), init); spin_unlock(&init_mm.page_table_lock); - paddr_last =3D paddr_next; continue; } =20 pmd =3D alloc_low_page(); - paddr_last =3D phys_pmd_init(pmd, paddr, paddr_end, - page_size_mask, prot, init); + phys_pmd_init(pmd, paddr, paddr_end, page_size_mask, prot, init); =20 spin_lock(&init_mm.page_table_lock); pud_populate_init(&init_mm, pud, pmd, init); @@ -682,23 +661,22 @@ phys_pud_init(pud_t *pud_page, unsigned long paddr, u= nsigned long paddr_end, } =20 update_page_count(PG_LEVEL_1G, pages); - - return paddr_last; } =20 -static unsigned long __meminit +static void __meminit phys_p4d_init(p4d_t *p4d_page, unsigned long paddr, unsigned long paddr_en= d, unsigned long page_size_mask, pgprot_t prot, bool init) { - unsigned long vaddr, vaddr_end, vaddr_next, paddr_next, paddr_last; + unsigned long vaddr, vaddr_end, vaddr_next, paddr_next; =20 - paddr_last =3D paddr_end; vaddr =3D (unsigned long)__va(paddr); vaddr_end =3D (unsigned long)__va(paddr_end); =20 - if (!pgtable_l5_enabled()) - return phys_pud_init((pud_t *) p4d_page, paddr, paddr_end, - page_size_mask, prot, init); + if (!pgtable_l5_enabled()) { + phys_pud_init((pud_t *) p4d_page, paddr, paddr_end, + page_size_mask, prot, init); + return; + } =20 for (; vaddr < vaddr_end; vaddr =3D vaddr_next) { p4d_t *p4d =3D p4d_page + p4d_index(vaddr); @@ -720,33 +698,30 @@ phys_p4d_init(p4d_t *p4d_page, unsigned long paddr, u= nsigned long paddr_end, =20 if (!p4d_none(*p4d)) { pud =3D pud_offset(p4d, 0); - paddr_last =3D phys_pud_init(pud, paddr, __pa(vaddr_end), - page_size_mask, prot, init); + phys_pud_init(pud, paddr, __pa(vaddr_end), + page_size_mask, prot, init); continue; } =20 pud =3D alloc_low_page(); - paddr_last =3D phys_pud_init(pud, paddr, __pa(vaddr_end), - page_size_mask, prot, init); + phys_pud_init(pud, paddr, __pa(vaddr_end), + page_size_mask, prot, init); =20 spin_lock(&init_mm.page_table_lock); p4d_populate_init(&init_mm, p4d, pud, init); spin_unlock(&init_mm.page_table_lock); } - - return paddr_last; } =20 -static unsigned long __meminit +static void __meminit __kernel_physical_mapping_init(unsigned long paddr_start, unsigned long paddr_end, unsigned long page_size_mask, pgprot_t prot, bool init) { bool pgd_changed =3D false; - unsigned long vaddr, vaddr_start, vaddr_end, vaddr_next, paddr_last; + unsigned long vaddr, vaddr_start, vaddr_end, vaddr_next; =20 - paddr_last =3D paddr_end; vaddr =3D (unsigned long)__va(paddr_start); vaddr_end =3D (unsigned long)__va(paddr_end); vaddr_start =3D vaddr; @@ -759,16 +734,14 @@ __kernel_physical_mapping_init(unsigned long paddr_st= art, =20 if (pgd_val(*pgd)) { p4d =3D (p4d_t *)pgd_page_vaddr(*pgd); - paddr_last =3D phys_p4d_init(p4d, __pa(vaddr), - __pa(vaddr_end), - page_size_mask, - prot, init); + phys_p4d_init(p4d, __pa(vaddr), __pa(vaddr_end), + page_size_mask, prot, init); continue; } =20 p4d =3D alloc_low_page(); - paddr_last =3D phys_p4d_init(p4d, __pa(vaddr), __pa(vaddr_end), - page_size_mask, prot, init); + phys_p4d_init(p4d, __pa(vaddr), __pa(vaddr_end), + page_size_mask, prot, init); =20 spin_lock(&init_mm.page_table_lock); if (pgtable_l5_enabled()) @@ -783,8 +756,6 @@ __kernel_physical_mapping_init(unsigned long paddr_star= t, =20 if (pgd_changed) sync_global_pgds(vaddr_start, vaddr_end - 1); - - return paddr_last; } =20 =20 @@ -792,15 +763,15 @@ __kernel_physical_mapping_init(unsigned long paddr_st= art, * Create page table mapping for the physical memory for specific physical * addresses. Note that it can only be used to populate non-present entrie= s. * The virtual and physical addresses have to be aligned on PMD level - * down. It returns the last physical address mapped. + * down. */ -unsigned long __meminit +void __meminit kernel_physical_mapping_init(unsigned long paddr_start, unsigned long paddr_end, unsigned long page_size_mask, pgprot_t prot) { - return __kernel_physical_mapping_init(paddr_start, paddr_end, - page_size_mask, prot, true); + __kernel_physical_mapping_init(paddr_start, paddr_end, + page_size_mask, prot, true); } =20 /* @@ -809,14 +780,13 @@ kernel_physical_mapping_init(unsigned long paddr_star= t, * when updating the mapping. The caller is responsible to flush the TLBs = after * the function returns. */ -unsigned long __meminit +void __meminit kernel_physical_mapping_change(unsigned long paddr_start, unsigned long paddr_end, unsigned long page_size_mask) { - return __kernel_physical_mapping_init(paddr_start, paddr_end, - page_size_mask, PAGE_KERNEL, - false); + __kernel_physical_mapping_init(paddr_start, paddr_end, + page_size_mask, PAGE_KERNEL, false); } =20 #ifndef CONFIG_NUMA diff --git a/arch/x86/mm/mm_internal.h b/arch/x86/mm/mm_internal.h index 7c4a41235323b..dad8abe65ed03 100644 --- a/arch/x86/mm/mm_internal.h +++ b/arch/x86/mm/mm_internal.h @@ -10,13 +10,10 @@ static inline void *alloc_low_page(void) =20 void early_ioremap_page_table_range_init(void); =20 -unsigned long kernel_physical_mapping_init(unsigned long start, - unsigned long end, - unsigned long page_size_mask, - pgprot_t prot); -unsigned long kernel_physical_mapping_change(unsigned long start, - unsigned long end, - unsigned long page_size_mask); +void kernel_physical_mapping_init(unsigned long start, unsigned long end, + unsigned long page_size_mask, pgprot_t prot); +void kernel_physical_mapping_change(unsigned long start, unsigned long end, + unsigned long page_size_mask); =20 extern int after_bootmem; =20 --=20 2.51.2