Interrupt descriptor table (IDT) is used by x86 arch to describe the
interrupt handlers. UEFI already setup an IDT before running the test
binaries, but this IDT is not compatible with the existing
KVM-Unit-Tests test cases, e.g., x86/msr.c triggers a #GP fault when
using UEFI IDT. This is because test cases setup new interrupt handlers
and register them into KVM-Unit-Tests' IDT, but it takes no effect if we
do not load KVM-Unit-Tests' IDT.
This commit fixes this issue:
1. Port the IDT definition from cstart64.S to efistart64.S
2. Update IDT descriptor with runtime IDT address and load it
In this commit, the x86/msr.c can run in UEFI and generates same output
as the default Seabios version.
Signed-off-by: Zixuan Wang <zixuanwang@xxxxxxxxxx>
---
lib/x86/setup.c | 6 ++++++
x86/Makefile.common | 3 ++-
x86/Makefile.x86_64 | 2 +-
x86/efi/README.md | 4 ++--
x86/efi/efistart64.S | 32 ++++++++++++++++++++++++++++++++
x86/efi/elf_x86_64_efi.lds | 6 +++++-
6 files changed, 48 insertions(+), 5 deletions(-)
create mode 100644 x86/efi/efistart64.S
diff --git a/lib/x86/setup.c b/lib/x86/setup.c
index e3faf00..9548c5b 100644
--- a/lib/x86/setup.c
+++ b/lib/x86/setup.c
@@ -9,6 +9,7 @@
#include "fwcfg.h"
#include "alloc_phys.h"
#include "argv.h"
+#include "x86/desc.h"
#include "asm/setup.h"
extern char edata;
@@ -121,9 +122,14 @@ void setup_multiboot(struct mbi_bootinfo *bi)
#ifdef TARGET_EFI
+/* From x86/efi/efistart64.S */
+extern void load_idt(void);
+
void setup_efi(void)
{
reset_apic();
+ setup_idt();
+ load_idt();
mask_pic_interrupts();
enable_apic();
enable_x2apic();
diff --git a/x86/Makefile.common b/x86/Makefile.common
index 00adddd..314bf47 100644
--- a/x86/Makefile.common
+++ b/x86/Makefile.common
@@ -48,7 +48,8 @@ ifeq ($(TARGET_EFI),y)
%.so: %.o $(FLATLIBS) $(SRCDIR)/x86/efi/elf_x86_64_efi.lds $(cstart.o)
$(LD) -T $(SRCDIR)/x86/efi/elf_x86_64_efi.lds $(EFI_LDFLAGS) -o $@ \
- $(filter %.o, $^) $(FLATLIBS) $(EFI_LIBS)
+ $(EFI_LIBS_PATH)/crt0-efi-x86_64.o $(filter %.o, $^) \
+ $(FLATLIBS) $(EFI_LIBS)
@chmod a-x $@
%.efi: %.so
diff --git a/x86/Makefile.x86_64 b/x86/Makefile.x86_64
index 7063ba1..aa23b22 100644
--- a/x86/Makefile.x86_64
+++ b/x86/Makefile.x86_64
@@ -5,7 +5,7 @@ ifeq ($(TARGET_EFI),y)
exe = efi
bin = so
FORMAT = efi-app-x86_64
-cstart.o = $(EFI_LIBS_PATH)/crt0-efi-x86_64.o
+cstart.o = $(TEST_DIR)/efi/efistart64.o
else
exe = flat
bin = elf
diff --git a/x86/efi/README.md b/x86/efi/README.md
index b7f760a..d31993e 100644
--- a/x86/efi/README.md
+++ b/x86/efi/README.md
@@ -30,13 +30,13 @@ searches GNU-EFI headers under `/usr/include/efi` and static libraries under
To run a test case with UEFI:
- ./x86/efi/run ./x86/dummy.efi
+ ./x86/efi/run ./x86/msr.efi
By default the runner script loads the UEFI firmware `/usr/share/ovmf/OVMF.fd`;
please install UEFI firmware to this path, or specify the correct path through
the env variable `EFI_UEFI`:
- EFI_UEFI=/path/to/OVMF.fd ./x86/efi/run ./x86/dummy.efi
+ EFI_UEFI=/path/to/OVMF.fd ./x86/efi/run ./x86/msr.efi
## Code structure
diff --git a/x86/efi/efistart64.S b/x86/efi/efistart64.S
new file mode 100644
index 0000000..e8d5ad6
--- /dev/null
+++ b/x86/efi/efistart64.S
@@ -0,0 +1,32 @@
+/* Startup code and pre-defined data structures */
+
+.globl boot_idt
+.globl idt_descr
+
+.data
+
+boot_idt:
+ .rept 256
+ .quad 0
+ .quad 0
+ .endr
+end_boot_idt:
+
+idt_descr:
+ .word end_boot_idt - boot_idt - 1
+ .quad 0 /* To be filled with runtime addr of boot_idt(%rip) */
+
+.section .init
+.code64
+.text
+
+.globl load_idt
+load_idt:
+ /* Set IDT runtime address */
+ lea boot_idt(%rip), %rax
+ mov %rax, idt_descr+2(%rip)
+
+ /* Load IDT */
+ lidtq idt_descr(%rip)
+
+ retq
diff --git a/x86/efi/elf_x86_64_efi.lds b/x86/efi/elf_x86_64_efi.lds
index 5eae376..3d92c86 100644
--- a/x86/efi/elf_x86_64_efi.lds
+++ b/x86/efi/elf_x86_64_efi.lds
@@ -1,4 +1,4 @@
-/* Copied from GNU-EFI/gnuefi/elf_x86_64_efi.lds, licensed under GNU GPL */
+/* Developed based on GNU-EFI/gnuefi/elf_x86_64_efi.lds, licensed under GNU GPL */
/* Same as elf_x86_64_fbsd_efi.lds, except for OUTPUT_FORMAT below - KEEP IN SYNC */
OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64")
OUTPUT_ARCH(i386:x86-64)
@@ -38,6 +38,10 @@ SECTIONS
*(.rodata*)
*(.got.plt)
*(.got)
+ /* Expected by lib/x86/desc.c to store exception_table */
+ exception_table_start = .;
+ *(.data.ex)
+ exception_table_end = .;
*(.data*)
*(.sdata)
/* the EFI loader doesn't seem to like a .bss section, so we stick
--
2.33.0.rc1.237.g0d66db33f3-goog
