[RFC PATCH v2 9/9] KVM: arm64: nv: selftests: Enable page_fault_test test to run in vEL2

[Ganapatrao Kulkarni]

Extend page_fault_test to run guest code with NV enabled.
NV is enabled using command line argument and it is disabled by default.

Signed-off-by: Ganapatrao Kulkarni <gankulka...@os.amperecomputing.com>
---
 .../selftests/kvm/arm64/page_fault_test.c     | 35 ++++++++++++++++---
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/tools/testing/selftests/kvm/arm64/page_fault_test.c 
b/tools/testing/selftests/kvm/arm64/page_fault_test.c
index ec33a8f9c908..e3d91cb68a71 100644
--- a/tools/testing/selftests/kvm/arm64/page_fault_test.c
+++ b/tools/testing/selftests/kvm/arm64/page_fault_test.c
@@ -11,6 +11,7 @@
 #include <fcntl.h>
 #include <test_util.h>
 #include <kvm_util.h>
+#include <nv_util.h>
 #include <processor.h>
 #include <asm/sysreg.h>
 #include <linux/bitfield.h>
@@ -70,6 +71,8 @@ struct test_params {
        struct test_desc *test_desc;
 };
 
+static bool is_nested;
+
 static inline void flush_tlb_page(uint64_t vaddr)
 {
        uint64_t page = vaddr >> 12;
@@ -701,14 +704,27 @@ static void run_test(enum vm_guest_mode mode, void *arg)
        struct kvm_vm *vm;
        struct kvm_vcpu *vcpu;
        struct uffd_desc *pt_uffd, *data_uffd;
+       int gic_fd = -1;
 
        print_test_banner(mode, p);
 
-       vm = ____vm_create(VM_SHAPE(mode));
-       setup_memslots(vm, p);
+       if (is_nested) {
+               struct kvm_vcpu_init init;
+
+               vm = ____vm_create(VM_SHAPE(mode));
+               setup_memslots(vm, p);
+               vm_ioctl(vm, KVM_ARM_PREFERRED_TARGET, &init);
+               init_vcpu_nested(&init);
+               vcpu = aarch64_vcpu_add(vm, 0, &init, guest_code);
+               gic_fd = vgic_v3_setup(vm, 1, 64);
+       } else {
+               vm = ____vm_create(VM_SHAPE(mode));
+               setup_memslots(vm, p);
+               vcpu = vm_vcpu_add(vm, 0, guest_code);
+       }
+
        kvm_vm_elf_load(vm, program_invocation_name);
        setup_ucall(vm);
-       vcpu = vm_vcpu_add(vm, 0, guest_code);
 
        setup_gva_maps(vm);
 
@@ -728,6 +744,9 @@ static void run_test(enum vm_guest_mode mode, void *arg)
 
        vcpu_run_loop(vm, vcpu, test);
 
+       if (is_nested)
+               close(gic_fd);
+
        kvm_vm_free(vm);
        free_uffd(test, pt_uffd, data_uffd);
 
@@ -742,7 +761,7 @@ static void run_test(enum vm_guest_mode mode, void *arg)
 static void help(char *name)
 {
        puts("");
-       printf("usage: %s [-h] [-s mem-type]\n", name);
+       printf("usage: %s [-h] [-s mem-type] [-g nested]\n", name);
        puts("");
        guest_modes_help();
        backing_src_help("-s");
@@ -1115,7 +1134,7 @@ int main(int argc, char *argv[])
 
        src_type = DEFAULT_VM_MEM_SRC;
 
-       while ((opt = getopt(argc, argv, "hm:s:")) != -1) {
+       while ((opt = getopt(argc, argv, "hm:s:g:")) != -1) {
                switch (opt) {
                case 'm':
                        guest_modes_cmdline(optarg);
@@ -1123,6 +1142,9 @@ int main(int argc, char *argv[])
                case 's':
                        src_type = parse_backing_src_type(optarg);
                        break;
+               case 'g':
+                       is_nested = atoi_non_negative("Is Nested", optarg);
+                       break;
                case 'h':
                default:
                        help(argv[0]);
@@ -1130,6 +1152,9 @@ int main(int argc, char *argv[])
                }
        }
 
+       if (is_nested)
+               TEST_REQUIRE(kvm_has_cap(KVM_CAP_ARM_EL2));
+
        for_each_test_and_guest_mode(src_type);
        return 0;
 }
-- 
2.48.1