diff --git a/arch/x86/crypto/TEST_MAPPING b/arch/x86/crypto/TEST_MAPPING
index c176addd0fb9..cd10aa1b43f0 100644
--- a/arch/x86/crypto/TEST_MAPPING
+++ b/arch/x86/crypto/TEST_MAPPING
@@ -35,6 +35,191 @@
         }
       ]
     },
+    {
+      "name": "selftests",
+      "options": [
+        {
+          "include-filter": "kselftest_binderfs_binderfs_test"
+        },
+        {
+          "include-filter": "kselftest_breakpoints_breakpoint_test"
+        },
+        {
+          "include-filter": "kselftest_capabilities_test_execve"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_mismatched_ops"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_signal_restart"
+        },
+        {
+          "include-filter": "kselftest_futex_wait"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_private_mapped_file"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_timeout"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_uninitialized_heap"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_wouldblock"
+        },
+        {
+          "include-filter": "kselftest_kcmp_kcmp_test"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_dontunmap"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_test"
+        },
+        {
+          "include-filter": "kselftest_mm_uffd_unit_tests"
+        },
+        {
+          "include-filter": "kselftest_net_psock_tpacket"
+        },
+        {
+          "include-filter": "kselftest_net_reuseaddr_conflict"
+        },
+        {
+          "include-filter": "kselftest_net_socket"
+        },
+        {
+          "include-filter": "kselftest_ptrace_peeksiginfo"
+        },
+        {
+          "include-filter": "kselftest_rtc_rtctest"
+        },
+        {
+          "include-filter": "kselftest_seccomp_seccomp_bpf"
+        },
+        {
+          "include-filter": "kselftest_size_test_get_size"
+        },
+        {
+          "include-filter": "kselftest_timers_inconsistency_check"
+        },
+        {
+          "include-filter": "kselftest_timers_nanosleep"
+        },
+        {
+          "include-filter": "kselftest_timers_nsleep_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_posix_timers"
+        },
+        {
+          "include-filter": "kselftest_timers_set_timer_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_tests_raw_skew"
+        },
+        {
+          "include-filter": "kselftest_timers_threadtest"
+        },
+        {
+          "include-filter": "kselftest_timers_valid_adjtimex"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_abi"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_clock_getres"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_getcpu"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_gettimeofday"
+        },
+        {
+          "include-filter": "kselftest_x86_check_initial_reg_state"
+        },
+        {
+          "include-filter": "kselftest_x86_ldt_gdt"
+        },
+        {
+          "include-filter": "kselftest_x86_ptrace_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_single_step_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_syscall_nt"
+        },
+        {
+          "include-filter": "kselftest_x86_test_mremap_vdso"
+        }
+      ]
+    },
     {
       "name": "vts_kernel_net_tests"
     }
diff --git a/arch/x86/entry/TEST_MAPPING b/arch/x86/entry/TEST_MAPPING
index 4f323dd8cc61..fbd8e4d0b231 100644
--- a/arch/x86/entry/TEST_MAPPING
+++ b/arch/x86/entry/TEST_MAPPING
@@ -35,6 +35,191 @@
         }
       ]
     },
+    {
+      "name": "selftests",
+      "options": [
+        {
+          "include-filter": "kselftest_binderfs_binderfs_test"
+        },
+        {
+          "include-filter": "kselftest_breakpoints_breakpoint_test"
+        },
+        {
+          "include-filter": "kselftest_capabilities_test_execve"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_mismatched_ops"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_signal_restart"
+        },
+        {
+          "include-filter": "kselftest_futex_wait"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_private_mapped_file"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_timeout"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_uninitialized_heap"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_wouldblock"
+        },
+        {
+          "include-filter": "kselftest_kcmp_kcmp_test"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_dontunmap"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_test"
+        },
+        {
+          "include-filter": "kselftest_mm_uffd_unit_tests"
+        },
+        {
+          "include-filter": "kselftest_net_psock_tpacket"
+        },
+        {
+          "include-filter": "kselftest_net_reuseaddr_conflict"
+        },
+        {
+          "include-filter": "kselftest_net_socket"
+        },
+        {
+          "include-filter": "kselftest_ptrace_peeksiginfo"
+        },
+        {
+          "include-filter": "kselftest_rtc_rtctest"
+        },
+        {
+          "include-filter": "kselftest_seccomp_seccomp_bpf"
+        },
+        {
+          "include-filter": "kselftest_size_test_get_size"
+        },
+        {
+          "include-filter": "kselftest_timers_inconsistency_check"
+        },
+        {
+          "include-filter": "kselftest_timers_nanosleep"
+        },
+        {
+          "include-filter": "kselftest_timers_nsleep_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_posix_timers"
+        },
+        {
+          "include-filter": "kselftest_timers_set_timer_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_tests_raw_skew"
+        },
+        {
+          "include-filter": "kselftest_timers_threadtest"
+        },
+        {
+          "include-filter": "kselftest_timers_valid_adjtimex"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_abi"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_clock_getres"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_getcpu"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_gettimeofday"
+        },
+        {
+          "include-filter": "kselftest_x86_check_initial_reg_state"
+        },
+        {
+          "include-filter": "kselftest_x86_ldt_gdt"
+        },
+        {
+          "include-filter": "kselftest_x86_ptrace_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_single_step_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_syscall_nt"
+        },
+        {
+          "include-filter": "kselftest_x86_test_mremap_vdso"
+        }
+      ]
+    },
     {
       "name": "vts_kernel_net_tests"
     }
diff --git a/arch/x86/include/asm/TEST_MAPPING b/arch/x86/include/asm/TEST_MAPPING
index 41f262b8e329..a03d4aba0f7d 100644
--- a/arch/x86/include/asm/TEST_MAPPING
+++ b/arch/x86/include/asm/TEST_MAPPING
@@ -35,6 +35,191 @@
         }
       ]
     },
+    {
+      "name": "selftests",
+      "options": [
+        {
+          "include-filter": "kselftest_binderfs_binderfs_test"
+        },
+        {
+          "include-filter": "kselftest_breakpoints_breakpoint_test"
+        },
+        {
+          "include-filter": "kselftest_capabilities_test_execve"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_mismatched_ops"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_signal_restart"
+        },
+        {
+          "include-filter": "kselftest_futex_wait"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_private_mapped_file"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_timeout"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_uninitialized_heap"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_wouldblock"
+        },
+        {
+          "include-filter": "kselftest_kcmp_kcmp_test"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_dontunmap"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_test"
+        },
+        {
+          "include-filter": "kselftest_mm_uffd_unit_tests"
+        },
+        {
+          "include-filter": "kselftest_net_psock_tpacket"
+        },
+        {
+          "include-filter": "kselftest_net_reuseaddr_conflict"
+        },
+        {
+          "include-filter": "kselftest_net_socket"
+        },
+        {
+          "include-filter": "kselftest_ptrace_peeksiginfo"
+        },
+        {
+          "include-filter": "kselftest_rtc_rtctest"
+        },
+        {
+          "include-filter": "kselftest_seccomp_seccomp_bpf"
+        },
+        {
+          "include-filter": "kselftest_size_test_get_size"
+        },
+        {
+          "include-filter": "kselftest_timers_inconsistency_check"
+        },
+        {
+          "include-filter": "kselftest_timers_nanosleep"
+        },
+        {
+          "include-filter": "kselftest_timers_nsleep_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_posix_timers"
+        },
+        {
+          "include-filter": "kselftest_timers_set_timer_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_tests_raw_skew"
+        },
+        {
+          "include-filter": "kselftest_timers_threadtest"
+        },
+        {
+          "include-filter": "kselftest_timers_valid_adjtimex"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_abi"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_clock_getres"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_getcpu"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_gettimeofday"
+        },
+        {
+          "include-filter": "kselftest_x86_check_initial_reg_state"
+        },
+        {
+          "include-filter": "kselftest_x86_ldt_gdt"
+        },
+        {
+          "include-filter": "kselftest_x86_ptrace_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_single_step_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_syscall_nt"
+        },
+        {
+          "include-filter": "kselftest_x86_test_mremap_vdso"
+        }
+      ]
+    },
     {
       "name": "vts_kernel_net_tests"
     }
diff --git a/arch/x86/kernel/fpu/TEST_MAPPING b/arch/x86/kernel/fpu/TEST_MAPPING
index 8487dbb9f3d5..a507ed982452 100644
--- a/arch/x86/kernel/fpu/TEST_MAPPING
+++ b/arch/x86/kernel/fpu/TEST_MAPPING
@@ -35,6 +35,191 @@
         }
       ]
     },
+    {
+      "name": "selftests",
+      "options": [
+        {
+          "include-filter": "kselftest_binderfs_binderfs_test"
+        },
+        {
+          "include-filter": "kselftest_breakpoints_breakpoint_test"
+        },
+        {
+          "include-filter": "kselftest_capabilities_test_execve"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_mismatched_ops"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_signal_restart"
+        },
+        {
+          "include-filter": "kselftest_futex_wait"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_private_mapped_file"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_timeout"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_uninitialized_heap"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_wouldblock"
+        },
+        {
+          "include-filter": "kselftest_kcmp_kcmp_test"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_dontunmap"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_test"
+        },
+        {
+          "include-filter": "kselftest_mm_uffd_unit_tests"
+        },
+        {
+          "include-filter": "kselftest_net_psock_tpacket"
+        },
+        {
+          "include-filter": "kselftest_net_reuseaddr_conflict"
+        },
+        {
+          "include-filter": "kselftest_net_socket"
+        },
+        {
+          "include-filter": "kselftest_ptrace_peeksiginfo"
+        },
+        {
+          "include-filter": "kselftest_rtc_rtctest"
+        },
+        {
+          "include-filter": "kselftest_seccomp_seccomp_bpf"
+        },
+        {
+          "include-filter": "kselftest_size_test_get_size"
+        },
+        {
+          "include-filter": "kselftest_timers_inconsistency_check"
+        },
+        {
+          "include-filter": "kselftest_timers_nanosleep"
+        },
+        {
+          "include-filter": "kselftest_timers_nsleep_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_posix_timers"
+        },
+        {
+          "include-filter": "kselftest_timers_set_timer_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_tests_raw_skew"
+        },
+        {
+          "include-filter": "kselftest_timers_threadtest"
+        },
+        {
+          "include-filter": "kselftest_timers_valid_adjtimex"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_abi"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_clock_getres"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_getcpu"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_gettimeofday"
+        },
+        {
+          "include-filter": "kselftest_x86_check_initial_reg_state"
+        },
+        {
+          "include-filter": "kselftest_x86_ldt_gdt"
+        },
+        {
+          "include-filter": "kselftest_x86_ptrace_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_single_step_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_syscall_nt"
+        },
+        {
+          "include-filter": "kselftest_x86_test_mremap_vdso"
+        }
+      ]
+    },
     {
       "name": "vts_kernel_net_tests"
     }
diff --git a/arch/x86/net/TEST_MAPPING b/arch/x86/net/TEST_MAPPING
index 9293b6130e8e..81501ea8bf9f 100644
--- a/arch/x86/net/TEST_MAPPING
+++ b/arch/x86/net/TEST_MAPPING
@@ -35,6 +35,191 @@
         }
       ]
     },
+    {
+      "name": "selftests",
+      "options": [
+        {
+          "include-filter": "kselftest_binderfs_binderfs_test"
+        },
+        {
+          "include-filter": "kselftest_breakpoints_breakpoint_test"
+        },
+        {
+          "include-filter": "kselftest_capabilities_test_execve"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_mismatched_ops"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_signal_restart"
+        },
+        {
+          "include-filter": "kselftest_futex_wait"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_private_mapped_file"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_timeout"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_uninitialized_heap"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_wouldblock"
+        },
+        {
+          "include-filter": "kselftest_kcmp_kcmp_test"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_dontunmap"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_test"
+        },
+        {
+          "include-filter": "kselftest_mm_uffd_unit_tests"
+        },
+        {
+          "include-filter": "kselftest_net_psock_tpacket"
+        },
+        {
+          "include-filter": "kselftest_net_reuseaddr_conflict"
+        },
+        {
+          "include-filter": "kselftest_net_socket"
+        },
+        {
+          "include-filter": "kselftest_ptrace_peeksiginfo"
+        },
+        {
+          "include-filter": "kselftest_rtc_rtctest"
+        },
+        {
+          "include-filter": "kselftest_seccomp_seccomp_bpf"
+        },
+        {
+          "include-filter": "kselftest_size_test_get_size"
+        },
+        {
+          "include-filter": "kselftest_timers_inconsistency_check"
+        },
+        {
+          "include-filter": "kselftest_timers_nanosleep"
+        },
+        {
+          "include-filter": "kselftest_timers_nsleep_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_posix_timers"
+        },
+        {
+          "include-filter": "kselftest_timers_set_timer_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_tests_raw_skew"
+        },
+        {
+          "include-filter": "kselftest_timers_threadtest"
+        },
+        {
+          "include-filter": "kselftest_timers_valid_adjtimex"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_abi"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_clock_getres"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_getcpu"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_gettimeofday"
+        },
+        {
+          "include-filter": "kselftest_x86_check_initial_reg_state"
+        },
+        {
+          "include-filter": "kselftest_x86_ldt_gdt"
+        },
+        {
+          "include-filter": "kselftest_x86_ptrace_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_single_step_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_syscall_nt"
+        },
+        {
+          "include-filter": "kselftest_x86_test_mremap_vdso"
+        }
+      ]
+    },
     {
       "name": "vts_kernel_net_tests"
     }
