From: Ard Biesheuvel <ardb+git@google.com>
To: linux-efi@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, x86@kernel.org,
Ard Biesheuvel <ardb@kernel.org>, Dave Young <dyoung@redhat.com>,
Gregory Price <gourry@gourry.net>,
Usama Arif <usamaarif642@gmail.com>,
Jiri Slaby <jirislaby@kernel.org>,
Breno Leitao <leitao@debian.org>
Subject: [PATCH v2 4/5] efi: Use efi_mem_reserve() to reserve the memory attribute table
Date: Wed, 1 Apr 2026 14:23:56 +0200 [thread overview]
Message-ID: <20260401122351.2058145-11-ardb+git@google.com> (raw)
In-Reply-To: <20260401122351.2058145-7-ardb+git@google.com>
From: Ard Biesheuvel <ardb@kernel.org>
Use efi_mem_reserve() rather than memblock_reserve() to reserve the EFI
memory attributes table. This is needed on x86, where memblock_reserve()
is not sufficient for assets that may be placed in EFI boot services
data memory.
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
---
drivers/firmware/efi/memattr.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/firmware/efi/memattr.c b/drivers/firmware/efi/memattr.c
index b83f1c5a9164..785b7fc687fe 100644
--- a/drivers/firmware/efi/memattr.c
+++ b/drivers/firmware/efi/memattr.c
@@ -75,7 +75,7 @@ void __init efi_memattr_init(void)
}
tbl_size = sizeof(*tbl) + tbl->num_entries * tbl->desc_size;
- memblock_reserve(efi_mem_attr_table, tbl_size);
+ efi_mem_reserve(efi_mem_attr_table, tbl_size);
set_bit(EFI_MEM_ATTR, &efi.flags);
unmap:
--
2.53.0.1118.gaef5881109-goog
next prev parent reply other threads:[~2026-04-01 12:24 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-01 12:23 [PATCH v2 0/5] x86/efi: Re-enable memory attributes table for kexec Ard Biesheuvel
2026-04-01 12:23 ` [PATCH v2 1/5] efi/memattr: Fix thinko in table size sanity check Ard Biesheuvel
2026-04-01 12:45 ` Breno Leitao
2026-04-01 14:31 ` Ard Biesheuvel
2026-04-01 14:35 ` Breno Leitao
2026-04-01 12:23 ` [PATCH v2 2/5] x86/efi: Gather initial memory reservation and table handling logic Ard Biesheuvel
2026-04-01 14:49 ` Breno Leitao
2026-04-01 14:59 ` Ard Biesheuvel
2026-04-01 12:23 ` [PATCH v2 3/5] x86/efi: Defer the call to efi_memattr_init() Ard Biesheuvel
2026-04-01 14:57 ` Breno Leitao
2026-04-01 12:23 ` Ard Biesheuvel [this message]
2026-04-01 17:39 ` [PATCH v2 4/5] efi: Use efi_mem_reserve() to reserve the memory attribute table Breno Leitao
2026-04-01 17:47 ` Ard Biesheuvel
2026-04-01 12:23 ` [PATCH v2 5/5] 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=20260401122351.2058145-11-ardb+git@google.com \
--to=ardb+git@google.com \
--cc=ardb@kernel.org \
--cc=dyoung@redhat.com \
--cc=gourry@gourry.net \
--cc=jirislaby@kernel.org \
--cc=leitao@debian.org \
--cc=linux-efi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=usamaarif642@gmail.com \
--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