From: Krish Sadhukhan <krish.sadhukhan@oracle.com>
To: kvm@vger.kernel.org
Cc: pbonzini@redhat.com, jmattson@google.com, seanjc@google.com
Subject: [PATCH 4/5 v3] Test: nSVM: Test MSR and IO bitmap address
Date: Tue, 2 Feb 2021 19:40:34 -0500 [thread overview]
Message-ID: <20210203004035.101292-5-krish.sadhukhan@oracle.com> (raw)
In-Reply-To: <20210203004035.101292-1-krish.sadhukhan@oracle.com>
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(+)
diff --git a/x86/svm_tests.c b/x86/svm_tests.c
index dc86efd..929a3e1 100644
--- a/x86/svm_tests.c
+++ b/x86/svm_tests.c
@@ -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[] = {
--
2.27.0
next prev parent reply other threads:[~2021-02-03 1:31 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-03 0:40 [PATCH 0/5 v3] KVM: nSVM: Check addresses of MSR bitmap and IO bitmap tables on vmrun of nested guests Krish Sadhukhan
2021-02-03 0:40 ` [PATCH 1/5 v3] KVM: SVM: Move IOPM_ALLOC_ORDER and MSRPM_ALLOC_ORDER #defines to svm.h Krish Sadhukhan
2021-02-03 0:40 ` [PATCH 2/5 v3] nSVM: Check addresses of MSR and IO bitmap Krish Sadhukhan
2021-02-03 8:23 ` Paolo Bonzini
2021-02-03 0:40 ` [PATCH 3/5 v3] KVM: nSVM: Cleanup in nested_svm_vmrun() Krish Sadhukhan
2021-02-03 0:40 ` Krish Sadhukhan [this message]
2021-02-03 0:40 ` [PATCH 5/5 v3] Test: SVM: Use ALIGN macro when aligning 'io_bitmap_area' Krish Sadhukhan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210203004035.101292-5-krish.sadhukhan@oracle.com \
--to=krish.sadhukhan@oracle.com \
--cc=jmattson@google.com \
--cc=kvm@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=seanjc@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.