diff --git a/block/TEST_MAPPING b/block/TEST_MAPPING
index 7a1be16ebc67..575f2ab1f015 100644
--- a/block/TEST_MAPPING
+++ b/block/TEST_MAPPING
@@ -48,6 +48,183 @@
       "options": [
         {
           "include-filter": "kselftest_binderfs_binderfs_test"
+        },
+        {
+          "include-filter": "kselftest_breakpoints_breakpoint_test"
+        },
+        {
+          "include-filter": "kselftest_capabilities_test_execve"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_mismatched_ops"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_signal_restart"
+        },
+        {
+          "include-filter": "kselftest_futex_wait"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_private_mapped_file"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_timeout"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_uninitialized_heap"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_wouldblock"
+        },
+        {
+          "include-filter": "kselftest_kcmp_kcmp_test"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_dontunmap"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_test"
+        },
+        {
+          "include-filter": "kselftest_mm_uffd_unit_tests"
+        },
+        {
+          "include-filter": "kselftest_net_psock_tpacket"
+        },
+        {
+          "include-filter": "kselftest_net_reuseaddr_conflict"
+        },
+        {
+          "include-filter": "kselftest_net_socket"
+        },
+        {
+          "include-filter": "kselftest_ptrace_peeksiginfo"
+        },
+        {
+          "include-filter": "kselftest_rtc_rtctest"
+        },
+        {
+          "include-filter": "kselftest_seccomp_seccomp_bpf"
+        },
+        {
+          "include-filter": "kselftest_size_test_get_size"
+        },
+        {
+          "include-filter": "kselftest_timers_inconsistency_check"
+        },
+        {
+          "include-filter": "kselftest_timers_nanosleep"
+        },
+        {
+          "include-filter": "kselftest_timers_nsleep_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_posix_timers"
+        },
+        {
+          "include-filter": "kselftest_timers_set_timer_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_tests_raw_skew"
+        },
+        {
+          "include-filter": "kselftest_timers_threadtest"
+        },
+        {
+          "include-filter": "kselftest_timers_valid_adjtimex"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_abi"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_clock_getres"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_getcpu"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_gettimeofday"
+        },
+        {
+          "include-filter": "kselftest_x86_check_initial_reg_state"
+        },
+        {
+          "include-filter": "kselftest_x86_ldt_gdt"
+        },
+        {
+          "include-filter": "kselftest_x86_ptrace_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_single_step_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_syscall_nt"
+        },
+        {
+          "include-filter": "kselftest_x86_test_mremap_vdso"
         }
       ]
     },
diff --git a/drivers/android/TEST_MAPPING b/drivers/android/TEST_MAPPING
index 7f8c96eece95..96a33057dd43 100644
--- a/drivers/android/TEST_MAPPING
+++ b/drivers/android/TEST_MAPPING
@@ -40,6 +40,183 @@
       "options": [
         {
           "include-filter": "kselftest_binderfs_binderfs_test"
+        },
+        {
+          "include-filter": "kselftest_breakpoints_breakpoint_test"
+        },
+        {
+          "include-filter": "kselftest_capabilities_test_execve"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_mismatched_ops"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_signal_restart"
+        },
+        {
+          "include-filter": "kselftest_futex_wait"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_private_mapped_file"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_timeout"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_uninitialized_heap"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_wouldblock"
+        },
+        {
+          "include-filter": "kselftest_kcmp_kcmp_test"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_dontunmap"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_test"
+        },
+        {
+          "include-filter": "kselftest_mm_uffd_unit_tests"
+        },
+        {
+          "include-filter": "kselftest_net_psock_tpacket"
+        },
+        {
+          "include-filter": "kselftest_net_reuseaddr_conflict"
+        },
+        {
+          "include-filter": "kselftest_net_socket"
+        },
+        {
+          "include-filter": "kselftest_ptrace_peeksiginfo"
+        },
+        {
+          "include-filter": "kselftest_rtc_rtctest"
+        },
+        {
+          "include-filter": "kselftest_seccomp_seccomp_bpf"
+        },
+        {
+          "include-filter": "kselftest_size_test_get_size"
+        },
+        {
+          "include-filter": "kselftest_timers_inconsistency_check"
+        },
+        {
+          "include-filter": "kselftest_timers_nanosleep"
+        },
+        {
+          "include-filter": "kselftest_timers_nsleep_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_posix_timers"
+        },
+        {
+          "include-filter": "kselftest_timers_set_timer_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_tests_raw_skew"
+        },
+        {
+          "include-filter": "kselftest_timers_threadtest"
+        },
+        {
+          "include-filter": "kselftest_timers_valid_adjtimex"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_abi"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_clock_getres"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_getcpu"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_gettimeofday"
+        },
+        {
+          "include-filter": "kselftest_x86_check_initial_reg_state"
+        },
+        {
+          "include-filter": "kselftest_x86_ldt_gdt"
+        },
+        {
+          "include-filter": "kselftest_x86_ptrace_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_single_step_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_syscall_nt"
+        },
+        {
+          "include-filter": "kselftest_x86_test_mremap_vdso"
         }
       ]
     },
diff --git a/drivers/base/TEST_MAPPING b/drivers/base/TEST_MAPPING
index 670f65a90c5a..fc0f6c09c908 100644
--- a/drivers/base/TEST_MAPPING
+++ b/drivers/base/TEST_MAPPING
@@ -35,6 +35,191 @@
         }
       ]
     },
+    {
+      "name": "selftests",
+      "options": [
+        {
+          "include-filter": "kselftest_binderfs_binderfs_test"
+        },
+        {
+          "include-filter": "kselftest_breakpoints_breakpoint_test"
+        },
+        {
+          "include-filter": "kselftest_capabilities_test_execve"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_mismatched_ops"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_signal_restart"
+        },
+        {
+          "include-filter": "kselftest_futex_wait"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_private_mapped_file"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_timeout"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_uninitialized_heap"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_wouldblock"
+        },
+        {
+          "include-filter": "kselftest_kcmp_kcmp_test"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_dontunmap"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_test"
+        },
+        {
+          "include-filter": "kselftest_mm_uffd_unit_tests"
+        },
+        {
+          "include-filter": "kselftest_net_psock_tpacket"
+        },
+        {
+          "include-filter": "kselftest_net_reuseaddr_conflict"
+        },
+        {
+          "include-filter": "kselftest_net_socket"
+        },
+        {
+          "include-filter": "kselftest_ptrace_peeksiginfo"
+        },
+        {
+          "include-filter": "kselftest_rtc_rtctest"
+        },
+        {
+          "include-filter": "kselftest_seccomp_seccomp_bpf"
+        },
+        {
+          "include-filter": "kselftest_size_test_get_size"
+        },
+        {
+          "include-filter": "kselftest_timers_inconsistency_check"
+        },
+        {
+          "include-filter": "kselftest_timers_nanosleep"
+        },
+        {
+          "include-filter": "kselftest_timers_nsleep_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_posix_timers"
+        },
+        {
+          "include-filter": "kselftest_timers_set_timer_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_tests_raw_skew"
+        },
+        {
+          "include-filter": "kselftest_timers_threadtest"
+        },
+        {
+          "include-filter": "kselftest_timers_valid_adjtimex"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_abi"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_clock_getres"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_getcpu"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_gettimeofday"
+        },
+        {
+          "include-filter": "kselftest_x86_check_initial_reg_state"
+        },
+        {
+          "include-filter": "kselftest_x86_ldt_gdt"
+        },
+        {
+          "include-filter": "kselftest_x86_ptrace_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_single_step_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_syscall_nt"
+        },
+        {
+          "include-filter": "kselftest_x86_test_mremap_vdso"
+        }
+      ]
+    },
     {
       "name": "vts_kernel_net_tests"
     }
diff --git a/drivers/base/power/TEST_MAPPING b/drivers/base/power/TEST_MAPPING
index abebdc438476..9d68dcd42b40 100644
--- a/drivers/base/power/TEST_MAPPING
+++ b/drivers/base/power/TEST_MAPPING
@@ -32,6 +32,191 @@
           "exclude-annotation": "com.android.testutils.SkipPresubmit"
         }
       ]
+    },
+    {
+      "name": "selftests",
+      "options": [
+        {
+          "include-filter": "kselftest_binderfs_binderfs_test"
+        },
+        {
+          "include-filter": "kselftest_breakpoints_breakpoint_test"
+        },
+        {
+          "include-filter": "kselftest_capabilities_test_execve"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_mismatched_ops"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_signal_restart"
+        },
+        {
+          "include-filter": "kselftest_futex_wait"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_private_mapped_file"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_timeout"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_uninitialized_heap"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_wouldblock"
+        },
+        {
+          "include-filter": "kselftest_kcmp_kcmp_test"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_dontunmap"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_test"
+        },
+        {
+          "include-filter": "kselftest_mm_uffd_unit_tests"
+        },
+        {
+          "include-filter": "kselftest_net_psock_tpacket"
+        },
+        {
+          "include-filter": "kselftest_net_reuseaddr_conflict"
+        },
+        {
+          "include-filter": "kselftest_net_socket"
+        },
+        {
+          "include-filter": "kselftest_ptrace_peeksiginfo"
+        },
+        {
+          "include-filter": "kselftest_rtc_rtctest"
+        },
+        {
+          "include-filter": "kselftest_seccomp_seccomp_bpf"
+        },
+        {
+          "include-filter": "kselftest_size_test_get_size"
+        },
+        {
+          "include-filter": "kselftest_timers_inconsistency_check"
+        },
+        {
+          "include-filter": "kselftest_timers_nanosleep"
+        },
+        {
+          "include-filter": "kselftest_timers_nsleep_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_posix_timers"
+        },
+        {
+          "include-filter": "kselftest_timers_set_timer_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_tests_raw_skew"
+        },
+        {
+          "include-filter": "kselftest_timers_threadtest"
+        },
+        {
+          "include-filter": "kselftest_timers_valid_adjtimex"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_abi"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_clock_getres"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_getcpu"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_gettimeofday"
+        },
+        {
+          "include-filter": "kselftest_x86_check_initial_reg_state"
+        },
+        {
+          "include-filter": "kselftest_x86_ldt_gdt"
+        },
+        {
+          "include-filter": "kselftest_x86_ptrace_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_single_step_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_syscall_nt"
+        },
+        {
+          "include-filter": "kselftest_x86_test_mremap_vdso"
+        }
+      ]
     }
   ],
   "presubmit-large": [
diff --git a/drivers/block/TEST_MAPPING b/drivers/block/TEST_MAPPING
index 7e148eb3ca90..d7f7f2d8693f 100644
--- a/drivers/block/TEST_MAPPING
+++ b/drivers/block/TEST_MAPPING
@@ -7,6 +7,191 @@
           "exclude-annotation": "com.android.testutils.SkipPresubmit"
         }
       ]
+    },
+    {
+      "name": "selftests",
+      "options": [
+        {
+          "include-filter": "kselftest_binderfs_binderfs_test"
+        },
+        {
+          "include-filter": "kselftest_breakpoints_breakpoint_test"
+        },
+        {
+          "include-filter": "kselftest_capabilities_test_execve"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_mismatched_ops"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_signal_restart"
+        },
+        {
+          "include-filter": "kselftest_futex_wait"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_private_mapped_file"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_timeout"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_uninitialized_heap"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_wouldblock"
+        },
+        {
+          "include-filter": "kselftest_kcmp_kcmp_test"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_dontunmap"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_test"
+        },
+        {
+          "include-filter": "kselftest_mm_uffd_unit_tests"
+        },
+        {
+          "include-filter": "kselftest_net_psock_tpacket"
+        },
+        {
+          "include-filter": "kselftest_net_reuseaddr_conflict"
+        },
+        {
+          "include-filter": "kselftest_net_socket"
+        },
+        {
+          "include-filter": "kselftest_ptrace_peeksiginfo"
+        },
+        {
+          "include-filter": "kselftest_rtc_rtctest"
+        },
+        {
+          "include-filter": "kselftest_seccomp_seccomp_bpf"
+        },
+        {
+          "include-filter": "kselftest_size_test_get_size"
+        },
+        {
+          "include-filter": "kselftest_timers_inconsistency_check"
+        },
+        {
+          "include-filter": "kselftest_timers_nanosleep"
+        },
+        {
+          "include-filter": "kselftest_timers_nsleep_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_posix_timers"
+        },
+        {
+          "include-filter": "kselftest_timers_set_timer_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_tests_raw_skew"
+        },
+        {
+          "include-filter": "kselftest_timers_threadtest"
+        },
+        {
+          "include-filter": "kselftest_timers_valid_adjtimex"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_abi"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_clock_getres"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_getcpu"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_gettimeofday"
+        },
+        {
+          "include-filter": "kselftest_x86_check_initial_reg_state"
+        },
+        {
+          "include-filter": "kselftest_x86_ldt_gdt"
+        },
+        {
+          "include-filter": "kselftest_x86_ptrace_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_single_step_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_syscall_nt"
+        },
+        {
+          "include-filter": "kselftest_x86_test_mremap_vdso"
+        }
+      ]
     }
   ]
 }
