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

Merge tag 'kvmarm-fixes-5.9-2' of... 

Merge tag 'kvmarm-fixes-5.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master

KVM/arm64 fixes for 5.9, take #2

- Fix handling of S1 Page Table Walk permission fault at S2
  on instruction fetch
- Cleanup kvm_vcpu_dabt_iswrite()
parents 7d1f8691 620cf45f

arch/arm64/include/asm/kvm_emulate.h

+11 −3
Original line number Diff line number Diff line
@@ -298,15 +298,15 @@ static __always_inline int kvm_vcpu_dabt_get_rd(const struct kvm_vcpu *vcpu) 
	return (kvm_vcpu_get_esr(vcpu) & ESR_ELx_SRT_MASK) >> ESR_ELx_SRT_SHIFT;

}



static __always_inline bool kvm_vcpu_dabt_iss1tw(const struct kvm_vcpu *vcpu)

static __always_inline bool kvm_vcpu_abt_iss1tw(const struct kvm_vcpu *vcpu)

{

	return !!(kvm_vcpu_get_esr(vcpu) & ESR_ELx_S1PTW);

}



/* Always check for S1PTW *before* using this. */

static __always_inline bool kvm_vcpu_dabt_iswrite(const struct kvm_vcpu *vcpu)

{

	return !!(kvm_vcpu_get_esr(vcpu) & ESR_ELx_WNR) ||

		kvm_vcpu_dabt_iss1tw(vcpu); /* AF/DBM update */

	return kvm_vcpu_get_esr(vcpu) & ESR_ELx_WNR;

}



static inline bool kvm_vcpu_dabt_is_cm(const struct kvm_vcpu *vcpu)
@@ -335,6 +335,11 @@ static inline bool kvm_vcpu_trap_is_iabt(const struct kvm_vcpu *vcpu) 
	return kvm_vcpu_trap_get_class(vcpu) == ESR_ELx_EC_IABT_LOW;

}



static inline bool kvm_vcpu_trap_is_exec_fault(const struct kvm_vcpu *vcpu)

{

	return kvm_vcpu_trap_is_iabt(vcpu) && !kvm_vcpu_abt_iss1tw(vcpu);

}



static __always_inline u8 kvm_vcpu_trap_get_fault(const struct kvm_vcpu *vcpu)

{

	return kvm_vcpu_get_esr(vcpu) & ESR_ELx_FSC;
@@ -372,6 +377,9 @@ static __always_inline int kvm_vcpu_sys_get_rt(struct kvm_vcpu *vcpu) 


static inline bool kvm_is_write_fault(struct kvm_vcpu *vcpu)

{

	if (kvm_vcpu_abt_iss1tw(vcpu))

		return true;



	if (kvm_vcpu_trap_is_iabt(vcpu))

		return false;

arch/arm64/kvm/hyp/include/hyp/switch.h

+1 −1
Original line number Diff line number Diff line
@@ -445,7 +445,7 @@ static inline bool fixup_guest_exit(struct kvm_vcpu *vcpu, u64 *exit_code) 
			kvm_vcpu_trap_get_fault_type(vcpu) == FSC_FAULT &&

			kvm_vcpu_dabt_isvalid(vcpu) &&

			!kvm_vcpu_abt_issea(vcpu) &&

			!kvm_vcpu_dabt_iss1tw(vcpu);

			!kvm_vcpu_abt_iss1tw(vcpu);



		if (valid) {

			int ret = __vgic_v2_perform_cpuif_access(vcpu);

arch/arm64/kvm/mmu.c

+2 −2
Original line number Diff line number Diff line
@@ -1849,7 +1849,7 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, 
	struct kvm_s2_mmu *mmu = vcpu->arch.hw_mmu;



	write_fault = kvm_is_write_fault(vcpu);

	exec_fault = kvm_vcpu_trap_is_iabt(vcpu);

	exec_fault = kvm_vcpu_trap_is_exec_fault(vcpu);

	VM_BUG_ON(write_fault && exec_fault);



	if (fault_status == FSC_PERM && !write_fault && !exec_fault) {
@@ -2131,7 +2131,7 @@ int kvm_handle_guest_abort(struct kvm_vcpu *vcpu) 
			goto out;

		}



		if (kvm_vcpu_dabt_iss1tw(vcpu)) {

		if (kvm_vcpu_abt_iss1tw(vcpu)) {

			kvm_inject_dabt(vcpu, kvm_vcpu_get_hfar(vcpu));

			ret = 1;

			goto out_unlock;

CRA Git | Maintained and supported by SUSTech CRA and CCSE