sys/linux/test: update after syz_kvm_assert_syzos_uexit API change

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.

40 files changed, 74 insertions, 74 deletions

diff --git a/sys/linux/test/amd64-syz_kvm_nested_amd_inject b/sys/linux/test/amd64-syz_kvm_nested_amd_inject
index f41b89489..42e65fadf 100644
--- 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
index e7a8b1f67..e78995676 100644
--- 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
index 21f57e878..fb370c7ce 100644
--- 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
index 4ccf23953..4d13643fb 100644
--- 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
index 1a26a4e82..b1d76fc9b 100644
--- 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
index 66efb98f8..0df9fc368 100644
--- 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
index f26b683bf..d399b3754 100644
--- 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
index 43abd7cc3..cae9bf00a 100644
--- 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
index 3c0e25635..bb36db020 100644
--- 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
index 0ccff3425..26c0aef0f 100644
--- 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
index ad2c9479a..8801f49a3 100644
--- 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
index 0e13a0337..0911bf2c7 100644
--- 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
index b950fb3a3..ca7b16a90 100644
--- 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
index b7ef63f8c..f837922f6 100644
--- 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
index d43310089..3c5e83686 100644
--- 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
index 2ecf90804..b1b12affc 100644
--- 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
index b2a0c59b4..a8e9ee9c2 100644
--- 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
index 8a6dab724..47ea6b188 100644
--- 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
index c2586d557..d48a1173e 100644
--- 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
index 2e8f0fba9..58877c5b7 100644
--- 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
index 6ed9d7e2f..940aa9744 100644
--- 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
index 5f9720d25..83667f73c 100644
--- 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
index 187eadbc0..f440ef4ea 100644
--- 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
index b984289b2..1da151cba 100644
--- 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
index 1be423dbb..dfbc1d45c 100644
--- 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
index e329712d0..34f9a95c6 100644
--- 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
index adc2c0934..d5a541756 100644
--- 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
index 14836d6c7..f9dbd74de 100644
--- 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
index 8c3e6db3b..f3bd594b3 100644
--- 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
index e206d3407..4e3d5165e 100644
--- 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
index bb91f426b..ad828386e 100644
--- 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
index 242e48475..9c8326585 100644
--- 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
index 5ee849468..adc354eab 100644
--- a/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-vgicv3-cpu1
+++ b/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-vgicv3-cpu1
@@ -13,11 +13,11 @@ r6 = mmap$KVM_VCPU(&(0x7f0000009000/0x1000)=nil, r5, 0x3, 0x1, r3, 0x0)
 r7 = mmap$KVM_VCPU(&(0x7f000000a000/0x1000)=nil, r5, 0x3, 0x1, r4, 0x0)
 
 ioctl$KVM_RUN(r4, AUTO, 0x0)
-syz_kvm_assert_syzos_uexit$arm64(r7, 0xffffffffffffffff)
+syz_kvm_assert_syzos_uexit$arm64(r4, r7, 0xffffffffffffffff)
 #
 # Calling KVM_RUN here again would result in infinite loop.
 # Instead, signal SPI 32 on CPU 1 (0x1010020), so that the guest can execute another uexit in the IRQ handler.
 #
 ioctl$KVM_IRQ_LINE(r1, AUTO, &AUTO={0x1010020, 0x1})
 ioctl$KVM_RUN(r3, AUTO, 0x0)
-syz_kvm_assert_syzos_uexit$arm64(r6, 0xfffffffffffffffe)
+syz_kvm_assert_syzos_uexit$arm64(r3, r6, 0xfffffffffffffffe)
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
index a2570b6a0..1ab577904 100644
--- a/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-vgicv3-its
+++ b/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-vgicv3-its
@@ -27,7 +27,7 @@ r6 = mmap$KVM_VCPU(&(0x7f0000009000/0x1000)=nil, r5, 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(r6, 0xffffffffffffffff)
+syz_kvm_assert_syzos_uexit$arm64(r3, r6, 0xffffffffffffffff)
 #
 # Calling KVM_RUN here again would result in infinite loop.
 # Instead, signal LPI 0x2000 that is mapped to the event 0, so that the guest can execute another uexit in the IRQ handler.
@@ -36,4 +36,4 @@ syz_kvm_assert_syzos_uexit$arm64(r6, 0xffffffffffffffff)
 #
 ioctl$KVM_SIGNAL_MSI(r1, AUTO, &AUTO={0x8090040, 0x0, 0x0, 0x1, 0x0, ""})
 ioctl$KVM_RUN(r3, AUTO, 0x0)
-syz_kvm_assert_syzos_uexit$arm64(r6, 0xfffffffffffffffe)
+syz_kvm_assert_syzos_uexit$arm64(r3, r6, 0xfffffffffffffffe)
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
index a3eec318c..9b27afdc4 100644
--- 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
@@ -31,9 +31,9 @@ r6 = mmap$KVM_VCPU(&(0x7f0000009000/0x1000)=nil, r5, 0x3, 0x1, r3, 0x0)
 # This KVM_RUN will stop after receiving the LPI.
 #
 ioctl$KVM_RUN(r3, AUTO, 0x0)
-syz_kvm_assert_syzos_uexit$arm64(r6, 0xfffffffffffffffe)
+syz_kvm_assert_syzos_uexit$arm64(r3, r6, 0xfffffffffffffffe)
 #
 # This KVM_RUN will stop after finishing the user program.
 #
 ioctl$KVM_RUN(r3, AUTO, 0x0)
-syz_kvm_assert_syzos_uexit$arm64(r6, 0xffffffffffffffff)
+syz_kvm_assert_syzos_uexit$arm64(r3, r6, 0xffffffffffffffff)
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
index 0110d0f1a..96b205285 100644
--- a/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-vgicv3-unroll
+++ b/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-vgicv3-unroll
@@ -20,11 +20,11 @@ r5 = ioctl$KVM_GET_VCPU_MMAP_SIZE(r0, AUTO)
 r6 = mmap$KVM_VCPU(&(0x7f0000009000/0x1000)=nil, r5, 0x3, 0x1, r3, 0x0)
 
 ioctl$KVM_RUN(r3, AUTO, 0x0)
-syz_kvm_assert_syzos_uexit$arm64(r6, 0xffffffffffffffff)
+syz_kvm_assert_syzos_uexit$arm64(r3, r6, 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.
 #
 ioctl$KVM_IRQ_LINE(r1, AUTO, &AUTO={0x1000020, 0x1})
 ioctl$KVM_RUN(r3, AUTO, 0x0)
-syz_kvm_assert_syzos_uexit$arm64(r6, 0xfffffffffffffffe)
+syz_kvm_assert_syzos_uexit$arm64(r3, r6, 0xfffffffffffffffe)
diff --git a/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-wfe b/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-wfe
index 9f8a17d1c..85739e6b0 100644
--- a/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-wfe
+++ b/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-wfe
@@ -14,4 +14,4 @@ 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)
diff --git a/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-wfet b/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-wfet
index 6c99a486c..e1f3f8796 100644
--- a/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-wfet
+++ b/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-wfet
@@ -14,12 +14,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-wfi b/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-wfi
index 229a83e4e..cbec4564a 100644
--- a/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-wfi
+++ b/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-wfi
@@ -14,4 +14,4 @@ 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)
diff --git a/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-wfit b/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-wfit
index ffff97c46..08320b182 100644
--- a/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-wfit
+++ b/sys/linux/test/arm64-syz_kvm_setup_syzos_vm-wfit
@@ -14,12 +14,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)