Commit 2dc720e6 authored by Fuad Tabba's avatar Fuad Tabba Committed by Oliver Upton
Browse files

KVM: arm64: Fix parameter ordering for VBAR_EL1 assignment 



The __vcpu_assign_sys_reg() helper expects the register ID as the second
argument and the value to be assigned as the third. However, the
existing code was passing these parameters in the incorrect order.

Fix the function call to properly read the live value of VBAR_EL1 from
the guest and update the vCPU value immediately before pending the
exception. This ensures the vCPU's value is the same as the guest's and
that the exception will be handled at the correct address upon resuming
the guest.

Fixes: 798eb597 ("KVM: arm64: Sync protected guest VBAR_EL1 on injecting an undef exception")
Signed-off-by: default avatarFuad Tabba <tabba@google.com>
Link: https://lore.kernel.org/r/20250908163557.2419780-1-tabba@google.com


Signed-off-by: default avatarOliver Upton <oliver.upton@linux.dev>
parent ebb2d8fd

arch/arm64/kvm/hyp/nvhe/sys_regs.c

+1 −1
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ static void inject_undef64(struct kvm_vcpu *vcpu) 


	*vcpu_pc(vcpu) = read_sysreg_el2(SYS_ELR);

	*vcpu_cpsr(vcpu) = read_sysreg_el2(SYS_SPSR);

	__vcpu_assign_sys_reg(vcpu, read_sysreg_el1(SYS_VBAR), VBAR_EL1);

	__vcpu_assign_sys_reg(vcpu, VBAR_EL1, read_sysreg_el1(SYS_VBAR));



	kvm_pend_exception(vcpu, EXCEPT_AA64_EL1_SYNC);