diff --git a/drivers/block/zram/TEST_MAPPING b/drivers/block/zram/TEST_MAPPING
index 8a2bbbc0b54f..46069dd80c08 100644
--- a/drivers/block/zram/TEST_MAPPING
+++ b/drivers/block/zram/TEST_MAPPING
@@ -35,6 +35,191 @@
         }
       ]
     },
+    {
+      "name": "selftests",
+      "options": [
+        {
+          "include-filter": "kselftest_binderfs_binderfs_test"
+        },
+        {
+          "include-filter": "kselftest_breakpoints_breakpoint_test"
+        },
+        {
+          "include-filter": "kselftest_capabilities_test_execve"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_mismatched_ops"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_signal_restart"
+        },
+        {
+          "include-filter": "kselftest_futex_wait"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_private_mapped_file"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_timeout"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_uninitialized_heap"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_wouldblock"
+        },
+        {
+          "include-filter": "kselftest_kcmp_kcmp_test"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_dontunmap"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_test"
+        },
+        {
+          "include-filter": "kselftest_mm_uffd_unit_tests"
+        },
+        {
+          "include-filter": "kselftest_net_psock_tpacket"
+        },
+        {
+          "include-filter": "kselftest_net_reuseaddr_conflict"
+        },
+        {
+          "include-filter": "kselftest_net_socket"
+        },
+        {
+          "include-filter": "kselftest_ptrace_peeksiginfo"
+        },
+        {
+          "include-filter": "kselftest_rtc_rtctest"
+        },
+        {
+          "include-filter": "kselftest_seccomp_seccomp_bpf"
+        },
+        {
+          "include-filter": "kselftest_size_test_get_size"
+        },
+        {
+          "include-filter": "kselftest_timers_inconsistency_check"
+        },
+        {
+          "include-filter": "kselftest_timers_nanosleep"
+        },
+        {
+          "include-filter": "kselftest_timers_nsleep_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_posix_timers"
+        },
+        {
+          "include-filter": "kselftest_timers_set_timer_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_tests_raw_skew"
+        },
+        {
+          "include-filter": "kselftest_timers_threadtest"
+        },
+        {
+          "include-filter": "kselftest_timers_valid_adjtimex"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_abi"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_clock_getres"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_getcpu"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_gettimeofday"
+        },
+        {
+          "include-filter": "kselftest_x86_check_initial_reg_state"
+        },
+        {
+          "include-filter": "kselftest_x86_ldt_gdt"
+        },
+        {
+          "include-filter": "kselftest_x86_ptrace_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_single_step_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_syscall_nt"
+        },
+        {
+          "include-filter": "kselftest_x86_test_mremap_vdso"
+        }
+      ]
+    },
     {
       "name": "vts_kernel_net_tests"
     }
diff --git a/drivers/char/TEST_MAPPING b/drivers/char/TEST_MAPPING
index 2e2b3bd17a98..96a33057dd43 100644
--- a/drivers/char/TEST_MAPPING
+++ b/drivers/char/TEST_MAPPING
@@ -35,6 +35,191 @@
         }
       ]
     },
+    {
+      "name": "selftests",
+      "options": [
+        {
+          "include-filter": "kselftest_binderfs_binderfs_test"
+        },
+        {
+          "include-filter": "kselftest_breakpoints_breakpoint_test"
+        },
+        {
+          "include-filter": "kselftest_capabilities_test_execve"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_mismatched_ops"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_signal_restart"
+        },
+        {
+          "include-filter": "kselftest_futex_wait"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_private_mapped_file"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_timeout"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_uninitialized_heap"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_wouldblock"
+        },
+        {
+          "include-filter": "kselftest_kcmp_kcmp_test"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_dontunmap"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_test"
+        },
+        {
+          "include-filter": "kselftest_mm_uffd_unit_tests"
+        },
+        {
+          "include-filter": "kselftest_net_psock_tpacket"
+        },
+        {
+          "include-filter": "kselftest_net_reuseaddr_conflict"
+        },
+        {
+          "include-filter": "kselftest_net_socket"
+        },
+        {
+          "include-filter": "kselftest_ptrace_peeksiginfo"
+        },
+        {
+          "include-filter": "kselftest_rtc_rtctest"
+        },
+        {
+          "include-filter": "kselftest_seccomp_seccomp_bpf"
+        },
+        {
+          "include-filter": "kselftest_size_test_get_size"
+        },
+        {
+          "include-filter": "kselftest_timers_inconsistency_check"
+        },
+        {
+          "include-filter": "kselftest_timers_nanosleep"
+        },
+        {
+          "include-filter": "kselftest_timers_nsleep_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_posix_timers"
+        },
+        {
+          "include-filter": "kselftest_timers_set_timer_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_tests_raw_skew"
+        },
+        {
+          "include-filter": "kselftest_timers_threadtest"
+        },
+        {
+          "include-filter": "kselftest_timers_valid_adjtimex"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_abi"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_clock_getres"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_getcpu"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_gettimeofday"
+        },
+        {
+          "include-filter": "kselftest_x86_check_initial_reg_state"
+        },
+        {
+          "include-filter": "kselftest_x86_ldt_gdt"
+        },
+        {
+          "include-filter": "kselftest_x86_ptrace_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_single_step_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_syscall_nt"
+        },
+        {
+          "include-filter": "kselftest_x86_test_mremap_vdso"
+        }
+      ]
+    },
     {
       "name": "vts_kernel_net_tests"
     }
diff --git a/drivers/cpufreq/TEST_MAPPING b/drivers/cpufreq/TEST_MAPPING
index abebdc438476..9d68dcd42b40 100644
--- a/drivers/cpufreq/TEST_MAPPING
+++ b/drivers/cpufreq/TEST_MAPPING
@@ -32,6 +32,191 @@
           "exclude-annotation": "com.android.testutils.SkipPresubmit"
         }
       ]
+    },
+    {
+      "name": "selftests",
+      "options": [
+        {
+          "include-filter": "kselftest_binderfs_binderfs_test"
+        },
+        {
+          "include-filter": "kselftest_breakpoints_breakpoint_test"
+        },
+        {
+          "include-filter": "kselftest_capabilities_test_execve"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_mismatched_ops"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_signal_restart"
+        },
+        {
+          "include-filter": "kselftest_futex_wait"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_private_mapped_file"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_timeout"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_uninitialized_heap"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_wouldblock"
+        },
+        {
+          "include-filter": "kselftest_kcmp_kcmp_test"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_dontunmap"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_test"
+        },
+        {
+          "include-filter": "kselftest_mm_uffd_unit_tests"
+        },
+        {
+          "include-filter": "kselftest_net_psock_tpacket"
+        },
+        {
+          "include-filter": "kselftest_net_reuseaddr_conflict"
+        },
+        {
+          "include-filter": "kselftest_net_socket"
+        },
+        {
+          "include-filter": "kselftest_ptrace_peeksiginfo"
+        },
+        {
+          "include-filter": "kselftest_rtc_rtctest"
+        },
+        {
+          "include-filter": "kselftest_seccomp_seccomp_bpf"
+        },
+        {
+          "include-filter": "kselftest_size_test_get_size"
+        },
+        {
+          "include-filter": "kselftest_timers_inconsistency_check"
+        },
+        {
+          "include-filter": "kselftest_timers_nanosleep"
+        },
+        {
+          "include-filter": "kselftest_timers_nsleep_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_posix_timers"
+        },
+        {
+          "include-filter": "kselftest_timers_set_timer_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_tests_raw_skew"
+        },
+        {
+          "include-filter": "kselftest_timers_threadtest"
+        },
+        {
+          "include-filter": "kselftest_timers_valid_adjtimex"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_abi"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_clock_getres"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_getcpu"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_gettimeofday"
+        },
+        {
+          "include-filter": "kselftest_x86_check_initial_reg_state"
+        },
+        {
+          "include-filter": "kselftest_x86_ldt_gdt"
+        },
+        {
+          "include-filter": "kselftest_x86_ptrace_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_single_step_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_syscall_nt"
+        },
+        {
+          "include-filter": "kselftest_x86_test_mremap_vdso"
+        }
+      ]
     }
   ],
   "presubmit-large": [
diff --git a/drivers/cpuidle/TEST_MAPPING b/drivers/cpuidle/TEST_MAPPING
index abebdc438476..9d68dcd42b40 100644
--- a/drivers/cpuidle/TEST_MAPPING
+++ b/drivers/cpuidle/TEST_MAPPING
@@ -32,6 +32,191 @@
           "exclude-annotation": "com.android.testutils.SkipPresubmit"
         }
       ]
+    },
+    {
+      "name": "selftests",
+      "options": [
+        {
+          "include-filter": "kselftest_binderfs_binderfs_test"
+        },
+        {
+          "include-filter": "kselftest_breakpoints_breakpoint_test"
+        },
+        {
+          "include-filter": "kselftest_capabilities_test_execve"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_mismatched_ops"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_signal_restart"
+        },
+        {
+          "include-filter": "kselftest_futex_wait"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_private_mapped_file"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_timeout"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_uninitialized_heap"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_wouldblock"
+        },
+        {
+          "include-filter": "kselftest_kcmp_kcmp_test"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_dontunmap"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_test"
+        },
+        {
+          "include-filter": "kselftest_mm_uffd_unit_tests"
+        },
+        {
+          "include-filter": "kselftest_net_psock_tpacket"
+        },
+        {
+          "include-filter": "kselftest_net_reuseaddr_conflict"
+        },
+        {
+          "include-filter": "kselftest_net_socket"
+        },
+        {
+          "include-filter": "kselftest_ptrace_peeksiginfo"
+        },
+        {
+          "include-filter": "kselftest_rtc_rtctest"
+        },
+        {
+          "include-filter": "kselftest_seccomp_seccomp_bpf"
+        },
+        {
+          "include-filter": "kselftest_size_test_get_size"
+        },
+        {
+          "include-filter": "kselftest_timers_inconsistency_check"
+        },
+        {
+          "include-filter": "kselftest_timers_nanosleep"
+        },
+        {
+          "include-filter": "kselftest_timers_nsleep_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_posix_timers"
+        },
+        {
+          "include-filter": "kselftest_timers_set_timer_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_tests_raw_skew"
+        },
+        {
+          "include-filter": "kselftest_timers_threadtest"
+        },
+        {
+          "include-filter": "kselftest_timers_valid_adjtimex"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_abi"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_clock_getres"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_getcpu"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_gettimeofday"
+        },
+        {
+          "include-filter": "kselftest_x86_check_initial_reg_state"
+        },
+        {
+          "include-filter": "kselftest_x86_ldt_gdt"
+        },
+        {
+          "include-filter": "kselftest_x86_ptrace_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_single_step_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_syscall_nt"
+        },
+        {
+          "include-filter": "kselftest_x86_test_mremap_vdso"
+        }
+      ]
     }
   ],
   "presubmit-large": [
diff --git a/drivers/dma-buf/TEST_MAPPING b/drivers/dma-buf/TEST_MAPPING
index 510985ac538c..9bf53907ccc5 100644
--- a/drivers/dma-buf/TEST_MAPPING
+++ b/drivers/dma-buf/TEST_MAPPING
@@ -35,6 +35,191 @@
         }
       ]
     },
