Commit 20589c8c authored by Marc Zyngier's avatar Marc Zyngier
Browse files

arm/arm64: KVM: Don't panic on failure to properly reset system registers 



Failing to properly reset system registers is pretty bad. But not
quite as bad as bringing the whole machine down... So warn loudly,
but slightly more gracefully.

Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Acked-by: default avatarChristoffer Dall <christoffer.dall@arm.com>
parent 358b28f0

arch/arm/kvm/coproc.c

+2 −2
Original line number Diff line number Diff line
@@ -1450,6 +1450,6 @@ void kvm_reset_coprocs(struct kvm_vcpu *vcpu) 
	reset_coproc_regs(vcpu, table, num);



	for (num = 1; num < NR_CP15_REGS; num++)

		if (vcpu_cp15(vcpu, num) == 0x42424242)

			panic("Didn't reset vcpu_cp15(vcpu, %zi)", num);

		WARN(vcpu_cp15(vcpu, num) == 0x42424242,

		     "Didn't reset vcpu_cp15(vcpu, %zi)", num);

}

arch/arm64/kvm/sys_regs.c

+5 −3
Original line number Diff line number Diff line
@@ -2608,7 +2608,9 @@ void kvm_reset_sys_regs(struct kvm_vcpu *vcpu) 
	table = get_target_table(vcpu->arch.target, true, &num);

	reset_sys_reg_descs(vcpu, table, num);



	for (num = 1; num < NR_SYS_REGS; num++)

		if (__vcpu_sys_reg(vcpu, num) == 0x4242424242424242)

			panic("Didn't reset __vcpu_sys_reg(%zi)", num);

	for (num = 1; num < NR_SYS_REGS; num++) {

		if (WARN(__vcpu_sys_reg(vcpu, num) == 0x4242424242424242,

			 "Didn't reset __vcpu_sys_reg(%zi)\n", num))

			break;

	}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE