Commit 959d6c4a authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvmarm-fixes-6.0-1' of... 

Merge tag 'kvmarm-fixes-6.0-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD

KVM/arm64 fixes for 6.0, take #1

- Fix unexpected sign extension of KVM_ARM_DEVICE_ID_MASK

- Tidy-up handling of AArch32 on asymmetric systems
parents eceb6e1d b10d86fb

arch/arm64/include/asm/kvm_host.h

+4 −0
Original line number Diff line number Diff line
@@ -929,6 +929,10 @@ bool kvm_arm_vcpu_is_finalized(struct kvm_vcpu *vcpu); 
	(system_supports_mte() &&				\

	 test_bit(KVM_ARCH_FLAG_MTE_ENABLED, &(kvm)->arch.flags))



#define kvm_supports_32bit_el0()				\

	(system_supports_32bit_el0() &&				\

	 !static_branch_unlikely(&arm64_mismatched_32bit_el0))



int kvm_trng_call(struct kvm_vcpu *vcpu);

#ifdef CONFIG_KVM

extern phys_addr_t hyp_mem_base;

arch/arm64/include/uapi/asm/kvm.h

+4 −2
Original line number Diff line number Diff line
@@ -75,9 +75,11 @@ struct kvm_regs { 


/* KVM_ARM_SET_DEVICE_ADDR ioctl id encoding */

#define KVM_ARM_DEVICE_TYPE_SHIFT	0

#define KVM_ARM_DEVICE_TYPE_MASK	(0xffff << KVM_ARM_DEVICE_TYPE_SHIFT)

#define KVM_ARM_DEVICE_TYPE_MASK	GENMASK(KVM_ARM_DEVICE_TYPE_SHIFT + 15, \

						KVM_ARM_DEVICE_TYPE_SHIFT)

#define KVM_ARM_DEVICE_ID_SHIFT		16

#define KVM_ARM_DEVICE_ID_MASK		(0xffff << KVM_ARM_DEVICE_ID_SHIFT)

#define KVM_ARM_DEVICE_ID_MASK		GENMASK(KVM_ARM_DEVICE_ID_SHIFT + 15, \

						KVM_ARM_DEVICE_ID_SHIFT)



/* Supported device IDs */

#define KVM_ARM_DEVICE_VGIC_V2		0

arch/arm64/kvm/arm.c

+1 −2
Original line number Diff line number Diff line
@@ -757,8 +757,7 @@ static bool vcpu_mode_is_bad_32bit(struct kvm_vcpu *vcpu) 
	if (likely(!vcpu_mode_is_32bit(vcpu)))

		return false;



	return !system_supports_32bit_el0() ||

		static_branch_unlikely(&arm64_mismatched_32bit_el0);

	return !kvm_supports_32bit_el0();

}



/**

arch/arm64/kvm/guest.c

+1 −1
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ static int set_core_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) 
		u64 mode = (*(u64 *)valp) & PSR_AA32_MODE_MASK;

		switch (mode) {

		case PSR_AA32_MODE_USR:

			if (!system_supports_32bit_el0())

			if (!kvm_supports_32bit_el0())

				return -EINVAL;

			break;

		case PSR_AA32_MODE_FIQ:

arch/arm64/kvm/sys_regs.c

+2 −2
Original line number Diff line number Diff line
@@ -652,7 +652,7 @@ static void reset_pmcr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *r) 
	 */

	val = ((pmcr & ~ARMV8_PMU_PMCR_MASK)

	       | (ARMV8_PMU_PMCR_MASK & 0xdecafbad)) & (~ARMV8_PMU_PMCR_E);

	if (!system_supports_32bit_el0())

	if (!kvm_supports_32bit_el0())

		val |= ARMV8_PMU_PMCR_LC;

	__vcpu_sys_reg(vcpu, r->reg) = val;

}
@@ -701,7 +701,7 @@ static bool access_pmcr(struct kvm_vcpu *vcpu, struct sys_reg_params *p, 
		val = __vcpu_sys_reg(vcpu, PMCR_EL0);

		val &= ~ARMV8_PMU_PMCR_MASK;

		val |= p->regval & ARMV8_PMU_PMCR_MASK;

		if (!system_supports_32bit_el0())

		if (!kvm_supports_32bit_el0())

			val |= ARMV8_PMU_PMCR_LC;

		__vcpu_sys_reg(vcpu, PMCR_EL0) = val;

		kvm_pmu_handle_pmcr(vcpu, val);