+    {
+      "name": "selftests",
+      "options": [
+        {
+          "include-filter": "kselftest_binderfs_binderfs_test"
+        },
+        {
+          "include-filter": "kselftest_breakpoints_breakpoint_test"
+        },
+        {
+          "include-filter": "kselftest_capabilities_test_execve"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_mismatched_ops"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_signal_restart"
+        },
+        {
+          "include-filter": "kselftest_futex_wait"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_private_mapped_file"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_timeout"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_uninitialized_heap"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_wouldblock"
+        },
+        {
+          "include-filter": "kselftest_kcmp_kcmp_test"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_dontunmap"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_test"
+        },
+        {
+          "include-filter": "kselftest_mm_uffd_unit_tests"
+        },
+        {
+          "include-filter": "kselftest_net_psock_tpacket"
+        },
+        {
+          "include-filter": "kselftest_net_reuseaddr_conflict"
+        },
+        {
+          "include-filter": "kselftest_net_socket"
+        },
+        {
+          "include-filter": "kselftest_ptrace_peeksiginfo"
+        },
+        {
+          "include-filter": "kselftest_rtc_rtctest"
+        },
+        {
+          "include-filter": "kselftest_seccomp_seccomp_bpf"
+        },
+        {
+          "include-filter": "kselftest_size_test_get_size"
+        },
+        {
+          "include-filter": "kselftest_timers_inconsistency_check"
+        },
+        {
+          "include-filter": "kselftest_timers_nanosleep"
+        },
+        {
+          "include-filter": "kselftest_timers_nsleep_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_posix_timers"
+        },
+        {
+          "include-filter": "kselftest_timers_set_timer_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_tests_raw_skew"
+        },
+        {
+          "include-filter": "kselftest_timers_threadtest"
+        },
+        {
+          "include-filter": "kselftest_timers_valid_adjtimex"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_abi"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_clock_getres"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_getcpu"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_gettimeofday"
+        },
+        {
+          "include-filter": "kselftest_x86_check_initial_reg_state"
+        },
+        {
+          "include-filter": "kselftest_x86_ldt_gdt"
+        },
+        {
+          "include-filter": "kselftest_x86_ptrace_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_single_step_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_syscall_nt"
+        },
+        {
+          "include-filter": "kselftest_x86_test_mremap_vdso"
+        }
+      ]
+    },
     {
       "name": "vts_kernel_net_tests"
     }
diff --git a/drivers/md/TEST_MAPPING b/drivers/md/TEST_MAPPING
index 1b389bbbd373..561144cdfe0f 100644
--- a/drivers/md/TEST_MAPPING
+++ b/drivers/md/TEST_MAPPING
@@ -35,6 +35,191 @@
         }
       ]
     },
+    {
+      "name": "selftests",
+      "options": [
+        {
+          "include-filter": "kselftest_binderfs_binderfs_test"
+        },
+        {
+          "include-filter": "kselftest_breakpoints_breakpoint_test"
+        },
+        {
+          "include-filter": "kselftest_capabilities_test_execve"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_mismatched_ops"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_signal_restart"
+        },
+        {
+          "include-filter": "kselftest_futex_wait"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_private_mapped_file"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_timeout"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_uninitialized_heap"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_wouldblock"
+        },
+        {
+          "include-filter": "kselftest_kcmp_kcmp_test"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_dontunmap"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_test"
+        },
+        {
+          "include-filter": "kselftest_mm_uffd_unit_tests"
+        },
+        {
+          "include-filter": "kselftest_net_psock_tpacket"
+        },
+        {
+          "include-filter": "kselftest_net_reuseaddr_conflict"
+        },
+        {
+          "include-filter": "kselftest_net_socket"
+        },
+        {
+          "include-filter": "kselftest_ptrace_peeksiginfo"
+        },
+        {
+          "include-filter": "kselftest_rtc_rtctest"
+        },
+        {
+          "include-filter": "kselftest_seccomp_seccomp_bpf"
+        },
+        {
+          "include-filter": "kselftest_size_test_get_size"
+        },
+        {
+          "include-filter": "kselftest_timers_inconsistency_check"
+        },
+        {
+          "include-filter": "kselftest_timers_nanosleep"
+        },
+        {
+          "include-filter": "kselftest_timers_nsleep_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_posix_timers"
+        },
+        {
+          "include-filter": "kselftest_timers_set_timer_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_tests_raw_skew"
+        },
+        {
+          "include-filter": "kselftest_timers_threadtest"
+        },
+        {
+          "include-filter": "kselftest_timers_valid_adjtimex"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_abi"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_clock_getres"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_getcpu"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_gettimeofday"
+        },
+        {
+          "include-filter": "kselftest_x86_check_initial_reg_state"
+        },
+        {
+          "include-filter": "kselftest_x86_ldt_gdt"
+        },
+        {
+          "include-filter": "kselftest_x86_ptrace_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_single_step_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_syscall_nt"
+        },
+        {
+          "include-filter": "kselftest_x86_test_mremap_vdso"
+        }
+      ]
+    },
     {
       "name": "vts_kernel_net_tests"
     }
diff --git a/drivers/net/TEST_MAPPING b/drivers/net/TEST_MAPPING
index 9f88c780ccb8..09e205b43adb 100644
--- a/drivers/net/TEST_MAPPING
+++ b/drivers/net/TEST_MAPPING
@@ -35,6 +35,191 @@
         }
       ]
     },
+    {
+      "name": "selftests",
+      "options": [
+        {
+          "include-filter": "kselftest_binderfs_binderfs_test"
+        },
+        {
+          "include-filter": "kselftest_breakpoints_breakpoint_test"
+        },
+        {
+          "include-filter": "kselftest_capabilities_test_execve"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_mismatched_ops"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_signal_restart"
+        },
+        {
+          "include-filter": "kselftest_futex_wait"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_private_mapped_file"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_timeout"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_uninitialized_heap"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_wouldblock"
+        },
+        {
+          "include-filter": "kselftest_kcmp_kcmp_test"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_dontunmap"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_test"
+        },
+        {
+          "include-filter": "kselftest_mm_uffd_unit_tests"
+        },
+        {
+          "include-filter": "kselftest_net_psock_tpacket"
+        },
+        {
+          "include-filter": "kselftest_net_reuseaddr_conflict"
+        },
+        {
+          "include-filter": "kselftest_net_socket"
+        },
+        {
+          "include-filter": "kselftest_ptrace_peeksiginfo"
+        },
+        {
+          "include-filter": "kselftest_rtc_rtctest"
+        },
+        {
+          "include-filter": "kselftest_seccomp_seccomp_bpf"
+        },
+        {
+          "include-filter": "kselftest_size_test_get_size"
+        },
+        {
+          "include-filter": "kselftest_timers_inconsistency_check"
+        },
+        {
+          "include-filter": "kselftest_timers_nanosleep"
+        },
+        {
+          "include-filter": "kselftest_timers_nsleep_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_posix_timers"
+        },
+        {
+          "include-filter": "kselftest_timers_set_timer_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_tests_raw_skew"
+        },
+        {
+          "include-filter": "kselftest_timers_threadtest"
+        },
+        {
+          "include-filter": "kselftest_timers_valid_adjtimex"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_abi"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_clock_getres"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_getcpu"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_gettimeofday"
+        },
+        {
+          "include-filter": "kselftest_x86_check_initial_reg_state"
+        },
+        {
+          "include-filter": "kselftest_x86_ldt_gdt"
+        },
+        {
+          "include-filter": "kselftest_x86_ptrace_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_single_step_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_syscall_nt"
+        },
+        {
+          "include-filter": "kselftest_x86_test_mremap_vdso"
+        }
+      ]
+    },
     {
       "name": "vts_kernel_net_tests"
     }
diff --git a/drivers/usb/TEST_MAPPING b/drivers/usb/TEST_MAPPING
index 21bc2f29fe3d..0b5eec0e1f74 100644
--- a/drivers/usb/TEST_MAPPING
+++ b/drivers/usb/TEST_MAPPING
@@ -7,6 +7,191 @@
           "exclude-annotation": "com.android.testutils.SkipPresubmit"
         }
       ]
+    },
+    {
+      "name": "selftests",
+      "options": [
+        {
+          "include-filter": "kselftest_binderfs_binderfs_test"
+        },
+        {
+          "include-filter": "kselftest_breakpoints_breakpoint_test"
+        },
+        {
+          "include-filter": "kselftest_capabilities_test_execve"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_mismatched_ops"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_signal_restart"
+        },
+        {
+          "include-filter": "kselftest_futex_wait"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_private_mapped_file"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_timeout"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_uninitialized_heap"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_wouldblock"
+        },
+        {
+          "include-filter": "kselftest_kcmp_kcmp_test"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_dontunmap"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_test"
+        },
+        {
+          "include-filter": "kselftest_mm_uffd_unit_tests"
+        },
+        {
+          "include-filter": "kselftest_net_psock_tpacket"
+        },
+        {
+          "include-filter": "kselftest_net_reuseaddr_conflict"
+        },
+        {
+          "include-filter": "kselftest_net_socket"
+        },
+        {
+          "include-filter": "kselftest_ptrace_peeksiginfo"
+        },
+        {
+          "include-filter": "kselftest_rtc_rtctest"
+        },
+        {
+          "include-filter": "kselftest_seccomp_seccomp_bpf"
+        },
+        {
+          "include-filter": "kselftest_size_test_get_size"
+        },
+        {
+          "include-filter": "kselftest_timers_inconsistency_check"
+        },
+        {
+          "include-filter": "kselftest_timers_nanosleep"
+        },
+        {
+          "include-filter": "kselftest_timers_nsleep_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_posix_timers"
+        },
+        {
+          "include-filter": "kselftest_timers_set_timer_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_tests_raw_skew"
+        },
+        {
+          "include-filter": "kselftest_timers_threadtest"
+        },
+        {
+          "include-filter": "kselftest_timers_valid_adjtimex"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_abi"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_clock_getres"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_getcpu"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_gettimeofday"
+        },
+        {
+          "include-filter": "kselftest_x86_check_initial_reg_state"
+        },
+        {
+          "include-filter": "kselftest_x86_ldt_gdt"
+        },
+        {
+          "include-filter": "kselftest_x86_ptrace_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_single_step_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_syscall_nt"
+        },
+        {
+          "include-filter": "kselftest_x86_test_mremap_vdso"
+        }
+      ]
     }
   ]
 }
diff --git a/drivers/usb/core/TEST_MAPPING b/drivers/usb/core/TEST_MAPPING
index e01273371ca0..a0c052f3dfec 100644
--- a/drivers/usb/core/TEST_MAPPING
+++ b/drivers/usb/core/TEST_MAPPING
@@ -24,6 +24,191 @@
         }
       ]
     },
+    {
+      "name": "selftests",
+      "options": [
+        {
+          "include-filter": "kselftest_binderfs_binderfs_test"
+        },
+        {
+          "include-filter": "kselftest_breakpoints_breakpoint_test"
+        },
+        {
+          "include-filter": "kselftest_capabilities_test_execve"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_mismatched_ops"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_signal_restart"
+        },
+        {
+          "include-filter": "kselftest_futex_wait"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_private_mapped_file"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_timeout"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_uninitialized_heap"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_wouldblock"
+        },
+        {
+          "include-filter": "kselftest_kcmp_kcmp_test"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_dontunmap"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_test"
+        },
+        {
+          "include-filter": "kselftest_mm_uffd_unit_tests"
+        },
+        {
+          "include-filter": "kselftest_net_psock_tpacket"
+        },
+        {
+          "include-filter": "kselftest_net_reuseaddr_conflict"
+        },
+        {
+          "include-filter": "kselftest_net_socket"
+        },
+        {
+          "include-filter": "kselftest_ptrace_peeksiginfo"
+        },
+        {
+          "include-filter": "kselftest_rtc_rtctest"
+        },
+        {
+          "include-filter": "kselftest_seccomp_seccomp_bpf"
+        },
+        {
+          "include-filter": "kselftest_size_test_get_size"
+        },
+        {
+          "include-filter": "kselftest_timers_inconsistency_check"
+        },
+        {
+          "include-filter": "kselftest_timers_nanosleep"
+        },
+        {
+          "include-filter": "kselftest_timers_nsleep_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_posix_timers"
+        },
+        {
+          "include-filter": "kselftest_timers_set_timer_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_tests_raw_skew"
+        },
+        {
+          "include-filter": "kselftest_timers_threadtest"
+        },
+        {
+          "include-filter": "kselftest_timers_valid_adjtimex"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_abi"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_clock_getres"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_getcpu"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_gettimeofday"
+        },
+        {
+          "include-filter": "kselftest_x86_check_initial_reg_state"
+        },
+        {
+          "include-filter": "kselftest_x86_ldt_gdt"
+        },
+        {
+          "include-filter": "kselftest_x86_ptrace_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_single_step_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_syscall_nt"
+        },
+        {
+          "include-filter": "kselftest_x86_test_mremap_vdso"
+        }
+      ]
+    },
     {
       "name": "vts_kernel_net_tests"
     }
