Skip to content
Permalink
Browse files
efi/x86: Implement support for unaccepted memory
UEFI Specification version 2.9 introduces concept of memory acceptance:
Some Virtual Machine platforms, such as Intel TDX or AMD SEV-SNP,
requiring memory to be accepted before it can be used by the guest.
Accepting happens via a protocol specific for the Virtrual Machine
platform.

Accepting memory is costly and it makes VMM allocate memory for the
accepted guest physical address range. It's better to postpone memory
acceptation until memory is needed. It lowers boot time and reduces
memory overhead.

Kernel needs to know what memory has been accepted. Firmware
communicates this information via memory map: a new memory type --
EFI_UNACCEPTED_MEMORY -- indicates such memory.

Range based tracking works fine for firmware, but it gets bulky for
kernel: e820 has to be modified on every page acceptance. It leads to
table fragmentation, but there's a limited number of entries in the e820
table

Other option is to mark such memory as usable in e820 and track if the
range has been accepted in a bitmap. One bit in the bitmap represents
2MiB in the address space: one 4k page is enough to track 64GiB or
physical address space.

In the worst case scenario -- a huge hole in the middle of the
address space -- It needs 256MiB to handle 4PiB of the address
space.

Any unaccepted memory that is not aligned to 2M get accepted upfront.

The bitmap allocated and constructed in EFI stub and passed down to
kernel via boot_params. allocate_e820() allocates the bitmap if
unaccepted memory present according to the maximum address in the memory
map.

The same boot_params.unaccepted_memory can be used to pass the bitmap
between two kernel on kexec, but the use-case is not yet implemented.

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
  • Loading branch information
kiryl authored and Kuppuswamy Sathyanarayanan committed Nov 11, 2021
1 parent 9aa2ad0 commit 102129224696b1fd61f13fc1493fd922cd281448
Show file tree
Hide file tree
Showing 10 changed files with 161 additions and 3 deletions.
@@ -42,4 +42,5 @@ Offset/Size Proto Name Meaning
2D0/A00 ALL e820_table E820 memory map table
(array of struct e820_entry)
D00/1EC ALL eddbuf EDD data (array of struct edd_info)
ECC/008 ALL unaccepted_memory Bitmap of unaccepted memory (1bit == 2M)
=========== ===== ======================= =================================================
@@ -100,6 +100,7 @@ endif
vmlinux-objs-$(CONFIG_ACPI) += $(obj)/acpi.o
vmlinux-objs-$(CONFIG_INTEL_TDX_GUEST) += $(obj)/tdx.o
vmlinux-objs-$(CONFIG_INTEL_TDX_GUEST) += $(obj)/tdcall.o
vmlinux-objs-$(CONFIG_UNACCEPTED_MEMORY) += $(obj)/bitmap.o $(obj)/unaccepted_memory.o

vmlinux-objs-$(CONFIG_EFI_MIXED) += $(obj)/efi_thunk_$(BITS).o
efi-obj-$(CONFIG_EFI_STUB) = $(objtree)/drivers/firmware/efi/libstub/lib.a
@@ -0,0 +1,24 @@
// SPDX-License-Identifier: GPL-2.0-only
/* Taken from lib/string.c */

#include <linux/bitmap.h>

void __bitmap_set(unsigned long *map, unsigned int start, int len)
{
unsigned long *p = map + BIT_WORD(start);
const unsigned int size = start + len;
int bits_to_set = BITS_PER_LONG - (start % BITS_PER_LONG);
unsigned long mask_to_set = BITMAP_FIRST_WORD_MASK(start);

while (len - bits_to_set >= 0) {
*p |= mask_to_set;
len -= bits_to_set;
bits_to_set = BITS_PER_LONG;
mask_to_set = ~0UL;
p++;
}
if (len) {
mask_to_set &= BITMAP_LAST_WORD_MASK(size);
*p |= mask_to_set;
}
}
@@ -0,0 +1,45 @@
// SPDX-License-Identifier: GPL-2.0-only

#include "error.h"
#include "misc.h"

static inline void __accept_memory(phys_addr_t start, phys_addr_t end)
{
/* Platform-specific memory-acceptance call goes here */
error("Cannot accept memory");
}

void mark_unaccepted(struct boot_params *params, u64 start, u64 end)
{
/*
* The accepted memory bitmap only works at PMD_SIZE granularity.
* If a request comes in to mark memory as unaccepted which is not
* PMD_SIZE-aligned, simply accept the memory now since it can not be
* *marked* as unaccepted.
*/

/* Immediately accept whole range if it is within a PMD_SIZE block: */
if ((start & PMD_MASK) == (end & PMD_MASK)) {
npages = (end - start) / PAGE_SIZE;
__accept_memory(start, start + npages * PAGE_SIZE);
return;
}

/* Immediately accept a <PMD_SIZE piece at the start: */
if (start & ~PMD_MASK) {
__accept_memory(start, round_up(start, PMD_SIZE));
start = round_up(start, PMD_SIZE);
}

/* Immediately accept a <PMD_SIZE piece at the end: */
if (end & ~PMD_MASK) {
__accept_memory(round_down(end, PMD_SIZE), end);
end = round_down(end, PMD_SIZE);
}

if (start == end)
return;

bitmap_set((unsigned long *)params->unaccepted_memory,
start / PMD_SIZE, (end - start) / PMD_SIZE);
}
@@ -0,0 +1,12 @@
/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2020 Intel Corporation */
#ifndef _ASM_X86_UNACCEPTED_MEMORY_H
#define _ASM_X86_UNACCEPTED_MEMORY_H

