Skip to content

Extend test coverage for nested SVM

Yosry Ahmed kvm lkml 2 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest23 patches 25 repliesIn review
  2. v112 patches 20 repliesSuperseded

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/23KVM: selftests: Minor improvements to asserts in test_vmx_nested_state()tools/testing/selftests/kvm/x86/vmx_set_nested_state_test.c+8 -22 replies
2/23KVM: selftests: Extend vmx_set_nested_state_test to cover SVMtools/testing/selftests/kvm/Makefile.kvm tools/testing/selftests/kvm/x86/set_nested_state_test.c+116 -111 reply
3/23KVM: selftests: Extend vmx_close_while_nested_test to cover SVMtools/testing/selftests/kvm/Makefile.kvm tools/testing/selftests/kvm/x86/close_while_nested_test.c+35 -91 reply
4/23KVM: selftests: Extend vmx_nested_tsc_scaling_test to cover SVMtools/testing/selftests/kvm/Makefile.kvm tools/testing/selftests/kvm/x86/nested_tsc_scaling_test.c+44 -61 reply
5/23KVM: selftests: Move nested invalid CR3 check to its own testtools/testing/selftests/kvm/Makefile.kvm tools/testing/selftests/kvm/x86/nested_invalid_cr3_test.c tools/testing/selftests/kvm/x86/vmx_tsc_adjust_test.c+82 -101 reply
6/23KVM: selftests: Extend nested_invalid_cr3_test to cover SVMtools/testing/selftests/kvm/x86/nested_invalid_cr3_test.c+40 -30 replies
7/23KVM: selftests: Extend vmx_tsc_adjust_test to cover SVMtools/testing/selftests/kvm/Makefile.kvm tools/testing/selftests/kvm/x86/nested_tsc_adjust_test.c+46 -250 replies
8/23KVM: selftests: Stop hardcoding PAGE_SIZE in x86 selfteststools/testing/selftests/kvm/x86/hyperv_features.c tools/testing/selftests/kvm/x86/hyperv_ipi.c tools/testing/selftests/kvm/x86/sev_smoke_test.c +3 more+18 -180 replies
9/23KVM: selftests: Remove the unused argument to prepare_eptp()tools/testing/selftests/kvm/include/x86/vmx.h tools/testing/selftests/kvm/lib/x86/memstress.c tools/testing/selftests/kvm/lib/x86/vmx.c +1 more+4 -60 replies
10/23KVM: selftests: Stop using __virt_pg_map() directly in teststools/testing/selftests/kvm/mmu_stress_test.c tools/testing/selftests/kvm/x86/hyperv_tlb_flush.c+3 -50 replies
11/23KVM: selftests: Make sure vm->vpages_mapped is always up-to-datetools/testing/selftests/kvm/include/kvm_util.h tools/testing/selftests/kvm/lib/kvm_util.c tools/testing/selftests/kvm/lib/x86/processor.c+3 -30 replies
12/23KVM: selftests: Parameterize the PTE bitmasks for virt mapping functionstools/testing/selftests/kvm/include/x86/processor.h tools/testing/selftests/kvm/lib/x86/processor.c+69 -502 replies
13/23KVM: selftests: Pass the root GPA into virt_get_pte()tools/testing/selftests/kvm/lib/x86/processor.c+10 -70 replies
14/23KVM: selftests: Pass the root GPA into __virt_pg_map()tools/testing/selftests/kvm/include/x86/processor.h tools/testing/selftests/kvm/lib/x86/processor.c+9 -90 replies
15/23KVM: selftests: Stop setting AD bits on nested EPTs on creationtools/testing/selftests/kvm/lib/x86/vmx.c+0 -80 replies
16/23KVM: selftests: Use __virt_pg_map() for nested EPTstools/testing/selftests/kvm/include/x86/processor.h tools/testing/selftests/kvm/include/x86/vmx.h tools/testing/selftests/kvm/lib/x86/processor.c +1 more+27 -1000 replies
17/23KVM: selftests: Kill eptPageTablePointertools/testing/selftests/kvm/lib/x86/vmx.c+17 -200 replies
18/23KVM: selftests: Generalize nested mapping functionstools/testing/selftests/kvm/include/x86/vmx.h tools/testing/selftests/kvm/lib/x86/memstress.c tools/testing/selftests/kvm/lib/x86/vmx.c +1 more+19 -172 replies
19/23KVM: selftests: Move nested MMU mapping functions outside of vmx.ctools/testing/selftests/kvm/include/x86/processor.h tools/testing/selftests/kvm/include/x86/vmx.h tools/testing/selftests/kvm/lib/x86/processor.c +1 more+84 -800 replies
20/23KVM: selftests: Stop passing a memslot to nested_map_memslot()tools/testing/selftests/kvm/include/x86/processor.h tools/testing/selftests/kvm/lib/x86/processor.c tools/testing/selftests/kvm/x86/vmx_dirty_log_test.c+9 -70 replies
21/23KVM: selftests: Allow kvm_cpu_has_ept() to be called on AMD CPUstools/testing/selftests/kvm/lib/x86/vmx.c+3 -00 replies
22/23KVM: selftests: Set the user bit on nested MMU PTEstools/testing/selftests/kvm/lib/x86/processor.c+2 -20 replies
23/23KVM: selftests: Extend vmx_dirty_log_test to cover SVMtools/testing/selftests/kvm/Makefile.kvm tools/testing/selftests/kvm/include/x86/svm_util.h tools/testing/selftests/kvm/lib/x86/svm.c +1 more+97 -280 replies

