Commit 419025b3 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

Merge branch kvm-arm64/misc-5.15 into kvmarm-master/next 



* kvm-arm64/misc-5.15:
  : Misc improvements for 5.15:
  :
  : - Account the number of VMID-wide TLB invalidations as
  :   remote TLB flushes
  : - Fix comments in the VGIC code
  : - Cleanup the PMU IMPDEF identification
  : - Streamline the TGRAN2 usage
  : - Avoid advertising a 52bit IPA range for non-64KB configs
  : - Avoid spurious signalling when a HW-mapped interrupt is in the
  :   A+P state on entry, and in the P state on exit, but that the
  :   physical line is not pending anymore.
  : - Bunch of minor cleanups
  KVM: arm64: Trim guest debug exception handling

Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parents 7c7b363d 8ce8a6fc

arch/arm64/kvm/handle_exit.c

+3 −17
Original line number Diff line number Diff line
@@ -113,34 +113,20 @@ static int kvm_handle_wfx(struct kvm_vcpu *vcpu) 
 * guest and host are using the same debug facilities it will be up to

 * userspace to re-inject the correct exception for guest delivery.

 *

 * @return: 0 (while setting vcpu->run->exit_reason), -1 for error

 * @return: 0 (while setting vcpu->run->exit_reason)

 */

static int kvm_handle_guest_debug(struct kvm_vcpu *vcpu)

{

	struct kvm_run *run = vcpu->run;

	u32 esr = kvm_vcpu_get_esr(vcpu);

	int ret = 0;



	run->exit_reason = KVM_EXIT_DEBUG;

	run->debug.arch.hsr = esr;



	switch (ESR_ELx_EC(esr)) {

	case ESR_ELx_EC_WATCHPT_LOW:

	if (ESR_ELx_EC(esr) == ESR_ELx_EC_WATCHPT_LOW)

		run->debug.arch.far = vcpu->arch.fault.far_el2;

		fallthrough;

	case ESR_ELx_EC_SOFTSTP_LOW:

	case ESR_ELx_EC_BREAKPT_LOW:

	case ESR_ELx_EC_BKPT32:

	case ESR_ELx_EC_BRK64:

		break;

	default:

		kvm_err("%s: un-handled case esr: %#08x\n",

			__func__, (unsigned int) esr);

		ret = -1;

		break;

	}



	return ret;

	return 0;

}



static int kvm_handle_unknown_ec(struct kvm_vcpu *vcpu)