#include <linux/types.h>

struct boot_params;

void mark_unaccepted(struct boot_params *params, u64 start, u64 num);

#endif
@@ -217,7 +217,8 @@ struct boot_params {
struct boot_e820_entry e820_table[E820_MAX_ENTRIES_ZEROPAGE]; /* 0x2d0 */
__u8 _pad8[48]; /* 0xcd0 */
struct edd_info eddbuf[EDDMAXNR]; /* 0xd00 */
__u8 _pad9[276]; /* 0xeec */
__u64 unaccepted_memory; /* 0xeec */
__u8 _pad9[268]; /* 0xef4 */
} __attribute__((packed));

/**
@@ -243,6 +243,20 @@ config EFI_DISABLE_PCI_DMA
options "efi=disable_early_pci_dma" or "efi=no_disable_early_pci_dma"
may be used to override this option.

config UNACCEPTED_MEMORY
bool
depends on EFI_STUB
help
Some Virtual Machine platforms, such as Intel TDX, introduce
the concept of memory acceptance, requiring memory to be accepted
before it can be used by the guest. This protects against a class of
attacks by the virtual machine platform.

UEFI specification v2.9 introduced EFI_UNACCEPTED_MEMORY memory type.

This option adds support for unaccepted memory and makes such memory
usable by kernel.

endmenu

config EFI_EMBEDDED_FIRMWARE
@@ -737,6 +737,7 @@ static __initdata char memory_type_name[][13] = {
"MMIO Port",
"PAL Code",
"Persistent",
"Unaccepted",
};

char * __init efi_md_typeattr_format(char *buf, size_t size,
@@ -9,12 +9,14 @@
#include <linux/efi.h>
#include <linux/pci.h>
#include <linux/stddef.h>
#include <linux/bitmap.h>

#include <asm/efi.h>
#include <asm/e820/types.h>
#include <asm/setup.h>
#include <asm/desc.h>
#include <asm/boot.h>
#include <asm/unaccepted_memory.h>

#include "efistub.h"

@@ -504,6 +506,13 @@ setup_e820(struct boot_params *params, struct setup_data *e820ext, u32 e820ext_s
e820_type = E820_TYPE_PMEM;
break;

case EFI_UNACCEPTED_MEMORY:
if (!IS_ENABLED(CONFIG_UNACCEPTED_MEMORY))
continue;
e820_type = E820_TYPE_RAM;
mark_unaccepted(params, d->phys_addr,
d->phys_addr + PAGE_SIZE * d->num_pages);
break;
default:
continue;
}
@@ -575,6 +584,9 @@ static efi_status_t allocate_e820(struct boot_params *params,
{
efi_status_t status;
__u32 nr_desc;
bool unaccepted_memory_present = false;
u64 max_addr = 0;
int i;

status = efi_get_memory_map(map);
if (status != EFI_SUCCESS)
@@ -589,9 +601,55 @@ static efi_status_t allocate_e820(struct boot_params *params,
if (status != EFI_SUCCESS)
goto out;
}

if (!IS_ENABLED(CONFIG_UNACCEPTED_MEMORY))
goto out;

/* Check if there's any unaccepted memory and find the max address */
for (i = 0; i < nr_desc; i++) {
efi_memory_desc_t *d;

d = efi_early_memdesc_ptr(*map->map, *map->desc_size, i);
if (d->type == EFI_UNACCEPTED_MEMORY)
unaccepted_memory_present = true;
if (d->phys_addr + d->num_pages * PAGE_SIZE > max_addr)
max_addr = d->phys_addr + d->num_pages * PAGE_SIZE;
}

/*
* If unaccepted memory present allocate a bitmap to track what memory
* has to be accepted before access.
*
* One bit in the bitmap represents 2MiB in the address space: one 4k
* page is enough to track 64GiB or physical address space.
*
* In the worst case scenario -- a huge hole in the middle of the
* address space -- It needs 256MiB to handle 4PiB of the address
* space.
*
* TODO: handle situation if params->unaccepted_memory has already set.
* It's required to deal with kexec.
*
* The bitmap will be populated in setup_e820() according to the memory
* map after efi_exit_boot_services().
*/
if (unaccepted_memory_present) {
unsigned long *unaccepted_memory = NULL;
u64 size = DIV_ROUND_UP(max_addr, PMD_SIZE * BITS_PER_BYTE);

status = efi_allocate_pages(size,
(unsigned long *)&unaccepted_memory,
ULONG_MAX);
if (status != EFI_SUCCESS)
goto out;
memset(unaccepted_memory, 0, size);
params->unaccepted_memory = (u64)unaccepted_memory;
}

out:
efi_bs_call(free_pool, *map->map);
return EFI_SUCCESS;
return status;

}

struct exit_boot_struct {
@@ -108,7 +108,8 @@ typedef struct {
#define EFI_MEMORY_MAPPED_IO_PORT_SPACE 12
#define EFI_PAL_CODE 13
#define EFI_PERSISTENT_MEMORY 14
#define EFI_MAX_MEMORY_TYPE 15
#define EFI_UNACCEPTED_MEMORY 15
#define EFI_MAX_MEMORY_TYPE 16

/* Attribute values: */
#define EFI_MEMORY_UC ((u64)0x0000000000000001ULL) /* uncached */

0 comments on commit 1021292

Please sign in to comment.