Reviews trailers per patch

3 of 23 patches have a Reviewed-by or Acked-by.

PatchJim Mattson
1/23R-b
2/23
3/23R-b
4/23
5/23
6/23
7/23R-b
8/23
9/23
10/23
11/23
12/23
13/23
14/23
15/23
16/23
17/23
18/23
19/23
20/23
21/23
22/23
23/23

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v2 thread

Cover letter [PATCH v2 00/23] Extend test coverage for nested SVM

There are multiple selftests exercising nested VMX that are not specific to VMX (at least not anymore). Extend their coverage to nested SVM.

This version is significantly different (and longer) than v1 [1], mainly due to the change of direction to reuse __virt_pg_map() for nested EPT/NPT mappings instead of extending the existing nested EPT infrastructure. It also has a lot more fixups and cleanups.

This series depends on two other series:
- "KVM: SVM: GIF and EFER.SVME are independent" [2]
- "KVM: selftests: Add test of SET_NESTED_STATE with 48-bit L2 on 57-bit L1" [3]

The dependency on the former is because set_nested_state_test is now also a regression test for that fix. The dependency on the latter is purely to avoid conflicts.

The patch ordering is not perfect, I did some cleanups toward the end that arguably should have been moved to the beginning, but I had to stop rebasing and send the patches out at some point:

Block #1 (patch 1 to patch 7):
- Direct successors to the first 6 patches in v1, addressing review comments from Jim and collecting his review tags. These patch extend 5 of the nVMX tests to cover nSVM.

Block #2 (patch 8 to patch 11):
- Miscellaneous fixups and cleanups.

