Commit c9a636f2 authored by Will Deacon's avatar Will Deacon Committed by Marc Zyngier
Browse files

KVM: arm64: Rename kvm_vcpu_dabt_isextabt() 



kvm_vcpu_dabt_isextabt() is not specific to data aborts and, unlike
kvm_vcpu_dabt_issext(), has nothing to do with sign extension.

Rename it to 'kvm_vcpu_abt_issea()'.

Signed-off-by: default avatarWill Deacon <will@kernel.org>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Cc: Marc Zyngier <maz@kernel.org>
Cc: Quentin Perret <qperret@google.com>
Link: https://lore.kernel.org/r/20200729102821.23392-2-will@kernel.org
parent 1ccf2fe3

arch/arm64/include/asm/kvm_emulate.h

+1 −1
Original line number Diff line number Diff line
@@ -366,7 +366,7 @@ static __always_inline u8 kvm_vcpu_trap_get_fault_type(const struct kvm_vcpu *vc 
	return kvm_vcpu_get_esr(vcpu) & ESR_ELx_FSC_TYPE;

}



static __always_inline bool kvm_vcpu_dabt_isextabt(const struct kvm_vcpu *vcpu)

static __always_inline bool kvm_vcpu_abt_issea(const struct kvm_vcpu *vcpu)

{

	switch (kvm_vcpu_trap_get_fault(vcpu)) {

	case FSC_SEA:

arch/arm64/kvm/hyp/switch.c

+1 −1
Original line number Diff line number Diff line
@@ -594,7 +594,7 @@ static bool __hyp_text fixup_guest_exit(struct kvm_vcpu *vcpu, u64 *exit_code) 
		valid = kvm_vcpu_trap_get_class(vcpu) == ESR_ELx_EC_DABT_LOW &&

			kvm_vcpu_trap_get_fault_type(vcpu) == FSC_FAULT &&

			kvm_vcpu_dabt_isvalid(vcpu) &&

			!kvm_vcpu_dabt_isextabt(vcpu) &&

			!kvm_vcpu_abt_issea(vcpu) &&

			!kvm_vcpu_dabt_iss1tw(vcpu);



		if (valid) {

arch/arm64/kvm/mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -2074,7 +2074,7 @@ int kvm_handle_guest_abort(struct kvm_vcpu *vcpu, struct kvm_run *run) 
	is_iabt = kvm_vcpu_trap_is_iabt(vcpu);



	/* Synchronous External Abort? */

	if (kvm_vcpu_dabt_isextabt(vcpu)) {

	if (kvm_vcpu_abt_issea(vcpu)) {

		/*

		 * For RAS the host kernel may handle this abort.

		 * There is no need to pass the error into the guest.

CRA Git | Maintained and supported by SUSTech CRA and CCSE