mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "tip-bot2 for Kirill A. Shutemov" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>,
	"Borislav Petkov (AMD)" <bp@alien8.de>,
	Borislav Petkov <bp@suse.de>,
	Tom Lendacky <thomas.lendacky@amd.com>,
	Ard Biesheuvel <ardb@kernel.org>,
	x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/cc] efi/x86: Get full memory map in allocate_e820()
Date: Tue, 06 Jun 2023 19:42:40 -0000	[thread overview]
Message-ID: <168608056067.404.15241671538092730395.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20230606142637.5171-3-kirill.shutemov@linux.intel.com>

The following commit has been merged into the x86/cc branch of tip:

Commit-ID:     2e9f46ee1599be8a50a5366eb3ef4a4b5acff0b7
Gitweb:        https://git.kernel.org/tip/2e9f46ee1599be8a50a5366eb3ef4a4b5acff0b7
Author:        Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
AuthorDate:    Tue, 06 Jun 2023 17:26:30 +03:00
Committer:     Borislav Petkov (AMD) <bp@alien8.de>
CommitterDate: Tue, 06 Jun 2023 16:45:14 +02:00

efi/x86: Get full memory map in allocate_e820()

Currently allocate_e820() is only interested in the size of map and size
of memory descriptor to determine how many e820 entries the kernel
needs.

UEFI Specification version 2.9 introduces a new memory type --
unaccepted memory. To track unaccepted memory, the kernel needs to
allocate a bitmap. The size of the bitmap is dependent on the maximum
physical address present in the system. A full memory map is required to
find the maximum address.

Modify allocate_e820() to get a full memory map.

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Reviewed-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Tom Lendacky <thomas.lendacky@amd.com>
Acked-by: Ard Biesheuvel <ardb@kernel.org>
Link: https://lore.kernel.org/r/20230606142637.5171-3-kirill.shutemov@linux.intel.com
---
 drivers/firmware/efi/libstub/x86-stub.c | 26 ++++++++++--------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/drivers/firmware/efi/libstub/x86-stub.c b/drivers/firmware/efi/libstub/x86-stub.c
