From: Krish Sadhukhan <krish.sadhukhan@oracle.com>
To: kvm@vger.kernel.org
Cc: pbonzini@redhat.com, jmattson@google.com, seanjc@google.com
Subject: [PATCH 7/7 v7] nSVM: Test addresses of MSR and IO permissions maps
Date: Mon, 12 Apr 2021 17:56:11 -0400 [thread overview]
Message-ID: <20210412215611.110095-8-krish.sadhukhan@oracle.com> (raw)
In-Reply-To: <20210412215611.110095-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.
The VMRUN instruction ignores the lower 12 bits of the address
specified in the VMCB."
Signed-off-by: Krish Sadhukhan <krish.sadhukhan@oracle.com>
---
x86/svm_tests.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 77 insertions(+), 1 deletion(-)
diff --git a/x86/svm_tests.c b/x86/svm_tests.c
index 29a0b59..15be8f5 100644
--- a/x86/svm_tests.c
+++ b/x86/svm_tests.c
@@ -2304,15 +2304,91 @@ static void test_dr(void)
vmcb->save.dr7 = dr_saved;
}
+#define TEST_BITMAP_ADDR(save_intercept, type, addr, exit_code, \
+ consistency_fail, msg) { \
+ u32 exit_code_hi; \
+ vmcb->control.intercept = saved_intercept | 1ULL << type; \
+ if (type == INTERCEPT_MSR_PROT) \
+ vmcb->control.msrpm_base_pa = addr; \
+ else \
+ vmcb->control.iopm_base_pa = addr; \
+ exit_code_hi = consistency_fail ? SVM_CONSISTENCY_ERR : 0; \
+ report(svm_vmrun() == exit_code && \
+ vmcb->control.exit_code_hi == exit_code_hi, \
+ "Test %s address: %lx %x", msg, addr, vmcb->control.exit_code_hi);\
+}
+
+/*
+ * 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.
+ *
+ * The VMRUN instruction ignores the lower 12 bits of the address specified
+ * in the VMCB.
+ *
+ * MSRPM spans 2 contiguous 4KB pages while IOPM spans 2 contiguous 4KB
+ * pages + 1 byte.
+ *
+ * [APM vol 2]
+ *
+ * Note: Unallocated MSRPM addresses conforming to consistency checks, generate
+ * #NPF.
+ */
+static void test_msrpm_iopm_bitmap_addrs(void)
+{
+ u64 saved_intercept = vmcb->control.intercept;
+ u64 addr_beyond_limit = 1ull << cpuid_maxphyaddr();
+ u64 addr = virt_to_phys(msr_bitmap) & (~((1ull << 12) - 1));
+
+ TEST_BITMAP_ADDR(saved_intercept, INTERCEPT_MSR_PROT,
+ addr_beyond_limit - 3 * PAGE_SIZE, SVM_EXIT_ERR, false,
+ "MSRPM");
+ TEST_BITMAP_ADDR(saved_intercept, INTERCEPT_MSR_PROT,
+ addr_beyond_limit - 2 * PAGE_SIZE, SVM_EXIT_ERR, false,
+ "MSRPM");
+ TEST_BITMAP_ADDR(saved_intercept, INTERCEPT_MSR_PROT,
+ addr_beyond_limit - 2 * PAGE_SIZE + 1, SVM_EXIT_ERR,
+ true, "MSRPM");
+ TEST_BITMAP_ADDR(saved_intercept, INTERCEPT_MSR_PROT,
+ addr_beyond_limit - PAGE_SIZE, SVM_EXIT_ERR, true,
+ "MSRPM");
+ TEST_BITMAP_ADDR(saved_intercept, INTERCEPT_MSR_PROT, addr,
+ SVM_EXIT_VMMCALL, false, "MSRPM");
+ addr |= (1ull << 12) - 1;
+ TEST_BITMAP_ADDR(saved_intercept, INTERCEPT_MSR_PROT, addr,
+ SVM_EXIT_VMMCALL, false, "MSRPM");
+
+ TEST_BITMAP_ADDR(saved_intercept, INTERCEPT_IOIO_PROT,
+ addr_beyond_limit - 4 * PAGE_SIZE, SVM_EXIT_VMMCALL,
+ false, "IOPM");
+ TEST_BITMAP_ADDR(saved_intercept, INTERCEPT_IOIO_PROT,
+ addr_beyond_limit - 3 * PAGE_SIZE, SVM_EXIT_VMMCALL,
+ false, "IOPM");
+ TEST_BITMAP_ADDR(saved_intercept, INTERCEPT_IOIO_PROT,
+ addr_beyond_limit - 3 * PAGE_SIZE + 1, SVM_EXIT_ERR,
+ true, "IOPM");
+ TEST_BITMAP_ADDR(saved_intercept, INTERCEPT_IOIO_PROT,
+ addr_beyond_limit - PAGE_SIZE, SVM_EXIT_ERR, true,
+ "IOPM");
+ addr = virt_to_phys(io_bitmap) & (~((1ull << 11) - 1));
+ TEST_BITMAP_ADDR(saved_intercept, INTERCEPT_IOIO_PROT, addr,
+ SVM_EXIT_VMMCALL, false, "IOPM");
+ addr |= (1ull << 12) - 1;
+ TEST_BITMAP_ADDR(saved_intercept, INTERCEPT_IOIO_PROT, addr,
+ SVM_EXIT_VMMCALL, false, "IOPM");
+
+ vmcb->control.intercept = saved_intercept;
+}
+
static void svm_guest_state_test(void)
{
test_set_guest(basic_guest_main);
-
test_efer();
test_cr0();
test_cr3();
test_cr4();
test_dr();
+ test_msrpm_iopm_bitmap_addrs();
}
--
2.27.0
next prev parent reply other threads:[~2021-04-12 22:45 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-12 21:56 [PATCH 0/7 v7] KVM: nSVM: Check addresses of MSR bitmap and IO bitmap tables on vmrun of nested guests Krish Sadhukhan
2021-04-12 21:56 ` [PATCH 1/7 v7] KVM: SVM: Define actual size of IOPM and MSRPM tables Krish Sadhukhan
2021-04-12 21:56 ` [PATCH 2/7 v7] KVM: nSVM: Define an exit code to reflect consistency check failure Krish Sadhukhan
2021-04-17 14:17 ` Paolo Bonzini
2021-04-19 17:57 ` Krish Sadhukhan
2021-04-19 18:28 ` Paolo Bonzini
2021-04-19 18:36 ` Jim Mattson
2021-04-12 21:56 ` [PATCH 3/7 v7] KVM: nSVM: No need to set bits 11:0 in MSRPM and IOPM bitmaps Krish Sadhukhan
2021-04-17 14:18 ` Paolo Bonzini
2021-04-20 20:00 ` Sean Christopherson
2021-04-22 17:50 ` Krish Sadhukhan
2021-04-22 17:52 ` Krish Sadhukhan
2021-04-22 17:56 ` Krish Sadhukhan
2021-04-22 18:01 ` Sean Christopherson
2021-04-23 1:12 ` Krish Sadhukhan
2021-04-23 15:56 ` Sean Christopherson
2021-04-23 20:31 ` Paolo Bonzini
2021-04-26 21:59 ` Krish Sadhukhan
2021-04-26 22:07 ` Sean Christopherson
2021-04-12 21:56 ` [PATCH 4/7 v7] nSVM: Check addresses of MSR and IO permission maps Krish Sadhukhan
2021-04-12 21:56 ` [PATCH 5/7 v7] SVM: Use ALIGN macro when aligning 'io_bitmap_area' Krish Sadhukhan
2021-04-12 21:56 ` [PATCH 6/7 v7] nSVM: Define an exit code to reflect consistency check failure Krish Sadhukhan
2021-04-12 21:56 ` Krish Sadhukhan [this message]
2021-04-17 14:35 ` [PATCH 0/7 v7] KVM: nSVM: Check addresses of MSR bitmap and IO bitmap tables on vmrun of nested guests Paolo Bonzini
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=20210412215611.110095-8-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).