x86_64 UEFI set up process refactor and scripts fixes
Subsystems (2)
v2 cover x86_64 UEFI set up process refactor and scripts fixes
Hello,
This patch series refactors the x86_64 UEFI set up process, fixes the run-tests.sh script to run under UEFI, and improves the boot speed under UEFI. The patches are organized as four parts.
The first part (patches 1-3) refactors the x86_64 UEFI set up process. The previous UEFI setup calls arch-specific setup functions twice and generates arch-specific data structure. As Andrew suggested [1], we refactor this process to make only one call to the arch-specific function and generate arch-neutral data structures. This simplifies the set up process and makes it easier to develop UEFI support for other architectures.
The second part (patch 4) converts several x86 test cases to position-independent code (PIC) to run under UEFI. This patch is ported from the initial UEFI support patchset [2] with fixes to the 32-bit compilation.
The third part (patches 5-8) fixes the UEFI runner scripts. Patch 5 sets UEFI OVMF image as read-only. Patch 6 fixes test cases' return code under UEFI, enabling Patch 7-8 to fix the run-tests.sh script under UEFI.
The fourth part (patches 9-10) improves the boot speed under UEFI. Patch 9 renames the EFI executables to EFI/BOOT/BOOTX64.EFI. UEFI OVMF recognizes this file by default and skips the 5-second user input waiting. Patch 10 makes run-tests.sh work with this new EFI executable filename.
This patchset is based on the uefi branch.
Changes since V1:
V2 Patch # Changes
---------- -------
03/10 (New patch from Sean) Skip SEV-ES setup if SEV is not available
04/10 Add more details to the commit message 06/10 Add UEFI shutdown in case exit() doesn't work 07/10 Simplify variable usages in scripts 08/10 Simplify variable usages in scripts 09/10 (New patch) Improve UEFI boot speed 10/10 (New patch) Update run-tests.sh
Best regards,
Zixuan Wang and Marc Orr
[1] https://lore.kernel.org/kvm/[email protected]/
[2] https://lore.kernel.org/kvm/[email protected]/
Marc Orr (3):
scripts: Generalize EFI check
x86 UEFI: Make run_tests.sh (mostly) work under UEFI x86 UEFI: Make _NO_FILE_4Uhere_ work w/ BOOTX64.EFI
Sean Christopherson (1):
x86 AMD SEV: Skip SEV-ES if SEV is unsupported
Zixuan Wang (6):
x86 UEFI: Remove mixed_mode
x86 UEFI: Refactor set up process
x86 UEFI: Convert x86 test cases to PIC
x86 UEFI: Set UEFI OVMF as readonly
x86 UEFI: Exit QEMU with return code
x86 UEFI: Improve Boot Speed
lib/efi.c | 63 +++++++-- lib/efi.h | 19 ++- lib/linux/efi.h | 317 ++++++++++++++----------------------------- lib/x86/acpi.c | 36 +++-- lib/x86/acpi.h | 5 +- lib/x86/asm/setup.h | 16 +-- lib/x86/setup.c | 145 +++++++++----------- lib/x86/usermode.c | 3 +- scripts/runtime.bash | 14 +- x86/Makefile.common | 10 +- x86/Makefile.x86_64 | 7 +- x86/access.c | 9 +- x86/cet.c | 8 +- x86/efi/run | 45 +++--- x86/emulator.c | 5 +- x86/eventinj.c | 8 ++ x86/run | 6 +- x86/smap.c | 13 +- x86/umip.c | 26 +++- 19 files changed, 361 insertions(+), 394 deletions(-)
Signature · 1 line
2.33.0
PATCH v2 1/10 x86 UEFI: Remove mixed_mode
From: Zixuan Wang <[email protected]>
Remove the mixed_mode code from efi.h as we are not supporting i386 UEFI for now.
--- lib/linux/efi.h | 317 +++++++++++++++--------------------------------- 1 file changed, 100 insertions(+), 217 deletions(-)
lib/linux/efi.h +100 -217
@@ -62,15 +62,7 @@ typedef guid_t efi_guid_t;typedef struct {efi_guid_t guid; -u32 table; -}efi_config_table_32_t ; - -typedef union { -struct { -efi_guid_t guid; -void *table; - }; -efi_config_table_32_t mixed_mode; +void *table; }efi_config_table_t ;/*
@@ -251,127 +243,76 @@ typedef struct efi_generic_dev_path efi_device_path_protocol_t;/* * EFI Boot Services table */ -union efi_boot_services { -struct { -efi_table_hdr_t hdr; -void *raise_tpl; -void *restore_tpl; - efi_status_t (__efiapi *allocate_pages)(int, int, unsigned long, - efi_physical_addr_t *); - efi_status_t (__efiapi *free_pages)(efi_physical_addr_t, - unsigned long); - efi_status_t (__efiapi *get_memory_map)(unsigned long *, void *, - unsigned long *, - unsigned long *, u32 *); - efi_status_t (__efiapi *allocate_pool)(int, unsigned long, - void **); - efi_status_t (__efiapi *free_pool)(void *); - efi_status_t (__efiapi *create_event)(u32, unsigned long, - efi_event_notify_t, void *, - efi_event_t *); - efi_status_t (__efiapi *set_timer)(efi_event_t, - EFI_TIMER_DELAY, u64); - efi_status_t (__efiapi *wait_for_event)(unsigned long, - efi_event_t *, - unsigned long *); -void *signal_event; - efi_status_t (__efiapi *close_event)(efi_event_t); -void *check_event; -void *install_protocol_interface; -void *reinstall_protocol_interface; -void *uninstall_protocol_interface; - efi_status_t (__efiapi *handle_protocol)(efi_handle_t, - efi_guid_t *, void **); -void *__reserved; -void *register_protocol_notify; - efi_status_t (__efiapi *locate_handle)(int, efi_guid_t *, - void *, unsigned long *, - efi_handle_t *); - efi_status_t (__efiapi *locate_device_path)(efi_guid_t *, - efi_device_path_protocol_t **, - efi_handle_t *); - efi_status_t (__efiapi *install_configuration_table)(efi_guid_t *, - void *); -void *load_image; -void *start_image; - efi_status_t (__efiapi *exit)(efi_handle_t, - efi_status_t, - unsigned long, - efi_char16_t *); -void *unload_image; - efi_status_t (__efiapi *exit_boot_services)(efi_handle_t, - unsigned long); -void *get_next_monotonic_count; - efi_status_t (__efiapi *stall)(unsigned long); -void *set_watchdog_timer; -void *connect_controller; - efi_status_t (__efiapi *disconnect_controller)(efi_handle_t, - efi_handle_t, - efi_handle_t); -void *open_protocol; -void *close_protocol; -void *open_protocol_information; -void *protocols_per_handle; -void *locate_handle_buffer; - efi_status_t (__efiapi *locate_protocol)(efi_guid_t *, void *, - void **); -void *install_multiple_protocol_interfaces; -void *uninstall_multiple_protocol_interfaces; -void *calculate_crc32; -void *copy_mem; -void *set_mem; -void *create_event_ex; - }; -struct { -efi_table_hdr_t hdr; -u32 raise_tpl; -u32 restore_tpl; -u32 allocate_pages; -u32 free_pages; -u32 get_memory_map; -u32 allocate_pool; -u32 free_pool; -u32 create_event; -u32 set_timer; -u32 wait_for_event; -u32 signal_event; -u32 close_event; -u32 check_event; -u32 install_protocol_interface; -u32 reinstall_protocol_interface; -u32 uninstall_protocol_interface; -u32 handle_protocol; -u32 __reserved; -u32 register_protocol_notify; -u32 locate_handle; -u32 locate_device_path; -u32 install_configuration_table; -u32 load_image; -u32 start_image; -u32 exit; -u32 unload_image; -u32 exit_boot_services; -u32 get_next_monotonic_count; -u32 stall; -u32 set_watchdog_timer; -u32 connect_controller; -u32 disconnect_controller; -u32 open_protocol; -u32 close_protocol; -u32 open_protocol_information; -u32 protocols_per_handle; -u32 locate_handle_buffer; -u32 locate_protocol; -u32 install_multiple_protocol_interfaces; -u32 uninstall_multiple_protocol_interfaces; -u32 calculate_crc32; -u32 copy_mem; -u32 set_mem; -u32 create_event_ex; - } mixed_mode; -}; - -typedef union efi_boot_services efi_boot_services_t ; +typedef struct { +efi_table_hdr_t hdr; +void *raise_tpl; +void *restore_tpl; + efi_status_t(__efiapi *allocate_pages)(int, int, unsigned long, + efi_physical_addr_t *); + efi_status_t(__efiapi *free_pages)(efi_physical_addr_t, + unsigned long); + efi_status_t(__efiapi *get_memory_map)(unsigned long *, void *, + unsigned long *, + unsigned long *, u32 *); + efi_status_t(__efiapi *allocate_pool)(int, unsigned long, + void **); + efi_status_t(__efiapi *free_pool)(void *); + efi_status_t(__efiapi *create_event)(u32, unsigned long, + efi_event_notify_t, void *, + efi_event_t *); + efi_status_t(__efiapi *set_timer)(efi_event_t, + EFI_TIMER_DELAY, u64); + efi_status_t(__efiapi *wait_for_event)(unsigned long, + efi_event_t *, + unsigned long *); +void *signal_event; + efi_status_t(__efiapi *close_event)(efi_event_t); +void *check_event; +void *install_protocol_interface; +void *reinstall_protocol_interface; +void *uninstall_protocol_interface; + efi_status_t(__efiapi *handle_protocol)(efi_handle_t, + efi_guid_t *, void **); +void *__reserved; +void *register_protocol_notify; + efi_status_t(__efiapi *locate_handle)(int, efi_guid_t *, + void *, unsigned long *, + efi_handle_t *); + efi_status_t(__efiapi *locate_device_path)(efi_guid_t *, + efi_device_path_protocol_t **, + efi_handle_t *); + efi_status_t(__efiapi *install_configuration_table)(efi_guid_t *, + void *); +void *load_image; +void *start_image; + efi_status_t(__efiapi *exit)(efi_handle_t, + efi_status_t, + unsigned long, + efi_char16_t *); +void *unload_image; + efi_status_t(__efiapi *exit_boot_services)(efi_handle_t, + unsigned long); +void *get_next_monotonic_count; + efi_status_t(__efiapi *stall)(unsigned long); +void *set_watchdog_timer; +void *connect_controller; + efi_status_t(__efiapi *disconnect_controller)(efi_handle_t, + efi_handle_t, + efi_handle_t); +void *open_protocol; +void *close_protocol; +void *open_protocol_information; +void *protocols_per_handle; +void *locate_handle_buffer; + efi_status_t(__efiapi *locate_protocol)(efi_guid_t *, void *, + void **); +void *install_multiple_protocol_interfaces; +void *uninstall_multiple_protocol_interfaces; +void *calculate_crc32; +void *copy_mem; +void *set_mem; +void *create_event_ex; +}efi_boot_services_t ;/* * Types and defines for EFI ResetSystem
@@ -386,24 +327,6 @@ typedef union efi_boot_services efi_boot_services_t;#define EFI_RUNTIME_SERVICES_SIGNATURE ((u64)0x5652453544e5552ULL)#define EFI_RUNTIME_SERVICES_REVISION 0x00010000 -typedef struct { -efi_table_hdr_t hdr; -u32 get_time; -u32 set_time; -u32 get_wakeup_time; -u32 set_wakeup_time; -u32 set_virtual_address_map; -u32 convert_pointer; -u32 get_variable; -u32 get_next_variable; -u32 set_variable; -u32 get_next_high_mono_count; -u32 reset_system; -u32 update_capsule; -u32 query_capsule_caps; -u32 query_variable_info; -}efi_runtime_services_32_t ; -typedef efi_status_t efi_get_time_t (efi_time_t *tm,efi_time_cap_t *tc);typedef efi_status_t efi_set_time_t (efi_time_t *tm); typedef efi_status_t efi_get_wakeup_time_t (efi_bool_t *enabled, efi_bool_t *pending,
@@ -438,25 +361,22 @@ typedef efi_status_t efi_query_variable_store_t(u32 attributes,unsigned long size, bool nonblocking); -typedef union { -struct { -efi_table_hdr_t hdr; - efi_get_time_t __efiapi *get_time; - efi_set_time_t __efiapi *set_time; - efi_get_wakeup_time_t __efiapi *get_wakeup_time; - efi_set_wakeup_time_t __efiapi *set_wakeup_time; - efi_set_virtual_address_map_t __efiapi *set_virtual_address_map; -void *convert_pointer; - efi_get_variable_t __efiapi *get_variable; - efi_get_next_variable_t __efiapi *get_next_variable; - efi_set_variable_t __efiapi *set_variable; - efi_get_next_high_mono_count_t __efiapi *get_next_high_mono_count; - efi_reset_system_t __efiapi *reset_system; - efi_update_capsule_t __efiapi *update_capsule; - efi_query_capsule_caps_t __efiapi *query_capsule_caps; - efi_query_variable_info_t __efiapi *query_variable_info; - }; -efi_runtime_services_32_t mixed_mode; +typedef struct { +efi_table_hdr_t hdr; + efi_get_time_t __efiapi *get_time; + efi_set_time_t __efiapi *set_time; + efi_get_wakeup_time_t __efiapi *get_wakeup_time; + efi_set_wakeup_time_t __efiapi *set_wakeup_time; + efi_set_virtual_address_map_t __efiapi *set_virtual_address_map; +void *convert_pointer; + efi_get_variable_t __efiapi *get_variable; + efi_get_next_variable_t __efiapi *get_next_variable; + efi_set_variable_t __efiapi *set_variable; + efi_get_next_high_mono_count_t __efiapi *get_next_high_mono_count; + efi_reset_system_t __efiapi *reset_system; + efi_update_capsule_t __efiapi *update_capsule; + efi_query_capsule_caps_t __efiapi *query_capsule_caps; + efi_query_variable_info_t __efiapi *query_variable_info; }efi_runtime_services_t ;#define EFI_SYSTEM_TABLE_SIGNATURE ((u64)0x5453595320494249ULL)
@@ -468,60 +388,23 @@ typedef union {#define EFI_1_10_SYSTEM_TABLE_REVISION ((1 << 16) | (10))#define EFI_1_02_SYSTEM_TABLE_REVISION ((1 << 16) | (02)) -typedef struct { -efi_table_hdr_t hdr; -u64 fw_vendor;/* physical addr of CHAR16 vendor string */ -u32 fw_revision; -u32 __pad1; -u64 con_in_handle; -u64 con_in; -u64 con_out_handle; -u64 con_out; -u64 stderr_handle; -u64 stderr; -u64 runtime; -u64 boottime; -u32 nr_tables; -u32 __pad2; -u64 tables; -}efi_system_table_64_t ; +typedef union efi_simple_text_input_protocol efi_simple_text_input_protocol_t ; +typedef union efi_simple_text_output_protocol efi_simple_text_output_protocol_t ;typedef struct {efi_table_hdr_t hdr; -u32 fw_vendor;/* physical addr of CHAR16 vendor string */ +unsigned long fw_vendor;/* physical addr of CHAR16 vendor string */ u32 fw_revision; -u32 con_in_handle; -u32 con_in; -u32 con_out_handle; -u32 con_out; -u32 stderr_handle; -u32 stderr; -u32 runtime; -u32 boottime; -u32 nr_tables; -u32 tables; -}efi_system_table_32_t ; - -typedef union efi_simple_text_input_protocol efi_simple_text_input_protocol_t ; -typedef union efi_simple_text_output_protocol efi_simple_text_output_protocol_t ; - -typedef union { -struct { -efi_table_hdr_t hdr; -unsigned long fw_vendor;/* physical addr of CHAR16 vendor string */ -u32 fw_revision; -unsigned long con_in_handle; -efi_simple_text_input_protocol_t *con_in; -unsigned long con_out_handle; -efi_simple_text_output_protocol_t *con_out; -unsigned long stderr_handle; -unsigned long stderr; -efi_runtime_services_t *runtime; -efi_boot_services_t *boottime; -unsigned long nr_tables; -unsigned long tables; - }; -efi_system_table_32_t mixed_mode; +unsigned long con_in_handle; +efi_simple_text_input_protocol_t *con_in; +unsigned long con_out_handle; +efi_simple_text_output_protocol_t *con_out; +unsigned long stderr_handle; +unsigned long stderr; +efi_runtime_services_t *runtime; +efi_boot_services_t *boottime; +unsigned long nr_tables; +unsigned long tables; }efi_system_table_t ;struct efi_boot_memmap {
Signature · 1 line
2.33.0
PATCH v2 2/10 x86 UEFI: Refactor set up process
In reply to Zixuan WangFrom: Zixuan Wang <[email protected]>
Refactor the EFI set up process. The previous set up process calls multiple arch-specific functions, now it's simplified to call only one arch-specific function:
1. (Arch neutral ) Extract EFI data structures, e.g., memory maps
2. (Arch neutral ) Exit EFI boot services
3. (Arch specific) Parse EFI data structures and set up arch-specific resources
4. (Arch neutral ) Run test cases' main functions
--- lib/efi.c | 50 ++++++++++++--- lib/efi.h | 19 ++++-- lib/x86/acpi.c | 36 ++++++----- lib/x86/acpi.h | 5 +- lib/x86/asm/setup.h | 16 +---- lib/x86/setup.c | 150 ++++++++++++++++++++------------------------ 6 files changed, 146 insertions(+), 130 deletions(-)
lib/efi.c +40 -10
@@ -65,9 +65,9 @@ out:return status; } -efi_status_t efi_exit_boot_services (void *handle,unsigned long mapkey) +efi_status_t efi_exit_boot_services (void *handle,struct efi_boot_memmap *map) { -return efi_bs_call (exit_boot_services, handle, mapkey); +return efi_bs_call (exit_boot_services, handle, *map->key_ptr); }efi_status_t efi_get_system_config_table (efi_guid_t table_guid,void **table)
@@ -88,31 +88,61 @@ efi_status_t efi_get_system_config_table(efi_guid_t table_guid, void **table)efi_status_t efi_main (efi_handle_t handle,efi_system_table_t *sys_tab) {int ret; -unsigned long mapkey =0 ;efi_status_t status;efi_bootinfo_t efi_bootinfo; efi_system_table = sys_tab; -setup_efi_bootinfo (&efi_bootinfo); - status =setup_efi_pre_boot (&mapkey, &efi_bootinfo); +/* Memory map struct values */ +efi_memory_desc_t *map =NULL ; +unsigned long map_size =0 , desc_size =0 , key =0 , buff_size =0 ; +u32 desc_ver; + +/* Set up efi_bootinfo */ + efi_bootinfo.mem_map.map = ↦ + efi_bootinfo.mem_map.map_size = &map_size; + efi_bootinfo.mem_map.desc_size = &desc_size; + efi_bootinfo.mem_map.desc_ver = &desc_ver; + 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 set up before ExitBootServices, exiting.\n" ); -return status; +printf ("Failed to get memory map\n" ); + goto efi_main_error; } - status =efi_exit_boot_services (handle, mapkey); +/* +* 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_SUCCESS ) {printf ("Failed to exit boot services\n" ); -return status; + goto efi_main_error; } -setup_efi (&efi_bootinfo); +/* Set up arch-specific resources */ + status =setup_efi (&efi_bootinfo); +if (status !=EFI_SUCCESS ) { +printf ("Failed to set up arch-specific resources\n" ); + goto efi_main_error; + } + +/* Run the test case */ ret =main (__argc, __argv, __environ);/* Shutdown the guest VM */ efi_rs_call (reset_system,EFI_RESET_SHUTDOWN , ret,0 ,NULL ); +/* Unreachable */ +return EFI_UNSUPPORTED ; + +efi_main_error: +/* Shutdown the guest with error EFI status */ +efi_rs_call (reset_system,EFI_RESET_SHUTDOWN , status,0 ,NULL ); +/* Unreachable */ return EFI_UNSUPPORTED ; }
lib/efi.h +14 -5
@@ -2,9 +2,7 @@#define _EFI_H_/* -* EFI-related functions in . This file's name "efi.h" is in -* conflict with GNU-EFI library's "efi.h", but does not include -* GNU-EFI headers or links against GNU-EFI. +* EFI-related functions. * * Copyright (c) 2021, Google Inc, Zixuan Wang <[email protected]> *
@@ -13,9 +11,20 @@#include "linux/efi.h" #include <elf.h> -efi_status_t _relocate (long ldbase,Elf64_Dyn *dyn,efi_handle_t handle,efi_system_table_t *sys_tab); +/* +* efi_bootinfo_t: stores EFI-related machine info retrieved before exiting EFI +* boot services, and is then used by setup_efi(). setup_efi() cannot retrieve +* this info as it is called after ExitBootServices and thus some EFI resources +* and functions are not available. +*/ +typedef struct { +struct efi_boot_memmap mem_map; +}efi_bootinfo_t ; + +efi_status_t _relocate (long ldbase,Elf64_Dyn *dyn,efi_handle_t handle, +efi_system_table_t *sys_tab);efi_status_t efi_get_memory_map (struct efi_boot_memmap *map); -efi_status_t efi_exit_boot_services (void *handle,unsigned long mapkey); +efi_status_t efi_exit_boot_services (void *handle,struct efi_boot_memmap *map);efi_status_t efi_get_system_config_table (efi_guid_t table_guid,void **table);efi_status_t efi_main (efi_handle_t handle,efi_system_table_t *sys_tab);
lib/x86/acpi.c +21 -15
@@ -4,29 +4,35 @@#ifdef TARGET_EFI struct rsdp_descriptor *efi_rsdp =NULL ; -void setup_efi_rsdp (struct rsdp_descriptor *rsdp) { +void set_efi_rsdp (struct rsdp_descriptor *rsdp) +{ efi_rsdp = rsdp; } -static struct rsdp_descriptor *get_rsdp (void ) { +static struct rsdp_descriptor *get_rsdp (void ) +{if (efi_rsdp ==NULL ) { -printf ("Can't find RSDP from UEFI, maybe setup_efi_rsdp() was not called\n" ); +printf ("Can't find RSDP from UEFI, maybe set_efi_rsdp() was not called\n" ); }return efi_rsdp; }#else -static struct rsdp_descriptor *get_rsdp (void ) { -struct rsdp_descriptor *rsdp; -unsigned long addr; -for (addr =0xf0000 ; addr <0x100000 ; addr +=16 ) { - rsdp = (void *)addr; -if (rsdp->signature ==RSDP_SIGNATURE_8BYTE ) -break ; - } -if (addr ==0x100000 ) { -return NULL ; - } -return rsdp; +static struct rsdp_descriptor *get_rsdp (void ) +{ +struct rsdp_descriptor *rsdp; +unsigned long addr; + +for (addr =0xf0000 ; addr <0x100000 ; addr +=16 ) { + rsdp = (void *)addr; +if (rsdp->signature ==RSDP_SIGNATURE_8BYTE ) +break ; + } + +if (addr ==0x100000 ) { +return NULL ; + } + +return rsdp; }#endif /* TARGET_EFI */
lib/x86/acpi.h +1 -4
@@ -106,10 +106,7 @@ struct facs_descriptor_rev1 u8 reserved3 [40]; /* Reserved - must be zero */ }; +void set_efi_rsdp (struct rsdp_descriptor *rsdp);void *find_acpi_table_addr (u32 sig); -#ifdef TARGET_EFI -void setup_efi_rsdp (struct rsdp_descriptor *rsdp); -#endif /* TARGET_EFI */ -#endif
lib/x86/asm/setup.h +1 -15
@@ -12,21 +12,7 @@ unsigned long setup_tss(u8 *stacktop);#include "efi.h" #include "x86/amd_sev.h" -/* -* efi_bootinfo_t: stores EFI-related machine info retrieved by -* setup_efi_pre_boot(), and is then used by setup_efi(). setup_efi() cannot -* retrieve this info as it is called after ExitBootServices and thus some EFI -* resources are not available. -*/ -typedef struct { -phys_addr_t free_mem_start; -phys_addr_t free_mem_size; -struct rsdp_descriptor *rsdp; -}efi_bootinfo_t ; - -void setup_efi_bootinfo (efi_bootinfo_t *efi_bootinfo); -void setup_efi (efi_bootinfo_t *efi_bootinfo); -efi_status_t setup_efi_pre_boot (unsigned long *mapkey,efi_bootinfo_t *efi_bootinfo); +efi_status_t setup_efi (efi_bootinfo_t *efi_bootinfo);void setup_5level_page_table (void );#endif /* TARGET_EFI */
lib/x86/setup.c +69 -81
197 lines not on this page · raw message
Signature · 1 line
2.33.0
PATCH v2 3/10 x86 AMD SEV: Skip SEV-ES if SEV is unsupported
In reply to Zixuan WangFrom: Sean Christopherson <[email protected]>
Skip the SEV-ES setup if SEV is unsupported. Also update the printf to include error codes.
--- lib/x86/setup.c | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-)
lib/x86/setup.c +12 -17
@@ -300,29 +300,24 @@ efi_status_t setup_efi(efi_bootinfo_t *efi_bootinfo) } status =setup_amd_sev (); +/* Continue if AMD SEV is not supported, but skip SEV-ES setup */ +if (status ==EFI_UNSUPPORTED ) { + goto continue_setup_after_sev; + } +if (status !=EFI_SUCCESS ) { -switch (status) { -case EFI_UNSUPPORTED : -/* Continue if AMD SEV is not supported */ -break ; -default : -printf ("Set up AMD SEV failed\n" ); -return status; - } +printf ("AMD SEV setup failed, error = 0x%lx\n" , status); +return status; } status =setup_amd_sev_es (); -if (status !=EFI_SUCCESS ) { -switch (status) { -case EFI_UNSUPPORTED : -/* Continue if AMD SEV-ES is not supported */ -break ; -default : -printf ("Set up AMD SEV-ES failed\n" ); -return status; - } +if (status !=EFI_SUCCESS && status !=EFI_UNSUPPORTED ) { +printf ("AMD SEV-ES setup failed, error = 0x%lx\n" , status); +return status; } +continue_setup_after_sev: +reset_apic ();setup_gdt_tss ();setup_idt ();
Signature · 1 line
2.33.0
PATCH v2 4/10 x86 UEFI: Convert x86 test cases to PIC
In reply to Zixuan WangFrom: Zixuan Wang <[email protected]>
UEFI loads EFI applications to dynamic runtime addresses, so it requires all applications to be compiled as PIC (position independent code). PIC does not allow the usage of compile time absolute address.
This commit converts multiple x86 test cases to PIC so they can compile and run in UEFI:
- x86/cet.efi
- x86/emulator.c: x86/emulator.c depends on lib/x86/usermode.c. But usermode.c contains non-PIC inline assembly code. This commit converts lib/x86/usermode.c and x86/emulator.c to PIC, so x86/emulator.c can compile and run in UEFI.
- x86/vmware_backdoors.c: it depends on lib/x86/usermode.c and now works without modifications.
- x86/eventinj.c
- x86/smap.c
- x86/access.c: it runs fine without '-cpu max', which disables the SMEP-related tests. But with '-cpu max', it crashes in the middle, so it is left disabled in this commit.
- x86/umip.c: convert to PIC and fix a bug:
In summary, in the following line, %[sp0] can be compiled as a %r8-based offset address:
x86/umip.c:127
"mov %%" R "sp, %[sp0]\n\t" /* kernel sp for exception handlers */
%r8 is then modified in function calls without saving/restoring, thus making the following line using the wrong address.
x86/umip.c:148
"mov %[sp0], %%" R "sp\n\t"
This register is selected by the compiler, it's not guaranteed to be %r8 so we cannot just push/pop %r8 before/after the function call. A simple fix is to save the %rsp to %rbx. %rbx is a callee-saved register, so its value is not modified by function calls.
--- lib/x86/usermode.c | 3 ++- x86/Makefile.common | 10 +++++----- x86/Makefile.x86_64 | 7 ++++--- x86/access.c | 9 +++++---- x86/cet.c | 8 +++++--- x86/emulator.c | 5 +++-- x86/eventinj.c | 8 ++++++++ x86/smap.c | 13 +++++++++---- x86/umip.c | 26 +++++++++++++++++++++++--- 9 files changed, 64 insertions(+), 25 deletions(-)
lib/x86/usermode.c +2 -1
@@ -58,7 +58,8 @@ uint64_t run_in_user(usermode_func func, unsigned int fault_vector,"pushq %[user_stack_top]\n\t" "pushfq\n\t" "pushq %[user_cs]\n\t" -"pushq $user_mode\n\t" +"lea user_mode(%%rip), %%rdx\n\t" +"pushq %%rdx\n\t" "iretq\n" "user_mode:\n\t"
x86/Makefile.common +5 -5
@@ -81,16 +81,16 @@ tests-common = $(TEST_DIR)/vmexit.$(exe) $(TEST_DIR)/tsc.$(exe) \ $(TEST_DIR)/init.$(exe) \ $(TEST_DIR)/hyperv_synic.$(exe) $(TEST_DIR)/hyperv_stimer.$(exe) \ $(TEST_DIR)/hyperv_connections.$(exe) \ - $(TEST_DIR)/tsx-ctrl.$(exe) + $(TEST_DIR)/tsx-ctrl.$(exe) \ + $(TEST_DIR)/eventinj.$(exe) \ + $(TEST_DIR)/smap.$(exe) \ + $(TEST_DIR)/umip.$(exe) # The following test cases are disabled when building EFI tests because they # use absolute addresses in their inline assembly code, which cannot compile # with the '-fPIC' flag ifneq ($(TARGET_EFI),y) -tests-common += $(TEST_DIR)/eventinj.$(exe) \ - $(TEST_DIR)/smap.$(exe) \ - $(TEST_DIR)/realmode.$(exe) \ - $(TEST_DIR)/umip.$(exe) +tests-common += $(TEST_DIR)/realmode.$(exe) endif test_cases: $(tests-common) $(tests)
x86/Makefile.x86_64 +4 -3
@@ -30,6 +30,8 @@ tests += $(TEST_DIR)/intel-iommu.$(exe) tests += $(TEST_DIR)/rdpru.$(exe) tests += $(TEST_DIR)/pks.$(exe) tests += $(TEST_DIR)/pmu_lbr.$(exe) +tests += $(TEST_DIR)/emulator.$(exe) +tests += $(TEST_DIR)/vmware_backdoors.$(exe) ifeq ($(TARGET_EFI),y) tests += $(TEST_DIR)/amd_sev.$(exe)
@@ -40,14 +42,13 @@ endif # with the '-fPIC' flag ifneq ($(TARGET_EFI),y) tests += $(TEST_DIR)/access.$(exe) -tests += $(TEST_DIR)/emulator.$(exe) tests += $(TEST_DIR)/svm.$(exe) tests += $(TEST_DIR)/vmx.$(exe) -tests += $(TEST_DIR)/vmware_backdoors.$(exe) +endif + ifneq ($(fcf_protection_full),) tests += $(TEST_DIR)/cet.$(exe) endif -endif include $(SRCDIR)/$(TEST_DIR)/Makefile.common
x86/access.c +5 -4
@@ -700,7 +700,7 @@ static int ac_test_do_access(ac_test_t *at)if (F (AC_ACCESS_TWICE )) { asmvolatile ( -"mov $fixed2, %%rsi \n\t" +"lea fixed2(%%rip), %%rsi \n\t" "mov (%[addr]), %[reg] \n\t" "fixed2:" : [reg]"=r"(r), [fault]"=a"(fault), "=b"(e)
@@ -710,7 +710,7 @@ static int ac_test_do_access(ac_test_t *at) fault =0 ; } - asmvolatile ("mov $fixed1, %%rsi \n\t" + asmvolatile ("lea fixed1(%%rip), %%rsi \n\t" "mov %%rsp, %[rsp0] \n\t" "cmp $0, %[user] \n\t" "jz do_access \n\t"
@@ -719,7 +719,8 @@ static int ac_test_do_access(ac_test_t *at)"pushq %[user_stack_top] \n\t" "pushfq \n\t" "pushq %[user_cs] \n\t" -"pushq $do_access \n\t" +"lea do_access(%%rip), %%r8\n\t" +"pushq %%r8\n\t" "iretq \n" "do_access: \n\t" "cmp $0, %[fetch] \n\t"
@@ -750,7 +751,7 @@ static int ac_test_do_access(ac_test_t *at) [user_cs]"i"(USER_CS), [user_stack_top]"r"(user_stack + sizeof user_stack), [kernel_entry_vector]"i"(0x20) - : "rsi"); + : "rsi", "r8"); asm volatile (".section .text.pf \n\t" "page_fault: \n\t"
x86/cet.c +5 -3
@@ -52,7 +52,7 @@ static u64 cet_ibt_func(void)printf ("No endbr64 instruction at jmp target, this triggers #CP...\n" ); asmvolatile ("movq $2, %rcx\n" "dec %rcx\n" -"leaq 2f, %rax\n" +"leaq 2f(%rip), %rax\n" "jmp *%rax \n" "2:\n" "dec %rcx\n" );
@@ -67,7 +67,8 @@ void test_func(void) {"pushq %[user_stack_top]\n\t" "pushfq\n\t" "pushq %[user_cs]\n\t" -"pushq $user_mode\n\t" +"lea user_mode(%%rip), %%rax\n\t" +"pushq %%rax\n\t" "iretq\n" "user_mode:\n\t"
@@ -77,7 +78,8 @@ void test_func(void) { [user_ds]"i"(USER_DS), [user_cs]"i"(USER_CS), [user_stack_top]"r"(user_stack + - sizeof(user_stack))); + sizeof(user_stack)) + : "rax"); }#define SAVE_REGS () \
x86/emulator.c +3 -2
@@ -262,12 +262,13 @@ static void test_pop(void *mem) asmvolatile ("mov %%rsp, %[tmp] \n\t" "mov %[stack_top], %%rsp \n\t" -"push $1f \n\t" +"lea 1f(%%rip), %%rax \n\t" +"push %%rax \n\t" "ret \n\t" "2: jmp 2b \n\t" "1: mov %[tmp], %%rsp" : [tmp]"=&r" (tmp) : [stack_top]"r" (stack_top) - :"memory" ); + :"memory" ,"rax" );report_pass ("ret" ); stack_top[-1 ] =0x778899 ;
x86/eventinj.c +8 -0
@@ -155,9 +155,17 @@ asm("do_iret:" "pushf"W" \n\t" "mov %cs, %ecx \n\t" "push"W" %"R "cx \n\t" +#ifndef __x86_64__ "push"W" $2f \n\t" "cmpb $0, no_test_device\n\t" // see if need to flush +#else + "leaq 2f(%rip), %rbx \n\t" + "pushq %rbx \n\t" + + "mov no_test_device(%rip), %bl \n\t" + "cmpb $0, %bl\n\t" // see if need to flush +#endif"jnz 1f\n\t" "outl %eax, $0xe4 \n\t" // flush page "1: \n\t"
x86/smap.c +9 -4
@@ -159,12 +159,17 @@ int main(int ac, char **av)init_test (i);stac (); test =-1 ; +#ifndef __x86_64__ +#define TEST "test" +#else +#define TEST "test(%rip)" +#endif asm("or $(" xstr(USER_BASE) "), %"R "sp \n""push $44 \n " -"decl test\n" +"decl " TEST "\n" "and $~(" xstr(USER_BASE) "), %"R "sp \n""pop %" R "ax\n" - "movl %eax, test"); + "movl %eax, " TEST "\n");report (pf_count ==0 && test ==44 ,"write to user stack with AC=1" );
@@ -173,10 +178,10 @@ int main(int ac, char **av) test =-1 ; asm("or $(" xstr(USER_BASE) "), %"R "sp \n""push $45 \n " -"decl test\n" +"decl " TEST "\n" "and $~(" xstr(USER_BASE) "), %"R "sp \n""pop %" R "ax\n" - "movl %eax, test"); + "movl %eax, " TEST "\n");report (pf_count ==1 && test ==45 && save ==-1 ,"write to user stack with AC=0" );
x86/umip.c +23 -3
@@ -20,10 +20,20 @@ static void gp_handler(struct ex_regs *regs) } } +#ifndef __x86_64__ +#define GP_ASM_MOVE_TO_RIP \ + "mov" W " $1f, %[expected_rip]\n\t" +#else +#define GP_ASM_MOVE_TO_RIP \ + "pushq %%rax\n\t" \ + "lea 1f(%%rip), %%rax\n\t" \ + "mov %%rax, %[expected_rip]\n\t" \ + "popq %%rax\n\t" +#endif #define GP_ASM (stmt, in, clobber) \ asm volatile ( \ - "mov" W " $1f, %[expected_rip]\n\t" \ + GP_ASM_MOVE_TO_RIP \ "movl $2f-1f, %[skip_count]\n\t" \ "1: " stmt "\n\t" \ "2: " \
@@ -125,12 +135,18 @@ static noinline int do_ring3(void (*fn)(const char *), const char *arg) "mov %%dx, %%fs\n\t" "mov %%dx, %%gs\n\t" "mov %%" R "sp, %[sp0]\n\t" /* kernel sp for exception handlers */ + "mov %[sp0], %%" R "bx\n\t" /* ebx/rbx is preserved before and after 'call' instruction */ "push" W " %%" R "dx \n\t" "lea %[user_stack_top], %%" R "dx \n\t" "push" W " %%" R "dx \n\t" "pushf" W "\n\t" "push" W " %[user_cs] \n\t" +#ifndef __x86_64__ "push" W " $1f \n\t" +#else + "lea 1f(%%rip), %%rdx \n\t" + "pushq %%rdx \n\t" +#endif "iret" W "\n" "1: \n\t"#ifndef __x86_64__
@@ -140,12 +156,16 @@ static noinline int do_ring3(void (*fn)(const char *), const char *arg)#ifndef __x86_64__ "pop %%ecx\n\t"#endif +#ifndef __x86_64__ "mov $1f, %%" R "dx\n\t" +#else + "lea 1f(%%" R "ip), %%" R "dx\n\t" +#endif "int %[kernel_entry_vector]\n\t" ".section .text.entry \n\t" "kernel_entry: \n\t" #ifdef __x86_64__ - "mov %[sp0], %%" R "sp\n\t" + "mov %%rbx, %%rsp\n\t" #else"add $(5 * " S "), %%esp\n\t" #endif
@@ -171,7 +191,7 @@ static noinline int do_ring3(void (*fn)(const char *), const char *arg) [arg]"D"(arg), [kernel_ds]"i"(KERNEL_DS), [kernel_entry_vector]"i"(0x20) - : "rcx", "rdx"); + : "rcx", "rdx", "rbx");return ret; }
Signature · 1 line
2.33.0
PATCH v2 5/10 x86 UEFI: Set UEFI OVMF as readonly
In reply to Zixuan WangFrom: Zixuan Wang <[email protected]>
Set readonly for UEFI OVMF image.
--- x86/efi/run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
x86/efi/run +1 -1
@@ -54,7 +54,7 @@ popd || exit 2 # UEFI's largest allocatable memory region is large enough. EFI_RUN=y \ "$TEST_DIR/run" \ - -drive file="$EFI_UEFI",format=raw,if=pflash \ + -drive file="$EFI_UEFI",format=raw,if=pflash,readonly=on \ -drive file.dir="$EFI_TEST/$EFI_CASE/",file.driver=vvfat,file.rw=on,format=raw,if=virtio \ -net none \ -nographic \
Signature · 1 line
2.33.0
PATCH v2 6/10 x86 UEFI: Exit QEMU with return code
In reply to Zixuan WangFrom: Zixuan Wang <[email protected]>
kvm-unit-tests runner scripts parse QEMU exit code to determine if a test case runs successfully. But the UEFI 'reset_system' function always exits QEMU with code 0, even if the test case returns a non-zero code.
This commit fixes this issue by calling 'exit' function to exit QEMU with the correct code.
--- lib/efi.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)
lib/efi.c +13 -2
@@ -85,6 +85,17 @@ efi_status_t efi_get_system_config_table(efi_guid_t table_guid, void **table)return EFI_NOT_FOUND ; } +static void efi_exit (efi_status_t code) +{ +exit (code); + +/* +* Fallback to UEFI reset_system() service, in case testdev is +* missing and exit() does not properly exit. +*/ +efi_rs_call (reset_system,EFI_RESET_SHUTDOWN , code,0 ,NULL ); +} +efi_status_t efi_main (efi_handle_t handle,efi_system_table_t *sys_tab) {int ret;
@@ -134,14 +145,14 @@ efi_status_t efi_main(efi_handle_t handle, efi_system_table_t *sys_tab) ret =main (__argc, __argv, __environ);/* Shutdown the guest VM */ -efi_rs_call (reset_system,EFI_RESET_SHUTDOWN , ret,0 ,NULL ); +efi_exit (ret);/* Unreachable */ return EFI_UNSUPPORTED ; efi_main_error:/* Shutdown the guest with error EFI status */ -efi_rs_call (reset_system,EFI_RESET_SHUTDOWN , status,0 ,NULL ); +efi_exit (status);/* Unreachable */ return EFI_UNSUPPORTED ;
Signature · 1 line
2.33.0
PATCH v2 7/10 scripts: Generalize EFI check
In reply to Zixuan WangFrom: Marc Orr <[email protected]>
Previously, the scripts distinguish between seabios and UEFI via a hard-coded env var in the EFI run script, arch/x86/efi/run. Furthermore, this var is passed to the x86 run script, arch/x86/run, and then not available in other scripts (or to other architectures).
Replace the previous approach with a common variable TARGET_EFI to check whether the repo has been configured to run under EFI. This variable is extracted from the config.mak file generated by configure.
--- x86/efi/run | 1 - x86/run | 6 ++++-- 2 files changed, 4 insertions(+), 3 deletions(-)
x86/efi/run +0 -1
@@ -52,7 +52,6 @@ popd || exit 2 # run in UEFI, some test cases, e.g. `x86/pmu.c`, require more free memory. A # simple fix is to increase the QEMU default memory size to 256MiB so that # UEFI's largest allocatable memory region is large enough. -EFI_RUN=y \ "$TEST_DIR/run" \ -drive file="$EFI_UEFI",format=raw,if=pflash,readonly=on \ -drive file.dir="$EFI_TEST/$EFI_CASE/",file.driver=vvfat,file.rw=on,format=raw,if=virtio \
x86/run +4 -2
@@ -1,5 +1,7 @@ #!/usr/bin/env bash +source scripts/common.bash + if [ -z "$STANDALONE" ]; then if [ ! -f config.mak ]; then echo "run ./configure && make first. See ./configure -h"
@@ -39,12 +41,12 @@ fi command="${qemu} --no-reboot -nodefaults $pc_testdev -vnc none -serial stdio $pci_testdev" command+=" -machine accel=$ACCEL" -if ! [ "$EFI_RUN" ]; then +if [ "${TARGET_EFI}" != "y" ]; then command+=" -kernel" fi command="$(timeout_cmd) $command" -if [ "$EFI_RUN" ]; then +if [ "${TARGET_EFI}" == "y" ]; then # Set ENVIRON_DEFAULT=n to remove '-initrd' flag for QEMU (see # 'scripts/arch-run.bash' for more details). This is because when using # UEFI, the test case binaries are passed to QEMU through the disk
Signature · 1 line
2.33.0
PATCH v2 8/10 x86 UEFI: Make run_tests.sh (mostly) work under UEFI
In reply to Zixuan WangFrom: Marc Orr <[email protected]>
Make several fixes so that run_tests.sh can run the test cases when the repo is configured to run under UEFI. Specifically:
1. The scripts are enlighted to run the .efi test cases rather than the .flat test cases.
2. The scripts are enlighted to run an empty file, _NO_FILE_4Uhere_, which is used to sanity check QEMU and QEMU flags.
3. The scripts are updated to always run with -smp 1, since SMP is not yet supported under UEFI.
Notably, QEMU's -append flag still does not work. This will need to be fixed in future commits. For now, test cases that use -append are marked SKIP.
--- scripts/runtime.bash | 14 ++++++++++++-- x86/efi/run | 24 ++++++++++++++++++++---- 2 files changed, 32 insertions(+), 6 deletions(-)
scripts/runtime.bash +12 -2
@@ -82,6 +82,10 @@ function run() local accel="$8" local timeout="${9:-$TIMEOUT}" # unittests.cfg overrides the default + if [ "${TARGET_EFI}" == "y" ]; then + kernel=$(basename $kernel .flat) + fi + if [ -z "$testname" ]; then return fi
@@ -127,8 +131,14 @@ function run() fi last_line=$(premature_failure > >(tail -1)) && { - print_result "SKIP" $testname "" "$last_line" - return 77 + skip=true + if [ "${TARGET_EFI}" == "y" ] && [[ "${last_line}" =~ "Reset" ]]; then + skip=false + fi + if [ ${skip} == true ]; then + print_result "SKIP" $testname "" "$last_line" + return 77 + fi } cmdline=$(get_cmdline $kernel)
x86/efi/run +20 -4
@@ -34,16 +34,27 @@ shift 1 # This host dir will be loaded by QEMU as a FAT32 image # - Make UEFI startup script that runs the .efi on boot mkdir -p "$EFI_TEST/$EFI_CASE/" -cp "$EFI_SRC/$EFI_CASE.efi" "$EFI_TEST/$EFI_CASE/" +if [ $EFI_CASE != "_NO_FILE_4Uhere_" ]; then + cp "$EFI_SRC/$EFI_CASE.efi" "$EFI_TEST/$EFI_CASE/" +else + touch "$EFI_TEST/$EFI_CASE/$EFI_CASE.efi" +fi pushd "$EFI_TEST/$EFI_CASE" || exit 2 # 'startup.nsh' is the default script executed by UEFI on boot # Use this script to run the test binary automatically -cat << EOF >startup.nsh +if [ $EFI_CASE != "_NO_FILE_4Uhere_" ]; then + cat << EOF >startup.nsh @echo -off fs0: "$EFI_CASE.efi" EOF +else + cat << EOF >startup.nsh +@echo -off +reset -s +EOF +fi popd || exit 2 # Run test case with 256MiB QEMU memory. QEMU default memory size is 128MiB.
@@ -52,11 +63,16 @@ popd || exit 2 # run in UEFI, some test cases, e.g. `x86/pmu.c`, require more free memory. A # simple fix is to increase the QEMU default memory size to 256MiB so that # UEFI's largest allocatable memory region is large enough. +# +# Also, pass in an EFI-specific smp count (i.e., `-smp 1`) as the last argument +# to x86/run. This `smp` flag overrides any previous `smp` flags (e.g., +# `-smp 4`). This is necessary because KVM-Unit-Tests do not currently support +# SMP under UEFI. This last flag should be removed when this issue is resolved. "$TEST_DIR/run" \ -drive file="$EFI_UEFI",format=raw,if=pflash,readonly=on \ -drive file.dir="$EFI_TEST/$EFI_CASE/",file.driver=vvfat,file.rw=on,format=raw,if=virtio \ -net none \ -nographic \ - -smp "$EFI_SMP" \ -m 256 \ - "$@" + "$@" \ + -smp "$EFI_SMP"
Signature · 1 line
2.33.0
PATCH v2 9/10 x86 UEFI: Improve Boot Speed
In reply to Zixuan WangFrom: Zixuan Wang <[email protected]>
The previous runner script uses startup.nsh to specify the EFI binaries. When a UEFI firmware sees this script, it waits 5 seconds for user input before executing the script.
To remove this 5-second waiting, this commit drops the startup.nsh script, and renames test case binaries as UEFI's default binary filename EFI/BOOT/BOOTX64.EFI. This does not trigger the 5-second waiting.
This commit only fix the boot speed for x86/efi/run script. The run-tests.sh will be fixed by the follow-up patch.
--- x86/efi/run | 30 +++++++----------------------- 1 file changed, 7 insertions(+), 23 deletions(-)
x86/efi/run +7 -23
@@ -30,32 +30,16 @@ fi shift 1 # Prepare EFI boot file system -# - Copy .efi file to host dir $EFI_TEST/$EFI_CASE/ +# - Copy .efi file to host dir $EFI_TEST/$EFI_CASE/EFI/BOOT/BOOTX64.EFI # This host dir will be loaded by QEMU as a FAT32 image -# - Make UEFI startup script that runs the .efi on boot -mkdir -p "$EFI_TEST/$EFI_CASE/" -if [ $EFI_CASE != "_NO_FILE_4Uhere_" ]; then - cp "$EFI_SRC/$EFI_CASE.efi" "$EFI_TEST/$EFI_CASE/" -else - touch "$EFI_TEST/$EFI_CASE/$EFI_CASE.efi" -fi +# - UEFI firmware by default loads the file EFI/BOOT/BOOTX64.EFI +: "${EFI_CASE_DIR:="$EFI_TEST/$EFI_CASE/EFI/BOOT"}" +: "${EFI_CASE_BINARY:="$EFI_CASE_DIR/BOOTX64.EFI"}" -pushd "$EFI_TEST/$EFI_CASE" || exit 2 -# 'startup.nsh' is the default script executed by UEFI on boot -# Use this script to run the test binary automatically -if [ $EFI_CASE != "_NO_FILE_4Uhere_" ]; then - cat << EOF >startup.nsh -@echo -off -fs0: -"$EFI_CASE.efi" -EOF -else - cat << EOF >startup.nsh -@echo -off -reset -s -EOF +mkdir -p "$EFI_CASE_DIR" +if [ "$EFI_CASE" != "_NO_FILE_4Uhere_" ]; then + cp "$EFI_SRC/$EFI_CASE.efi" "$EFI_CASE_BINARY" fi -popd || exit 2 # Run test case with 256MiB QEMU memory. QEMU default memory size is 128MiB. # After UEFI boot up and we call `LibMemoryMap()`, the largest consecutive
Signature · 1 line
2.33.0
PATCH v2 10/10 x86 UEFI: Make _NO_FILE_4Uhere_ work w/ BOOTX64.EFI
In reply to Zixuan WangFrom: Marc Orr <[email protected]>
The _NO_FILE_4Uhere_ test case is used by the runner scripts to verify QEMU's configuration. Make it work with EFI/BOOT/BOOTX64.EFI by compling a minimal EFI binary, called dummy.c that returns immediately.
--- scripts/runtime.bash | 2 +- x86/efi/run | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-)
scripts/runtime.bash +1 -1
@@ -132,7 +132,7 @@ function run() last_line=$(premature_failure > >(tail -1)) && { skip=true - if [ "${TARGET_EFI}" == "y" ] && [[ "${last_line}" =~ "Reset" ]]; then + if [ "${TARGET_EFI}" == "y" ] && [[ "${last_line}" =~ "enabling apic" ]]; then skip=false fi if [ ${skip} == true ]; then
x86/efi/run +12 -0
@@ -39,6 +39,18 @@ shift 1 mkdir -p "$EFI_CASE_DIR" if [ "$EFI_CASE" != "_NO_FILE_4Uhere_" ]; then cp "$EFI_SRC/$EFI_CASE.efi" "$EFI_CASE_BINARY" +else + if ! [ -f "$EFI_CASE_BINARY" ]; then + cat <<EOF >$EFI_SRC/efi/dummy.c +int main(int argc, char **argv) +{ + return 0; +} +EOF + make "$EFI_SRC/efi/dummy.efi" + cp "$EFI_SRC/efi/dummy.efi" "$EFI_CASE_BINARY" + rm -f $EFI_SRC/efi/dummy* + fi fi # Run test case with 256MiB QEMU memory. QEMU default memory size is 128MiB.
Signature · 1 line
2.33.0
Paolo Bonzini
maintainerRe: [kvm-unit-tests PATCH v2 10/10] x86 UEFI: Make _NO_FILE_4Uhere_ work w/ BOOTX64.EFI
Quoted 7 lines · Zixuan Wang
From: Marc Orr <[email protected]>
The
_NO_FILE_4Uhere_test case is used by the runner scripts to verify QEMU's configuration. Make it work with EFI/BOOT/BOOTX64.EFI by compling a minimal EFI binary, calleddummy.cthat returns immediately.Signed-off-by Marc Orr <[email protected]>
A slightly simpler way to do it is to just let the normal build process create dummy.efi as well:
commit 2fbec25780568559e13486f7e5b5350630d061d3 (HEAD -> uefi)
Author: Marc Orr <[email protected]> Date: Tue Nov 16 12:40:53 2021 -0800
x86 UEFI: Make _NO_FILE_4Uhere_ work w/ BOOTX64.EFI
The _NO_FILE_4Uhere_ test case is used by the runner scripts to verify QEMU's configuration. Make it work with EFI/BOOT/BOOTX64.EFI by compling a minimal EFI binary, called dummy.c that returns immediately.
Message-Id: <[email protected]>
scripts/runtime.bash +1 -1
@@ -132,7 +132,7 @@ function run() last_line=$(premature_failure > >(tail -1)) && { skip=true - if [ "${TARGET_EFI}" == "y" ] && [[ "${last_line}" =~ "Reset" ]]; then + if [ "${TARGET_EFI}" == "y" ] && [[ "${last_line}" =~ "enabling apic" ]]; then skip=false fi if [ ${skip} == true ]; then
x86/Makefile.common +1 -1
@@ -72,7 +72,7 @@ else endif tests-common = $(TEST_DIR)/vmexit.$(exe) $(TEST_DIR)/tsc.$(exe) \ - $(TEST_DIR)/smptest.$(exe) \ + $(TEST_DIR)/smptest.$(exe) $(TEST_DIR)/dummy.$(exe) \ $(TEST_DIR)/msr.$(exe) \ $(TEST_DIR)/hypercall.$(exe) $(TEST_DIR)/sieve.$(exe) \ $(TEST_DIR)/kvmclock_test.$(exe) \
x86/dummy.c new file +4 -0
@@ -0,0 +1,4 @@ +int main (int argc,char **argv) +{ +return 0 ; +}
x86/efi/run +5 -3
@@ -29,6 +29,10 @@ fi # Remove the TEST_CASE from $@ shift 1 +if [ "$EFI_CASE" = "_NO_FILE_4Uhere_" ]; then + EFI_CASE=dummy +fi + # Prepare EFI boot file system # - Copy .efi file to host dir $EFI_TEST/$EFI_CASE/EFI/BOOT/BOOTX64.EFI # This host dir will be loaded by QEMU as a FAT32 image
@@ -37,9 +41,7 @@ shift 1 : "${EFI_CASE_BINARY:="$EFI_CASE_DIR/BOOTX64.EFI"}" mkdir -p "$EFI_CASE_DIR" -if [ "$EFI_CASE" != "_NO_FILE_4Uhere_" ]; then - cp "$EFI_SRC/$EFI_CASE.efi" "$EFI_CASE_BINARY" -fi +cp "$EFI_SRC/$EFI_CASE.efi" "$EFI_CASE_BINARY" # Run test case with 256MiB QEMU memory. QEMU default memory size is 128MiB. # After UEFI boot up and we call `LibMemoryMap()`, the largest consecutive
Paolo Bonzini
maintainerQuoted 24 lines · Zixuan Wang
Hello,
This patch series refactors the
x86_64UEFI set up process, fixes therun-tests.shscript to run under UEFI, and improves the boot speed under UEFI. The patches are organized as four parts.The first part (patches 1-3) refactors the
x86_64UEFI set up process. The previous UEFI setup calls arch-specific setup functions twice and generates arch-specific data structure. As Andrew suggested [1], we refactor this process to make only one call to the arch-specific function and generate arch-neutral data structures. This simplifies the set up process and makes it easier to develop UEFI support for other architectures.The second part (patch 4) converts several x86 test cases to position-independent code (PIC) to run under UEFI. This patch is ported from the initial UEFI support patchset [2] with fixes to the 32-bit compilation.
The third part (patches 5-8) fixes the UEFI runner scripts. Patch 5 sets UEFI OVMF image as read-only. Patch 6 fixes test cases' return code under UEFI, enabling Patch 7-8 to fix the
run-tests.shscript under UEFI.
Quoted 7 lines
The fourth part (patches 9-10) improves the boot speed under UEFI. Patch 9 renames the EFI executables to EFI/BOOT/BOOTX64.EFI. UEFI OVMF recognizes this file by default and skips the 5-second user input waiting. Patch 10 makes
run-tests.shwork with this new EFI executable filename.This patchset is based on the
uefibranch.
Hi, I have now merged this series and the uefi branch into master.
Paolo
Quoted 32 lines · Paolo Bonzini
Quoted 30 lines · Zixuan Wang
Hello,
This patch series refactors the
x86_64UEFI set up process, fixes therun-tests.shscript to run under UEFI, and improves the boot speed under UEFI. The patches are organized as four parts.The first part (patches 1-3) refactors the
x86_64UEFI set up process. The previous UEFI setup calls arch-specific setup functions twice and generates arch-specific data structure. As Andrew suggested [1], we refactor this process to make only one call to the arch-specific function and generate arch-neutral data structures. This simplifies the set up process and makes it easier to develop UEFI support for other architectures.The second part (patch 4) converts several x86 test cases to position-independent code (PIC) to run under UEFI. This patch is ported from the initial UEFI support patchset [2] with fixes to the 32-bit compilation.
The third part (patches 5-8) fixes the UEFI runner scripts. Patch 5 sets UEFI OVMF image as read-only. Patch 6 fixes test cases' return code under UEFI, enabling Patch 7-8 to fix the
run-tests.shscript under UEFI.The fourth part (patches 9-10) improves the boot speed under UEFI. Patch 9 renames the EFI executables to EFI/BOOT/BOOTX64.EFI. UEFI OVMF recognizes this file by default and skips the 5-second user input waiting. Patch 10 makes
run-tests.shwork with this new EFI executable filename.
Quoted 6 lines
Quoted 1 line
This patchset is based on the
uefibranch.Hi, I have now merged this series and the uefi branch into master.
Paolo
Excellent! The change to the last patch looks good to me by the way.