index a0bfd31..cd77a7a 100644
--- a/drivers/firmware/efi/libstub/x86-stub.c
+++ b/drivers/firmware/efi/libstub/x86-stub.c
@@ -681,28 +681,24 @@ static efi_status_t allocate_e820(struct boot_params *params,
 				  struct setup_data **e820ext,
 				  u32 *e820ext_size)
 {
-	unsigned long map_size, desc_size, map_key;
+	struct efi_boot_memmap *map;
 	efi_status_t status;
-	__u32 nr_desc, desc_version;
+	__u32 nr_desc;
 
-	/* Only need the size of the mem map and size of each mem descriptor */
-	map_size = 0;
-	status = efi_bs_call(get_memory_map, &map_size, NULL, &map_key,
-			     &desc_size, &desc_version);
-	if (status != EFI_BUFFER_TOO_SMALL)
-		return (status != EFI_SUCCESS) ? status : EFI_UNSUPPORTED;
-
-	nr_desc = map_size / desc_size + EFI_MMAP_NR_SLACK_SLOTS;
+	status = efi_get_memory_map(&map, false);
+	if (status != EFI_SUCCESS)
+		return status;
 
-	if (nr_desc > ARRAY_SIZE(params->e820_table)) {
-		u32 nr_e820ext = nr_desc - ARRAY_SIZE(params->e820_table);
+	nr_desc = map->map_size / map->desc_size;
+	if (nr_desc > ARRAY_SIZE(params->e820_table) - EFI_MMAP_NR_SLACK_SLOTS) {
+		u32 nr_e820ext = nr_desc - ARRAY_SIZE(params->e820_table) +
+				 EFI_MMAP_NR_SLACK_SLOTS;
 
 		status = alloc_e820ext(nr_e820ext, e820ext, e820ext_size);
-		if (status != EFI_SUCCESS)
-			return status;
 	}
 
-	return EFI_SUCCESS;
+	efi_bs_call(free_pool, map);
+	return status;
 }
 
 struct exit_boot_struct {

  reply	other threads:[~2023-06-06 19:43 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-06 14:26 [PATCHv14 0/9] mm, x86/cc, efi: Implement support for unaccepted memory Kirill A. Shutemov
2023-06-06 14:26 ` [PATCHv14 1/9] mm: Add " Kirill A. Shutemov
2023-06-06 19:42   ` [tip: x86/cc] " tip-bot2 for Kirill A. Shutemov
2023-06-06 14:26 ` [PATCHv14 2/9] efi/x86: Get full memory map in allocate_e820() Kirill A. Shutemov
2023-06-06 19:42   ` tip-bot2 for Kirill A. Shutemov [this message]
2023-06-06 14:26 ` [PATCHv14 3/9] efi/libstub: Implement support for unaccepted memory Kirill A. Shutemov
2023-06-06 19:42   ` [tip: x86/cc] " tip-bot2 for Kirill A. Shutemov
2023-06-06 14:26 ` [PATCHv14 4/9] x86/boot/compressed: Handle " Kirill A. Shutemov
2023-06-06 19:42   ` [tip: x86/cc] " tip-bot2 for Kirill A. Shutemov
2023-06-06 14:26 ` [PATCHv14 5/9] efi: Add unaccepted memory support Kirill A. Shutemov
2023-06-06 19:42   ` [tip: x86/cc] " tip-bot2 for Kirill A. Shutemov
2023-07-03 13:25   ` [PATCHv14 5/9] " Mel Gorman
2023-07-04 14:37     ` Kirill A. Shutemov
2023-07-12  9:18       ` Mel Gorman
2023-10-10 21:05   ` Michael Roth
2023-10-13 12:33     ` Kirill A. Shutemov
2023-10-13 16:22       ` Kirill A. Shutemov
2023-10-13 16:44         ` Vlastimil Babka
2023-10-13 17:27           ` Kirill A. Shutemov
2023-10-13 21:54             ` Kirill A. Shutemov
2023-10-13 17:45         ` Tom Lendacky
2023-10-13 19:53           ` Kirill A. Shutemov
2023-06-06 14:26 ` [PATCHv14 6/9] efi/unaccepted: Avoid load_unaligned_zeropad() stepping into unaccepted memory Kirill A. Shutemov
2023-06-06 19:42   ` [tip: x86/cc] " tip-bot2 for Kirill A. Shutemov
2023-06-06 14:26 ` [PATCHv14 7/9] x86/tdx: Make _tdx_hypercall() and __tdx_module_call() available in boot stub Kirill A. Shutemov
2023-06-06 19:42   ` [tip: x86/cc] " tip-bot2 for Kirill A. Shutemov
2023-06-06 14:26 ` [PATCHv14 8/9] x86/tdx: Refactor try_accept_one() Kirill A. Shutemov
2023-06-06 19:42   ` [tip: x86/cc] " tip-bot2 for Kirill A. Shutemov
2023-06-06 14:26 ` [PATCHv14 9/9] x86/tdx: Add unaccepted memory support Kirill A. Shutemov
2023-06-06 19:42   ` [tip: x86/cc] " tip-bot2 for Kirill A. Shutemov
2023-06-06 14:51 ` [PATCH v9 0/6] Provide SEV-SNP support for unaccepted memory Tom Lendacky
2023-06-06 14:51   ` [PATCH v9 1/6] x86/sev: Fix calculation of end address based on number of pages Tom Lendacky
2023-06-06 14:51   ` [PATCH v9 2/6] x86/sev: Put PSC struct on the stack in prep for unaccepted memory support Tom Lendacky
2023-06-06 14:51   ` [PATCH v9 3/6] x86/sev: Allow for use of the early boot GHCB for PSC requests Tom Lendacky
2023-06-06 14:51   ` [PATCH v9 4/6] x86/sev: Use large PSC requests if applicable Tom Lendacky
2023-06-06 14:51   ` [PATCH v9 5/6] x86/sev: Add SNP-specific unaccepted memory support Tom Lendacky
2023-09-06 14:04     ` Christopher Schramm
2023-09-07 16:50       ` Tom Lendacky
2023-09-12 12:17         ` Kirill A. Shutemov
2023-09-12 14:49           ` Tom Lendacky
2023-06-06 14:51   ` [PATCH v9 6/6] x86/efi: Safely enable unaccepted memory in UEFI Tom Lendacky
2023-06-06 15:39     ` Ard Biesheuvel
2023-06-06 16:16 ` [PATCHv14 0/9] mm, x86/cc, efi: Implement support for unaccepted memory Borislav Petkov
2023-06-06 16:25   ` Borislav Petkov
2023-06-06 18:14   ` Kirill A. Shutemov

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=168608056067.404.15241671538092730395.tip-bot2@tip-bot2 \
    --to=tip-bot2@linutronix.de \
    --cc=ardb@kernel.org \
    --cc=bp@alien8.de \
    --cc=bp@suse.de \
    --cc=kirill.shutemov@linux.intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=thomas.lendacky@amd.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

all inboxes | Powered by JetHome®