* [PATCH kvm-unit-tests] nSVM: test canonicalization of segment bases in VMLOAD
@ 2021-08-05 8:57 Lara Lazier
2021-08-05 10:17 ` Paolo Bonzini
0 siblings, 1 reply; 2+ messages in thread
From: Lara Lazier @ 2021-08-05 8:57 UTC (permalink / raw)
To: kvm; +Cc: pbonzini, Lara Lazier
APM2 states that VMRUN and VMLOAD should canonicalize all base
addresses in the segment registers that have been loaded respectively.
Split up in test_canonicalization the TEST_CANONICAL for VMLOAD and
VMRUN. Added the respective test for KERNEL_GS.
Signed-off-by: Lara Lazier <laramglazier@gmail.com>
---
x86/svm_tests.c | 51 +++++++++++++++++++++++++++++++++----------------
1 file changed, 35 insertions(+), 16 deletions(-)
diff --git a/x86/svm_tests.c b/x86/svm_tests.c
index 7c7b19d..f6bccb7 100644
--- a/x86/svm_tests.c
+++ b/x86/svm_tests.c
@@ -2460,32 +2460,51 @@ static void test_msrpm_iopm_bitmap_addrs(void)
vmcb->control.intercept = saved_intercept;
}
-#define TEST_CANONICAL(seg_base, msg) \
- saved_addr = seg_base; \
+#define TEST_CANONICAL_VMRUN(seg_base, msg) \
+ saved_addr = seg_base; \
seg_base = (seg_base & ((1ul << addr_limit) - 1)) | noncanonical_mask; \
- report(svm_vmrun() == SVM_EXIT_VMMCALL, "Test %s.base for canonical form: %lx", msg, seg_base); \
+ return_value = svm_vmrun(); \
+ report(return_value == SVM_EXIT_VMMCALL, \
+ "Successful VMRUN with noncanonical %s.base", msg); \
+ report(is_canonical(seg_base), \
+ "Test %s.base for canonical form: %lx", msg, seg_base); \
+ seg_base = saved_addr;
+
+
+#define TEST_CANONICAL_VMLOAD(seg_base, msg) \
+ saved_addr = seg_base; \
+ seg_base = (seg_base & ((1ul << addr_limit) - 1)) | noncanonical_mask; \
+ asm volatile ("vmload %0" : : "a"(vmcb_phys) : "memory"); \
+ asm volatile ("vmsave %0" : : "a"(vmcb_phys) : "memory"); \
+ report(is_canonical(seg_base), \
+ "Test %s.base for canonical form: %lx", msg, seg_base); \
seg_base = saved_addr;
/*
* VMRUN canonicalizes (i.e., sign-extend to bit 63) all base addresses
• in the segment registers that have been loaded.
*/
-static void test_vmrun_canonicalization(void)
+static void test_canonicalization(void)
{
u64 saved_addr;
- u8 addr_limit = cpuid_maxphyaddr();
+ u64 return_value;
+ u64 addr_limit;
+ u64 vmcb_phys = virt_to_phys(vmcb);
+
+ addr_limit = (this_cpu_has(X86_FEATURE_LA57)) ? 57 : 48;
u64 noncanonical_mask = NONCANONICAL & ~((1ul << addr_limit) - 1);
- TEST_CANONICAL(vmcb->save.es.base, "ES");
- TEST_CANONICAL(vmcb->save.cs.base, "CS");
- TEST_CANONICAL(vmcb->save.ss.base, "SS");
- TEST_CANONICAL(vmcb->save.ds.base, "DS");
- TEST_CANONICAL(vmcb->save.fs.base, "FS");
- TEST_CANONICAL(vmcb->save.gs.base, "GS");
- TEST_CANONICAL(vmcb->save.gdtr.base, "GDTR");
- TEST_CANONICAL(vmcb->save.ldtr.base, "LDTR");
- TEST_CANONICAL(vmcb->save.idtr.base, "IDTR");
- TEST_CANONICAL(vmcb->save.tr.base, "TR");
+ TEST_CANONICAL_VMLOAD(vmcb->save.fs.base, "FS");
+ TEST_CANONICAL_VMLOAD(vmcb->save.gs.base, "GS");
+ TEST_CANONICAL_VMLOAD(vmcb->save.ldtr.base, "LDTR");
+ TEST_CANONICAL_VMLOAD(vmcb->save.tr.base, "TR");
+ TEST_CANONICAL_VMLOAD(vmcb->save.kernel_gs_base, "KERNEL GS");
+ TEST_CANONICAL_VMRUN(vmcb->save.es.base, "ES");
+ TEST_CANONICAL_VMRUN(vmcb->save.cs.base, "CS");
+ TEST_CANONICAL_VMRUN(vmcb->save.ss.base, "SS");
+ TEST_CANONICAL_VMRUN(vmcb->save.ds.base, "DS");
+ TEST_CANONICAL_VMRUN(vmcb->save.gdtr.base, "GDTR");
+ TEST_CANONICAL_VMRUN(vmcb->save.idtr.base, "IDTR");
}
static void svm_guest_state_test(void)
@@ -2497,7 +2516,7 @@ static void svm_guest_state_test(void)
test_cr4();
test_dr();
test_msrpm_iopm_bitmap_addrs();
- test_vmrun_canonicalization();
+ test_canonicalization();
}
static void __svm_npt_rsvd_bits_test(u64 *pxe, u64 rsvd_bits, u64 efer,
--
2.25.1
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH kvm-unit-tests] nSVM: test canonicalization of segment bases in VMLOAD
2021-08-05 8:57 [PATCH kvm-unit-tests] nSVM: test canonicalization of segment bases in VMLOAD Lara Lazier
@ 2021-08-05 10:17 ` Paolo Bonzini
0 siblings, 0 replies; 2+ messages in thread
From: Paolo Bonzini @ 2021-08-05 10:17 UTC (permalink / raw)
To: Lara Lazier, kvm
On 05/08/21 10:57, Lara Lazier wrote:
> APM2 states that VMRUN and VMLOAD should canonicalize all base
> addresses in the segment registers that have been loaded respectively.
>
> Split up in test_canonicalization the TEST_CANONICAL for VMLOAD and
> VMRUN. Added the respective test for KERNEL_GS.
>
> Signed-off-by: Lara Lazier <laramglazier@gmail.com>
> ---
> x86/svm_tests.c | 51 +++++++++++++++++++++++++++++++++----------------
> 1 file changed, 35 insertions(+), 16 deletions(-)
>
> diff --git a/x86/svm_tests.c b/x86/svm_tests.c
> index 7c7b19d..f6bccb7 100644
> --- a/x86/svm_tests.c
> +++ b/x86/svm_tests.c
> @@ -2460,32 +2460,51 @@ static void test_msrpm_iopm_bitmap_addrs(void)
> vmcb->control.intercept = saved_intercept;
> }
>
> -#define TEST_CANONICAL(seg_base, msg) \
> - saved_addr = seg_base; \
> +#define TEST_CANONICAL_VMRUN(seg_base, msg) \
> + saved_addr = seg_base; \
> seg_base = (seg_base & ((1ul << addr_limit) - 1)) | noncanonical_mask; \
> - report(svm_vmrun() == SVM_EXIT_VMMCALL, "Test %s.base for canonical form: %lx", msg, seg_base); \
> + return_value = svm_vmrun(); \
> + report(return_value == SVM_EXIT_VMMCALL, \
> + "Successful VMRUN with noncanonical %s.base", msg); \
> + report(is_canonical(seg_base), \
> + "Test %s.base for canonical form: %lx", msg, seg_base); \
> + seg_base = saved_addr;
Interesting, processors seem not to write back the canonicalized form on
VMRUN. They probably remember it has not changed and avoid the
writeback. Oh well.
Note that you do not need to reproduce this behavior for QEMU/TCG, as it
is not even documented.
I removed the second "report" and pushed the patch.
Thanks!
Paolo
> +
> +#define TEST_CANONICAL_VMLOAD(seg_base, msg) \
> + saved_addr = seg_base; \
> + seg_base = (seg_base & ((1ul << addr_limit) - 1)) | noncanonical_mask; \
> + asm volatile ("vmload %0" : : "a"(vmcb_phys) : "memory"); \
> + asm volatile ("vmsave %0" : : "a"(vmcb_phys) : "memory"); \
> + report(is_canonical(seg_base), \
> + "Test %s.base for canonical form: %lx", msg, seg_base); \
> seg_base = saved_addr;
>
> /*
> * VMRUN canonicalizes (i.e., sign-extend to bit 63) all base addresses
> • in the segment registers that have been loaded.
> */
> -static void test_vmrun_canonicalization(void)
> +static void test_canonicalization(void)
> {
> u64 saved_addr;
> - u8 addr_limit = cpuid_maxphyaddr();
> + u64 return_value;
> + u64 addr_limit;
> + u64 vmcb_phys = virt_to_phys(vmcb);
> +
> + addr_limit = (this_cpu_has(X86_FEATURE_LA57)) ? 57 : 48;
> u64 noncanonical_mask = NONCANONICAL & ~((1ul << addr_limit) - 1);
>
> - TEST_CANONICAL(vmcb->save.es.base, "ES");
> - TEST_CANONICAL(vmcb->save.cs.base, "CS");
> - TEST_CANONICAL(vmcb->save.ss.base, "SS");
> - TEST_CANONICAL(vmcb->save.ds.base, "DS");
> - TEST_CANONICAL(vmcb->save.fs.base, "FS");
> - TEST_CANONICAL(vmcb->save.gs.base, "GS");
> - TEST_CANONICAL(vmcb->save.gdtr.base, "GDTR");
> - TEST_CANONICAL(vmcb->save.ldtr.base, "LDTR");
> - TEST_CANONICAL(vmcb->save.idtr.base, "IDTR");
> - TEST_CANONICAL(vmcb->save.tr.base, "TR");
> + TEST_CANONICAL_VMLOAD(vmcb->save.fs.base, "FS");
> + TEST_CANONICAL_VMLOAD(vmcb->save.gs.base, "GS");
> + TEST_CANONICAL_VMLOAD(vmcb->save.ldtr.base, "LDTR");
> + TEST_CANONICAL_VMLOAD(vmcb->save.tr.base, "TR");
> + TEST_CANONICAL_VMLOAD(vmcb->save.kernel_gs_base, "KERNEL GS");
> + TEST_CANONICAL_VMRUN(vmcb->save.es.base, "ES");
> + TEST_CANONICAL_VMRUN(vmcb->save.cs.base, "CS");
> + TEST_CANONICAL_VMRUN(vmcb->save.ss.base, "SS");
> + TEST_CANONICAL_VMRUN(vmcb->save.ds.base, "DS");
> + TEST_CANONICAL_VMRUN(vmcb->save.gdtr.base, "GDTR");
> + TEST_CANONICAL_VMRUN(vmcb->save.idtr.base, "IDTR");
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-08-05 10:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-05 8:57 [PATCH kvm-unit-tests] nSVM: test canonicalization of segment bases in VMLOAD Lara Lazier
2021-08-05 10:17 ` Paolo Bonzini
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.