@@ -2304,6 +2304,43 @@ static void test_dr(void)
vmcb->save.dr7 = dr_saved;
}
+extern u8 msr_bitmap_area[];
+extern u8 io_bitmap_area[];
+
+#define TEST_BITMAP_ADDR(prot_type, bitmap_addr, msg) { \
+ vmcb->control.intercept = 1ULL << prot_type; \
+ addr_unalign = virt_to_phys(bitmap_addr); \
+ if (prot_type == INTERCEPT_MSR_PROT) \
+ vmcb->control.msrpm_base_pa = addr_unalign; \
+ else \
+ vmcb->control.iopm_base_pa = addr_unalign; \
+ report(svm_vmrun() == SVM_EXIT_ERR, "Test %s address: %lx", msg,\
+ addr_unalign); \
+ vmcb->control.msrpm_base_pa = addr_spill_beyond_ram; \
+ report(svm_vmrun() == SVM_EXIT_ERR, "Test %s address: %lx", msg,\
+ addr_spill_beyond_ram); \
+} \
+
+/*
+ * If the MSR or IOIO intercept table extends to a physical address that
+ * is greater than or equal to the maximum supported physical address, the
+ * guest state is illegal.
+ *
+ * [ APM vol 2]
+ */
+static void test_msrpm_iopm_bitmap_addrs(void)
+{
+ u64 addr_unalign;
+ u64 addr_spill_beyond_ram =
+ (u64)(((u64)1 << cpuid_maxphyaddr()) - 4096);
+
+ /* MSR bitmap address */
+ TEST_BITMAP_ADDR(INTERCEPT_MSR_PROT, msr_bitmap_area, "MSRPM");
+
+ /* MSR bitmap address */
+ TEST_BITMAP_ADDR(INTERCEPT_IOIO_PROT, io_bitmap_area, "IOPM");
+}
+
static void svm_guest_state_test(void)
{
test_set_guest(basic_guest_main);
@@ -2313,6 +2350,7 @@ static void svm_guest_state_test(void)
test_cr3();
test_cr4();
test_dr();
+ test_msrpm_iopm_bitmap_addrs();
}
struct svm_test svm_tests[] = {
According to section "Canonicalization and Consistency Checks" in APM vol 2, the following guest state is illegal: "The MSR or IOIO intercept tables extend to a physical address that is greater than or equal to the maximum supported physical address." Also test that these addresses are aligned on page boundary. Signed-off-by: Krish Sadhukhan <krish.sadhukhan@oracle.com> --- x86/svm_tests.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+)