Block #3 (patch 11 to patch 17):
- Moving nested EPT mapping functions to use __virt_pg_map(), patches 11 to 15 do the prep work, and patch 16 does the switch. Patch 17 is a minor cleanup on top (which arguably fits better in block #2).

Block #4 (patch 18 to 23):
- Patches 18 to 22 are prep work to generalize the nested EPT mapping code to work with nested NPT, and patch 23 finally extends the nested dirty logging test to work with nSVM using the nested NPT infrastructure. Patch 19 is admittedly an imposter in this block and should have been in block #2.

[1]https://lore.kernel.org/kvm/[email protected]/ [2]https://lore.kernel.org/kvm/[email protected]/ [3]https://lore.kernel.org/kvm/[email protected]/

Yosry Ahmed (23):
KVM: selftests: Minor improvements to asserts in
test_vmx_nested_state()
KVM: selftests: Extend vmx_set_nested_state_test to cover SVM
KVM: selftests: Extend vmx_close_while_nested_test to cover SVM
KVM: selftests: Extend vmx_nested_tsc_scaling_test to cover SVM
KVM: selftests: Move nested invalid CR3 check to its own test
KVM: selftests: Extend nested_invalid_cr3_test to cover SVM
KVM: selftests: Extend vmx_tsc_adjust_test to cover SVM
KVM: selftests: Stop hardcoding PAGE_SIZE in x86 selftests
KVM: selftests: Remove the unused argument to prepare_eptp()
KVM: selftests: Stop using __virt_pg_map() directly in tests
KVM: selftests: Make sure vm->vpages_mapped is always up-to-date
KVM: selftests: Parameterize the PTE bitmasks for virt mapping
functions
KVM: selftests: Pass the root GPA into virt_get_pte()
KVM: selftests: Pass the root GPA into __virt_pg_map()
KVM: selftests: Stop setting AD bits on nested EPTs on creation
KVM: selftests: Use __virt_pg_map() for nested EPTs
KVM: selftests: Kill eptPageTablePointer
KVM: selftests: Generalize nested mapping functions
KVM: selftests: Move nested MMU mapping functions outside of vmx.c
KVM: selftests: Stop passing a memslot to nested_map_memslot()
KVM: selftests: Allow kvm_cpu_has_ept() to be called on AMD CPUs
KVM: selftests: Set the user bit on nested MMU PTEs
KVM: selftests: Extend vmx_dirty_log_test to cover SVM

 tools/testing/selftests/kvm/Makefile.kvm      |  11 +-
 .../testing/selftests/kvm/include/kvm_util.h  |   1 +
 .../selftests/kvm/include/x86/processor.h     |  34 ++-
 .../selftests/kvm/include/x86/svm_util.h      |   8 +
 tools/testing/selftests/kvm/include/x86/vmx.h |  15 +-
 tools/testing/selftests/kvm/lib/kvm_util.c    |   3 -
 .../testing/selftests/kvm/lib/x86/memstress.c |   6 +-
 .../testing/selftests/kvm/lib/x86/processor.c | 184 +++++++++++---
 tools/testing/selftests/kvm/lib/x86/svm.c     |  19 ++
 tools/testing/selftests/kvm/lib/x86/vmx.c     | 232 +++---------------
 tools/testing/selftests/kvm/mmu_stress_test.c |   6 +-
 ...ested_test.c => close_while_nested_test.c} |  42 +++-
 .../selftests/kvm/x86/hyperv_features.c       |   2 +-
 tools/testing/selftests/kvm/x86/hyperv_ipi.c  |  18 +-
 .../selftests/kvm/x86/hyperv_tlb_flush.c      |   2 +-
 ...rty_log_test.c => nested_dirty_log_test.c} | 102 +++++---
 .../kvm/x86/nested_invalid_cr3_test.c         | 118 +++++++++
 ...adjust_test.c => nested_tsc_adjust_test.c} |  79 +++---
 ...aling_test.c => nested_tsc_scaling_test.c} |  48 +++-
 ...d_state_test.c => set_nested_state_test.c} | 135 +++++++++-
 .../selftests/kvm/x86/sev_smoke_test.c        |   2 +-
 tools/testing/selftests/kvm/x86/state_test.c  |   2 +-
 .../selftests/kvm/x86/userspace_io_test.c     |   2 +-
 23 files changed, 695 insertions(+), 376 deletions(-)
 rename tools/testing/selftests/kvm/x86/{vmx_close_while_nested_test.c => close_while_nested_test.c} (64%)
 rename tools/testing/selftests/kvm/x86/{vmx_dirty_log_test.c => nested_dirty_log_test.c} (57%)
 create mode 100644 tools/testing/selftests/kvm/x86/nested_invalid_cr3_test.c
 rename tools/testing/selftests/kvm/x86/{vmx_tsc_adjust_test.c => nested_tsc_adjust_test.c} (61%)
 rename tools/testing/selftests/kvm/x86/{vmx_nested_tsc_scaling_test.c => nested_tsc_scaling_test.c} (83%)
 rename tools/testing/selftests/kvm/x86/{vmx_set_nested_state_test.c => set_nested_state_test.c} (67%)
Signature · 1 line
2.51.0.869.ge66316f041-goog