diff --git a/drivers/virtio/TEST_MAPPING b/drivers/virtio/TEST_MAPPING
index aca90195dafa..96315eb490eb 100644
--- a/drivers/virtio/TEST_MAPPING
+++ b/drivers/virtio/TEST_MAPPING
@@ -40,6 +40,183 @@
       "options": [
         {
           "include-filter": "kselftest_binderfs_binderfs_test"
+        },
+        {
+          "include-filter": "kselftest_breakpoints_breakpoint_test"
+        },
+        {
+          "include-filter": "kselftest_capabilities_test_execve"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_mismatched_ops"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_signal_restart"
+        },
+        {
+          "include-filter": "kselftest_futex_wait"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_private_mapped_file"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_timeout"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_uninitialized_heap"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_wouldblock"
+        },
+        {
+          "include-filter": "kselftest_kcmp_kcmp_test"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_dontunmap"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_test"
+        },
+        {
+          "include-filter": "kselftest_mm_uffd_unit_tests"
+        },
+        {
+          "include-filter": "kselftest_net_psock_tpacket"
+        },
+        {
+          "include-filter": "kselftest_net_reuseaddr_conflict"
+        },
+        {
+          "include-filter": "kselftest_net_socket"
+        },
+        {
+          "include-filter": "kselftest_ptrace_peeksiginfo"
+        },
+        {
+          "include-filter": "kselftest_rtc_rtctest"
+        },
+        {
+          "include-filter": "kselftest_seccomp_seccomp_bpf"
+        },
+        {
+          "include-filter": "kselftest_size_test_get_size"
+        },
+        {
+          "include-filter": "kselftest_timers_inconsistency_check"
+        },
+        {
+          "include-filter": "kselftest_timers_nanosleep"
+        },
+        {
+          "include-filter": "kselftest_timers_nsleep_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_posix_timers"
+        },
+        {
+          "include-filter": "kselftest_timers_set_timer_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_tests_raw_skew"
+        },
+        {
+          "include-filter": "kselftest_timers_threadtest"
+        },
+        {
+          "include-filter": "kselftest_timers_valid_adjtimex"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_abi"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_clock_getres"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_getcpu"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_gettimeofday"
+        },
+        {
+          "include-filter": "kselftest_x86_check_initial_reg_state"
+        },
+        {
+          "include-filter": "kselftest_x86_ldt_gdt"
+        },
+        {
+          "include-filter": "kselftest_x86_ptrace_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_single_step_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_syscall_nt"
+        },
+        {
+          "include-filter": "kselftest_x86_test_mremap_vdso"
         }
       ]
     },
diff --git a/fs/TEST_MAPPING b/fs/TEST_MAPPING
index 29e0731af02a..2aa9c8c35439 100644
--- a/fs/TEST_MAPPING
+++ b/fs/TEST_MAPPING
@@ -39,6 +39,183 @@
       "options": [
         {
           "include-filter": "kselftest_binderfs_binderfs_test"
+        },
+        {
+          "include-filter": "kselftest_breakpoints_breakpoint_test"
+        },
+        {
+          "include-filter": "kselftest_capabilities_test_execve"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_mismatched_ops"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_signal_restart"
+        },
+        {
+          "include-filter": "kselftest_futex_wait"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_private_mapped_file"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_timeout"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_uninitialized_heap"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_wouldblock"
+        },
+        {
+          "include-filter": "kselftest_kcmp_kcmp_test"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_dontunmap"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_test"
+        },
+        {
+          "include-filter": "kselftest_mm_uffd_unit_tests"
+        },
+        {
+          "include-filter": "kselftest_net_psock_tpacket"
+        },
+        {
+          "include-filter": "kselftest_net_reuseaddr_conflict"
+        },
+        {
+          "include-filter": "kselftest_net_socket"
+        },
+        {
+          "include-filter": "kselftest_ptrace_peeksiginfo"
+        },
+        {
+          "include-filter": "kselftest_rtc_rtctest"
+        },
+        {
+          "include-filter": "kselftest_seccomp_seccomp_bpf"
+        },
+        {
+          "include-filter": "kselftest_size_test_get_size"
+        },
+        {
+          "include-filter": "kselftest_timers_inconsistency_check"
+        },
+        {
+          "include-filter": "kselftest_timers_nanosleep"
+        },
+        {
+          "include-filter": "kselftest_timers_nsleep_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_posix_timers"
+        },
+        {
+          "include-filter": "kselftest_timers_set_timer_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_tests_raw_skew"
+        },
+        {
+          "include-filter": "kselftest_timers_threadtest"
+        },
+        {
+          "include-filter": "kselftest_timers_valid_adjtimex"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_abi"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_clock_getres"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_getcpu"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_gettimeofday"
+        },
+        {
+          "include-filter": "kselftest_x86_check_initial_reg_state"
+        },
+        {
+          "include-filter": "kselftest_x86_ldt_gdt"
+        },
+        {
+          "include-filter": "kselftest_x86_ptrace_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_single_step_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_syscall_nt"
+        },
+        {
+          "include-filter": "kselftest_x86_test_mremap_vdso"
         }
       ]
     }
diff --git a/include/asm-generic/TEST_MAPPING b/include/asm-generic/TEST_MAPPING
index d5b1f1659888..de079cfaa444 100644
--- a/include/asm-generic/TEST_MAPPING
+++ b/include/asm-generic/TEST_MAPPING
@@ -35,6 +35,191 @@
         }
       ]
     },
+    {
+      "name": "selftests",
+      "options": [
+        {
+          "include-filter": "kselftest_binderfs_binderfs_test"
+        },
+        {
+          "include-filter": "kselftest_breakpoints_breakpoint_test"
+        },
+        {
+          "include-filter": "kselftest_capabilities_test_execve"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_mismatched_ops"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_signal_restart"
+        },
+        {
+          "include-filter": "kselftest_futex_wait"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_private_mapped_file"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_timeout"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_uninitialized_heap"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_wouldblock"
+        },
+        {
+          "include-filter": "kselftest_kcmp_kcmp_test"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_dontunmap"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_test"
+        },
+        {
+          "include-filter": "kselftest_mm_uffd_unit_tests"
+        },
+        {
+          "include-filter": "kselftest_net_psock_tpacket"
+        },
+        {
+          "include-filter": "kselftest_net_reuseaddr_conflict"
+        },
+        {
+          "include-filter": "kselftest_net_socket"
+        },
+        {
+          "include-filter": "kselftest_ptrace_peeksiginfo"
+        },
+        {
+          "include-filter": "kselftest_rtc_rtctest"
+        },
+        {
+          "include-filter": "kselftest_seccomp_seccomp_bpf"
+        },
+        {
+          "include-filter": "kselftest_size_test_get_size"
+        },
+        {
+          "include-filter": "kselftest_timers_inconsistency_check"
+        },
+        {
+          "include-filter": "kselftest_timers_nanosleep"
+        },
+        {
+          "include-filter": "kselftest_timers_nsleep_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_posix_timers"
+        },
+        {
+          "include-filter": "kselftest_timers_set_timer_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_tests_raw_skew"
+        },
+        {
+          "include-filter": "kselftest_timers_threadtest"
+        },
+        {
+          "include-filter": "kselftest_timers_valid_adjtimex"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_abi"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_clock_getres"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_getcpu"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_gettimeofday"
+        },
+        {
+          "include-filter": "kselftest_x86_check_initial_reg_state"
+        },
+        {
+          "include-filter": "kselftest_x86_ldt_gdt"
+        },
+        {
+          "include-filter": "kselftest_x86_ptrace_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_single_step_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_syscall_nt"
+        },
+        {
+          "include-filter": "kselftest_x86_test_mremap_vdso"
+        }
+      ]
+    },
     {
       "name": "vts_kernel_net_tests"
     }
diff --git a/include/crypto/TEST_MAPPING b/include/crypto/TEST_MAPPING
index 4483e79f0bc9..56f86045ee62 100644
--- a/include/crypto/TEST_MAPPING
+++ b/include/crypto/TEST_MAPPING
@@ -35,6 +35,191 @@
         }
       ]
     },
+    {
+      "name": "selftests",
+      "options": [
+        {
+          "include-filter": "kselftest_binderfs_binderfs_test"
+        },
+        {
+          "include-filter": "kselftest_breakpoints_breakpoint_test"
+        },
+        {
+          "include-filter": "kselftest_capabilities_test_execve"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_mismatched_ops"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_signal_restart"
+        },
+        {
+          "include-filter": "kselftest_futex_wait"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_private_mapped_file"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_timeout"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_uninitialized_heap"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_wouldblock"
+        },
+        {
+          "include-filter": "kselftest_kcmp_kcmp_test"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_dontunmap"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_test"
+        },
+        {
+          "include-filter": "kselftest_mm_uffd_unit_tests"
+        },
+        {
+          "include-filter": "kselftest_net_psock_tpacket"
+        },
+        {
+          "include-filter": "kselftest_net_reuseaddr_conflict"
+        },
+        {
+          "include-filter": "kselftest_net_socket"
+        },
+        {
+          "include-filter": "kselftest_ptrace_peeksiginfo"
+        },
+        {
+          "include-filter": "kselftest_rtc_rtctest"
+        },
+        {
+          "include-filter": "kselftest_seccomp_seccomp_bpf"
+        },
+        {
+          "include-filter": "kselftest_size_test_get_size"
+        },
+        {
+          "include-filter": "kselftest_timers_inconsistency_check"
+        },
+        {
+          "include-filter": "kselftest_timers_nanosleep"
+        },
+        {
+          "include-filter": "kselftest_timers_nsleep_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_posix_timers"
+        },
+        {
+          "include-filter": "kselftest_timers_set_timer_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_tests_raw_skew"
+        },
+        {
+          "include-filter": "kselftest_timers_threadtest"
+        },
+        {
+          "include-filter": "kselftest_timers_valid_adjtimex"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_abi"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_clock_getres"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_getcpu"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_gettimeofday"
+        },
+        {
+          "include-filter": "kselftest_x86_check_initial_reg_state"
+        },
+        {
+          "include-filter": "kselftest_x86_ldt_gdt"
+        },
+        {
+          "include-filter": "kselftest_x86_ptrace_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_single_step_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_syscall_nt"
+        },
+        {
+          "include-filter": "kselftest_x86_test_mremap_vdso"
+        }
+      ]
+    },
     {
       "name": "vts_kernel_net_tests"
     }
diff --git a/include/drm/TEST_MAPPING b/include/drm/TEST_MAPPING
index bbc9070dcf1a..6e021443f8f8 100644
--- a/include/drm/TEST_MAPPING
+++ b/include/drm/TEST_MAPPING
@@ -48,6 +48,183 @@
       "options": [
         {
           "include-filter": "kselftest_binderfs_binderfs_test"
+        },
+        {
+          "include-filter": "kselftest_breakpoints_breakpoint_test"
+        },
+        {
+          "include-filter": "kselftest_capabilities_test_execve"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_mismatched_ops"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_signal_restart"
+        },
+        {
+          "include-filter": "kselftest_futex_wait"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_private_mapped_file"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_timeout"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_uninitialized_heap"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_wouldblock"
+        },
+        {
+          "include-filter": "kselftest_kcmp_kcmp_test"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_dontunmap"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_test"
+        },
+        {
+          "include-filter": "kselftest_mm_uffd_unit_tests"
+        },
+        {
+          "include-filter": "kselftest_net_psock_tpacket"
+        },
+        {
+          "include-filter": "kselftest_net_reuseaddr_conflict"
+        },
+        {
+          "include-filter": "kselftest_net_socket"
+        },
+        {
+          "include-filter": "kselftest_ptrace_peeksiginfo"
+        },
+        {
+          "include-filter": "kselftest_rtc_rtctest"
+        },
+        {
+          "include-filter": "kselftest_seccomp_seccomp_bpf"
+        },
+        {
+          "include-filter": "kselftest_size_test_get_size"
+        },
+        {
+          "include-filter": "kselftest_timers_inconsistency_check"
+        },
+        {
+          "include-filter": "kselftest_timers_nanosleep"
+        },
+        {
+          "include-filter": "kselftest_timers_nsleep_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_posix_timers"
+        },
+        {
+          "include-filter": "kselftest_timers_set_timer_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_tests_raw_skew"
+        },
+        {
+          "include-filter": "kselftest_timers_threadtest"
+        },
+        {
+          "include-filter": "kselftest_timers_valid_adjtimex"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_abi"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_clock_getres"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_getcpu"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_gettimeofday"
+        },
+        {
+          "include-filter": "kselftest_x86_check_initial_reg_state"
+        },
+        {
+          "include-filter": "kselftest_x86_ldt_gdt"
+        },
+        {
+          "include-filter": "kselftest_x86_ptrace_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_single_step_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_syscall_nt"
+        },
+        {
+          "include-filter": "kselftest_x86_test_mremap_vdso"
         }
       ]
     },
