x86: nSVM: Add test for EPT A/D bits
PATCH 1/1 x86: nSVM: Add test for EPT A/D bits
The nVMX tests already have coverage for TDP A/D bits. Add a similar test for nSVM to improve test parity between nSVM and nVMX.
--- x86/svm.c | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++ x86/svm.h | 5 +++ x86/svm_npt.c | 46 +++++++++++++++++++++++++ 3 files changed, 144 insertions(+)
x86/svm.c +93 -0
@@ -14,6 +14,8 @@#include "isr.h" #include "apic.h" +#include <asm/page.h> +/* for the nested page table*/ u64 *pml4e;
@@ -43,6 +45,97 @@ u64 *npt_get_pml4e(void)return pml4e; } +void clear_npt_ad (unsigned long *pml4e,u64 guest_cr3, +unsigned long guest_addr) +{ +int l; +unsigned long *pt = (unsigned long *)guest_cr3, gpa; +u64 *npt_pte, pte, offset_in_page; +unsigned offset; + +for (l =PAGE_LEVEL ; ; --l) { + offset =PGDIR_OFFSET (guest_addr, l); + npt_pte =npt_get_pte ((u64) &pt[offset]); + +if (!npt_pte) { +printf ("NPT - guest level %d page table is not mapped.\n" , l); +return ; + } + + *npt_pte &= ~(PT_AD_MASK ); + + pte = pt[offset]; +if (l ==1 || (l <4 && (pte &PT_PAGE_SIZE_MASK ))) +break ; +if (!(pte &PT_PRESENT_MASK )) +return ; + pt = (unsigned long *)(pte &PT_ADDR_MASK ); + } + + offset =PGDIR_OFFSET (guest_addr, l); + offset_in_page = guest_addr & ((1 <<PGDIR_BITS (l)) -1 ); + gpa = (pt[offset] &PT_ADDR_MASK ) | (guest_addr & offset_in_page); + npt_pte =npt_get_pte (gpa); + *npt_pte &= ~(PT_AD_MASK ); +} + +void check_npt_ad (unsigned long *pml4e,u64 guest_cr3, +unsigned long guest_addr,int expected_gpa_ad, +int expected_pt_ad) +{ +int l; +unsigned long *pt = (unsigned long *)guest_cr3, gpa; +u64 *npt_pte, pte, offset_in_page; +unsigned offset; +bool bad_pt_ad = false; + +for (l =PAGE_LEVEL ; ; --l) { + offset =PGDIR_OFFSET (guest_addr, l); + npt_pte =npt_get_pte ((u64) &pt[offset]); + +if (!npt_pte) { +printf ("NPT - guest level %d page table is not mapped.\n" , l); +return ; + } + +if (!bad_pt_ad) { + bad_pt_ad |= (*npt_pte &PT_AD_MASK ) != expected_pt_ad; +if (bad_pt_ad) +report_fail ("NPT - received guest level %d page table A=%d/D=%d" , + l, + !!(expected_pt_ad &PT_ACCESSED_MASK ), + !!(expected_pt_ad &PT_DIRTY_MASK )); + } + + pte = pt[offset]; +if (l ==1 || (l <4 && (pte &PT_PAGE_SIZE_MASK ))) +break ; +if (!(pte &PT_PRESENT_MASK )) +return ; + pt = (unsigned long *)(pte &PT_ADDR_MASK ); + } + +if (!bad_pt_ad) +report_pass ("NPT - guest page table structures A=%d/D=%d" , + !!(expected_pt_ad &PT_ACCESSED_MASK ), + !!(expected_pt_ad &PT_DIRTY_MASK )); + + offset =PGDIR_OFFSET (guest_addr, l); + offset_in_page = guest_addr & ((1 <<PGDIR_BITS (l)) -1 ); + gpa = (pt[offset] &PT_ADDR_MASK ) | (guest_addr & offset_in_page); + + npt_pte =npt_get_pte (gpa); + +if (!npt_pte) { +report_fail ("NPT - guest physical address is not mapped" ); +return ; + } +report ((*npt_pte &PT_AD_MASK ) == expected_gpa_ad, +"NPT - guest physical address A=%d/D=%d" , + !!(expected_gpa_ad &PT_ACCESSED_MASK ), + !!(expected_gpa_ad &PT_DIRTY_MASK )); +} +bool smp_supported (void ) {return cpu_count () >1 ;
x86/svm.h +5 -0
@@ -415,6 +415,11 @@ u64 *npt_get_pte(u64 address);u64 *npt_get_pde (u64 address);u64 *npt_get_pdpe (u64 address);u64 *npt_get_pml4e (void ); +void clear_npt_ad (unsigned long *pml4e,u64 guest_cr3, +unsigned long guest_addr); +void check_npt_ad (unsigned long *pml4e,u64 guest_cr3, +unsigned long guest_addr,int expected_gpa_ad, +int expected_pt_ad);bool smp_supported (void );bool default_supported (void );bool vgif_supported (void );
x86/svm_npt.c +46 -0
58 lines not on this page · raw message
Signature · 1 line
2.51.0.261.g7ce5a0a67e-goog
Quoted 203 lines · Kevin Cheng
The nVMX tests already have coverage for TDP A/D bits. Add a similar test for nSVM to improve test parity between nSVM and nVMX.
Signed-off-by Kevin Cheng <[email protected]>--- x86/svm.c | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++ x86/svm.h | 5 +++ x86/svm_npt.c | 46 +++++++++++++++++++++++++ 3 files changed, 144 insertions(+)x86/svm.c +93
-0@@ -14,6 +14,8 @@#include "isr.h" #include "apic.h" +#include <asm/page.h> +/* for the nested page table*/ u64 *pml4e;@@ -43,6 +45,97 @@ u64 *npt_get_pml4e(void)return pml4e; } +void clear_npt_ad (unsigned long *pml4e,u64 guest_cr3, +unsigned long guest_addr) +{ +int l; +unsigned long *pt = (unsigned long *)guest_cr3, gpa; +u64 *npt_pte, pte, offset_in_page; +unsigned offset; + +for (l =PAGE_LEVEL ; ; --l) { + offset =PGDIR_OFFSET (guest_addr, l); + npt_pte =npt_get_pte ((u64) &pt[offset]); + +if (!npt_pte) { +printf ("NPT - guest level %d page table is not mapped.\n" , l); +return ; + } + + *npt_pte &= ~(PT_AD_MASK ); + + pte = pt[offset]; +if (l ==1 || (l <4 && (pte &PT_PAGE_SIZE_MASK ))) +break ; +if (!(pte &PT_PRESENT_MASK )) +return ; + pt = (unsigned long *)(pte &PT_ADDR_MASK ); + } + + offset =PGDIR_OFFSET (guest_addr, l); + offset_in_page = guest_addr & ((1 <<PGDIR_BITS (l)) -1 ); + gpa = (pt[offset] &PT_ADDR_MASK ) | (guest_addr & offset_in_page); + npt_pte =npt_get_pte (gpa); + *npt_pte &= ~(PT_AD_MASK ); +} + +void check_npt_ad (unsigned long *pml4e,u64 guest_cr3, +unsigned long guest_addr,int expected_gpa_ad, +int expected_pt_ad) +{ +int l; +unsigned long *pt = (unsigned long *)guest_cr3, gpa; +u64 *npt_pte, pte, offset_in_page; +unsigned offset; +bool bad_pt_ad = false; + +for (l =PAGE_LEVEL ; ; --l) { + offset =PGDIR_OFFSET (guest_addr, l); + npt_pte =npt_get_pte ((u64) &pt[offset]); + +if (!npt_pte) { +printf ("NPT - guest level %d page table is not mapped.\n" , l); +return ; + } + +if (!bad_pt_ad) { + bad_pt_ad |= (*npt_pte &PT_AD_MASK ) != expected_pt_ad; +if (bad_pt_ad) +report_fail ("NPT - received guest level %d page table A=%d/D=%d" , + l, + !!(expected_pt_ad &PT_ACCESSED_MASK ), + !!(expected_pt_ad &PT_DIRTY_MASK )); + } + + pte = pt[offset]; +if (l ==1 || (l <4 && (pte &PT_PAGE_SIZE_MASK ))) +break ; +if (!(pte &PT_PRESENT_MASK )) +return ; + pt = (unsigned long *)(pte &PT_ADDR_MASK ); + } + +if (!bad_pt_ad) +report_pass ("NPT - guest page table structures A=%d/D=%d" , + !!(expected_pt_ad &PT_ACCESSED_MASK ), + !!(expected_pt_ad &PT_DIRTY_MASK )); + + offset =PGDIR_OFFSET (guest_addr, l); + offset_in_page = guest_addr & ((1 <<PGDIR_BITS (l)) -1 ); + gpa = (pt[offset] &PT_ADDR_MASK ) | (guest_addr & offset_in_page); + + npt_pte =npt_get_pte (gpa); + +if (!npt_pte) { +report_fail ("NPT - guest physical address is not mapped" ); +return ; + } +report ((*npt_pte &PT_AD_MASK ) == expected_gpa_ad, +"NPT - guest physical address A=%d/D=%d" , + !!(expected_gpa_ad &PT_ACCESSED_MASK ), + !!(expected_gpa_ad &PT_DIRTY_MASK )); +} +bool smp_supported (void ) {return cpu_count () >1 ;x86/svm.h +5
-0@@ -415,6 +415,11 @@ u64 *npt_get_pte(u64 address);u64 *npt_get_pde (u64 address);u64 *npt_get_pdpe (u64 address);u64 *npt_get_pml4e (void ); +void clear_npt_ad (unsigned long *pml4e,u64 guest_cr3, +unsigned long guest_addr); +void check_npt_ad (unsigned long *pml4e,u64 guest_cr3, +unsigned long guest_addr,int expected_gpa_ad, +int expected_pt_ad);bool smp_supported (void );bool default_supported (void );bool vgif_supported (void );x86/svm_npt.c +46
-1@@ -380,6 +380,51 @@ skip_pte_test: vmcb->save.cr4 = sg_cr4; } +static void npt_ad_read_guest (struct svm_test *test) +{ +u64 *data = (void *)(0x80000 ); + (void )*(volatile u64 *)data; +} + +static void npt_ad_write_guest (struct svm_test *test) +{ +u64 *data = (void *)(0x80000 ); + *data =0 ; +} + +static void npt_ad_test (void ) +{ +u64 *data = (void *)(0x80000 ); +u64 guest_cr3 = vmcb->save.cr3; + +if (!npt_supported ()) { +report_skip ("NPT not supported" ); +return ; + } + +clear_npt_ad (npt_get_pml4e (), guest_cr3, (unsigned long )data); + +check_npt_ad (npt_get_pml4e (), guest_cr3, (unsigned long )data,0 ,0 ); + +test_set_guest (npt_ad_read_guest); +svm_vmrun (); + +check_npt_ad (npt_get_pml4e (), guest_cr3, + (unsigned long )data, +PT_ACCESSED_MASK , +PT_AD_MASK ); + +test_set_guest (npt_ad_write_guest); +svm_vmrun (); + +check_npt_ad (npt_get_pml4e (), guest_cr3, + (unsigned long )data, +PT_AD_MASK , +PT_AD_MASK ); + +clear_npt_ad (npt_get_pml4e (), guest_cr3, (unsigned long )data); +} +#define NPT_V1_TEST (name, prepare, guest_code, check) \ { #name, npt_supported, prepare, default_prepare_gif_clear, guest_code, \ default_finished, check }@@ -395,6 +440,7 @@ static struct svm_test npt_tests[] = {NPT_V1_TEST (npt_l1mmio, npt_l1mmio_prepare, npt_l1mmio_test, npt_l1mmio_check),NPT_V1_TEST (npt_rw_l1mmio, npt_rw_l1mmio_prepare, npt_rw_l1mmio_test, npt_rw_l1mmio_check),NPT_V2_TEST (svm_npt_rsvd_bits_test), +NPT_V2_TEST (npt_ad_test), { NULL, NULL, NULL, NULL, NULL, NULL, NULL } }; --
Quoted 2 lines
2.51.0.261.g7ce5a0a67e-goog
Just checking in as it's been a couple weeks :) If there is anyone else who would be better suited to take a look at these please let me know and I can cc them as well!
Sean Christopherson
reviewerQuoted 2 lines · Kevin Cheng
The nVMX tests already have coverage for TDP A/D bits. Add a similar test for nSVM to improve test parity between nSVM and nVMX.
Please write a more verbose changelog that explains _exactly_ what you intend to test. Partly because I don't entirely trust the EPT A/D tests, but mostly because I think it will help you fully understand the double walks that need to be done. E.g. explain what all NPT entries will be touched if the guest writes using a virtual address.
Quoted 5 lines
Signed-off-by Kevin Cheng <[email protected]>--- x86/svm.c | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++ x86/svm.h | 5 +++ x86/svm_npt.c | 46 +++++++++++++++++++++++++
The {check,clear}_npt_ad() helpers belong in svm_npt.c, not svm.c
Quoted 16 lines
3 files changed, 144 insertions(+)x86/svm.c +2
-0@@ -14,6 +14,8 @@#include "isr.h" #include "apic.h" +#include <asm/page.h> +/* for the nested page table*/ u64 *pml4e;
x86/svm.c u64 *npt_get_pml4e(void) · line 49
Quoted 5 lines
x86/svm.c +2
-0@@ -43,6 +45,97 @@ u64 *npt_get_pml4e(void)return pml4e; } +void clear_npt_ad (unsigned long *pml4e,u64 guest_cr3, +unsigned long guest_addr)
GPAs are of type phys_addr_t, not "unsigned long". The tests pass because they're 64-bit only, but that's ugly and shouldn't be relied upon.
And pml4e, a.k.a. npt_get_pml4e(), is a u64 *. Actually, pml4e isn't even used, which makes me question whether or not this test does what it intended to do.
Ah, guest_addr is actually a _virtual_ address. Please name it "gva" to remove ambiguity (and to help clarify that guest_cr3 really is CR3, not nCR3).
x86/svm.c u64 *npt_get_pml4e(void) · line 54
Quoted 5 lines
x86/svm.c +5
-0+{ +int l; +unsigned long *pt = (unsigned long *)guest_cr3, gpa; +u64 *npt_pte, pte, offset_in_page; +unsigned offset;
Please don't use bare "unsigned", and use reverse fir-tree. "offset" can simply be an "int" because we're 100% relying on it not to be greater than 511. I.e.
unsigned long *pt = (unsigned long *)guest_cr3, gpa; u64 *npt_pte, pte, offset_in_page; int l, offset;
x86/svm.c u64 *npt_get_pml4e(void) · line 58
Quoted 4 lines
x86/svm.c +4
-0+ +for (l =PAGE_LEVEL ; ; --l) { + offset =PGDIR_OFFSET (guest_addr, l); + npt_pte =npt_get_pte ((u64) &pt[offset]);
This is retrieving a PTE from a non-NPT page table (pt == guest_cr3).
x86/svm.c u64 *npt_get_pml4e(void) · line 60
Quoted 2 lines
x86/svm.c +2
-0+if (!npt_pte) { +printf ("NPT - guest level %d page table is not mapped.\n" , l);
Why printf instead of report_fail()?
x86/svm.c u64 *npt_get_pml4e(void) · line 65
Quoted 4 lines
x86/svm.c +4
-0+return ; + } + + *npt_pte &= ~(PT_AD_MASK );
And so here you're clearing bits in the non-nested page tables. The test passes because check_npt_ad() also checks the non-nested page tables, but the test isn't doing what it purports to do.
x86/svm.c u64 *npt_get_pml4e(void) · line 78
Quoted 13 lines
x86/svm.c +13
-0+ + pte = pt[offset]; +if (l ==1 || (l <4 && (pte &PT_PAGE_SIZE_MASK ))) +break ; +if (!(pte &PT_PRESENT_MASK )) +return ; + pt = (unsigned long *)(pte &PT_ADDR_MASK ); + } + + offset =PGDIR_OFFSET (guest_addr, l); + offset_in_page = guest_addr & ((1 <<PGDIR_BITS (l)) -1 ); + gpa = (pt[offset] &PT_ADDR_MASK ) | (guest_addr & offset_in_page); + npt_pte =npt_get_pte (gpa);
Ah, the nested NPT tables are checked, but only for the leaf PTE of the final GPA. This fails to validate address. This fails to validate Accessed bits on non-leaf NPT entries, and fails to validate A/D bits on NPT entries used to translate GPAs accessed while walking the guest GVA=>GPA page tables.
x86/svm.c u64 *npt_get_pml4e(void) · line 84
Quoted 6 lines
x86/svm.c +6
-0+ *npt_pte &= ~(PT_AD_MASK ); +} + +void check_npt_ad (unsigned long *pml4e,u64 guest_cr3, +unsigned long guest_addr,int expected_gpa_ad, +int expected_pt_ad)
Align indentation.
x86/svm.c u64 *npt_get_pml4e(void) · line 97
Quoted 13 lines
x86/svm.c +13
-0+{ +int l; +unsigned long *pt = (unsigned long *)guest_cr3, gpa; +u64 *npt_pte, pte, offset_in_page; +unsigned offset; +bool bad_pt_ad = false; + +for (l =PAGE_LEVEL ; ; --l) { + offset =PGDIR_OFFSET (guest_addr, l); + npt_pte =npt_get_pte ((u64) &pt[offset]); + +if (!npt_pte) { +printf ("NPT - guest level %d page table is not mapped.\n" , l);
Why printf instead of report_fail()?
x86/svm.c u64 *npt_get_pml4e(void) · line 103
Quoted 6 lines
x86/svm.c +6
-0+return ; + } + +if (!bad_pt_ad) { + bad_pt_ad |= (*npt_pte &PT_AD_MASK ) != expected_pt_ad; +if (bad_pt_ad)
Unnecessary nesting. E.g. ignoring the below feedback, this could be:
if (!bad_pt_ad && (*npt_pte & PT_AD_MASK) != expected_pt_ad) {
bad_pt_ad = true
report_fail(...)
}x86/svm.c u64 *npt_get_pml4e(void) · line 107
Quoted 4 lines
x86/svm.c +4
-0+report_fail ("NPT - received guest level %d page table A=%d/D=%d" , + l, + !!(expected_pt_ad &PT_ACCESSED_MASK ), + !!(expected_pt_ad &PT_DIRTY_MASK ));
Print both expected and actual, otherwise debugging is no fun. Actually, looking at the caller, passing in @expected_pt_ad is quite silly. The only time A/D bits are expected to be '0' are for the initial check, immediately after A/D bits are zeroed. That's honestly uninteresting, it's basically verifying KVM hasn't randomly corrupted memory. If someone _really_ wants to verify that A/D bits are cleared, just read back immediately after writing.
Dropping @expected_pt_ad will make it easier to expand coverage, e.g. for reads vs. writes, and of intermediate GPAs.
E.g.
Quoted 30 lines
x86/svm.c +30
-0+ } + + pte = pt[offset]; +if (l ==1 || (l <4 && (pte &PT_PAGE_SIZE_MASK ))) +break ; +if (!(pte &PT_PRESENT_MASK )) +return ; + pt = (unsigned long *)(pte &PT_ADDR_MASK ); + } + +if (!bad_pt_ad) +report_pass ("NPT - guest page table structures A=%d/D=%d" , + !!(expected_pt_ad &PT_ACCESSED_MASK ), + !!(expected_pt_ad &PT_DIRTY_MASK )); + + offset =PGDIR_OFFSET (guest_addr, l); + offset_in_page = guest_addr & ((1 <<PGDIR_BITS (l)) -1 ); + gpa = (pt[offset] &PT_ADDR_MASK ) | (guest_addr & offset_in_page); + + npt_pte =npt_get_pte (gpa); + +if (!npt_pte) { +report_fail ("NPT - guest physical address is not mapped" ); +return ; + } +report ((*npt_pte &PT_AD_MASK ) == expected_gpa_ad, +"NPT - guest physical address A=%d/D=%d" , + !!(expected_gpa_ad &PT_ACCESSED_MASK ), + !!(expected_gpa_ad &PT_DIRTY_MASK )); +}
Quoted 181 lines · Sean Christopherson
Quoted 2 lines · Kevin Cheng
The nVMX tests already have coverage for TDP A/D bits. Add a similar test for nSVM to improve test parity between nSVM and nVMX.
Please write a more verbose changelog that explains _exactly_ what you intend to test. Partly because I don't entirely trust the EPT A/D tests, but mostly because I think it will help you fully understand the double walks that need to be done. E.g. explain what all NPT entries will be touched if the guest writes using a virtual address.
Quoted 5 lines
Signed-off-by Kevin Cheng <[email protected]>--- x86/svm.c | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++ x86/svm.h | 5 +++ x86/svm_npt.c | 46 +++++++++++++++++++++++++The {check,clear}_npt_ad() helpers belong in
svm_npt.c, notsvm.cQuoted 16 lines
3 files changed, 144 insertions(+)x86/svm.c +2
-0@@ -14,6 +14,8 @@#include "isr.h" #include "apic.h" +#include <asm/page.h> +/* for the nested page table*/ u64 *pml4e;x86/svm.c u64 *npt_get_pml4e(void) · line 49
Quoted 5 lines
x86/svm.c +2
-0@@ -43,6 +45,97 @@ u64 *npt_get_pml4e(void)return pml4e; } +void clear_npt_ad (unsigned long *pml4e,u64 guest_cr3, +unsigned long guest_addr)GPAs are of type
phys_addr_t, not "unsigned long". The tests pass because they're 64-bit only, but that's ugly and shouldn't be relied upon.And pml4e, a.k.a.
npt_get_pml4e(), is a u64 *. Actually, pml4e isn't even used, which makes me question whether or not this test does what it intended to do.Ah,
guest_addris actually a _virtual_ address. Please name it "gva" to remove ambiguity (and to help clarify thatguest_cr3really is CR3, not nCR3).x86/svm.c u64 *npt_get_pml4e(void) · line 54
Quoted 5 lines
x86/svm.c +5
-0+{ +int l; +unsigned long *pt = (unsigned long *)guest_cr3, gpa; +u64 *npt_pte, pte, offset_in_page; +unsigned offset;Please don't use bare "unsigned", and use reverse fir-tree. "offset" can simply be an "int" because we're 100% relying on it not to be greater than 511. I.e.
unsigned long *pt = (unsigned long *)guest_cr3, gpa; u64 *npt_pte, pte, offset_in_page; int l, offset;x86/svm.c u64 *npt_get_pml4e(void) · line 58
Quoted 4 lines
x86/svm.c +4
-0+ +for (l =PAGE_LEVEL ; ; --l) { + offset =PGDIR_OFFSET (guest_addr, l); + npt_pte =npt_get_pte ((u64) &pt[offset]);This is retrieving a PTE from a non-NPT page table (pt ==
guest_cr3).x86/svm.c u64 *npt_get_pml4e(void) · line 60
Quoted 2 lines
x86/svm.c +2
-0+if (!npt_pte) { +printf ("NPT - guest level %d page table is not mapped.\n" , l);Why printf instead of
report_fail()?x86/svm.c u64 *npt_get_pml4e(void) · line 65
Quoted 4 lines
x86/svm.c +4
-0+return ; + } + + *npt_pte &= ~(PT_AD_MASK );And so here you're clearing bits in the non-nested page tables. The test passes because
check_npt_ad()also checks the non-nested page tables, but the test isn't doing what it purports to do.x86/svm.c u64 *npt_get_pml4e(void) · line 78
Quoted 13 lines
x86/svm.c +13
-0+ + pte = pt[offset]; +if (l ==1 || (l <4 && (pte &PT_PAGE_SIZE_MASK ))) +break ; +if (!(pte &PT_PRESENT_MASK )) +return ; + pt = (unsigned long *)(pte &PT_ADDR_MASK ); + } + + offset =PGDIR_OFFSET (guest_addr, l); + offset_in_page = guest_addr & ((1 <<PGDIR_BITS (l)) -1 ); + gpa = (pt[offset] &PT_ADDR_MASK ) | (guest_addr & offset_in_page); + npt_pte =npt_get_pte (gpa);Ah, the nested NPT tables are checked, but only for the leaf PTE of the final GPA. This fails to validate address. This fails to validate Accessed bits on non-leaf NPT entries, and fails to validate A/D bits on NPT entries used to translate GPAs accessed while walking the guest GVA=>GPA page tables.
x86/svm.c u64 *npt_get_pml4e(void) · line 84
Quoted 6 lines
x86/svm.c +6
-0+ *npt_pte &= ~(PT_AD_MASK ); +} + +void check_npt_ad (unsigned long *pml4e,u64 guest_cr3, +unsigned long guest_addr,int expected_gpa_ad, +int expected_pt_ad)Align indentation.
x86/svm.c u64 *npt_get_pml4e(void) · line 97
Quoted 13 lines
x86/svm.c +13
-0+{ +int l; +unsigned long *pt = (unsigned long *)guest_cr3, gpa; +u64 *npt_pte, pte, offset_in_page; +unsigned offset; +bool bad_pt_ad = false; + +for (l =PAGE_LEVEL ; ; --l) { + offset =PGDIR_OFFSET (guest_addr, l); + npt_pte =npt_get_pte ((u64) &pt[offset]); + +if (!npt_pte) { +printf ("NPT - guest level %d page table is not mapped.\n" , l);Why printf instead of
report_fail()?x86/svm.c u64 *npt_get_pml4e(void) · line 103
Quoted 6 lines
x86/svm.c +6
-0+return ; + } + +if (!bad_pt_ad) { + bad_pt_ad |= (*npt_pte &PT_AD_MASK ) != expected_pt_ad; +if (bad_pt_ad)Unnecessary nesting. E.g. ignoring the below feedback, this could be:
if (!bad_pt_ad && (*npt_pte & PT_AD_MASK) != expected_pt_ad) { bad_pt_ad = true report_fail(...) }x86/svm.c u64 *npt_get_pml4e(void) · line 107
Quoted 4 lines
x86/svm.c +4
-0+report_fail ("NPT - received guest level %d page table A=%d/D=%d" , + l, + !!(expected_pt_ad &PT_ACCESSED_MASK ), + !!(expected_pt_ad &PT_DIRTY_MASK ));Print both expected and actual, otherwise debugging is no fun. Actually, looking at the caller, passing in @expected_pt_ad is quite silly. The only time A/D bits are expected to be '0' are for the initial check, immediately after A/D bits are zeroed. That's honestly uninteresting, it's basically verifying KVM hasn't randomly corrupted memory. If someone _really_ wants to verify that A/D bits are cleared, just read back immediately after writing.
Dropping @expected_pt_ad will make it easier to expand coverage, e.g. for reads vs. writes, and of intermediate GPAs.
E.g.
Quoted 22 lines
x86/svm.c +22
-0+ } + + pte = pt[offset]; +if (l ==1 || (l <4 && (pte &PT_PAGE_SIZE_MASK ))) +break ; +if (!(pte &PT_PRESENT_MASK )) +return ; + pt = (unsigned long *)(pte &PT_ADDR_MASK ); + } + +if (!bad_pt_ad) +report_pass ("NPT - guest page table structures A=%d/D=%d" , + !!(expected_pt_ad &PT_ACCESSED_MASK ), + !!(expected_pt_ad &PT_DIRTY_MASK )); + + offset =PGDIR_OFFSET (guest_addr, l); + offset_in_page = guest_addr & ((1 <<PGDIR_BITS (l)) -1 ); + gpa = (pt[offset] &PT_ADDR_MASK ) | (guest_addr & offset_in_page); + + npt_pte =npt_get_pte (gpa); + +if (!npt_pte) {
Quoted 8 lines
x86/svm.c u64 *npt_get_pml4e(void) · line 137
Quoted 8 lines
x86/svm.c +8
-0+report_fail ("NPT - guest physical address is not mapped" ); +return ; + } +report ((*npt_pte &PT_AD_MASK ) == expected_gpa_ad, +"NPT - guest physical address A=%d/D=%d" , + !!(expected_gpa_ad &PT_ACCESSED_MASK ), + !!(expected_gpa_ad &PT_DIRTY_MASK )); +}
Changes have been included in
https://lore.kernel.org/all/[email protected]/.
Thanks Sean!
This patch has been superseded by a new series:
https://lore.kernel.org/all/[email protected]/
Please disregard this standalone version.
Quoted 205 lines · Kevin Cheng
The nVMX tests already have coverage for TDP A/D bits. Add a similar test for nSVM to improve test parity between nSVM and nVMX.
Signed-off-by Kevin Cheng <[email protected]>--- x86/svm.c | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++ x86/svm.h | 5 +++ x86/svm_npt.c | 46 +++++++++++++++++++++++++ 3 files changed, 144 insertions(+)x86/svm.c +93
-0@@ -14,6 +14,8 @@#include "isr.h" #include "apic.h" +#include <asm/page.h> +/* for the nested page table*/ u64 *pml4e;@@ -43,6 +45,97 @@ u64 *npt_get_pml4e(void)return pml4e; } +void clear_npt_ad (unsigned long *pml4e,u64 guest_cr3, +unsigned long guest_addr) +{ +int l; +unsigned long *pt = (unsigned long *)guest_cr3, gpa; +u64 *npt_pte, pte, offset_in_page; +unsigned offset; + +for (l =PAGE_LEVEL ; ; --l) { + offset =PGDIR_OFFSET (guest_addr, l); + npt_pte =npt_get_pte ((u64) &pt[offset]); + +if (!npt_pte) { +printf ("NPT - guest level %d page table is not mapped.\n" , l); +return ; + } + + *npt_pte &= ~(PT_AD_MASK ); + + pte = pt[offset]; +if (l ==1 || (l <4 && (pte &PT_PAGE_SIZE_MASK ))) +break ; +if (!(pte &PT_PRESENT_MASK )) +return ; + pt = (unsigned long *)(pte &PT_ADDR_MASK ); + } + + offset =PGDIR_OFFSET (guest_addr, l); + offset_in_page = guest_addr & ((1 <<PGDIR_BITS (l)) -1 ); + gpa = (pt[offset] &PT_ADDR_MASK ) | (guest_addr & offset_in_page); + npt_pte =npt_get_pte (gpa); + *npt_pte &= ~(PT_AD_MASK ); +} + +void check_npt_ad (unsigned long *pml4e,u64 guest_cr3, +unsigned long guest_addr,int expected_gpa_ad, +int expected_pt_ad) +{ +int l; +unsigned long *pt = (unsigned long *)guest_cr3, gpa; +u64 *npt_pte, pte, offset_in_page; +unsigned offset; +bool bad_pt_ad = false; + +for (l =PAGE_LEVEL ; ; --l) { + offset =PGDIR_OFFSET (guest_addr, l); + npt_pte =npt_get_pte ((u64) &pt[offset]); + +if (!npt_pte) { +printf ("NPT - guest level %d page table is not mapped.\n" , l); +return ; + } + +if (!bad_pt_ad) { + bad_pt_ad |= (*npt_pte &PT_AD_MASK ) != expected_pt_ad; +if (bad_pt_ad) +report_fail ("NPT - received guest level %d page table A=%d/D=%d" , + l, + !!(expected_pt_ad &PT_ACCESSED_MASK ), + !!(expected_pt_ad &PT_DIRTY_MASK )); + } + + pte = pt[offset]; +if (l ==1 || (l <4 && (pte &PT_PAGE_SIZE_MASK ))) +break ; +if (!(pte &PT_PRESENT_MASK )) +return ; + pt = (unsigned long *)(pte &PT_ADDR_MASK ); + } + +if (!bad_pt_ad) +report_pass ("NPT - guest page table structures A=%d/D=%d" , + !!(expected_pt_ad &PT_ACCESSED_MASK ), + !!(expected_pt_ad &PT_DIRTY_MASK )); + + offset =PGDIR_OFFSET (guest_addr, l); + offset_in_page = guest_addr & ((1 <<PGDIR_BITS (l)) -1 ); + gpa = (pt[offset] &PT_ADDR_MASK ) | (guest_addr & offset_in_page); + + npt_pte =npt_get_pte (gpa); + +if (!npt_pte) { +report_fail ("NPT - guest physical address is not mapped" ); +return ; + } +report ((*npt_pte &PT_AD_MASK ) == expected_gpa_ad, +"NPT - guest physical address A=%d/D=%d" , + !!(expected_gpa_ad &PT_ACCESSED_MASK ), + !!(expected_gpa_ad &PT_DIRTY_MASK )); +} +bool smp_supported (void ) {return cpu_count () >1 ;x86/svm.h +5
-0@@ -415,6 +415,11 @@ u64 *npt_get_pte(u64 address);u64 *npt_get_pde (u64 address);u64 *npt_get_pdpe (u64 address);u64 *npt_get_pml4e (void ); +void clear_npt_ad (unsigned long *pml4e,u64 guest_cr3, +unsigned long guest_addr); +void check_npt_ad (unsigned long *pml4e,u64 guest_cr3, +unsigned long guest_addr,int expected_gpa_ad, +int expected_pt_ad);bool smp_supported (void );bool default_supported (void );bool vgif_supported (void );x86/svm_npt.c +46
-1@@ -380,6 +380,51 @@ skip_pte_test: vmcb->save.cr4 = sg_cr4; } +static void npt_ad_read_guest (struct svm_test *test) +{ +u64 *data = (void *)(0x80000 ); + (void )*(volatile u64 *)data; +} + +static void npt_ad_write_guest (struct svm_test *test) +{ +u64 *data = (void *)(0x80000 ); + *data =0 ; +} + +static void npt_ad_test (void ) +{ +u64 *data = (void *)(0x80000 ); +u64 guest_cr3 = vmcb->save.cr3; + +if (!npt_supported ()) { +report_skip ("NPT not supported" ); +return ; + } + +clear_npt_ad (npt_get_pml4e (), guest_cr3, (unsigned long )data); + +check_npt_ad (npt_get_pml4e (), guest_cr3, (unsigned long )data,0 ,0 ); + +test_set_guest (npt_ad_read_guest); +svm_vmrun (); + +check_npt_ad (npt_get_pml4e (), guest_cr3, + (unsigned long )data, +PT_ACCESSED_MASK , +PT_AD_MASK ); + +test_set_guest (npt_ad_write_guest); +svm_vmrun (); + +check_npt_ad (npt_get_pml4e (), guest_cr3, + (unsigned long )data, +PT_AD_MASK , +PT_AD_MASK ); + +clear_npt_ad (npt_get_pml4e (), guest_cr3, (unsigned long )data); +} +#define NPT_V1_TEST (name, prepare, guest_code, check) \ { #name, npt_supported, prepare, default_prepare_gif_clear, guest_code, \ default_finished, check }@@ -395,6 +440,7 @@ static struct svm_test npt_tests[] = {NPT_V1_TEST (npt_l1mmio, npt_l1mmio_prepare, npt_l1mmio_test, npt_l1mmio_check),NPT_V1_TEST (npt_rw_l1mmio, npt_rw_l1mmio_prepare, npt_rw_l1mmio_test, npt_rw_l1mmio_check),NPT_V2_TEST (svm_npt_rsvd_bits_test), +NPT_V2_TEST (npt_ad_test), { NULL, NULL, NULL, NULL, NULL, NULL, NULL } }; --2.51.0.261.g7ce5a0a67e-goog