x86 EFI: Bypass call to fdt_check_header()
Subsystems (2)
PATCH v3 1/4 x86 EFI: Bypass call to fdt_check_header()
Issuing a call to fdt_check_header() prevents running any of x86 UEFI enabled tests. Bypass this call for x86 and also calls to efi_load_image(), efi_grow_buffer(), efi_get_var() in order to enable UEFI supported tests for KUT x86 arch.
--- lib/efi.c | 7 +++++++ 1 file changed, 7 insertions(+)
lib/efi.c +7 -0
@@ -204,6 +204,7 @@ static char *efi_convert_cmdline(struct efi_loaded_image_64 *image, int *cmd_linreturn (char *)cmdline_addr; } +#if defined(__aarch64__) || defined(__riscv)/* * Open the file and read it into a buffer. */
@@ -330,6 +331,12 @@ static void *efi_get_fdt(efi_handle_t handle, struct efi_loaded_image_64 *image)return fdt_check_header (fdt) ==0 ? fdt :NULL ; } +#else +static void *efi_get_fdt (efi_handle_t handle,struct efi_loaded_image_64 *image) +{ +return NULL ; +} +#endif static const struct { struct efi_vendor_dev_path vendor;
Signature · 1 line
2.34.1
PATCH v3 2/4 x86/efi: Retry call to efi exit boot services
In some cases, KUT guest might fail to exit boot services due to a possible memory map update that might have taken place between efi_get_memory_map() and efi_exit_boot_services() calls. As per UEFI spec 2.10 (Section 7.4.6 EFI_BOOT_SERVICES.ExitBootServices()), we need to keep trying to update the memory map and calls to exit boot services as long as case status is EFI_INVALID_PARAMETER. Keep freeing the old memory map before obtaining new memory map via efi_get_memory_map() in case of exit boot services failure.
--- lib/efi.c | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-)
lib/efi.c +20 -14
@@ -406,8 +406,8 @@ efi_status_t efi_main(efi_handle_t handle, efi_system_table_t *sys_tab) efi_system_table = sys_tab;/* Memory map struct values */ -efi_memory_desc_t *map =NULL ; -unsigned long map_size =0 , desc_size =0 , key =0 , buff_size =0 ; +efi_memory_desc_t *map; +unsigned long map_size, desc_size, key, buff_size;u32 desc_ver;/* Helper variables needed to get the cmdline */
@@ -446,13 +446,6 @@ efi_status_t efi_main(efi_handle_t handle, efi_system_table_t *sys_tab) efi_bootinfo.mem_map.key_ptr = &key; efi_bootinfo.mem_map.buff_size = &buff_size; -/* Get EFI memory map */ - status =efi_get_memory_map (&efi_bootinfo.mem_map); -if (status !=EFI_SUCCESS ) { -printf ("Failed to get memory map\n" ); - goto efi_main_error; - } -#ifdef __riscv status =efi_get_boot_hartid ();if (status !=EFI_SUCCESS ) {
@@ -461,11 +454,24 @@ efi_status_t efi_main(efi_handle_t handle, efi_system_table_t *sys_tab) }#endif -/* -* Exit EFI boot services, let kvm-unit-tests take full control of the -* guest -*/ - status =efi_exit_boot_services (handle, &efi_bootinfo.mem_map); + status =EFI_INVALID_PARAMETER ; +while (status ==EFI_INVALID_PARAMETER ) { +/* Get EFI memory map */ + status =efi_get_memory_map (&efi_bootinfo.mem_map); +if (status !=EFI_SUCCESS ) { +printf ("Failed to get memory map\n" ); + goto efi_main_error; + } +/* +* Exit EFI boot services, let kvm-unit-tests take full +* control of the guest. +*/ + status =efi_exit_boot_services (handle, + &efi_bootinfo.mem_map); +if (status ==EFI_INVALID_PARAMETER ) +efi_free_pool (*efi_bootinfo.mem_map.map); + } +if (status !=EFI_SUCCESS ) {printf ("Failed to exit boot services\n" ); goto efi_main_error;
Signature · 1 line
2.34.1
Re: [kvm-unit-tests PATCH v3 2/4] x86/efi: Retry call to efi exit boot services
Quoted 45 lines · Pavan Kumar Paluri
In some cases, KUT guest might fail to exit boot services due to a possible memory map update that might have taken place between
efi_get_memory_map()andefi_exit_boot_services()calls. As per UEFI spec 2.10 (Section 7.4.6EFI_BOOT_SERVICES.ExitBootServices()), we need to keep trying to update the memory map and calls to exit boot services as long as case status isEFI_INVALID_PARAMETER. Keep freeing the old memory map before obtaining new memory map viaefi_get_memory_map()in case of exit boot services failure.Signed-off-by Pavan Kumar Paluri <[email protected]>--- lib/efi.c | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-)lib/efi.c +2
-9@@ -406,8 +406,8 @@ efi_status_t efi_main(efi_handle_t handle, efi_system_table_t *sys_tab) efi_system_table = sys_tab;/* Memory map struct values */ -efi_memory_desc_t *map =NULL ; -unsigned long map_size =0 , desc_size =0 , key =0 , buff_size =0 ; +efi_memory_desc_t *map; +unsigned long map_size, desc_size, key, buff_size;u32 desc_ver;/* Helper variables needed to get the cmdline */ @@ -446,13 +446,6 @@ efi_status_t efi_main(efi_handle_t handle, efi_system_table_t *sys_tab) efi_bootinfo.mem_map.key_ptr = &key; efi_bootinfo.mem_map.buff_size = &buff_size; -/* Get EFI memory map */ - status =efi_get_memory_map (&efi_bootinfo.mem_map); -if (status !=EFI_SUCCESS ) { -printf ("Failed to get memory map\n" ); - goto efi_main_error; - } -#ifdef __riscv status =efi_get_boot_hartid ();if (status !=EFI_SUCCESS ) {@@ -461,11 +454,24 @@ efi_status_t efi_main(efi_handle_t handle, efi_system_table_t *sys_tab) }
lib/efi.c efi_status_t efi_main(efi_handle_t handle, efi_system_table_t *sys_tab) · line 459
Quoted 10 lines
lib/efi.c +3
-5#endif -/* -* Exit EFI boot services, let kvm-unit-tests take full control of the -* guest -*/ - status =efi_exit_boot_services (handle, &efi_bootinfo.mem_map); + status =EFI_INVALID_PARAMETER ; +while (status ==EFI_INVALID_PARAMETER ) { +/* Get EFI memory map */
I tried to get rid of this comment since it states the exact same thing as the function name below does.
lib/efi.c efi_status_t efi_main(efi_handle_t handle, efi_system_table_t *sys_tab) · line 470
Quoted 11 lines
lib/efi.c +11
-0+ status =efi_get_memory_map (&efi_bootinfo.mem_map); +if (status !=EFI_SUCCESS ) { +printf ("Failed to get memory map\n" ); + goto efi_main_error; + } +/* +* Exit EFI boot services, let kvm-unit-tests take full +* control of the guest. +*/ + status =efi_exit_boot_services (handle, + &efi_bootinfo.mem_map);
We have 100 char lines (and that's just a soft limit) so this would look better sticking out.
Quoted 10 lines
lib/efi.c +4
-0+if (status ==EFI_INVALID_PARAMETER ) +efi_free_pool (*efi_bootinfo.mem_map.map); + } +if (status !=EFI_SUCCESS ) {printf ("Failed to exit boot services\n" ); goto efi_main_error;Signature · 1 line
2.34.1
Besides the nits,
(A general comment for the series is that we're on v3 but there's no changelog anywhere. Please use cover letters for a series and then put the changelog in the cover letter.)
Thanks,
drew
Re: [kvm-unit-tests PATCH v3 2/4] x86/efi: Retry call to efi exit boot services
Quoted 48 lines · Andrew Jones
Quoted 47 lines · Pavan Kumar Paluri
In some cases, KUT guest might fail to exit boot services due to a possible memory map update that might have taken place between
efi_get_memory_map()andefi_exit_boot_services()calls. As per UEFI spec 2.10 (Section 7.4.6EFI_BOOT_SERVICES.ExitBootServices()), we need to keep trying to update the memory map and calls to exit boot services as long as case status isEFI_INVALID_PARAMETER. Keep freeing the old memory map before obtaining new memory map viaefi_get_memory_map()in case of exit boot services failure.Signed-off-by Pavan Kumar Paluri <[email protected]>--- lib/efi.c | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-)lib/efi.c +2
-9@@ -406,8 +406,8 @@ efi_status_t efi_main(efi_handle_t handle, efi_system_table_t *sys_tab) efi_system_table = sys_tab;/* Memory map struct values */ -efi_memory_desc_t *map =NULL ; -unsigned long map_size =0 , desc_size =0 , key =0 , buff_size =0 ; +efi_memory_desc_t *map; +unsigned long map_size, desc_size, key, buff_size;u32 desc_ver;/* Helper variables needed to get the cmdline */ @@ -446,13 +446,6 @@ efi_status_t efi_main(efi_handle_t handle, efi_system_table_t *sys_tab) efi_bootinfo.mem_map.key_ptr = &key; efi_bootinfo.mem_map.buff_size = &buff_size; -/* Get EFI memory map */ - status =efi_get_memory_map (&efi_bootinfo.mem_map); -if (status !=EFI_SUCCESS ) { -printf ("Failed to get memory map\n" ); - goto efi_main_error; - } -#ifdef __riscv status =efi_get_boot_hartid ();if (status !=EFI_SUCCESS ) {@@ -461,11 +454,24 @@ efi_status_t efi_main(efi_handle_t handle, efi_system_table_t *sys_tab) }#endif
Quoted 12 lines
lib/efi.c efi_status_t efi_main(efi_handle_t handle, efi_system_table_t *sys_tab) · line 459
Quoted 8 lines
lib/efi.c +3
-5-/* -* Exit EFI boot services, let kvm-unit-tests take full control of the -* guest -*/ - status =efi_exit_boot_services (handle, &efi_bootinfo.mem_map); + status =EFI_INVALID_PARAMETER ; +while (status ==EFI_INVALID_PARAMETER ) { +/* Get EFI memory map */ I tried to get rid of this comment since it states the exact same thing as the function name below does.
Will make the change.
Quoted 6 lines
Quoted 6 lines
lib/efi.c +6
-0+ status =efi_get_memory_map (&efi_bootinfo.mem_map); +if (status !=EFI_SUCCESS ) { +printf ("Failed to get memory map\n" ); + goto efi_main_error; + } +/*
Quoted 9 lines
lib/efi.c efi_status_t efi_main(efi_handle_t handle, efi_system_table_t *sys_tab) · line 470
Quoted 5 lines
lib/efi.c +5
-0+* Exit EFI boot services, let kvm-unit-tests take full +* control of the guest. +*/ + status =efi_exit_boot_services (handle, + &efi_bootinfo.mem_map);We have 100 char lines (and that's just a soft limit) so this would look better sticking out.
Will do.
Quoted 13 lines
Quoted 10 lines
lib/efi.c +4
-0+if (status ==EFI_INVALID_PARAMETER ) +efi_free_pool (*efi_bootinfo.mem_map.map); + } +if (status !=EFI_SUCCESS ) {printf ("Failed to exit boot services\n" ); goto efi_main_error;Signature · 1 line
2.34.1Besides the nits,
Quoted 6 lines
Reviewed-by Andrew Jones <[email protected]>(A general comment for the series is that we're on v3 but there's no changelog anywhere. Please use cover letters for a series and then put the changelog in the cover letter.)
Ah, I missed out on that. I will include a cover-letter for v4 and also plan to drop patches 3 & 4 and send them separately as they aren't very relevant to UEFI fixes and for easier upstreaming.
Thanks,
Pavan
Quoted 2 lines
Thanks,
drew
PATCH v3 3/4 x86 AMD SEV-ES: Set GHCB page attributes for a new page table
In reply to Pavan Kumar PaluriSEV-ES/SNP guest uses GHCB page to communicate with the host. Such a page should remain unencrypted (its c-bit should be unset). Therefore, call setup_ghcb_pte() in the path of setup_vm() to make sure c-bit of GHCB's pte is unset, for a new page table that will be setup as a part of page allocation for SEV-ES/SNP tests later on.
--- lib/x86/vm.c | 6 ++++++ 1 file changed, 6 insertions(+)
lib/x86/vm.c +6 -0
@@ -3,6 +3,7 @@#include "vmalloc.h" #include "alloc_page.h" #include "smp.h" +#include "amd_sev.h" static pteval_t pte_opt_mask;
@@ -197,6 +198,11 @@ void *setup_mmu(phys_addr_t end_of_memory, void *opt_mask)init_alloc_vpage ((void *)(3ul <<30 ));#endif +#ifdef CONFIG_EFI +if (amd_sev_es_enabled ()) +setup_ghcb_pte (cr3); +#endif +write_cr3 (virt_to_phys (cr3));#ifndef __x86_64__write_cr4 (X86_CR4_PSE );
Signature · 1 line
2.34.1
PATCH v3 4/4 x86 AMD SEV-ES: Setup a new page table and install level-1 PTEs
In reply to Pavan Kumar PaluriKUT's UEFI tests don't currently have support for page allocation. SEV-ES/SNP tests will need this later, so the support for page allocation is provided via setup_vm().
--- x86/amd_sev.c | 7 +++++++ 1 file changed, 7 insertions(+)
x86/amd_sev.c +7 -0
@@ -14,6 +14,8 @@#include "x86/processor.h" #include "x86/amd_sev.h" #include "msr.h" +#include "x86/vm.h" +#include "alloc_page.h" #define EXIT_SUCCESS 0#define EXIT_FAILURE 1
@@ -89,9 +91,14 @@ static void test_stringio(void)int main (void ) {int rtn; +unsigned long *vaddr; rtn =test_sev_activation ();report (rtn ==EXIT_SUCCESS ,"SEV activation test." );test_sev_es_activation ();test_stringio (); +setup_vm (); + vaddr =alloc_page (); +if (!vaddr) +assert_msg (vaddr,"Page allocation failure" );return report_summary (); }
Signature · 1 line
2.34.1