From: Ard Biesheuvel <ardb+git@google.com>
To: linux-kernel@vger.kernel.org
Cc: linux-efi@vger.kernel.org, x86@kernel.org,
Ard Biesheuvel <ardb@kernel.org>,
"Mike Rapoport (Microsoft)" <rppt@kernel.org>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Dave Young <ruirui.yang@linux.dev>,
Gregory Price <gourry@gourry.net>
Subject: [PATCH v3 02/17] x86/efi: Drop redundant EFI_PARAVIRT check
Date: Thu, 23 Apr 2026 17:20:27 +0200 [thread overview]
Message-ID: <20260423152024.1098465-21-ardb+git@google.com> (raw)
In-Reply-To: <20260423152024.1098465-19-ardb+git@google.com>
From: Ard Biesheuvel <ardb@kernel.org>
efi_memblock_x86_reserve_range() exits early if EFI_PARAVIRT is set, so
there is no point in checking it a second time further down.
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
---
arch/x86/platform/efi/efi.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index 0c39adb96b91..1b7a0cd54d08 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -211,11 +211,9 @@ int __init efi_memblock_x86_reserve_range(void)
data.desc_size = e->efi_memdesc_size;
data.desc_version = e->efi_memdesc_version;
- if (!efi_enabled(EFI_PARAVIRT)) {
- rv = efi_memmap_init_early(&data);
- if (rv)
- return rv;
- }
+ rv = efi_memmap_init_early(&data);
+ if (rv)
+ return rv;
if (add_efi_memmap || do_efi_soft_reserve())
do_add_efi_memmap();
--
2.54.0.rc2.544.gc7ae2d5bb8-goog
next prev parent reply other threads:[~2026-04-23 15:21 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-23 15:20 [PATCH v3 00/17] efi/x86: Avoid the need to mangle the EFI memory map Ard Biesheuvel
2026-04-23 15:20 ` [PATCH v3 01/17] x86/efi: Omit redundant kernel image overlap check Ard Biesheuvel
2026-04-28 8:21 ` Mike Rapoport
2026-04-28 10:40 ` Gregory Price
2026-04-23 15:20 ` Ard Biesheuvel [this message]
2026-04-28 8:21 ` [PATCH v3 02/17] x86/efi: Drop redundant EFI_PARAVIRT check Mike Rapoport
2026-04-28 10:42 ` Gregory Price
2026-04-23 15:20 ` [PATCH v3 03/17] x86/efi: Only merge EFI memory map entries on 32-bit systems Ard Biesheuvel
2026-04-28 10:47 ` Gregory Price
2026-04-23 15:20 ` [PATCH v3 04/17] x86/efi: Defer sub-1M check from unmap to free stage Ard Biesheuvel
2026-04-28 8:25 ` Mike Rapoport
2026-04-23 15:20 ` [PATCH v3 05/17] x86/efi: Simplify real mode trampoline allocation quirk Ard Biesheuvel
2026-04-28 8:32 ` Mike Rapoport
2026-04-23 15:20 ` [PATCH v3 06/17] x86/efi: Unmap kernel-reserved boot regions from EFI page tables Ard Biesheuvel
2026-04-23 15:20 ` [PATCH v3 07/17] x86/efi: Drop EFI_MEMORY_RUNTIME check from __ioremap_check_other() Ard Biesheuvel
2026-04-23 15:20 ` [PATCH v3 08/17] x86/efi: Allow ranges_to_free array to grow beyond initial size Ard Biesheuvel
2026-04-28 8:38 ` Mike Rapoport
2026-04-23 15:20 ` [PATCH v3 09/17] x86/efi: Intersect ranges_to_free with MEMBLOCK_RSRV_KERN regions Ard Biesheuvel
2026-04-28 8:40 ` Mike Rapoport
2026-04-23 15:20 ` [PATCH v3 10/17] x86/efi: Do not rely on EFI_MEMORY_RUNTIME bit and avoid entry splitting Ard Biesheuvel
2026-04-23 15:20 ` [PATCH v3 11/17] efi: Use nr_map not map_end to find the last valid memory map entry Ard Biesheuvel
2026-04-23 15:20 ` [PATCH v3 12/17] x86/efi: Clean the memory map using iterator and filter API Ard Biesheuvel
2026-04-23 15:20 ` [PATCH v3 13/17] x86/efi: Update the runtime map in place Ard Biesheuvel
2026-04-23 15:20 ` [PATCH v3 14/17] x86/efi: Reuse memory map instead of reallocating it Ard Biesheuvel
2026-04-23 15:20 ` [PATCH v3 15/17] x86/efi: Merge two traversals of the memory map when freeing boot regions Ard Biesheuvel
2026-04-23 15:20 ` [PATCH v3 16/17] x86/efi: Avoid EFI_MEMORY_RUNTIME for early EFI boot memory reservations Ard Biesheuvel
2026-04-23 15:20 ` [PATCH v3 17/17] x86/efi: Drop kexec quirk for the EFI memory attributes table Ard Biesheuvel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260423152024.1098465-21-ardb+git@google.com \
--to=ardb+git@google.com \
--cc=ardb@kernel.org \
--cc=benh@kernel.crashing.org \
--cc=gourry@gourry.net \
--cc=linux-efi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rppt@kernel.org \
--cc=ruirui.yang@linux.dev \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox