Commit 69adec18 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

KVM: arm64: Fix reporting of endianess when the access originates at EL0 



We currently check SCTLR_EL1.EE when computing the address of
a faulting guest access. However, the fault could have occured at
EL0, in which case the right bit to check would be SCTLR_EL1.E0E.

This is pretty unlikely to cause any issue in practice: You'd have
to have a guest with a LE EL1 and a BE EL0 (or the other way around),
and have mapped a device into the EL0 page tables.

Good luck with that!

Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Reviewed-by: default avatarAndrew Jones <drjones@redhat.com>
Link: https://lore.kernel.org/r/20211012112312.1247467-1-maz@kernel.org
parent e26bb75a

arch/arm64/include/asm/kvm_emulate.h

+4 −1
Original line number Diff line number Diff line
@@ -396,7 +396,10 @@ static inline bool kvm_vcpu_is_be(struct kvm_vcpu *vcpu) 
	if (vcpu_mode_is_32bit(vcpu))

		return !!(*vcpu_cpsr(vcpu) & PSR_AA32_E_BIT);



	return !!(vcpu_read_sys_reg(vcpu, SCTLR_EL1) & (1 << 25));

	if (vcpu_mode_priv(vcpu))

		return !!(vcpu_read_sys_reg(vcpu, SCTLR_EL1) & SCTLR_ELx_EE);

	else

		return !!(vcpu_read_sys_reg(vcpu, SCTLR_EL1) & SCTLR_EL1_E0E);

}



static inline unsigned long vcpu_data_guest_to_host(struct kvm_vcpu *vcpu,