Commit b82ebaf2 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvmarm-fixes-6.18-3' of... 

Merge tag 'kvmarm-fixes-6.18-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD

KVM/arm64 fixes for 6.18, take #3

- Only adjust the ID registers when no irqchip has been created once
  per VM run, instead of doing it once per vcpu, as this otherwise
  triggers a pretty bad conbsistency check failure in the sysreg code.

- Make sure the per-vcpu Fine Grain Traps are computed before we load
  the system registers on the HW, as we otherwise start running without
  anything set until the first preemption of the vcpu.
parents 6a23ae0a 85592114

arch/arm64/kvm/arm.c

+1 −1
Original line number Diff line number Diff line
@@ -624,6 +624,7 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu) 
	kvm_timer_vcpu_load(vcpu);

	kvm_vgic_load(vcpu);

	kvm_vcpu_load_debug(vcpu);

	kvm_vcpu_load_fgt(vcpu);

	if (has_vhe())

		kvm_vcpu_load_vhe(vcpu);

	kvm_arch_vcpu_load_fp(vcpu);
@@ -642,7 +643,6 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu) 
		vcpu->arch.hcr_el2 |= HCR_TWI;



	vcpu_set_pauth_traps(vcpu);

	kvm_vcpu_load_fgt(vcpu);



	if (is_protected_kvm_enabled()) {

		kvm_call_hyp_nvhe(__pkvm_vcpu_load,

arch/arm64/kvm/sys_regs.c

+5 −1
Original line number Diff line number Diff line
@@ -5609,7 +5609,11 @@ int kvm_finalize_sys_regs(struct kvm_vcpu *vcpu) 


	guard(mutex)(&kvm->arch.config_lock);



	if (!irqchip_in_kernel(kvm)) {

	/*

	 * This hacks into the ID registers, so only perform it when the

	 * first vcpu runs, or the kvm_set_vm_id_reg() helper will scream.

	 */

	if (!irqchip_in_kernel(kvm) && !kvm_vm_has_ran_once(kvm)) {

		u64 val;



		val = kvm_read_vm_id_reg(kvm, SYS_ID_AA64PFR0_EL1) & ~ID_AA64PFR0_EL1_GIC;