Skip to contentSkip to conversation

x86: hyper-v: Add overlay page tests

PATCH New Siddharth Chandrasekaran 1 participant 4 messages Jun 10, 2021 KVM

lore
Share & tools
lore
#0 lore raw

cover x86: hyper-v: Add overlay page tests

Patch series [1] starts treating hypercall code page as an overlay page (along with the existing synic event and message pages). Add KVM unit tests to make sure the underlying page contents are intact with various overlay workflows.

While at it, promote hyperv.h to lib/x86 and expose hv_hypercall() from there so future tests can use it to do hypercalls.

[1]: https://www.spinics.net/lists/kvm/msg244569.html

~ Sid.

Siddharth Chandrasekaran (3):
x86: Move hyperv helpers into libs/x86
x86: Move hyper-v hypercall related methods to lib/x86/
x86: Add hyper-v overlay page tests

 x86/Makefile.common       |  8 +---
 {x86 => lib/x86}/hyperv.h |  4 ++
 {x86 => lib/x86}/hyperv.c | 51 +++++++++++++++++++++
 x86/hyperv_connections.c  | 60 ++----------------------
 x86/hyperv_overlay.c      | 96 +++++++++++++++++++++++++++++++++++++++
 x86/unittests.cfg         |  5 ++
 6 files changed, 163 insertions(+), 61 deletions(-)
 rename {x86 => lib/x86}/hyperv.h (97%)
 rename {x86 => lib/x86}/hyperv.c (63%)
 create mode 100644 x86/hyperv_overlay.c
Signature · 11 lines
2.17.1



Amazon Development Center Germany GmbH
Krausenstr. 38
10117 Berlin
Geschaeftsfuehrung: Christian Schlaeger, Jonathan Weiss
Eingetragen am Amtsgericht Charlottenburg unter HRB 149173 B
Sitz: Berlin
Ust-ID: DE 289 237 879
#1 lore raw

PATCH 1/3 x86: Move hyperv helpers into libs/x86

Move hyperv.c and hyperv.h into into libs/x86/ as it appears to be a better place for them.

---
 x86/Makefile.common       | 7 +------
 {x86 => lib/x86}/hyperv.h | 1 -
 {x86 => lib/x86}/hyperv.c | 0
 3 files changed, 1 insertion(+), 7 deletions(-)
 rename {x86 => lib/x86}/hyperv.h (99%)
 rename {x86 => lib/x86}/hyperv.c (100%)
x86/Makefile.common +1 -6
index 52bb7aa..802f8c1 100644
@@ -22,6 +22,7 @@ cflatobjs += lib/x86/acpi.o
 cflatobjs += lib/x86/stack.o
 cflatobjs += lib/x86/fault_test.o
 cflatobjs += lib/x86/delay.o
+cflatobjs += lib/x86/hyperv.o
 
 OBJDIRS += lib/x86
 
@@ -74,12 +75,6 @@ $(TEST_DIR)/realmode.o: bits = $(if $(call cc-option,-m16,""),16,32)
 
 $(TEST_DIR)/kvmclock_test.elf: $(TEST_DIR)/kvmclock.o
 
