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

Commit 609b7002 authored by Radim Krčmář's avatar Radim Krčmář
Browse files

Merge tag 'kvm-arm-fixes-for-v4.15-1' of... 

Merge tag 'kvm-arm-fixes-for-v4.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm

KVM/ARM Fixes for v4.15.

Fixes:
 - A number of issues in the vgic discovered using SMATCH
 - A bit one-off calculation in out stage base address mask (32-bit and
   64-bit)
 - Fixes to single-step debugging instructions that trap for other
   reasons such as MMMIO aborts
 - Printing unavailable hyp mode as error
 - Potential spinlock deadlock in the vgic
 - Avoid calling vgic vcpu free more than once
 - Broken bit calculation for big endian systems
parents ae64f9bd fc396e06

arch/arm/include/asm/kvm_arm.h

+1 −2
Original line number Original line Diff line number Diff line
@@ -161,8 +161,7 @@ 
#else

#else

#define VTTBR_X		(5 - KVM_T0SZ)

#define VTTBR_X		(5 - KVM_T0SZ)

#endif

#endif

#define VTTBR_BADDR_SHIFT (VTTBR_X - 1)

#define VTTBR_BADDR_MASK  (((_AC(1, ULL) << (40 - VTTBR_X)) - 1) << VTTBR_X)

#define VTTBR_BADDR_MASK  (((_AC(1, ULL) << (40 - VTTBR_X)) - 1) << VTTBR_BADDR_SHIFT)

#define VTTBR_VMID_SHIFT  _AC(48, ULL)

#define VTTBR_VMID_SHIFT  _AC(48, ULL)

#define VTTBR_VMID_MASK(size)	(_AT(u64, (1 << size) - 1) << VTTBR_VMID_SHIFT)

#define VTTBR_VMID_MASK(size)	(_AT(u64, (1 << size) - 1) << VTTBR_VMID_SHIFT)

arch/arm/include/asm/kvm_host.h

+5 −0
Original line number Original line Diff line number Diff line
@@ -285,6 +285,11 @@ static inline void kvm_arm_init_debug(void) {} 
static inline void kvm_arm_setup_debug(struct kvm_vcpu *vcpu) {}

static inline void kvm_arm_setup_debug(struct kvm_vcpu *vcpu) {}

static inline void kvm_arm_clear_debug(struct kvm_vcpu *vcpu) {}

static inline void kvm_arm_clear_debug(struct kvm_vcpu *vcpu) {}

static inline void kvm_arm_reset_debug_ptr(struct kvm_vcpu *vcpu) {}

static inline void kvm_arm_reset_debug_ptr(struct kvm_vcpu *vcpu) {}

static inline bool kvm_arm_handle_step_debug(struct kvm_vcpu *vcpu,

					     struct kvm_run *run)

{

	return false;

}





int kvm_arm_vcpu_arch_set_attr(struct kvm_vcpu *vcpu,

int kvm_arm_vcpu_arch_set_attr(struct kvm_vcpu *vcpu,

			       struct kvm_device_attr *attr);

			       struct kvm_device_attr *attr);

arch/arm64/include/asm/kvm_arm.h

+1 −2
Original line number Original line Diff line number Diff line
@@ -170,8 +170,7 @@ 
#define VTCR_EL2_FLAGS			(VTCR_EL2_COMMON_BITS | VTCR_EL2_TGRAN_FLAGS)

#define VTCR_EL2_FLAGS			(VTCR_EL2_COMMON_BITS | VTCR_EL2_TGRAN_FLAGS)

#define VTTBR_X				(VTTBR_X_TGRAN_MAGIC - VTCR_EL2_T0SZ_IPA)

#define VTTBR_X				(VTTBR_X_TGRAN_MAGIC - VTCR_EL2_T0SZ_IPA)





#define VTTBR_BADDR_SHIFT (VTTBR_X - 1)

#define VTTBR_BADDR_MASK  (((UL(1) << (PHYS_MASK_SHIFT - VTTBR_X)) - 1) << VTTBR_X)

#define VTTBR_BADDR_MASK  (((UL(1) << (PHYS_MASK_SHIFT - VTTBR_X)) - 1) << VTTBR_BADDR_SHIFT)

#define VTTBR_VMID_SHIFT  (UL(48))

#define VTTBR_VMID_SHIFT  (UL(48))

#define VTTBR_VMID_MASK(size) (_AT(u64, (1 << size) - 1) << VTTBR_VMID_SHIFT)

#define VTTBR_VMID_MASK(size) (_AT(u64, (1 << size) - 1) << VTTBR_VMID_SHIFT)

arch/arm64/include/asm/kvm_host.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -370,6 +370,7 @@ void kvm_arm_init_debug(void); 
void kvm_arm_setup_debug(struct kvm_vcpu *vcpu);

void kvm_arm_setup_debug(struct kvm_vcpu *vcpu);

void kvm_arm_clear_debug(struct kvm_vcpu *vcpu);

void kvm_arm_clear_debug(struct kvm_vcpu *vcpu);

void kvm_arm_reset_debug_ptr(struct kvm_vcpu *vcpu);

void kvm_arm_reset_debug_ptr(struct kvm_vcpu *vcpu);

bool kvm_arm_handle_step_debug(struct kvm_vcpu *vcpu, struct kvm_run *run);

int kvm_arm_vcpu_arch_set_attr(struct kvm_vcpu *vcpu,

int kvm_arm_vcpu_arch_set_attr(struct kvm_vcpu *vcpu,

			       struct kvm_device_attr *attr);

			       struct kvm_device_attr *attr);

int kvm_arm_vcpu_arch_get_attr(struct kvm_vcpu *vcpu,

int kvm_arm_vcpu_arch_get_attr(struct kvm_vcpu *vcpu,

arch/arm64/kvm/debug.c

+21 −0
Original line number Original line Diff line number Diff line
@@ -221,3 +221,24 @@ void kvm_arm_clear_debug(struct kvm_vcpu *vcpu) 
		}

		}

	}

	}

}

}





/*

 * After successfully emulating an instruction, we might want to

 * return to user space with a KVM_EXIT_DEBUG. We can only do this

 * once the emulation is complete, though, so for userspace emulations

 * we have to wait until we have re-entered KVM before calling this

 * helper.

 *

 * Return true (and set exit_reason) to return to userspace or false

 * if no further action is required.

 */

bool kvm_arm_handle_step_debug(struct kvm_vcpu *vcpu, struct kvm_run *run)

{

	if (vcpu->guest_debug & KVM_GUESTDBG_SINGLESTEP) {

		run->exit_reason = KVM_EXIT_DEBUG;

		run->debug.arch.hsr = ESR_ELx_EC_SOFTSTP_LOW << ESR_ELx_EC_SHIFT;

		return true;

	}

	return false;

}