diff --git a/include/linux/TEST_MAPPING b/include/linux/TEST_MAPPING
index 7a1be16ebc67..575f2ab1f015 100644
--- a/include/linux/TEST_MAPPING
+++ b/include/linux/TEST_MAPPING
@@ -48,6 +48,183 @@
       "options": [
         {
           "include-filter": "kselftest_binderfs_binderfs_test"
+        },
+        {
+          "include-filter": "kselftest_breakpoints_breakpoint_test"
+        },
+        {
+          "include-filter": "kselftest_capabilities_test_execve"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_mismatched_ops"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_signal_restart"
+        },
+        {
+          "include-filter": "kselftest_futex_wait"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_private_mapped_file"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_timeout"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_uninitialized_heap"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_wouldblock"
+        },
+        {
+          "include-filter": "kselftest_kcmp_kcmp_test"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_dontunmap"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_test"
+        },
+        {
+          "include-filter": "kselftest_mm_uffd_unit_tests"
+        },
+        {
+          "include-filter": "kselftest_net_psock_tpacket"
+        },
+        {
+          "include-filter": "kselftest_net_reuseaddr_conflict"
+        },
+        {
+          "include-filter": "kselftest_net_socket"
+        },
+        {
+          "include-filter": "kselftest_ptrace_peeksiginfo"
+        },
+        {
+          "include-filter": "kselftest_rtc_rtctest"
+        },
+        {
+          "include-filter": "kselftest_seccomp_seccomp_bpf"
+        },
+        {
+          "include-filter": "kselftest_size_test_get_size"
+        },
+        {
+          "include-filter": "kselftest_timers_inconsistency_check"
+        },
+        {
+          "include-filter": "kselftest_timers_nanosleep"
+        },
+        {
+          "include-filter": "kselftest_timers_nsleep_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_posix_timers"
+        },
+        {
+          "include-filter": "kselftest_timers_set_timer_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_tests_raw_skew"
+        },
+        {
+          "include-filter": "kselftest_timers_threadtest"
+        },
+        {
+          "include-filter": "kselftest_timers_valid_adjtimex"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_abi"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_clock_getres"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_getcpu"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_gettimeofday"
+        },
+        {
+          "include-filter": "kselftest_x86_check_initial_reg_state"
+        },
+        {
+          "include-filter": "kselftest_x86_ldt_gdt"
+        },
+        {
+          "include-filter": "kselftest_x86_ptrace_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_single_step_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_syscall_nt"
+        },
+        {
+          "include-filter": "kselftest_x86_test_mremap_vdso"
         }
       ]
     },
diff --git a/include/linux/device/TEST_MAPPING b/include/linux/device/TEST_MAPPING
index d997982601a3..f80b5dfb234d 100644
--- a/include/linux/device/TEST_MAPPING
+++ b/include/linux/device/TEST_MAPPING
@@ -35,6 +35,191 @@
         }
       ]
     },
+    {
+      "name": "selftests",
+      "options": [
+        {
+          "include-filter": "kselftest_binderfs_binderfs_test"
+        },
+        {
+          "include-filter": "kselftest_breakpoints_breakpoint_test"
+        },
+        {
+          "include-filter": "kselftest_capabilities_test_execve"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_mismatched_ops"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_signal_restart"
+        },
+        {
+          "include-filter": "kselftest_futex_wait"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_private_mapped_file"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_timeout"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_uninitialized_heap"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_wouldblock"
+        },
+        {
+          "include-filter": "kselftest_kcmp_kcmp_test"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_dontunmap"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_test"
+        },
+        {
+          "include-filter": "kselftest_mm_uffd_unit_tests"
+        },
+        {
+          "include-filter": "kselftest_net_psock_tpacket"
+        },
+        {
+          "include-filter": "kselftest_net_reuseaddr_conflict"
+        },
+        {
+          "include-filter": "kselftest_net_socket"
+        },
+        {
+          "include-filter": "kselftest_ptrace_peeksiginfo"
+        },
+        {
+          "include-filter": "kselftest_rtc_rtctest"
+        },
+        {
+          "include-filter": "kselftest_seccomp_seccomp_bpf"
+        },
+        {
+          "include-filter": "kselftest_size_test_get_size"
+        },
+        {
+          "include-filter": "kselftest_timers_inconsistency_check"
+        },
+        {
+          "include-filter": "kselftest_timers_nanosleep"
+        },
+        {
+          "include-filter": "kselftest_timers_nsleep_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_posix_timers"
+        },
+        {
+          "include-filter": "kselftest_timers_set_timer_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_tests_raw_skew"
+        },
+        {
+          "include-filter": "kselftest_timers_threadtest"
+        },
+        {
+          "include-filter": "kselftest_timers_valid_adjtimex"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_abi"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_clock_getres"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_getcpu"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_gettimeofday"
+        },
+        {
+          "include-filter": "kselftest_x86_check_initial_reg_state"
+        },
+        {
+          "include-filter": "kselftest_x86_ldt_gdt"
+        },
+        {
+          "include-filter": "kselftest_x86_ptrace_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_single_step_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_syscall_nt"
+        },
+        {
+          "include-filter": "kselftest_x86_test_mremap_vdso"
+        }
+      ]
+    },
     {
       "name": "vts_kernel_net_tests"
     }
diff --git a/include/linux/sched/TEST_MAPPING b/include/linux/sched/TEST_MAPPING
index 19cc6269eb8a..e8ecbb2f7954 100644
--- a/include/linux/sched/TEST_MAPPING
+++ b/include/linux/sched/TEST_MAPPING
@@ -32,6 +32,191 @@
             "exclude-annotation": "com.android.testutils.SkipPresubmit"
           }
         ]
+      },
+      {
+        "name": "selftests",
+        "options": [
+          {
+            "include-filter": "kselftest_binderfs_binderfs_test"
+          },
+          {
+            "include-filter": "kselftest_breakpoints_breakpoint_test"
+          },
+          {
+            "include-filter": "kselftest_capabilities_test_execve"
+          },
+          {
+            "include-filter": "kselftest_futex_requeue"
+          },
+          {
+            "include-filter": "kselftest_futex_requeue_pi"
+          },
+          {
+            "include-filter": "kselftest_futex_requeue_pi_500k"
+          },
+          {
+            "include-filter": "kselftest_futex_requeue_pi_5k"
+          },
+          {
+            "include-filter": "kselftest_futex_requeue_pi_b"
+          },
+          {
+            "include-filter": "kselftest_futex_requeue_pi_b_500k"
+          },
+          {
+            "include-filter": "kselftest_futex_requeue_pi_b_5k"
+          },
+          {
+            "include-filter": "kselftest_futex_requeue_pi_bl"
+          },
+          {
+            "include-filter": "kselftest_futex_requeue_pi_bl_2G"
+          },
+          {
+            "include-filter": "kselftest_futex_requeue_pi_bl_500k"
+          },
+          {
+            "include-filter": "kselftest_futex_requeue_pi_bl_5k"
+          },
+          {
+            "include-filter": "kselftest_futex_requeue_pi_bo"
+          },
+          {
+            "include-filter": "kselftest_futex_requeue_pi_bo_500k"
+          },
+          {
+            "include-filter": "kselftest_futex_requeue_pi_bo_5k"
+          },
+          {
+            "include-filter": "kselftest_futex_requeue_pi_l"
+          },
+          {
+            "include-filter": "kselftest_futex_requeue_pi_l_2G"
+          },
+          {
+            "include-filter": "kselftest_futex_requeue_pi_l_500k"
+          },
+          {
+            "include-filter": "kselftest_futex_requeue_pi_l_5k"
+          },
+          {
+            "include-filter": "kselftest_futex_requeue_pi_mismatched_ops"
+          },
+          {
+            "include-filter": "kselftest_futex_requeue_pi_o"
+          },
+          {
+            "include-filter": "kselftest_futex_requeue_pi_o_500k"
+          },
+          {
+            "include-filter": "kselftest_futex_requeue_pi_o_5k"
+          },
+          {
+            "include-filter": "kselftest_futex_requeue_pi_signal_restart"
+          },
+          {
+            "include-filter": "kselftest_futex_wait"
+          },
+          {
+            "include-filter": "kselftest_futex_wait_private_mapped_file"
+          },
+          {
+            "include-filter": "kselftest_futex_wait_timeout"
+          },
+          {
+            "include-filter": "kselftest_futex_wait_uninitialized_heap"
+          },
+          {
+            "include-filter": "kselftest_futex_wait_wouldblock"
+          },
+          {
+            "include-filter": "kselftest_kcmp_kcmp_test"
+          },
+          {
+            "include-filter": "kselftest_mm_mremap_dontunmap"
+          },
+          {
+            "include-filter": "kselftest_mm_mremap_test"
+          },
+          {
+            "include-filter": "kselftest_mm_uffd_unit_tests"
+          },
+          {
+            "include-filter": "kselftest_net_psock_tpacket"
+          },
+          {
+            "include-filter": "kselftest_net_reuseaddr_conflict"
+          },
+          {
+            "include-filter": "kselftest_net_socket"
+          },
+          {
+            "include-filter": "kselftest_ptrace_peeksiginfo"
+          },
+          {
+            "include-filter": "kselftest_rtc_rtctest"
+          },
+          {
+            "include-filter": "kselftest_seccomp_seccomp_bpf"
+          },
+          {
+            "include-filter": "kselftest_size_test_get_size"
+          },
+          {
+            "include-filter": "kselftest_timers_inconsistency_check"
+          },
+          {
+            "include-filter": "kselftest_timers_nanosleep"
+          },
+          {
+            "include-filter": "kselftest_timers_nsleep_lat"
+          },
+          {
+            "include-filter": "kselftest_timers_posix_timers"
+          },
+          {
+            "include-filter": "kselftest_timers_set_timer_lat"
+          },
+          {
+            "include-filter": "kselftest_timers_tests_raw_skew"
+          },
+          {
+            "include-filter": "kselftest_timers_threadtest"
+          },
+          {
+            "include-filter": "kselftest_timers_valid_adjtimex"
+          },
+          {
+            "include-filter": "kselftest_vdso_vdso_test_abi"
+          },
+          {
+            "include-filter": "kselftest_vdso_vdso_test_clock_getres"
+          },
+          {
+            "include-filter": "kselftest_vdso_vdso_test_getcpu"
+          },
+          {
+            "include-filter": "kselftest_vdso_vdso_test_gettimeofday"
+          },
+          {
+            "include-filter": "kselftest_x86_check_initial_reg_state"
+          },
+          {
+            "include-filter": "kselftest_x86_ldt_gdt"
+          },
+          {
+            "include-filter": "kselftest_x86_ptrace_syscall"
+          },
+          {
+            "include-filter": "kselftest_x86_single_step_syscall"
+          },
+          {
+            "include-filter": "kselftest_x86_syscall_nt"
+          },
+          {
+            "include-filter": "kselftest_x86_test_mremap_vdso"
+          }
+        ]
       }
     ],
     "presubmit-large": [
diff --git a/include/net/TEST_MAPPING b/include/net/TEST_MAPPING
index a98e7fe389a8..ad670e27d5e2 100644
--- a/include/net/TEST_MAPPING
+++ b/include/net/TEST_MAPPING
@@ -48,6 +48,183 @@
       "options": [
         {
           "include-filter": "kselftest_binderfs_binderfs_test"
+        },
+        {
+          "include-filter": "kselftest_breakpoints_breakpoint_test"
+        },
+        {
+          "include-filter": "kselftest_capabilities_test_execve"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_mismatched_ops"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_signal_restart"
+        },
+        {
+          "include-filter": "kselftest_futex_wait"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_private_mapped_file"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_timeout"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_uninitialized_heap"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_wouldblock"
+        },
+        {
+          "include-filter": "kselftest_kcmp_kcmp_test"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_dontunmap"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_test"
+        },
+        {
+          "include-filter": "kselftest_mm_uffd_unit_tests"
+        },
+        {
+          "include-filter": "kselftest_net_psock_tpacket"
+        },
+        {
+          "include-filter": "kselftest_net_reuseaddr_conflict"
+        },
+        {
+          "include-filter": "kselftest_net_socket"
+        },
+        {
+          "include-filter": "kselftest_ptrace_peeksiginfo"
+        },
+        {
+          "include-filter": "kselftest_rtc_rtctest"
+        },
+        {
+          "include-filter": "kselftest_seccomp_seccomp_bpf"
+        },
+        {
+          "include-filter": "kselftest_size_test_get_size"
+        },
+        {
+          "include-filter": "kselftest_timers_inconsistency_check"
+        },
+        {
+          "include-filter": "kselftest_timers_nanosleep"
+        },
+        {
+          "include-filter": "kselftest_timers_nsleep_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_posix_timers"
+        },
+        {
+          "include-filter": "kselftest_timers_set_timer_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_tests_raw_skew"
+        },
+        {
+          "include-filter": "kselftest_timers_threadtest"
+        },
+        {
+          "include-filter": "kselftest_timers_valid_adjtimex"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_abi"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_clock_getres"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_getcpu"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_gettimeofday"
+        },
+        {
+          "include-filter": "kselftest_x86_check_initial_reg_state"
+        },
+        {
+          "include-filter": "kselftest_x86_ldt_gdt"
+        },
+        {
+          "include-filter": "kselftest_x86_ptrace_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_single_step_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_syscall_nt"
+        },
+        {
+          "include-filter": "kselftest_x86_test_mremap_vdso"
         }
       ]
     },
