[kvm-unit-tests PATCH 6/6] x86: Disable some breaking tests for EFI and modify vmexit test
From: Varad Gautam via Virtualization <hidden>
Date: 2021-07-02 11:48:53
Also in:
kvm
Subsystem:
the rest · Maintainer:
Linus Torvalds
Disable some tests from building on EFI. These fail early, and need some adaptation (eg. inline asm changes / AP initialization / memory reclamation from EFI). Eg, asyncpf: runs out of memory since the allocator only uses the largest EFI_CONVENTIONAL_MEMORY block. hyperv_*: untested with EFI. vmexit: breaks since test arg passing isn't enabled - enable it except for pci-* cases since iomem needs more fixups. Signed-off-by: Varad Gautam <redacted> --- x86/Makefile.common | 21 +++++++++++---------- x86/vmexit.c | 7 +++++++ 2 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/x86/Makefile.common b/x86/Makefile.common
index 98d8de9..b995a67 100644
--- a/x86/Makefile.common
+++ b/x86/Makefile.common@@ -62,17 +62,18 @@ FLATLIBS = lib/libcflat.a @chmod a-x $@ tests-flatonly = $(TEST_DIR)/realmode.$(out) $(TEST_DIR)/eventinj.$(out) \ - $(TEST_DIR)/smap.$(out) $(TEST_DIR)/umip.$(out) - -tests-common = $(TEST_DIR)/vmexit.$(out) $(TEST_DIR)/tsc.$(out) \ - $(TEST_DIR)/smptest.$(out) $(TEST_DIR)/msr.$(out) \ - $(TEST_DIR)/hypercall.$(out) $(TEST_DIR)/sieve.$(out) \ - $(TEST_DIR)/kvmclock_test.$(out) $(TEST_DIR)/s3.$(out) \ + $(TEST_DIR)/smap.$(out) $(TEST_DIR)/umip.$(out) \ + $(TEST_DIR)/kvmclock_test.$(out) $(TEST_DIR)/hypercall.$(out) \ + $(TEST_DIR)/init.$(out) \ + $(TEST_DIR)/asyncpf.$(out) $(TEST_DIR)/hyperv_synic.$(out) \ + $(TEST_DIR)/hyperv_stimer.$(out) $(TEST_DIR)/hyperv_connections.$(out) + +tests-common = $(TEST_DIR)/tsc.$(out) $(TEST_DIR)/smptest.$(out) \ + $(TEST_DIR)/msr.$(out) $(TEST_DIR)/sieve.$(out) \ + $(TEST_DIR)/sieve.$(out) $(TEST_DIR)/s3.$(out) \ $(TEST_DIR)/pmu.$(out) $(TEST_DIR)/setjmp.$(out) \ - $(TEST_DIR)/tsc_adjust.$(out) $(TEST_DIR)/asyncpf.$(out) \ - $(TEST_DIR)/init.$(out) $(TEST_DIR)/hyperv_synic.$(out) \ - $(TEST_DIR)/hyperv_stimer.$(out) $(TEST_DIR)/hyperv_connections.$(out) \ - $(TEST_DIR)/tsx-ctrl.$(out) + $(TEST_DIR)/tsc_adjust.$(out) $(TEST_DIR)/tsx-ctrl.$(out) \ + $(TEST_DIR)/vmexit.$(out) ifneq ($(CONFIG_EFI),y) tests-common += $(tests-flatonly)
diff --git a/x86/vmexit.c b/x86/vmexit.c
index 999babf..4062f7a 100644
--- a/x86/vmexit.c
+++ b/x86/vmexit.c@@ -560,6 +560,12 @@ static void enable_nx(void *junk) static bool test_wanted(struct test *test, char *wanted[], int nwanted) { +#ifdef CONFIG_EFI + if (strcmp(test->name, "pci-io") == 0 || strcmp(test->name, "pci-mem") == 0 ) + return false; + + return true; +#else int i; if (!nwanted)
@@ -570,6 +576,7 @@ static bool test_wanted(struct test *test, char *wanted[], int nwanted) return true; return false; +#endif } int main(int ac, char **av)
--
2.30.2
_______________________________________________
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization