sys/linux/test: update after syz_kvm_assert_syzos_uexit API change

ramosian-glider · ramosian-glider · commit 0c2e1647a23d · 2026-01-16T09:47:24.000Z
This patch updates all relevant regression tests in sys/linux/test/ to
align with the API change introduced in syz_kvm_assert_syzos_uexit.
The syz_kvm_assert_syzos_uexit syscall now requires the VCPU file
descriptor as its first argument.
diff --git a/sys/linux/test/amd64-syz_kvm_nested_amd_inject b/sys/linux/test/amd64-syz_kvm_nested_amd_inject
@@ -29,9 +29,9 @@ r5 = mmap$KVM_VCPU(&(0x7f0000009000/0x1000)=nil, r4, 0x3, 0x1, r3, 0x0)
 # If KVM L0 processes the EVENTINJ correctly, the guest should eventually exit back to us.
 #
 ioctl$KVM_RUN(r3, AUTO, 0x0)
-syz_kvm_assert_syzos_uexit$x86(r5, 0xface)
+syz_kvm_assert_syzos_uexit$x86(r3, r5, 0xface)
 
 # Cleanup
 #
 ioctl$KVM_RUN(r3, AUTO, 0x0)
-syz_kvm_assert_syzos_uexit$x86(r5, 0xffffffff)
+syz_kvm_assert_syzos_uexit$x86(r3, r5, 0xffffffff)
diff --git a/sys/linux/test/amd64-syz_kvm_nested_amd_invlpga b/sys/linux/test/amd64-syz_kvm_nested_amd_invlpga
@@ -27,9 +27,9 @@ r5 = mmap$KVM_VCPU(&(0x7f0000009000/0x1000)=nil, r4, 0x3, 0x1, r3, 0x0)
 # and then immediately yield with UEXIT code 0xface.
 #
 ioctl$KVM_RUN(r3, AUTO, 0x0)
-syz_kvm_assert_syzos_uexit$x86(r5, 0xface)
+syz_kvm_assert_syzos_uexit$x86(r3, r5, 0xface)
 
 # guest_main should finish with guest_uexit(-1).
 #
 ioctl$KVM_RUN(r3, AUTO, 0x0)
-syz_kvm_assert_syzos_uexit$x86(r5, 0xffffffff)
+syz_kvm_assert_syzos_uexit$x86(r3, r5, 0xffffffff)
diff --git a/sys/linux/test/amd64-syz_kvm_nested_amd_stgi b/sys/linux/test/amd64-syz_kvm_nested_amd_stgi
@@ -21,7 +21,7 @@ r5 = mmap$KVM_VCPU(&(0x7f0000009000/0x1000)=nil, r4, 0x3, 0x1, r3, 0x0)
 # Run 1: Execute CLGI -> UEXIT(0x1337)
 #
 ioctl$KVM_RUN(r3, AUTO, 0x0)
-syz_kvm_assert_syzos_uexit$x86(r5, 0x1337)
+syz_kvm_assert_syzos_uexit$x86(r3, r5, 0x1337)
 
 # Inject NMI into the vCPU.
 # Since GIF=0 in the guest, this NMI should be queued by L0.
@@ -39,9 +39,9 @@ ioctl$KVM_RUN(r3, AUTO, 0x0)
 # If the guest handles it transparently, we see 0xface.
 # For this regression test, ensuring we don't crash L0 is the primary goal.
 #
-syz_kvm_assert_syzos_uexit$x86(r5, 0xface)
+syz_kvm_assert_syzos_uexit$x86(r3, r5, 0xface)
 
 # Cleanup.
 #
 ioctl$KVM_RUN(r3, AUTO, 0x0)
-syz_kvm_assert_syzos_uexit$x86(r5, 0xffffffff)
+syz_kvm_assert_syzos_uexit$x86(r3, r5, 0xffffffff)
diff --git a/sys/linux/test/amd64-syz_kvm_nested_amd_vmcb_write_mask b/sys/linux/test/amd64-syz_kvm_nested_amd_vmcb_write_mask
@@ -24,7 +24,7 @@ r5 = mmap$KVM_VCPU(&(0x7f0000009000/0x1000)=nil, r4, 0x3, 0x1, r3, 0x0)
 # L2 VM executes HLT. Exit reason is mapped to 0xe2e20001.
 #
 ioctl$KVM_RUN(r3, AUTO, 0x0)
-syz_kvm_assert_syzos_uexit$x86(r5, 0xe2e20001)
+syz_kvm_assert_syzos_uexit$x86(r3, r5, 0xe2e20001)
 
 # L1 disables HLT intercept and resumes L2. L2 executes HLT, causing KVM_EXIT_HLT (0x5) from L1 to L0.
 # This confirms that the vmcb_write_mask command was successful.
@@ -35,9 +35,9 @@ syz_kvm_assert_syzos_kvm_exit$x86(r5, 0x5)
 # After resuming, L2 executes INVD. Exit reason is mapped to 0xe2e20002.
 #
 ioctl$KVM_RUN(r3, AUTO, 0x0)
-syz_kvm_assert_syzos_uexit$x86(r5, 0xe2e20002)
+syz_kvm_assert_syzos_uexit$x86(r3, r5, 0xe2e20002)
 
 # guest_main should finish with guest_uexit(-1).
 #
 ioctl$KVM_RUN(r3, AUTO, 0x0)
-syz_kvm_assert_syzos_uexit$x86(r5, 0xffffffff)
+syz_kvm_assert_syzos_uexit$x86(r3, r5, 0xffffffff)
diff --git a/sys/linux/test/amd64-syz_kvm_nested_create_vm-hlt b/sys/linux/test/amd64-syz_kvm_nested_create_vm-hlt
@@ -15,9 +15,9 @@ r5 = mmap$KVM_VCPU(&(0x7f0000009000/0x1000)=nil, r4, 0x3, 0x1, r3, 0x0)
 # (0x1 is SYZOS_NESTED_EXIT_REASON_HLT).
 #
 ioctl$KVM_RUN(r3, AUTO, 0x0)
-syz_kvm_assert_syzos_uexit$x86(r5, 0xe2e20001)
+syz_kvm_assert_syzos_uexit$x86(r3, r5, 0xe2e20001)
 
 # KVM_RUN should exit with KVM_EXIT_MMIO due to guest_uexit(-1).
 #
 ioctl$KVM_RUN(r3, AUTO, 0x0)
-syz_kvm_assert_syzos_uexit$x86(r5, 0xffffffff)
+syz_kvm_assert_syzos_uexit$x86(r3, r5, 0xffffffff)
diff --git a/sys/linux/test/amd64-syz_kvm_nested_intel_vmwrite_mask b/sys/linux/test/amd64-syz_kvm_nested_intel_vmwrite_mask
@@ -20,7 +20,7 @@ r5 = mmap$KVM_VCPU(&(0x7f0000009000/0x1000)=nil, r4, 0x3, 0x1, r3, 0x0)
 # L2 VM executes HLT. Exit reason is mapped to 0xe2e20001.
 #
 ioctl$KVM_RUN(r3, AUTO, 0x0)
-syz_kvm_assert_syzos_uexit$x86(r5, 0xe2e20001)
+syz_kvm_assert_syzos_uexit$x86(r3, r5, 0xe2e20001)
 
 # L1 disables HLT exiting and resumes L2. L2 resumes at HLT, and breaks out of KVM_RUN.
 # 0x05 is KVM_EXIT_HLT.
@@ -32,9 +32,9 @@ syz_kvm_assert_syzos_kvm_exit$x86(r5, 0x5)
 # After resuming, L2 executes INVD. Exit reason is mapped to 0xe2e20002.
 #
 ioctl$KVM_RUN(r3, AUTO, 0x0)
-syz_kvm_assert_syzos_uexit$x86(r5, 0xe2e20002)
+syz_kvm_assert_syzos_uexit$x86(r3, r5, 0xe2e20002)
 
 # guest_main should finish with guest_uexit(-1).
 #
 ioctl$KVM_RUN(r3, AUTO, 0x0)
-syz_kvm_assert_syzos_uexit$x86(r5, 0xffffffff)
+syz_kvm_assert_syzos_uexit$x86(r3, r5, 0xffffffff)
diff --git a/sys/linux/test/amd64-syz_kvm_nested_vmresume b/sys/linux/test/amd64-syz_kvm_nested_vmresume
@@ -16,14 +16,14 @@ r5 = mmap$KVM_VCPU(&(0x7f0000009000/0x1000)=nil, r4, 0x3, 0x1, r3, 0x0)
 # L2 VM executes INVD. Exit reason is mapped to 0xe2e20002.
 #
 ioctl$KVM_RUN(r3, AUTO, 0x0)
-syz_kvm_assert_syzos_uexit$x86(r5, 0xe2e20002)
+syz_kvm_assert_syzos_uexit$x86(r3, r5, 0xe2e20002)
 
 # L1 resumes L2, which executes HLT. Exit reason is mapped to 0xe2e20001.
 #
 ioctl$KVM_RUN(r3, AUTO, 0x0)
-syz_kvm_assert_syzos_uexit$x86(r5, 0xe2e20001)
+syz_kvm_assert_syzos_uexit$x86(r3, r5, 0xe2e20001)
 
 # guest_main should finish with guest_uexit(-1).
 #
 ioctl$KVM_RUN(r3, AUTO, 0x0)
-syz_kvm_assert_syzos_uexit$x86(r5, 0xffffffff)
+syz_kvm_assert_syzos_uexit$x86(r3, r5, 0xffffffff)
diff --git a/sys/linux/test/amd64-syz_kvm_nested_vmresume-cpuid b/sys/linux/test/amd64-syz_kvm_nested_vmresume-cpuid
@@ -14,14 +14,14 @@ r5 = mmap$KVM_VCPU(&(0x7f0000009000/0x1000)=nil, r4, 0x3, 0x1, r3, 0x0)
 # L2 VM executes CPUID. Exit reason is mapped to 0xe2e20003.
 #
 ioctl$KVM_RUN(r3, AUTO, 0x0)
-syz_kvm_assert_syzos_uexit$x86(r5, 0xe2e20003)
+syz_kvm_assert_syzos_uexit$x86(r3, r5, 0xe2e20003)
 
 # L1 resumes L2, which executes HLT. Exit reason is mapped to 0xe2e20001.
 #
 ioctl$KVM_RUN(r3, AUTO, 0x0)
-syz_kvm_assert_syzos_uexit$x86(r5, 0xe2e20001)
+syz_kvm_assert_syzos_uexit$x86(r3, r5, 0xe2e20001)
 
 # guest_main should finish with guest_uexit(-1).
 #
 ioctl$KVM_RUN(r3, AUTO, 0x0)
-syz_kvm_assert_syzos_uexit$x86(r5, 0xffffffff)
+syz_kvm_assert_syzos_uexit$x86(r3, r5, 0xffffffff)
diff --git a/sys/linux/test/amd64-syz_kvm_nested_vmresume-rdtsc b/sys/linux/test/amd64-syz_kvm_nested_vmresume-rdtsc
@@ -14,14 +14,14 @@ r5 = mmap$KVM_VCPU(&(0x7f0000009000/0x1000)=nil, r4, 0x3, 0x1, r3, 0x0)
 # L2 VM executes CPUID. Exit reason is mapped to 0xe2e20004.
 #
 ioctl$KVM_RUN(r3, AUTO, 0x0)
-syz_kvm_assert_syzos_uexit$x86(r5, 0xe2e20004)
+syz_kvm_assert_syzos_uexit$x86(r3, r5, 0xe2e20004)
 
 # L1 resumes L2, which executes HLT. Exit reason is mapped to 0xe2e20001.
 #
 ioctl$KVM_RUN(r3, AUTO, 0x0)
-syz_kvm_assert_syzos_uexit$x86(r5, 0xe2e20001)
+syz_kvm_assert_syzos_uexit$x86(r3, r5, 0xe2e20001)
 
 # guest_main should finish with guest_uexit(-1).
 #
 ioctl$KVM_RUN(r3, AUTO, 0x0)
-syz_kvm_assert_syzos_uexit$x86(r5, 0xffffffff)
+syz_kvm_assert_syzos_uexit$x86(r3, r5, 0xffffffff)
diff --git a/sys/linux/test/amd64-syz_kvm_nested_vmresume-rdtscp b/sys/linux/test/amd64-syz_kvm_nested_vmresume-rdtscp
@@ -14,14 +14,14 @@ r5 = mmap$KVM_VCPU(&(0x7f0000009000/0x1000)=nil, r4, 0x3, 0x1, r3, 0x0)
 # L2 VM executes CPUID. Exit reason is mapped to 0xe2e20005.
 #
 ioctl$KVM_RUN(r3, AUTO, 0x0)
-syz_kvm_assert_syzos_uexit$x86(r5, 0xe2e20005)
+syz_kvm_assert_syzos_uexit$x86(r3, r5, 0xe2e20005)
 
 # L1 resumes L2, which executes HLT. Exit reason is mapped to 0xe2e20001.
 #
 ioctl$KVM_RUN(r3, AUTO, 0x0)
-syz_kvm_assert_syzos_uexit$x86(r5, 0xe2e20001)
+syz_kvm_assert_syzos_uexit$x86(r3, r5, 0xe2e20001)
 
 # guest_main should finish with guest_uexit(-1).
 #
 ioctl$KVM_RUN(r3, AUTO, 0x0)
-syz_kvm_assert_syzos_uexit$x86(r5, 0xffffffff)
+syz_kvm_assert_syzos_uexit$x86(r3, r5, 0xffffffff)
diff --git a/sys/linux/test/amd64-syz_kvm_set_irq_handler b/sys/linux/test/amd64-syz_kvm_set_irq_handler
@@ -14,7 +14,7 @@ r5 = mmap$KVM_VCPU(&(0x7f0000009000/0x1000)=nil, r4, 0x3, 0x1, r3, 0x0)
 # Run till uexit(0xaaaa).
 #
 ioctl$KVM_RUN(r3, AUTO, 0x0)
-syz_kvm_assert_syzos_uexit$x86(r5, 0xaaaa)
+syz_kvm_assert_syzos_uexit$x86(r3, r5, 0xaaaa)
 
 # Inject interrupt 0x80.
 #
@@ -23,9 +23,9 @@ ioctl$KVM_RUN(r3, AUTO, 0x0)
 
 # Ensure that the uexit code is UEXIT_IRQ.
 #
-syz_kvm_assert_syzos_uexit$x86(r5, 0xfffffffffffffffe)
+syz_kvm_assert_syzos_uexit$x86(r3, r5, 0xfffffffffffffffe)
 
 # Run till the end.
 #
 ioctl$KVM_RUN(r3, AUTO, 0x0)
-syz_kvm_assert_syzos_uexit$x86(r5, 0xffffffffffffffff)
+syz_kvm_assert_syzos_uexit$x86(r3, r5, 0xffffffffffffffff)
diff --git a/sys/linux/test/amd64-syz_kvm_setup_syzos_vm b/sys/linux/test/amd64-syz_kvm_setup_syzos_vm
@@ -18,11 +18,11 @@ r5 = mmap$KVM_VCPU(&(0x7f0000009000/0x1000)=nil, r4, 0x3, 0x1, r3, 0x0)
 # Run till the first uexit.
 #
 ioctl$KVM_RUN(r3, AUTO, 0x0)
-syz_kvm_assert_syzos_uexit$x86(r5, 0x0)
+syz_kvm_assert_syzos_uexit$x86(r3, r5, 0x0)
 # Run till the second uexit.
 #
 ioctl$KVM_RUN(r3, AUTO, 0x0)
-syz_kvm_assert_syzos_uexit$x86(r5, 0xaaaa)
+syz_kvm_assert_syzos_uexit$x86(r3, r5, 0xaaaa)
 
 # Run till the end of guest_main().
 #
@@ -31,4 +31,4 @@ ioctl$KVM_RUN(r3, AUTO, 0x0)
 # Ensure that exit reason is KVM_EXIT_MMIO and uexit code is UEXIT_END.
 #
 syz_kvm_assert_syzos_kvm_exit$x86(r5, 0x6)
-syz_kvm_assert_syzos_uexit$x86(r5, 0xffffffffffffffff)
+syz_kvm_assert_syzos_uexit$x86(r3, r5, 0xffffffffffffffff)
diff --git a/sys/linux/test/amd64-syz_kvm_setup_syzos_vm-cpuid b/sys/linux/test/amd64-syz_kvm_setup_syzos_vm-cpuid
@@ -18,4 +18,4 @@ ioctl$KVM_RUN(r3, AUTO, 0x0)
 # Ensure that exit reason is KVM_EXIT_MMIO and uexit code is UEXIT_END.
 #
 syz_kvm_assert_syzos_kvm_exit$x86(r5, 0x6)
-syz_kvm_assert_syzos_uexit$x86(r5, 0xffffffffffffffff)
+syz_kvm_assert_syzos_uexit$x86(r3, r5, 0xffffffffffffffff)
diff --git a/sys/linux/test/amd64-syz_kvm_setup_syzos_vm-default_irq_handler b/sys/linux/test/amd64-syz_kvm_setup_syzos_vm-default_irq_handler
@@ -14,7 +14,7 @@ r5 = mmap$KVM_VCPU(&(0x7f0000009000/0x1000)=nil, r4, 0x3, 0x1, r3, 0x0)
 # Run till the first uexit.
 #
 ioctl$KVM_RUN(r3, AUTO, 0x0)
-syz_kvm_assert_syzos_uexit$x86(r5, 0xaaaa)
+syz_kvm_assert_syzos_uexit$x86(r3, r5, 0xaaaa)
 
 # Inject interrupt 0x80.
 #
@@ -23,4 +23,4 @@ ioctl$KVM_RUN(r3, AUTO, 0x0)
 
 # Run till the second uexit.
 #
-syz_kvm_assert_syzos_uexit$x86(r5, 0xbbbb)
+syz_kvm_assert_syzos_uexit$x86(r3, r5, 0xbbbb)
diff --git a/sys/linux/test/amd64-syz_kvm_setup_syzos_vm-wr_drn-soft b/sys/linux/test/amd64-syz_kvm_setup_syzos_vm-wr_drn-soft
@@ -20,4 +20,4 @@ ioctl$KVM_RUN(r3, AUTO, 0x0)
 # Ensure that the exception is handled by the guest, and the program finishes normally.
 #
 syz_kvm_assert_syzos_kvm_exit$x86(r5, 0x6)
-syz_kvm_assert_syzos_uexit$x86(r5, 0xffffffffffffffff)
+syz_kvm_assert_syzos_uexit$x86(r3, r5, 0xffffffffffffffff)
diff --git a/sys/linux/test/amd64-syz_kvm_setup_syzos_vm-wrmsr-rdmsr b/sys/linux/test/amd64-syz_kvm_setup_syzos_vm-wrmsr-rdmsr
@@ -18,4 +18,4 @@ ioctl$KVM_RUN(r3, AUTO, 0x0)
 # Ensure that exit reason is KVM_EXIT_MMIO and uexit code is UEXIT_END.
 #
 syz_kvm_assert_syzos_kvm_exit$x86(r5, 0x6)
-syz_kvm_assert_syzos_uexit$x86(r5, 0xffffffffffffffff)
+syz_kvm_assert_syzos_uexit$x86(r3, r5, 0xffffffffffffffff)
diff --git a/sys/linux/test/arm64-syz_kvm_setup_syzos_vm b/sys/linux/test/arm64-syz_kvm_setup_syzos_vm
@@ -19,12 +19,12 @@ r5 = mmap$KVM_VCPU(&(0x7f0000009000/0x1000)=nil, r4, 0x3, 0x1, r3, 0x0)
 # Run till the first uexit.
 #
 ioctl$KVM_RUN(r3, AUTO, 0x0)
-syz_kvm_assert_syzos_uexit$arm64(r5, 0x0)
+syz_kvm_assert_syzos_uexit$arm64(r3, r5, 0x0)
 # Run till the second uexit.
 #
 ioctl$KVM_RUN(r3, AUTO, 0x0)
-syz_kvm_assert_syzos_uexit$arm64(r5, 0xaaaa)
+syz_kvm_assert_syzos_uexit$arm64(r3, r5, 0xaaaa)
 # Run till the end of guest_main(). 0xffffffffffffffff is UEXIT_END.
 #
 ioctl$KVM_RUN(r3, AUTO, 0x0)
-syz_kvm_assert_syzos_uexit$arm64(r5, 0xffffffffffffffff)
+syz_kvm_assert_syzos_uexit$arm64(r3, r5, 0xffffffffffffffff)
diff --git a/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-enable-pmu-mrs b/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-enable-pmu-mrs
@@ -22,4 +22,4 @@ r5 = mmap$KVM_VCPU(&(0x7f0000009000/0x1000)=nil, r4, 0x3, 0x1, r3, 0x0)
 # Run till the end of guest_main(). 0xffffffffffffffff is UEXIT_END.
 #
 ioctl$KVM_RUN(r3, AUTO, 0x0)
-syz_kvm_assert_syzos_uexit$arm64(r5, 0xffffffffffffffff)
+syz_kvm_assert_syzos_uexit$arm64(r3, r5, 0xffffffffffffffff)
diff --git a/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-enable-pmu-msr b/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-enable-pmu-msr
@@ -22,5 +22,5 @@ r5 = mmap$KVM_VCPU(&(0x7f0000009000/0x1000)=nil, r4, 0x3, 0x1, r3, 0x0)
 # Run till the end of guest_main(). 0xffffffffffffffff is UEXIT_END.
 #
 ioctl$KVM_RUN(r3, AUTO, 0x0)
-syz_kvm_assert_syzos_uexit$arm64(r5, 0xffffffffffffffff)
+syz_kvm_assert_syzos_uexit$arm64(r3, r5, 0xffffffffffffffff)
 syz_kvm_assert_reg(r3, 0x603000000013df40, 0x8000)
diff --git a/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-enable-pmu-msr-emul-0 b/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-enable-pmu-msr-emul-0
@@ -35,7 +35,7 @@ r5 = mmap$KVM_VCPU(&(0x7f0000009000/0x1000)=nil, r4, 0x3, 0x1, r3, 0x0)
 # Run till the end of guest_main(). 0xffffffffffffffff is UEXIT_END.
 #
 ioctl$KVM_RUN(r3, AUTO, 0x0)
-syz_kvm_assert_syzos_uexit$arm64(r5, 0xffffffffffffffff)
+syz_kvm_assert_syzos_uexit$arm64(r3, r5, 0xffffffffffffffff)
 syz_kvm_assert_reg(r3, 0x603000000013c4f1, 0x8000)
 syz_kvm_assert_reg(r3, 0x603000000013c4f2, 0x8000)
 syz_kvm_assert_reg(r3, 0x603000000013dce0, 0x8000)
diff --git a/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-enable-pmu-msr-emul-1 b/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-enable-pmu-msr-emul-1
@@ -35,7 +35,7 @@ r5 = mmap$KVM_VCPU(&(0x7f0000009000/0x1000)=nil, r4, 0x3, 0x1, r3, 0x0)
 # Run till the end of guest_main(). 0xffffffffffffffff is UEXIT_END.
 #
 ioctl$KVM_RUN(r3, AUTO, 0x0)
-syz_kvm_assert_syzos_uexit$arm64(r5, 0xffffffffffffffff)
+syz_kvm_assert_syzos_uexit$arm64(r3, r5, 0xffffffffffffffff)
 syz_kvm_assert_reg(r3, 0x603000000013dcea, 0x8000)
 syz_kvm_assert_reg(r3, 0x603000000013dcf0, 0x8000)
 syz_kvm_assert_reg(r3, 0x603000000013dcf3, 0x8000)
diff --git a/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-enable-pmu-msr-emul-2 b/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-enable-pmu-msr-emul-2
@@ -32,7 +32,7 @@ r5 = mmap$KVM_VCPU(&(0x7f0000009000/0x1000)=nil, r4, 0x3, 0x1, r3, 0x0)
 # Run till the end of guest_main(). 0xffffffffffffffff is UEXIT_END.
 #
 ioctl$KVM_RUN(r3, AUTO, 0x0)
-syz_kvm_assert_syzos_uexit$arm64(r5, 0xffffffffffffffff)
+syz_kvm_assert_syzos_uexit$arm64(r3, r5, 0xffffffffffffffff)
 syz_kvm_assert_reg(r3, 0x603000000013df60, 0x8000)
 syz_kvm_assert_reg(r3, 0x603000000013df61, 0x8000)
 syz_kvm_assert_reg(r3, 0x603000000013df62, 0x8000)
diff --git a/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-memwrite b/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-memwrite
@@ -13,8 +13,8 @@ r5 = mmap$KVM_VCPU(&(0x7f0000009000/0x1000)=nil, r4, 0x3, 0x1, r3, 0x0)
 # Run till the emulated uexit.
 #
 ioctl$KVM_RUN(r3, AUTO, 0x0)
-syz_kvm_assert_syzos_uexit$arm64(r5, 0x0)
+syz_kvm_assert_syzos_uexit$arm64(r3, r5, 0x0)
 # Run till the end of guest_main(). 0xffffffffffffffff is UEXIT_END.
 #
 ioctl$KVM_RUN(r3, AUTO, 0x0)
-syz_kvm_assert_syzos_uexit$arm64(r5, 0xffffffffffffffff)
+syz_kvm_assert_syzos_uexit$arm64(r3, r5, 0xffffffffffffffff)
diff --git a/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-mrs b/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-mrs
@@ -14,4 +14,4 @@ r5 = mmap$KVM_VCPU(&(0x7f0000009000/0x1000)=nil, r4, 0x3, 0x1, r3, 0x0)
 # Run till the end of guest_main(). 0xffffffffffffffff is UEXIT_END.
 #
 ioctl$KVM_RUN(r3, AUTO, 0x0)
-syz_kvm_assert_syzos_uexit$arm64(r5, 0xffffffffffffffff)
+syz_kvm_assert_syzos_uexit$arm64(r3, r5, 0xffffffffffffffff)
diff --git a/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-msr b/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-msr
@@ -14,5 +14,5 @@ r5 = mmap$KVM_VCPU(&(0x7f0000009000/0x1000)=nil, r4, 0x3, 0x1, r3, 0x0)
 # Run till the end of guest_main(). 0xffffffffffffffff is UEXIT_END.
 #
 ioctl$KVM_RUN(r3, AUTO, 0x0)
-syz_kvm_assert_syzos_uexit$arm64(r5, 0xffffffffffffffff)
+syz_kvm_assert_syzos_uexit$arm64(r3, r5, 0xffffffffffffffff)
 syz_kvm_assert_reg(r3, 0x603000000013c600, 0xfefefee0)
diff --git a/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-msr-emul-0 b/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-msr-emul-0
@@ -26,7 +26,7 @@ r5 = mmap$KVM_VCPU(&(0x7f0000009000/0x1000)=nil, r4, 0x3, 0x1, r3, 0x0)
 # Run till the end of guest_main(). 0xffffffffffffffff is UEXIT_END.
 #
 ioctl$KVM_RUN(r3, AUTO, 0x0)
-syz_kvm_assert_syzos_uexit$arm64(r5, 0xffffffffffffffff)
+syz_kvm_assert_syzos_uexit$arm64(r3, r5, 0xffffffffffffffff)
 syz_kvm_assert_reg(r3, 0x6030000000138010, 0x8000)
 syz_kvm_assert_reg(r3, 0x6030000000138012, 0x8000)
 syz_kvm_assert_reg(r3, 0x6030000000138004, 0x8000)
diff --git a/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-msr-emul-1 b/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-msr-emul-1
@@ -26,7 +26,7 @@ r5 = mmap$KVM_VCPU(&(0x7f0000009000/0x1000)=nil, r4, 0x3, 0x1, r3, 0x0)
 # Run till the end of guest_main(). 0xffffffffffffffff is UEXIT_END.
 #
 ioctl$KVM_RUN(r3, AUTO, 0x0)
-syz_kvm_assert_syzos_uexit$arm64(r5, 0xffffffffffffffff)
+syz_kvm_assert_syzos_uexit$arm64(r3, r5, 0xffffffffffffffff)
 syz_kvm_assert_reg(r3, 0x6030000000138015, 0x8000)
 syz_kvm_assert_reg(r3, 0x603000000013801d, 0x8000)
 syz_kvm_assert_reg(r3, 0x6030000000138025, 0x8000)
diff --git a/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-msr-emul-2 b/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-msr-emul-2
@@ -26,7 +26,7 @@ r5 = mmap$KVM_VCPU(&(0x7f0000009000/0x1000)=nil, r4, 0x3, 0x1, r3, 0x0)
 # Run till the end of guest_main(). 0xffffffffffffffff is UEXIT_END.
 #
 ioctl$KVM_RUN(r3, AUTO, 0x0)
-syz_kvm_assert_syzos_uexit$arm64(r5, 0xffffffffffffffff)
+syz_kvm_assert_syzos_uexit$arm64(r3, r5, 0xffffffffffffffff)
 syz_kvm_assert_reg(r3, 0x6030000000138017, 0x8000)
 syz_kvm_assert_reg(r3, 0x603000000013801f, 0x8000)
 syz_kvm_assert_reg(r3, 0x6030000000138084, 0x8000)
diff --git a/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-msr-emul-3 b/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-msr-emul-3
@@ -26,7 +26,7 @@ r5 = mmap$KVM_VCPU(&(0x7f0000009000/0x1000)=nil, r4, 0x3, 0x1, r3, 0x0)
 # Run till the end of guest_main(). 0xffffffffffffffff is UEXIT_END.
 #
 ioctl$KVM_RUN(r3, AUTO, 0x0)
-syz_kvm_assert_syzos_uexit$arm64(r5, 0xffffffffffffffff)
+syz_kvm_assert_syzos_uexit$arm64(r3, r5, 0xffffffffffffffff)
 syz_kvm_assert_reg(r3, 0x603000000013c520, 0x8000)
 syz_kvm_assert_reg(r3, 0x603000000013c521, 0x8000)
 syz_kvm_assert_reg(r3, 0x603000000013c522, 0x8000)
diff --git a/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-msr-emul-4 b/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-msr-emul-4
@@ -26,7 +26,7 @@ r5 = mmap$KVM_VCPU(&(0x7f0000009000/0x1000)=nil, r4, 0x3, 0x1, r3, 0x0)
 # Run till the end of guest_main(). 0xffffffffffffffff is UEXIT_END.
 #
 ioctl$KVM_RUN(r3, AUTO, 0x0)
-syz_kvm_assert_syzos_uexit$arm64(r5, 0xffffffffffffffff)
+syz_kvm_assert_syzos_uexit$arm64(r3, r5, 0xffffffffffffffff)
 syz_kvm_assert_reg(r3, 0x603000000013c65e, 0x8000)
 syz_kvm_assert_reg(r3, 0x603000000013c65f, 0x8000)
 syz_kvm_assert_reg(r3, 0x603000000013c661, 0x8000)
diff --git a/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-smc b/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-smc
@@ -25,4 +25,4 @@ r5 = mmap$KVM_VCPU(&(0x7f0000009000/0x1000)=nil, r4, 0x3, 0x1, r3, 0x0)
 # Run till the end of guest_main(). 0xffffffffffffffff is UEXIT_END.
 #
 ioctl$KVM_RUN(r3, AUTO, 0x0)
-syz_kvm_assert_syzos_uexit$arm64(r5, 0xffffffffffffffff)
+syz_kvm_assert_syzos_uexit$arm64(r3, r5, 0xffffffffffffffff)
diff --git a/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-vgicv3 b/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-vgicv3
@@ -12,7 +12,7 @@ r5 = mmap$KVM_VCPU(&(0x7f0000009000/0x1000)=nil, r4, 0x3, 0x1, r3, 0x0)
 # Run till the end of guest_main(). 0xffffffffffffffff is UEXIT_END.
 #
 ioctl$KVM_RUN(r3, AUTO, 0x0)
-syz_kvm_assert_syzos_uexit$arm64(r5, 0xffffffffffffffff)
+syz_kvm_assert_syzos_uexit$arm64(r3, r5, 0xffffffffffffffff)
 #
 # Calling KVM_RUN here again would result in infinite loop.
 # Instead, signal SPI 32 (0x1000020), so that the guest can execute another uexit in the IRQ handler.
@@ -21,4 +21,4 @@ ioctl$KVM_IRQ_LINE(r1, AUTO, &AUTO={0x1000020, 0x1})
 ioctl$KVM_RUN(r3, AUTO, 0x0)
 # 0xfffffffffffffffe is UEXIT_IRQ.
 #
-syz_kvm_assert_syzos_uexit$arm64(r5, 0xfffffffffffffffe)
+syz_kvm_assert_syzos_uexit$arm64(r3, r5, 0xfffffffffffffffe)
diff --git a/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-vgicv3-cpu1 b/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-vgicv3-cpu1
diff --git a/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-vgicv3-its b/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-vgicv3-its
diff --git a/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-vgicv3-its-cmd b/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-vgicv3-its-cmd
diff --git a/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-vgicv3-unroll b/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-vgicv3-unroll
diff --git a/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-wfe b/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-wfe
diff --git a/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-wfet b/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-wfet
diff --git a/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-wfi b/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-wfi
diff --git a/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-wfit b/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-wfit

Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,9 @@ r5 = mmap$KVM_VCPU(&(0x7f0000009000/0x1000)=nil, r4, 0x3, 0x1, r3, 0x0)`
`29`	`29`	`# If KVM L0 processes the EVENTINJ correctly, the guest should eventually exit back to us.`
`30`	`30`	`#`
`31`	`31`	`ioctl$KVM_RUN(r3, AUTO, 0x0)`
`32`		`-syz_kvm_assert_syzos_uexit$x86(r5, 0xface)`
	`32`	`+syz_kvm_assert_syzos_uexit$x86(r3, r5, 0xface)`
`33`	`33`
`34`	`34`	`# Cleanup`
`35`	`35`	`#`
`36`	`36`	`ioctl$KVM_RUN(r3, AUTO, 0x0)`
`37`		`-syz_kvm_assert_syzos_uexit$x86(r5, 0xffffffff)`
	`37`	`+syz_kvm_assert_syzos_uexit$x86(r3, r5, 0xffffffff)`
Original file line number	Diff line number	Diff line change
`@@ -27,9 +27,9 @@ r5 = mmap$KVM_VCPU(&(0x7f0000009000/0x1000)=nil, r4, 0x3, 0x1, r3, 0x0)`
`27`	`27`	`# and then immediately yield with UEXIT code 0xface.`
`28`	`28`	`#`
`29`	`29`	`ioctl$KVM_RUN(r3, AUTO, 0x0)`
`30`		`-syz_kvm_assert_syzos_uexit$x86(r5, 0xface)`
	`30`	`+syz_kvm_assert_syzos_uexit$x86(r3, r5, 0xface)`
`31`	`31`
`32`	`32`	`# guest_main should finish with guest_uexit(-1).`
`33`	`33`	`#`
`34`	`34`	`ioctl$KVM_RUN(r3, AUTO, 0x0)`
`35`		`-syz_kvm_assert_syzos_uexit$x86(r5, 0xffffffff)`
	`35`	`+syz_kvm_assert_syzos_uexit$x86(r3, r5, 0xffffffff)`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ r5 = mmap$KVM_VCPU(&(0x7f0000009000/0x1000)=nil, r4, 0x3, 0x1, r3, 0x0)`
`21`	`21`	`# Run 1: Execute CLGI -> UEXIT(0x1337)`
`22`	`22`	`#`
`23`	`23`	`ioctl$KVM_RUN(r3, AUTO, 0x0)`
`24`		`-syz_kvm_assert_syzos_uexit$x86(r5, 0x1337)`
	`24`	`+syz_kvm_assert_syzos_uexit$x86(r3, r5, 0x1337)`
`25`	`25`
`26`	`26`	`# Inject NMI into the vCPU.`
`27`	`27`	`# Since GIF=0 in the guest, this NMI should be queued by L0.`
`@@ -39,9 +39,9 @@ ioctl$KVM_RUN(r3, AUTO, 0x0)`
`39`	`39`	`# If the guest handles it transparently, we see 0xface.`
`40`	`40`	`# For this regression test, ensuring we don't crash L0 is the primary goal.`
`41`	`41`	`#`
`42`		`-syz_kvm_assert_syzos_uexit$x86(r5, 0xface)`
	`42`	`+syz_kvm_assert_syzos_uexit$x86(r3, r5, 0xface)`
`43`	`43`
`44`	`44`	`# Cleanup.`
`45`	`45`	`#`
`46`	`46`	`ioctl$KVM_RUN(r3, AUTO, 0x0)`
`47`		`-syz_kvm_assert_syzos_uexit$x86(r5, 0xffffffff)`
	`47`	`+syz_kvm_assert_syzos_uexit$x86(r3, r5, 0xffffffff)`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ r5 = mmap$KVM_VCPU(&(0x7f0000009000/0x1000)=nil, r4, 0x3, 0x1, r3, 0x0)`
`24`	`24`	`# L2 VM executes HLT. Exit reason is mapped to 0xe2e20001.`
`25`	`25`	`#`
`26`	`26`	`ioctl$KVM_RUN(r3, AUTO, 0x0)`
`27`		`-syz_kvm_assert_syzos_uexit$x86(r5, 0xe2e20001)`
	`27`	`+syz_kvm_assert_syzos_uexit$x86(r3, r5, 0xe2e20001)`
`28`	`28`
`29`	`29`	`# L1 disables HLT intercept and resumes L2. L2 executes HLT, causing KVM_EXIT_HLT (0x5) from L1 to L0.`
`30`	`30`	`# This confirms that the vmcb_write_mask command was successful.`
`@@ -35,9 +35,9 @@ syz_kvm_assert_syzos_kvm_exit$x86(r5, 0x5)`
`35`	`35`	`# After resuming, L2 executes INVD. Exit reason is mapped to 0xe2e20002.`
`36`	`36`	`#`
`37`	`37`	`ioctl$KVM_RUN(r3, AUTO, 0x0)`
`38`		`-syz_kvm_assert_syzos_uexit$x86(r5, 0xe2e20002)`
	`38`	`+syz_kvm_assert_syzos_uexit$x86(r3, r5, 0xe2e20002)`
`39`	`39`
`40`	`40`	`# guest_main should finish with guest_uexit(-1).`
`41`	`41`	`#`
`42`	`42`	`ioctl$KVM_RUN(r3, AUTO, 0x0)`
`43`		`-syz_kvm_assert_syzos_uexit$x86(r5, 0xffffffff)`
	`43`	`+syz_kvm_assert_syzos_uexit$x86(r3, r5, 0xffffffff)`
Original file line number	Diff line number	Diff line change
`@@ -15,9 +15,9 @@ r5 = mmap$KVM_VCPU(&(0x7f0000009000/0x1000)=nil, r4, 0x3, 0x1, r3, 0x0)`
`15`	`15`	`# (0x1 is SYZOS_NESTED_EXIT_REASON_HLT).`
`16`	`16`	`#`
`17`	`17`	`ioctl$KVM_RUN(r3, AUTO, 0x0)`
`18`		`-syz_kvm_assert_syzos_uexit$x86(r5, 0xe2e20001)`
	`18`	`+syz_kvm_assert_syzos_uexit$x86(r3, r5, 0xe2e20001)`
`19`	`19`
`20`	`20`	`# KVM_RUN should exit with KVM_EXIT_MMIO due to guest_uexit(-1).`
`21`	`21`	`#`
`22`	`22`	`ioctl$KVM_RUN(r3, AUTO, 0x0)`
`23`		`-syz_kvm_assert_syzos_uexit$x86(r5, 0xffffffff)`
	`23`	`+syz_kvm_assert_syzos_uexit$x86(r3, r5, 0xffffffff)`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ r5 = mmap$KVM_VCPU(&(0x7f0000009000/0x1000)=nil, r4, 0x3, 0x1, r3, 0x0)`
`20`	`20`	`# L2 VM executes HLT. Exit reason is mapped to 0xe2e20001.`
`21`	`21`	`#`
`22`	`22`	`ioctl$KVM_RUN(r3, AUTO, 0x0)`
`23`		`-syz_kvm_assert_syzos_uexit$x86(r5, 0xe2e20001)`
	`23`	`+syz_kvm_assert_syzos_uexit$x86(r3, r5, 0xe2e20001)`
`24`	`24`
`25`	`25`	`# L1 disables HLT exiting and resumes L2. L2 resumes at HLT, and breaks out of KVM_RUN.`
`26`	`26`	`# 0x05 is KVM_EXIT_HLT.`
`@@ -32,9 +32,9 @@ syz_kvm_assert_syzos_kvm_exit$x86(r5, 0x5)`
`32`	`32`	`# After resuming, L2 executes INVD. Exit reason is mapped to 0xe2e20002.`
`33`	`33`	`#`
`34`	`34`	`ioctl$KVM_RUN(r3, AUTO, 0x0)`
`35`		`-syz_kvm_assert_syzos_uexit$x86(r5, 0xe2e20002)`
	`35`	`+syz_kvm_assert_syzos_uexit$x86(r3, r5, 0xe2e20002)`
`36`	`36`
`37`	`37`	`# guest_main should finish with guest_uexit(-1).`
`38`	`38`	`#`
`39`	`39`	`ioctl$KVM_RUN(r3, AUTO, 0x0)`
`40`		`-syz_kvm_assert_syzos_uexit$x86(r5, 0xffffffff)`
	`40`	`+syz_kvm_assert_syzos_uexit$x86(r3, r5, 0xffffffff)`
Original file line number	Diff line number	Diff line change
`@@ -16,14 +16,14 @@ r5 = mmap$KVM_VCPU(&(0x7f0000009000/0x1000)=nil, r4, 0x3, 0x1, r3, 0x0)`
`16`	`16`	`# L2 VM executes INVD. Exit reason is mapped to 0xe2e20002.`
`17`	`17`	`#`
`18`	`18`	`ioctl$KVM_RUN(r3, AUTO, 0x0)`
`19`		`-syz_kvm_assert_syzos_uexit$x86(r5, 0xe2e20002)`
	`19`	`+syz_kvm_assert_syzos_uexit$x86(r3, r5, 0xe2e20002)`
`20`	`20`
`21`	`21`	`# L1 resumes L2, which executes HLT. Exit reason is mapped to 0xe2e20001.`
`22`	`22`	`#`
`23`	`23`	`ioctl$KVM_RUN(r3, AUTO, 0x0)`
`24`		`-syz_kvm_assert_syzos_uexit$x86(r5, 0xe2e20001)`
	`24`	`+syz_kvm_assert_syzos_uexit$x86(r3, r5, 0xe2e20001)`
`25`	`25`
`26`	`26`	`# guest_main should finish with guest_uexit(-1).`
`27`	`27`	`#`
`28`	`28`	`ioctl$KVM_RUN(r3, AUTO, 0x0)`
`29`		`-syz_kvm_assert_syzos_uexit$x86(r5, 0xffffffff)`
	`29`	`+syz_kvm_assert_syzos_uexit$x86(r3, r5, 0xffffffff)`
Original file line number	Diff line number	Diff line change
`@@ -14,14 +14,14 @@ r5 = mmap$KVM_VCPU(&(0x7f0000009000/0x1000)=nil, r4, 0x3, 0x1, r3, 0x0)`
`14`	`14`	`# L2 VM executes CPUID. Exit reason is mapped to 0xe2e20003.`
`15`	`15`	`#`
`16`	`16`	`ioctl$KVM_RUN(r3, AUTO, 0x0)`
`17`		`-syz_kvm_assert_syzos_uexit$x86(r5, 0xe2e20003)`
	`17`	`+syz_kvm_assert_syzos_uexit$x86(r3, r5, 0xe2e20003)`
`18`	`18`
`19`	`19`	`# L1 resumes L2, which executes HLT. Exit reason is mapped to 0xe2e20001.`
`20`	`20`	`#`
`21`	`21`	`ioctl$KVM_RUN(r3, AUTO, 0x0)`
`22`		`-syz_kvm_assert_syzos_uexit$x86(r5, 0xe2e20001)`
	`22`	`+syz_kvm_assert_syzos_uexit$x86(r3, r5, 0xe2e20001)`
`23`	`23`
`24`	`24`	`# guest_main should finish with guest_uexit(-1).`
`25`	`25`	`#`
`26`	`26`	`ioctl$KVM_RUN(r3, AUTO, 0x0)`
`27`		`-syz_kvm_assert_syzos_uexit$x86(r5, 0xffffffff)`
	`27`	`+syz_kvm_assert_syzos_uexit$x86(r3, r5, 0xffffffff)`