diff --git a/include/trace/TEST_MAPPING b/include/trace/TEST_MAPPING
index e9ea3f1912aa..213de7071881 100644
--- a/include/trace/TEST_MAPPING
+++ b/include/trace/TEST_MAPPING
@@ -48,6 +48,183 @@
       "options": [
         {
           "include-filter": "kselftest_binderfs_binderfs_test"
+        },
+        {
+          "include-filter": "kselftest_breakpoints_breakpoint_test"
+        },
+        {
+          "include-filter": "kselftest_capabilities_test_execve"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_mismatched_ops"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_signal_restart"
+        },
+        {
+          "include-filter": "kselftest_futex_wait"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_private_mapped_file"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_timeout"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_uninitialized_heap"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_wouldblock"
+        },
+        {
+          "include-filter": "kselftest_kcmp_kcmp_test"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_dontunmap"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_test"
+        },
+        {
+          "include-filter": "kselftest_mm_uffd_unit_tests"
+        },
+        {
+          "include-filter": "kselftest_net_psock_tpacket"
+        },
+        {
+          "include-filter": "kselftest_net_reuseaddr_conflict"
+        },
+        {
+          "include-filter": "kselftest_net_socket"
+        },
+        {
+          "include-filter": "kselftest_ptrace_peeksiginfo"
+        },
+        {
+          "include-filter": "kselftest_rtc_rtctest"
+        },
+        {
+          "include-filter": "kselftest_seccomp_seccomp_bpf"
+        },
+        {
+          "include-filter": "kselftest_size_test_get_size"
+        },
+        {
+          "include-filter": "kselftest_timers_inconsistency_check"
+        },
+        {
+          "include-filter": "kselftest_timers_nanosleep"
+        },
+        {
+          "include-filter": "kselftest_timers_nsleep_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_posix_timers"
+        },
+        {
+          "include-filter": "kselftest_timers_set_timer_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_tests_raw_skew"
+        },
+        {
+          "include-filter": "kselftest_timers_threadtest"
+        },
+        {
+          "include-filter": "kselftest_timers_valid_adjtimex"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_abi"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_clock_getres"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_getcpu"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_gettimeofday"
+        },
+        {
+          "include-filter": "kselftest_x86_check_initial_reg_state"
+        },
+        {
+          "include-filter": "kselftest_x86_ldt_gdt"
+        },
+        {
+          "include-filter": "kselftest_x86_ptrace_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_single_step_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_syscall_nt"
+        },
+        {
+          "include-filter": "kselftest_x86_test_mremap_vdso"
         }
       ]
     },
diff --git a/include/uapi/linux/TEST_MAPPING b/include/uapi/linux/TEST_MAPPING
index 4f323dd8cc61..fbd8e4d0b231 100644
--- a/include/uapi/linux/TEST_MAPPING
+++ b/include/uapi/linux/TEST_MAPPING
@@ -35,6 +35,191 @@
         }
       ]
     },
+    {
+      "name": "selftests",
+      "options": [
+        {
+          "include-filter": "kselftest_binderfs_binderfs_test"
+        },
+        {
+          "include-filter": "kselftest_breakpoints_breakpoint_test"
+        },
+        {
+          "include-filter": "kselftest_capabilities_test_execve"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_mismatched_ops"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_signal_restart"
+        },
+        {
+          "include-filter": "kselftest_futex_wait"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_private_mapped_file"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_timeout"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_uninitialized_heap"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_wouldblock"
+        },
+        {
+          "include-filter": "kselftest_kcmp_kcmp_test"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_dontunmap"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_test"
+        },
+        {
+          "include-filter": "kselftest_mm_uffd_unit_tests"
+        },
+        {
+          "include-filter": "kselftest_net_psock_tpacket"
+        },
+        {
+          "include-filter": "kselftest_net_reuseaddr_conflict"
+        },
+        {
+          "include-filter": "kselftest_net_socket"
+        },
+        {
+          "include-filter": "kselftest_ptrace_peeksiginfo"
+        },
+        {
+          "include-filter": "kselftest_rtc_rtctest"
+        },
+        {
+          "include-filter": "kselftest_seccomp_seccomp_bpf"
+        },
+        {
+          "include-filter": "kselftest_size_test_get_size"
+        },
+        {
+          "include-filter": "kselftest_timers_inconsistency_check"
+        },
+        {
+          "include-filter": "kselftest_timers_nanosleep"
+        },
+        {
+          "include-filter": "kselftest_timers_nsleep_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_posix_timers"
+        },
+        {
+          "include-filter": "kselftest_timers_set_timer_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_tests_raw_skew"
+        },
+        {
+          "include-filter": "kselftest_timers_threadtest"
+        },
+        {
+          "include-filter": "kselftest_timers_valid_adjtimex"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_abi"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_clock_getres"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_getcpu"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_gettimeofday"
+        },
+        {
+          "include-filter": "kselftest_x86_check_initial_reg_state"
+        },
+        {
+          "include-filter": "kselftest_x86_ldt_gdt"
+        },
+        {
+          "include-filter": "kselftest_x86_ptrace_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_single_step_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_syscall_nt"
+        },
+        {
+          "include-filter": "kselftest_x86_test_mremap_vdso"
+        }
+      ]
+    },
     {
       "name": "vts_kernel_net_tests"
     }
diff --git a/include/vdso/TEST_MAPPING b/include/vdso/TEST_MAPPING
index d997982601a3..f80b5dfb234d 100644
--- a/include/vdso/TEST_MAPPING
+++ b/include/vdso/TEST_MAPPING
@@ -35,6 +35,191 @@
         }
       ]
     },
+    {
+      "name": "selftests",
+      "options": [
+        {
+          "include-filter": "kselftest_binderfs_binderfs_test"
+        },
+        {
+          "include-filter": "kselftest_breakpoints_breakpoint_test"
+        },
+        {
+          "include-filter": "kselftest_capabilities_test_execve"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_mismatched_ops"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_signal_restart"
+        },
+        {
+          "include-filter": "kselftest_futex_wait"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_private_mapped_file"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_timeout"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_uninitialized_heap"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_wouldblock"
+        },
+        {
+          "include-filter": "kselftest_kcmp_kcmp_test"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_dontunmap"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_test"
+        },
+        {
+          "include-filter": "kselftest_mm_uffd_unit_tests"
+        },
+        {
+          "include-filter": "kselftest_net_psock_tpacket"
+        },
+        {
+          "include-filter": "kselftest_net_reuseaddr_conflict"
+        },
+        {
+          "include-filter": "kselftest_net_socket"
+        },
+        {
+          "include-filter": "kselftest_ptrace_peeksiginfo"
+        },
+        {
+          "include-filter": "kselftest_rtc_rtctest"
+        },
+        {
+          "include-filter": "kselftest_seccomp_seccomp_bpf"
+        },
+        {
+          "include-filter": "kselftest_size_test_get_size"
+        },
+        {
+          "include-filter": "kselftest_timers_inconsistency_check"
+        },
+        {
+          "include-filter": "kselftest_timers_nanosleep"
+        },
+        {
+          "include-filter": "kselftest_timers_nsleep_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_posix_timers"
+        },
+        {
+          "include-filter": "kselftest_timers_set_timer_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_tests_raw_skew"
+        },
+        {
+          "include-filter": "kselftest_timers_threadtest"
+        },
+        {
+          "include-filter": "kselftest_timers_valid_adjtimex"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_abi"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_clock_getres"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_getcpu"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_gettimeofday"
+        },
+        {
+          "include-filter": "kselftest_x86_check_initial_reg_state"
+        },
+        {
+          "include-filter": "kselftest_x86_ldt_gdt"
+        },
+        {
+          "include-filter": "kselftest_x86_ptrace_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_single_step_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_syscall_nt"
+        },
+        {
+          "include-filter": "kselftest_x86_test_mremap_vdso"
+        }
+      ]
+    },
     {
       "name": "vts_kernel_net_tests"
     }
diff --git a/io_uring/TEST_MAPPING b/io_uring/TEST_MAPPING
index d997982601a3..f80b5dfb234d 100644
--- a/io_uring/TEST_MAPPING
+++ b/io_uring/TEST_MAPPING
@@ -35,6 +35,191 @@
         }
       ]
     },
+    {
+      "name": "selftests",
+      "options": [
+        {
+          "include-filter": "kselftest_binderfs_binderfs_test"
+        },
+        {
+          "include-filter": "kselftest_breakpoints_breakpoint_test"
+        },
+        {
+          "include-filter": "kselftest_capabilities_test_execve"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_mismatched_ops"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_signal_restart"
+        },
+        {
+          "include-filter": "kselftest_futex_wait"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_private_mapped_file"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_timeout"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_uninitialized_heap"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_wouldblock"
+        },
+        {
+          "include-filter": "kselftest_kcmp_kcmp_test"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_dontunmap"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_test"
+        },
+        {
+          "include-filter": "kselftest_mm_uffd_unit_tests"
+        },
+        {
+          "include-filter": "kselftest_net_psock_tpacket"
+        },
+        {
+          "include-filter": "kselftest_net_reuseaddr_conflict"
+        },
+        {
+          "include-filter": "kselftest_net_socket"
+        },
+        {
+          "include-filter": "kselftest_ptrace_peeksiginfo"
+        },
+        {
+          "include-filter": "kselftest_rtc_rtctest"
+        },
+        {
+          "include-filter": "kselftest_seccomp_seccomp_bpf"
+        },
+        {
+          "include-filter": "kselftest_size_test_get_size"
+        },
+        {
+          "include-filter": "kselftest_timers_inconsistency_check"
+        },
+        {
+          "include-filter": "kselftest_timers_nanosleep"
+        },
+        {
+          "include-filter": "kselftest_timers_nsleep_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_posix_timers"
+        },
+        {
+          "include-filter": "kselftest_timers_set_timer_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_tests_raw_skew"
+        },
+        {
+          "include-filter": "kselftest_timers_threadtest"
+        },
+        {
+          "include-filter": "kselftest_timers_valid_adjtimex"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_abi"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_clock_getres"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_getcpu"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_gettimeofday"
+        },
+        {
+          "include-filter": "kselftest_x86_check_initial_reg_state"
+        },
+        {
+          "include-filter": "kselftest_x86_ldt_gdt"
+        },
+        {
+          "include-filter": "kselftest_x86_ptrace_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_single_step_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_syscall_nt"
+        },
+        {
+          "include-filter": "kselftest_x86_test_mremap_vdso"
+        }
+      ]
+    },
     {
       "name": "vts_kernel_net_tests"
     }
diff --git a/kernel/bpf/TEST_MAPPING b/kernel/bpf/TEST_MAPPING
index 9556e19d2bbf..46fc7434f165 100644
--- a/kernel/bpf/TEST_MAPPING
+++ b/kernel/bpf/TEST_MAPPING
@@ -35,6 +35,191 @@
         }
       ]
     },
+    {
+      "name": "selftests",
+      "options": [
+        {
+          "include-filter": "kselftest_binderfs_binderfs_test"
+        },
+        {
+          "include-filter": "kselftest_breakpoints_breakpoint_test"
+        },
+        {
+          "include-filter": "kselftest_capabilities_test_execve"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_mismatched_ops"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_signal_restart"
+        },
+        {
+          "include-filter": "kselftest_futex_wait"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_private_mapped_file"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_timeout"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_uninitialized_heap"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_wouldblock"
+        },
+        {
+          "include-filter": "kselftest_kcmp_kcmp_test"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_dontunmap"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_test"
+        },
+        {
+          "include-filter": "kselftest_mm_uffd_unit_tests"
+        },
+        {
+          "include-filter": "kselftest_net_psock_tpacket"
+        },
+        {
+          "include-filter": "kselftest_net_reuseaddr_conflict"
+        },
+        {
+          "include-filter": "kselftest_net_socket"
+        },
+        {
+          "include-filter": "kselftest_ptrace_peeksiginfo"
+        },
+        {
+          "include-filter": "kselftest_rtc_rtctest"
+        },
+        {
+          "include-filter": "kselftest_seccomp_seccomp_bpf"
+        },
+        {
+          "include-filter": "kselftest_size_test_get_size"
+        },
+        {
+          "include-filter": "kselftest_timers_inconsistency_check"
+        },
+        {
+          "include-filter": "kselftest_timers_nanosleep"
+        },
+        {
+          "include-filter": "kselftest_timers_nsleep_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_posix_timers"
+        },
+        {
+          "include-filter": "kselftest_timers_set_timer_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_tests_raw_skew"
+        },
+        {
+          "include-filter": "kselftest_timers_threadtest"
+        },
+        {
+          "include-filter": "kselftest_timers_valid_adjtimex"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_abi"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_clock_getres"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_getcpu"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_gettimeofday"
+        },
+        {
+          "include-filter": "kselftest_x86_check_initial_reg_state"
+        },
+        {
+          "include-filter": "kselftest_x86_ldt_gdt"
+        },
+        {
+          "include-filter": "kselftest_x86_ptrace_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_single_step_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_syscall_nt"
+        },
+        {
+          "include-filter": "kselftest_x86_test_mremap_vdso"
+        }
+      ]
+    },
     {
       "name": "vts_kernel_net_tests"
     }
diff --git a/kernel/cgroup/TEST_MAPPING b/kernel/cgroup/TEST_MAPPING
index 9556e19d2bbf..46fc7434f165 100644
--- a/kernel/cgroup/TEST_MAPPING
+++ b/kernel/cgroup/TEST_MAPPING
@@ -35,6 +35,191 @@
         }
       ]
     },
