Commit 6c6165f8 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge branch 'kvm-master' into HEAD 

Merge 5.8-rc bugfixes.
parents 26d05b36 8038a922

arch/arm64/include/asm/arch_gicv3.h

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ static inline u32 gic_read_pmr(void) 
	return read_sysreg_s(SYS_ICC_PMR_EL1);

}



static inline void gic_write_pmr(u32 val)

static __always_inline void gic_write_pmr(u32 val)

{

	write_sysreg_s(val, SYS_ICC_PMR_EL1);

}

arch/arm64/include/asm/cpufeature.h

+1 −1
Original line number Diff line number Diff line
@@ -675,7 +675,7 @@ static inline bool system_supports_generic_auth(void) 
		cpus_have_const_cap(ARM64_HAS_GENERIC_AUTH);

}



static inline bool system_uses_irq_prio_masking(void)

static __always_inline bool system_uses_irq_prio_masking(void)

{

	return IS_ENABLED(CONFIG_ARM64_PSEUDO_NMI) &&

	       cpus_have_const_cap(ARM64_HAS_IRQ_PRIO_MASKING);

arch/arm64/kvm/hyp-init.S

+7 −4
Original line number Diff line number Diff line
@@ -136,11 +136,15 @@ SYM_CODE_START(__kvm_handle_stub_hvc) 


1:	cmp	x0, #HVC_RESET_VECTORS

	b.ne	1f

reset:



	/*

	 * Reset kvm back to the hyp stub. Do not clobber x0-x4 in

	 * case we coming via HVC_SOFT_RESTART.

	 * Set the HVC_RESET_VECTORS return code before entering the common

	 * path so that we do not clobber x0-x2 in case we are coming via

	 * HVC_SOFT_RESTART.

	 */

	mov	x0, xzr

reset:

	/* Reset kvm back to the hyp stub. */

	mrs	x5, sctlr_el2

	mov_q	x6, SCTLR_ELx_FLAGS

	bic	x5, x5, x6		// Clear SCTL_M and etc
@@ -151,7 +155,6 @@ reset: 
	/* Install stub vectors */

	adr_l	x5, __hyp_stub_vectors

	msr	vbar_el2, x5

	mov	x0, xzr

	eret



1:	/* Bad stub call */

arch/arm64/kvm/pmu.c

+6 −1
Original line number Diff line number Diff line
@@ -159,7 +159,10 @@ static void kvm_vcpu_pmu_disable_el0(unsigned long events) 
}



/*

 * On VHE ensure that only guest events have EL0 counting enabled

 * On VHE ensure that only guest events have EL0 counting enabled.

 * This is called from both vcpu_{load,put} and the sysreg handling.

 * Since the latter is preemptible, special care must be taken to

 * disable preemption.

 */

void kvm_vcpu_pmu_restore_guest(struct kvm_vcpu *vcpu)

{
@@ -169,12 +172,14 @@ void kvm_vcpu_pmu_restore_guest(struct kvm_vcpu *vcpu) 
	if (!has_vhe())

		return;



	preempt_disable();

	host = this_cpu_ptr(&kvm_host_data);

	events_guest = host->pmu_events.events_guest;

	events_host = host->pmu_events.events_host;



	kvm_vcpu_pmu_enable_el0(events_guest);

	kvm_vcpu_pmu_disable_el0(events_host);

	preempt_enable();

}



/*

arch/arm64/kvm/pvtime.c

+12 −3
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 


#include <linux/arm-smccc.h>

#include <linux/kvm_host.h>

#include <linux/sched/stat.h>



#include <asm/kvm_mmu.h>

#include <asm/pvclock-abi.h>
@@ -73,6 +74,11 @@ gpa_t kvm_init_stolen_time(struct kvm_vcpu *vcpu) 
	return base;

}



static bool kvm_arm_pvtime_supported(void)

{

	return !!sched_info_on();

}



int kvm_arm_pvtime_set_attr(struct kvm_vcpu *vcpu,

			    struct kvm_device_attr *attr)

{
@@ -82,7 +88,8 @@ int kvm_arm_pvtime_set_attr(struct kvm_vcpu *vcpu, 
	int ret = 0;

	int idx;



	if (attr->attr != KVM_ARM_VCPU_PVTIME_IPA)

	if (!kvm_arm_pvtime_supported() ||

	    attr->attr != KVM_ARM_VCPU_PVTIME_IPA)

		return -ENXIO;



	if (get_user(ipa, user))
@@ -110,7 +117,8 @@ int kvm_arm_pvtime_get_attr(struct kvm_vcpu *vcpu, 
	u64 __user *user = (u64 __user *)attr->addr;

	u64 ipa;



	if (attr->attr != KVM_ARM_VCPU_PVTIME_IPA)

	if (!kvm_arm_pvtime_supported() ||

	    attr->attr != KVM_ARM_VCPU_PVTIME_IPA)

		return -ENXIO;



	ipa = vcpu->arch.steal.base;
@@ -125,6 +133,7 @@ int kvm_arm_pvtime_has_attr(struct kvm_vcpu *vcpu, 
{

	switch (attr->attr) {

	case KVM_ARM_VCPU_PVTIME_IPA:

		if (kvm_arm_pvtime_supported())

			return 0;

	}

	return -ENXIO;