selftests: add support for VMA userspace tests

Add support for testing VMA userspace tests under the radix tree test
bundle. The VMA tests are located in tools/testing/vma and are
userspace-only tests that don't require kernel module loading like
the existing xarray and maple tree tests.

This extends the SELFTESTS_TEST_BUNDLE_RADIX_TREE configuration to
include VMA testing alongside the existing xarray and maple tree tests.

Demo:

make DEVOPS_HOSTS_PREFIX="mm" defconfig-seltests-radix-tree
make
make linux
make selftests
make sefltests-baseline HOSTS=mm-vma

cat workflows/selftests/results/last-run/6.16.0-rc7/vma.userspace.log
16 tests run, 16 passed, 0 failed

Generated-by: Claude AI
Suggested-by: Liam Howlett <liam.howlett@oracle.com>
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>

Author: mcgrof

playbooks/roles/selftests/defaults/main.yml

@@ -22,6 +22,7 @@ selftests_section_kmod: False
 selftests_section_maple: False
 selftests_section_sysctl: False
 selftests_section_xarray: False
+selftests_section_vma: False
 
 selftests_ksrc: "tools/testing/selftests/"
 selftests_data: "{{ target_linux_dir_path }}/{{ selftests_ksrc }}"
@@ -35,3 +36,4 @@ selftest_kernelspace: False
 
 selftest_xarray: False
 selftest_maple: False
+selftest_vma: False

playbooks/roles/selftests/tasks/main.yml

@@ -28,15 +28,17 @@
   vars:
     is_selftest_xarray: "{{ 'xarray' in ansible_host }}"
     is_selftest_maple: "{{ 'maple' in ansible_host }}"
+    is_selftest_vma: "{{ 'vma' in ansible_host }}"
   set_fact:
     selftest_xarray: "{{ is_selftest_xarray }}"
     selftest_maple: "{{ is_selftest_maple }}"
+    selftest_vma: "{{ is_selftest_vma }}"
   tags: ['vars']
 
 - name: Check if this node is in charge of userspace tests
   vars:
   set_fact:
-    selftest_userspace: "{{ selftest_xarray or selftest_maple }}"
+    selftest_userspace: "{{ selftest_xarray or selftest_maple or selftest_vma }}"
   tags: ['vars']
 
 - name: Check if this node is in charge of running kernel tests
@@ -50,6 +52,7 @@
       Host: {{ ansible_host }}
       - selftest_xarray: {{ selftest_xarray }}
       - selftest_maple: {{ selftest_maple }}
+      - selftest_vma: {{ selftest_vma }}
       - selftest_kernelspace: {{ selftest_kernelspace }}
       - selftest_userspace: {{ selftest_userspace }}
   tags: ['run_tests']
@@ -69,7 +72,7 @@
 - name: Fail if selftest_kernelspace is true on incorrect host
   fail:
     msg: "Both selftest_userspace and selftest_kernelspace are True for host {{ ansible_host }}. This is not expected."
-  when: (selftest_kernelspace and (selftest_xarray or selftest_maple))
+  when: (selftest_kernelspace and (selftest_xarray or selftest_maple or selftest_vma))
   tags: ['vars']
 
 - name: Remove /lib/udev/rules.d/50-firmware.rules
@@ -189,6 +192,26 @@
     - bootlinux_9p|bool
     - selftests_build_radix_tree|bool
 
+- name: Build VMA tools/testing/vma
+  tags: [ 'selftests', 'build' ]
+  make:
+    chdir: "{{ target_linux_dir_path }}/tools/testing/vma"
+    jobs: "{{ nproc.stdout }}"
+  when:
+    - not bootlinux_9p|bool
+    - selftest_vma|bool
+
+- name: Build VMA tools/testing/vma on host
+  tags: [ 'selftests', 'build' ]
+  command: "make -j{{ nproc.stdout }}"
+  args:
+    chdir: "{{ bootlinux_9p_host_path }}/tools/testing/vma"
+  delegate_to: localhost
+  run_once: true
+  when:
+    - bootlinux_9p|bool
+    - selftest_vma|bool
+
 # We use the target node only, not the host as if you've enaabled
 # 9p the path will be available and everything will have been built
 # for us.
@@ -315,6 +338,7 @@
     - kdevops_run_selftests|bool
     - selftests_build_radix_tree|bool
     - selftest_userspace|bool
+    - not selftest_vma|bool
   vars:
     command_to_run: >
       {%- if selftest_xarray  -%}
@@ -332,20 +356,25 @@
   become_method: sudo
   command: "{{ command_to_run }}"
   args:
-    chdir: "{{ target_linux_dir_path }}/tools/testing/radix-tree"
+    chdir: "{{ test_target_dir }}"
   register: selftests_userspace_out
   when:
     - kdevops_run_selftests|bool
-    - selftests_build_radix_tree|bool
-    - selftest_userspace|bool
+    - (selftests_build_radix_tree|bool and selftest_userspace|bool and not selftest_vma|bool) or selftest_vma|bool
   vars:
-    command_to_run: >
-      {%- if selftest_xarray  -%}
-      ./xarray
-      modprobe test_xarray
+    test_target_dir: >-
+      {%- if selftest_vma -%}
+      {{ target_linux_dir_path }}/tools/testing/vma
+      {%- else -%}
+      {{ target_linux_dir_path }}/tools/testing/radix-tree
+      {%- endif -%}
+    command_to_run: >-
+      {%- if selftest_vma -%}
+      ./vma
+      {%- elif selftest_xarray -%}
+      ./xarray && modprobe test_xarray
       {%- elif selftest_maple -%}
-      ./maple
-      modprobe test_maple_tree
+      ./maple && modprobe test_maple_tree
       {%- else -%}
       echo missing command
       {%- endif -%}
@@ -450,6 +479,7 @@
     dest: "{{ selftests_workdir}}/module.log"
   when:
     - selftest_userspace|bool
+    - not selftest_vma|bool
 
 - name: Look for the test output logs files on {{ selftests_workdir }}
   tags: [ 'selftests', 'copy_results' ]

workflows/selftests/Kconfig

@@ -33,6 +33,7 @@ config SELFTESTS_TEST_BUNDLE_RADIX_TREE
 	output yaml
 	select SELFTESTS_SECTION_MAPLE
 	select SELFTESTS_SECTION_XARRAY
+	select SELFTESTS_SECTION_VMA
 	help
 	  This will ensure you test the radix tree in the kernel.
 
@@ -78,6 +79,12 @@ config SELFTESTS_SECTION_XARRAY
 	help
 	  This will create a host to test the xarray.
 
+config SELFTESTS_SECTION_VMA
+	bool "VMA"
+	output yaml
+	help
+	  This will create a host to test the VMA userspace tests.
+
 endif # SELFTESTS_MANUAL_COVERAGE
 
 if !SELFTESTS_MANUAL_COVERAGE
@@ -107,6 +114,11 @@ config SELFTESTS_SECTION_XARRAY
 	output yaml
 	default y
 
+config SELFTESTS_SECTION_VMA
+	bool
+	output yaml
+	default y
+
 endif # !SELFTESTS_MANUAL_COVERAGE
 
 endmenu