+    {
+      "name": "selftests",
+      "options": [
+        {
+          "include-filter": "kselftest_binderfs_binderfs_test"
+        },
+        {
+          "include-filter": "kselftest_breakpoints_breakpoint_test"
+        },
+        {
+          "include-filter": "kselftest_capabilities_test_execve"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_mismatched_ops"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_signal_restart"
+        },
+        {
+          "include-filter": "kselftest_futex_wait"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_private_mapped_file"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_timeout"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_uninitialized_heap"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_wouldblock"
+        },
+        {
+          "include-filter": "kselftest_kcmp_kcmp_test"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_dontunmap"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_test"
+        },
+        {
+          "include-filter": "kselftest_mm_uffd_unit_tests"
+        },
+        {
+          "include-filter": "kselftest_net_psock_tpacket"
+        },
+        {
+          "include-filter": "kselftest_net_reuseaddr_conflict"
+        },
+        {
+          "include-filter": "kselftest_net_socket"
+        },
+        {
+          "include-filter": "kselftest_ptrace_peeksiginfo"
+        },
+        {
+          "include-filter": "kselftest_rtc_rtctest"
+        },
+        {
+          "include-filter": "kselftest_seccomp_seccomp_bpf"
+        },
+        {
+          "include-filter": "kselftest_size_test_get_size"
+        },
+        {
+          "include-filter": "kselftest_timers_inconsistency_check"
+        },
+        {
+          "include-filter": "kselftest_timers_nanosleep"
+        },
+        {
+          "include-filter": "kselftest_timers_nsleep_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_posix_timers"
+        },
+        {
+          "include-filter": "kselftest_timers_set_timer_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_tests_raw_skew"
+        },
+        {
+          "include-filter": "kselftest_timers_threadtest"
+        },
+        {
+          "include-filter": "kselftest_timers_valid_adjtimex"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_abi"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_clock_getres"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_getcpu"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_gettimeofday"
+        },
+        {
+          "include-filter": "kselftest_x86_check_initial_reg_state"
+        },
+        {
+          "include-filter": "kselftest_x86_ldt_gdt"
+        },
+        {
+          "include-filter": "kselftest_x86_ptrace_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_single_step_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_syscall_nt"
+        },
+        {
+          "include-filter": "kselftest_x86_test_mremap_vdso"
+        }
+      ]
+    },
     {
       "name": "vts_kernel_net_tests"
     }
diff --git a/kernel/dma/TEST_MAPPING b/kernel/dma/TEST_MAPPING
index d997982601a3..f80b5dfb234d 100644
--- a/kernel/dma/TEST_MAPPING
+++ b/kernel/dma/TEST_MAPPING
@@ -35,6 +35,191 @@
         }
       ]
     },
+    {
+      "name": "selftests",
+      "options": [
+        {
+          "include-filter": "kselftest_binderfs_binderfs_test"
+        },
+        {
+          "include-filter": "kselftest_breakpoints_breakpoint_test"
+        },
+        {
+          "include-filter": "kselftest_capabilities_test_execve"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_mismatched_ops"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_signal_restart"
+        },
+        {
+          "include-filter": "kselftest_futex_wait"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_private_mapped_file"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_timeout"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_uninitialized_heap"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_wouldblock"
+        },
+        {
+          "include-filter": "kselftest_kcmp_kcmp_test"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_dontunmap"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_test"
+        },
+        {
+          "include-filter": "kselftest_mm_uffd_unit_tests"
+        },
+        {
+          "include-filter": "kselftest_net_psock_tpacket"
+        },
+        {
+          "include-filter": "kselftest_net_reuseaddr_conflict"
+        },
+        {
+          "include-filter": "kselftest_net_socket"
+        },
+        {
+          "include-filter": "kselftest_ptrace_peeksiginfo"
+        },
+        {
+          "include-filter": "kselftest_rtc_rtctest"
+        },
+        {
+          "include-filter": "kselftest_seccomp_seccomp_bpf"
+        },
+        {
+          "include-filter": "kselftest_size_test_get_size"
+        },
+        {
+          "include-filter": "kselftest_timers_inconsistency_check"
+        },
+        {
+          "include-filter": "kselftest_timers_nanosleep"
+        },
+        {
+          "include-filter": "kselftest_timers_nsleep_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_posix_timers"
+        },
+        {
+          "include-filter": "kselftest_timers_set_timer_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_tests_raw_skew"
+        },
+        {
+          "include-filter": "kselftest_timers_threadtest"
+        },
+        {
+          "include-filter": "kselftest_timers_valid_adjtimex"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_abi"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_clock_getres"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_getcpu"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_gettimeofday"
+        },
+        {
+          "include-filter": "kselftest_x86_check_initial_reg_state"
+        },
+        {
+          "include-filter": "kselftest_x86_ldt_gdt"
+        },
+        {
+          "include-filter": "kselftest_x86_ptrace_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_single_step_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_syscall_nt"
+        },
+        {
+          "include-filter": "kselftest_x86_test_mremap_vdso"
+        }
+      ]
+    },
     {
       "name": "vts_kernel_net_tests"
     }
diff --git a/kernel/sched/TEST_MAPPING b/kernel/sched/TEST_MAPPING
index 9a81e45acf1a..c443c9fe4a37 100644
--- a/kernel/sched/TEST_MAPPING
+++ b/kernel/sched/TEST_MAPPING
@@ -46,6 +46,183 @@
       "options": [
         {
           "include-filter": "kselftest_binderfs_binderfs_test"
+        },
+        {
+          "include-filter": "kselftest_breakpoints_breakpoint_test"
+        },
+        {
+          "include-filter": "kselftest_capabilities_test_execve"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_mismatched_ops"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_signal_restart"
+        },
+        {
+          "include-filter": "kselftest_futex_wait"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_private_mapped_file"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_timeout"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_uninitialized_heap"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_wouldblock"
+        },
+        {
+          "include-filter": "kselftest_kcmp_kcmp_test"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_dontunmap"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_test"
+        },
+        {
+          "include-filter": "kselftest_mm_uffd_unit_tests"
+        },
+        {
+          "include-filter": "kselftest_net_psock_tpacket"
+        },
+        {
+          "include-filter": "kselftest_net_reuseaddr_conflict"
+        },
+        {
+          "include-filter": "kselftest_net_socket"
+        },
+        {
+          "include-filter": "kselftest_ptrace_peeksiginfo"
+        },
+        {
+          "include-filter": "kselftest_rtc_rtctest"
+        },
+        {
+          "include-filter": "kselftest_seccomp_seccomp_bpf"
+        },
+        {
+          "include-filter": "kselftest_size_test_get_size"
+        },
+        {
+          "include-filter": "kselftest_timers_inconsistency_check"
+        },
+        {
+          "include-filter": "kselftest_timers_nanosleep"
+        },
+        {
+          "include-filter": "kselftest_timers_nsleep_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_posix_timers"
+        },
+        {
+          "include-filter": "kselftest_timers_set_timer_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_tests_raw_skew"
+        },
+        {
+          "include-filter": "kselftest_timers_threadtest"
+        },
+        {
+          "include-filter": "kselftest_timers_valid_adjtimex"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_abi"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_clock_getres"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_getcpu"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_gettimeofday"
+        },
+        {
+          "include-filter": "kselftest_x86_check_initial_reg_state"
+        },
+        {
+          "include-filter": "kselftest_x86_ldt_gdt"
+        },
+        {
+          "include-filter": "kselftest_x86_ptrace_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_single_step_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_syscall_nt"
+        },
+        {
+          "include-filter": "kselftest_x86_test_mremap_vdso"
         }
       ]
     }
diff --git a/mm/TEST_MAPPING b/mm/TEST_MAPPING
index a5e4d161c411..2e46efc40d5a 100644
--- a/mm/TEST_MAPPING
+++ b/mm/TEST_MAPPING
@@ -36,6 +36,99 @@
         {
           "include-filter": "kselftest_binderfs_binderfs_test"
         },
+        {
+          "include-filter": "kselftest_breakpoints_breakpoint_test"
+        },
+        {
+          "include-filter": "kselftest_capabilities_test_execve"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_mismatched_ops"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_signal_restart"
+        },
+        {
+          "include-filter": "kselftest_futex_wait"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_private_mapped_file"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_timeout"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_uninitialized_heap"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_wouldblock"
+        },
+        {
+          "include-filter": "kselftest_kcmp_kcmp_test"
+        },
         {
           "include-filter": "kselftest_mm_mremap_dontunmap"
         },
@@ -44,6 +137,81 @@
         },
         {
           "include-filter": "kselftest_mm_uffd_unit_tests"
+        },
+        {
+          "include-filter": "kselftest_net_psock_tpacket"
+        },
+        {
+          "include-filter": "kselftest_net_reuseaddr_conflict"
+        },
+        {
+          "include-filter": "kselftest_net_socket"
+        },
+        {
+          "include-filter": "kselftest_ptrace_peeksiginfo"
+        },
+        {
+          "include-filter": "kselftest_rtc_rtctest"
+        },
+        {
+          "include-filter": "kselftest_seccomp_seccomp_bpf"
+        },
+        {
+          "include-filter": "kselftest_size_test_get_size"
+        },
+        {
+          "include-filter": "kselftest_timers_inconsistency_check"
+        },
+        {
+          "include-filter": "kselftest_timers_nanosleep"
+        },
+        {
+          "include-filter": "kselftest_timers_nsleep_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_posix_timers"
+        },
+        {
+          "include-filter": "kselftest_timers_set_timer_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_tests_raw_skew"
+        },
+        {
+          "include-filter": "kselftest_timers_threadtest"
+        },
+        {
+          "include-filter": "kselftest_timers_valid_adjtimex"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_abi"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_clock_getres"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_getcpu"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_gettimeofday"
+        },
+        {
+          "include-filter": "kselftest_x86_check_initial_reg_state"
+        },
+        {
+          "include-filter": "kselftest_x86_ldt_gdt"
+        },
+        {
+          "include-filter": "kselftest_x86_ptrace_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_single_step_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_syscall_nt"
+        },
+        {
+          "include-filter": "kselftest_x86_test_mremap_vdso"
         }
       ]
     }
diff --git a/net/TEST_MAPPING b/net/TEST_MAPPING
index 19b82fcf807c..2f2c22b95a76 100644
--- a/net/TEST_MAPPING
+++ b/net/TEST_MAPPING
@@ -48,6 +48,183 @@
       "options": [
         {
           "include-filter": "kselftest_binderfs_binderfs_test"
+        },
+        {
+          "include-filter": "kselftest_breakpoints_breakpoint_test"
+        },
+        {
+          "include-filter": "kselftest_capabilities_test_execve"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_b_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bl_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_bo_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_2G"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_l_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_mismatched_ops"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_500k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_o_5k"
+        },
+        {
+          "include-filter": "kselftest_futex_requeue_pi_signal_restart"
+        },
+        {
+          "include-filter": "kselftest_futex_wait"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_private_mapped_file"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_timeout"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_uninitialized_heap"
+        },
+        {
+          "include-filter": "kselftest_futex_wait_wouldblock"
+        },
+        {
+          "include-filter": "kselftest_kcmp_kcmp_test"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_dontunmap"
+        },
+        {
+          "include-filter": "kselftest_mm_mremap_test"
+        },
+        {
+          "include-filter": "kselftest_mm_uffd_unit_tests"
+        },
+        {
+          "include-filter": "kselftest_net_psock_tpacket"
+        },
+        {
+          "include-filter": "kselftest_net_reuseaddr_conflict"
+        },
+        {
+          "include-filter": "kselftest_net_socket"
+        },
+        {
+          "include-filter": "kselftest_ptrace_peeksiginfo"
+        },
+        {
+          "include-filter": "kselftest_rtc_rtctest"
+        },
+        {
+          "include-filter": "kselftest_seccomp_seccomp_bpf"
+        },
+        {
+          "include-filter": "kselftest_size_test_get_size"
+        },
+        {
+          "include-filter": "kselftest_timers_inconsistency_check"
+        },
+        {
+          "include-filter": "kselftest_timers_nanosleep"
+        },
+        {
+          "include-filter": "kselftest_timers_nsleep_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_posix_timers"
+        },
+        {
+          "include-filter": "kselftest_timers_set_timer_lat"
+        },
+        {
+          "include-filter": "kselftest_timers_tests_raw_skew"
+        },
+        {
+          "include-filter": "kselftest_timers_threadtest"
+        },
+        {
+          "include-filter": "kselftest_timers_valid_adjtimex"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_abi"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_clock_getres"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_getcpu"
+        },
+        {
+          "include-filter": "kselftest_vdso_vdso_test_gettimeofday"
+        },
+        {
+          "include-filter": "kselftest_x86_check_initial_reg_state"
+        },
+        {
+          "include-filter": "kselftest_x86_ldt_gdt"
+        },
+        {
+          "include-filter": "kselftest_x86_ptrace_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_single_step_syscall"
+        },
+        {
+          "include-filter": "kselftest_x86_syscall_nt"
+        },
+        {
+          "include-filter": "kselftest_x86_test_mremap_vdso"
         }
       ]
     },