-$(TEST_DIR)/hyperv_synic.elf: $(TEST_DIR)/hyperv.o
-
-$(TEST_DIR)/hyperv_stimer.elf: $(TEST_DIR)/hyperv.o
-
-$(TEST_DIR)/hyperv_connections.elf: $(TEST_DIR)/hyperv.o
-
 arch_clean:
 	$(RM) $(TEST_DIR)/*.o $(TEST_DIR)/*.flat $(TEST_DIR)/*.elf \
 	$(TEST_DIR)/.*.d lib/x86/.*.d \
lib/x86/hyperv.h renamed from x86/hyperv.h +0 -1
similarity index 99%
rename from x86/hyperv.h
rename to lib/x86/hyperv.h
index e3803e0..38de0d2 100644
@@ -213,5 +213,4 @@ struct hv_reference_tsc_page {
         int64_t tsc_offset;
 };
 
-
 #endif
lib/x86/hyperv.c renamed from x86/hyperv.c +0 -0
similarity index 100%
rename from x86/hyperv.c
rename to lib/x86/hyperv.c
Signature · 12 lines
2.17.1




Amazon Development Center Germany GmbH
Krausenstr. 38
10117 Berlin
Geschaeftsfuehrung: Christian Schlaeger, Jonathan Weiss
Eingetragen am Amtsgericht Charlottenburg unter HRB 149173 B
Sitz: Berlin
Ust-ID: DE 289 237 879
#2 lore raw

PATCH 2/3 x86: Move hyper-v hypercall related methods to lib/x86/

In reply to Siddharth Chandrasekaran

Some future tests that we are about to write need to perform hypercalls; move do_hypercall() and hypercall page setup methods to a more accessible location: libs/x86/hyperv.c.

---
 lib/x86/hyperv.h         |  4 +++
 lib/x86/hyperv.c         | 51 ++++++++++++++++++++++++++++++++++
 x86/hyperv_connections.c | 60 ++++------------------------------------
 3 files changed, 60 insertions(+), 55 deletions(-)
lib/x86/hyperv.h +4 -0
index 38de0d2..889f5a6 100644
@@ -213,4 +213,8 @@ struct hv_reference_tsc_page {
         int64_t tsc_offset;
 };
 
+void hv_setup_hypercall(void);
+void hv_teardown_hypercall(void);
+u64 hv_hypercall(u16 code, u64 arg, bool fast);
+
 #endif
lib/x86/hyperv.c +51 -0

60 lines not on this page · raw message

x86/hyperv_connections.c +5 -55

91 lines not on this page · raw message

Signature · 12 lines
2.17.1




Amazon Development Center Germany GmbH
Krausenstr. 38
10117 Berlin
Geschaeftsfuehrung: Christian Schlaeger, Jonathan Weiss
Eingetragen am Amtsgericht Charlottenburg unter HRB 149173 B
Sitz: Berlin
Ust-ID: DE 289 237 879
#3 lore raw

PATCH 3/3 x86: Add hyper-v overlay page tests

In reply to Siddharth Chandrasekaran

Patch series [1] starts treating hypercall code page as an overlay page (along with the existing synic event and message pages). Add KVM unit tests to make sure the underlying page contents are intact with various overlay workflows.

[1]: https://www.spinics.net/lists/kvm/msg244569.html

---
 x86/Makefile.common  |  1 +
 lib/x86/hyperv.h     |  1 +
 x86/hyperv_overlay.c | 96 ++++++++++++++++++++++++++++++++++++++++++++
 x86/unittests.cfg    |  5 +++
 4 files changed, 103 insertions(+)
 create mode 100644 x86/hyperv_overlay.c
x86/Makefile.common +1 -0
index 802f8c1..cb41992 100644
@@ -61,6 +61,7 @@ tests-common = $(TEST_DIR)/vmexit.flat $(TEST_DIR)/tsc.flat \
                $(TEST_DIR)/init.flat $(TEST_DIR)/smap.flat \
                $(TEST_DIR)/hyperv_synic.flat $(TEST_DIR)/hyperv_stimer.flat \
                $(TEST_DIR)/hyperv_connections.flat \
+               $(TEST_DIR)/hyperv_overlay.flat \
                $(TEST_DIR)/umip.flat $(TEST_DIR)/tsx-ctrl.flat
 
 test_cases: $(tests-common) $(tests)
lib/x86/hyperv.h +1 -0
index 889f5a6..e207c69 100644
@@ -52,6 +52,7 @@
 #define HV_X64_MSR_STIMER3_CONFIG               0x400000B6
 #define HV_X64_MSR_STIMER3_COUNT                0x400000B7
 
+#define HV_OVERLAY_ENABLE                       (1ULL << 0)
 #define HV_SYNIC_CONTROL_ENABLE                 (1ULL << 0)
 #define HV_SYNIC_SIMP_ENABLE                    (1ULL << 0)
 #define HV_SYNIC_SIEFP_ENABLE                   (1ULL << 0)
x86/hyperv_overlay.c new file +96 -0

96 lines not on this page · raw message

x86/unittests.cfg +5 -0
index d5efab0..03f7d57 100644
@@ -377,6 +377,11 @@ arch = x86_64
 groups = hyperv
 check = /sys/devices/system/clocksource/clocksource0/current_clocksource=tsc
 
+[hyperv_overlay]
+file = hyperv_overlay.flat
+extra_params = -cpu kvm64,hv_vpindex,hv_synic
+groups = hyperv
+
 [intel_iommu]
 file = intel-iommu.flat
 arch = x86_64
Signature · 12 lines
2.17.1




Amazon Development Center Germany GmbH
Krausenstr. 38
10117 Berlin
Geschaeftsfuehrung: Christian Schlaeger, Jonathan Weiss
Eingetragen am Amtsgericht Charlottenburg unter HRB 149173 B
Sitz: Berlin
Ust-ID: DE 289 237 879