This series adds a new aarch64 selftest for testing stage 2 fault handling for various combinations of guest accesses (e.g., write, S1PTW), backing sources (e.g., anon), and types of faults (e.g., read on hugetlbfs with a hole, write on a readonly memslot). Each test tries a different combination and then checks that the access results in the right behavior (e.g., uffd faults with the right address and write/read flag). Some interesting combinations are: - loading an instruction leads to a stage 1 page-table-walk that misses on stage 2 because the backing memslot for the page table it not in host memory (a hole was punched right there) and the fault is handled using userfaultfd. The expected behavior is that this leads to a userfaultfd fault marked as a write. See commit c4ad98e4b72c ("KVM: arm64: Assume write fault on S1PTW permission fault on instruction fetch") for why that's a write. - a cas (compare-and-swap) on a readonly memslot leads to a failed vcpu run. - write-faulting on a memslot that's marked for userfaultfd handling and dirty logging should result in a uffd fault and having the respective bit set in the dirty log. The first 8 commits of this series add library support. The first one adds a new userfaultfd library (out of demand_paging_test.c). The next 3 add some library functions to get the GPA of a PTE, and to get the fd of a backing source. Commit 6 fixes a leaked fd when using shared backing stores. The last 5 commits add the new selftest, one type of test at a time. It first adds core tests, then uffd, then dirty logging, then readonly memslots tests, and finally combinations of the previous ones (like uffd and dirty logging at the same time). v4 -> v5: https://lore.kernel.org/kvmarm/20220624213257.1504783-1-ricarkol@xxxxxxxxxx/ - biggest change: followed suggestion from Sean and Andrew regarding a new arg for vm_create() to specify the guest memory layout. That's taken care of with these two new commits: KVM: selftests: Use the right memslot for code, page-tables, and data allocations KVM: selftests: Change ____vm_create() to take struct kvm_vm_mem_params plus the respective changes in the page_fault_test itself (mostly code reduction). - dropped some commits that are not needed after the above change: KVM: selftests: aarch64: Export _virt_pg_map with a pt_memslot arg KVM: selftests: Add vm_alloc_page_table_in_memslot library function KVM: selftests: Add vm_mem_region_get_src_fd library function - addressed Oliver comments in commit "KVM: selftests: aarch64: Add aarch64/page_fault_test" - collect r-b's from Andrew v3 -> v4: https://lore.kernel.org/kvmarm/20220408004120.1969099-1-ricarkol@xxxxxxxxxx/ - rebased on top of latest kvm/queue. - addressed Oliver comments: vm_get_pte_gpa rename, page_fault_test and other nits. - adding MAIR entry for MT_DEVICE_nGnRnE. The value and indices are both 0, so the change is really esthetic. - allocating less memory for the test (smaller memslots). - better comments, including an ascii diagram about how memory is laid out for the test. v2 -> v3: Thank you very much Oliver and Ben - collected r-b's from Ben. [Ben] - moved some defitions (like TCR_EL1_HA) to common headers. [Oliver] - use FIELD_GET and ARM64_FEATURE_MASK. [Oliver] - put test data in a macro. [Oliver] - check for DCZID_EL1.DZP=0b0 before using "dc zva". [Oliver] - various new comments. [Oliver] - use 'asm' instead of hand assembly. [Oliver] - don't copy test descriptors into the guest. [Oliver] - rename large_page_size into backing_page_size. [Oliver] - add enumeration for memory types (4 is MT_NORMAL). [Oliver] - refactored the test macro definitions. v1 -> v2: https://lore.kernel.org/kvmarm/20220323225405.267155-1-ricarkol@xxxxxxxxxx/ - collect r-b from Ben for the memslot lib commit. [Ben] - move userfaultfd desc struct to header. [Ben] - move commit "KVM: selftests: Add vm_mem_region_get_src_fd library function" to right before it's used. [Ben] - nit: wrong indentation in patch 6. [Ben] Ricardo Koller (13): KVM: selftests: Add a userfaultfd library KVM: selftests: aarch64: Add virt_get_pte_hva() library function KVM: selftests: Add missing close and munmap in __vm_mem_region_delete() KVM: selftests: aarch64: Construct DEFAULT_MAIR_EL1 using sysreg.h macros tools: Copy bitfield.h from the kernel sources KVM: selftests: Stash backing_src_type in struct userspace_mem_region KVM: selftests: Change ____vm_create() to take struct kvm_vm_mem_params KVM: selftests: Use the right memslot for code, page-tables, and data allocations KVM: selftests: aarch64: Add aarch64/page_fault_test KVM: selftests: aarch64: Add userfaultfd tests into page_fault_test KVM: selftests: aarch64: Add dirty logging tests into page_fault_test KVM: selftests: aarch64: Add readonly memslot tests into page_fault_test KVM: selftests: aarch64: Add mix of tests into page_fault_test tools/include/linux/bitfield.h | 176 +++ tools/testing/selftests/kvm/Makefile | 2 + .../selftests/kvm/aarch64/page_fault_test.c | 1132 +++++++++++++++++ .../selftests/kvm/demand_paging_test.c | 228 +--- .../selftests/kvm/include/aarch64/processor.h | 35 +- .../selftests/kvm/include/kvm_util_base.h | 65 +- .../selftests/kvm/include/userfaultfd_util.h | 46 + .../selftests/kvm/lib/aarch64/processor.c | 29 +- tools/testing/selftests/kvm/lib/elf.c | 3 +- tools/testing/selftests/kvm/lib/kvm_util.c | 129 +- .../selftests/kvm/lib/riscv/processor.c | 7 +- .../selftests/kvm/lib/s390x/processor.c | 7 +- .../selftests/kvm/lib/userfaultfd_util.c | 187 +++ .../selftests/kvm/lib/x86_64/processor.c | 13 +- 14 files changed, 1801 insertions(+), 258 deletions(-) create mode 100644 tools/include/linux/bitfield.h create mode 100644 tools/testing/selftests/kvm/aarch64/page_fault_test.c create mode 100644 tools/testing/selftests/kvm/include/userfaultfd_util.h create mode 100644 tools/testing/selftests/kvm/lib/userfaultfd_util.c -- 2.37.1.595.g718a3a8f04-goog _______________________________________________ kvmarm mailing list kvmarm@xxxxxxxxxxxxxxxxxxxxx https://lists.cs.columbia.edu/mailman/listinfo/kvmarm