Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c667186f authored by Marc Zyngier's avatar Marc Zyngier Committed by Christoffer Dall
Browse files

arm64: KVM: Fix decoding of Rt/Rt2 when trapping AArch32 CP accesses 



Our 32bit CP14/15 handling inherited some of the ARMv7 code for handling
the trapped system registers, completely missing the fact that the
fields for Rt and Rt2 are now 5 bit wide, and not 4...

Let's fix it, and provide an accessor for the most common Rt case.

Cc: stable@vger.kernel.org
Reviewed-by: default avatarChristoffer Dall <cdall@linaro.org>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarChristoffer Dall <cdall@linaro.org>
parent 1edb6321

arch/arm64/include/asm/kvm_emulate.h

+6 −0
Original line number Diff line number Diff line
@@ -240,6 +240,12 @@ static inline u8 kvm_vcpu_trap_get_fault_type(const struct kvm_vcpu *vcpu) 
	return kvm_vcpu_get_hsr(vcpu) & ESR_ELx_FSC_TYPE;

}



static inline int kvm_vcpu_sys_get_rt(struct kvm_vcpu *vcpu)

{

	u32 esr = kvm_vcpu_get_hsr(vcpu);

	return (esr & ESR_ELx_SYS64_ISS_RT_MASK) >> ESR_ELx_SYS64_ISS_RT_SHIFT;

}



static inline unsigned long kvm_vcpu_get_mpidr_aff(struct kvm_vcpu *vcpu)

{

	return vcpu_sys_reg(vcpu, MPIDR_EL1) & MPIDR_HWID_BITMASK;

arch/arm64/kvm/sys_regs.c

+4 −4
Original line number Diff line number Diff line
@@ -1529,8 +1529,8 @@ static int kvm_handle_cp_64(struct kvm_vcpu *vcpu, 
{

	struct sys_reg_params params;

	u32 hsr = kvm_vcpu_get_hsr(vcpu);

	int Rt = (hsr >> 5) & 0xf;

	int Rt2 = (hsr >> 10) & 0xf;

	int Rt = kvm_vcpu_sys_get_rt(vcpu);

	int Rt2 = (hsr >> 10) & 0x1f;



	params.is_aarch32 = true;

	params.is_32bit = false;
@@ -1586,7 +1586,7 @@ static int kvm_handle_cp_32(struct kvm_vcpu *vcpu, 
{

	struct sys_reg_params params;

	u32 hsr = kvm_vcpu_get_hsr(vcpu);

	int Rt  = (hsr >> 5) & 0xf;

	int Rt  = kvm_vcpu_sys_get_rt(vcpu);



	params.is_aarch32 = true;

	params.is_32bit = true;
@@ -1688,7 +1688,7 @@ int kvm_handle_sys_reg(struct kvm_vcpu *vcpu, struct kvm_run *run) 
{

	struct sys_reg_params params;

	unsigned long esr = kvm_vcpu_get_hsr(vcpu);

	int Rt = (esr >> 5) & 0x1f;

	int Rt = kvm_vcpu_sys_get_rt(vcpu);

	int ret;



	trace_kvm_handle_sys_reg(esr);