Commit 701e39d0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm 

Pll KVM fixes from Radim Krčmář:
 "ARM:
   - Fix proxying of GICv2 CPU interface accesses
   - Fix crash when switching to BE
   - Track source vcpu git GICv2 SGIs
   - Fix an outdated bit of documentation

  x86:
   - Speed up injection of expired timers (for stable)"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: x86: remove APIC Timer periodic/oneshot spikes
  arm64: vgic-v2: Fix proxying of cpuif access
  KVM: arm/arm64: vgic_init: Cleanup reference to process_maintenance
  KVM: arm64: Fix order of vcpu_write_sys_reg() arguments
  KVM: arm/arm64: vgic: Fix source vcpu issues for GICv2 SGI
parents 772d4f84 ecf08dad

arch/arm64/include/asm/kvm_emulate.h

+1 −1
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ static inline void kvm_vcpu_set_be(struct kvm_vcpu *vcpu) 
	} else {

		u64 sctlr = vcpu_read_sys_reg(vcpu, SCTLR_EL1);

		sctlr |= (1 << 25);

		vcpu_write_sys_reg(vcpu, SCTLR_EL1, sctlr);

		vcpu_write_sys_reg(vcpu, sctlr, SCTLR_EL1);

	}

}

arch/arm64/kvm/hyp/vgic-v2-cpuif-proxy.c

+19 −5
Original line number Diff line number Diff line
@@ -18,11 +18,20 @@ 
#include <linux/compiler.h>

#include <linux/irqchip/arm-gic.h>

#include <linux/kvm_host.h>

#include <linux/swab.h>



#include <asm/kvm_emulate.h>

#include <asm/kvm_hyp.h>

#include <asm/kvm_mmu.h>



static bool __hyp_text __is_be(struct kvm_vcpu *vcpu)

{

	if (vcpu_mode_is_32bit(vcpu))

		return !!(read_sysreg_el2(spsr) & COMPAT_PSR_E_BIT);



	return !!(read_sysreg(SCTLR_EL1) & SCTLR_ELx_EE);

}



/*

 * __vgic_v2_perform_cpuif_access -- perform a GICV access on behalf of the

 *				     guest.
@@ -64,14 +73,19 @@ int __hyp_text __vgic_v2_perform_cpuif_access(struct kvm_vcpu *vcpu) 
	addr += fault_ipa - vgic->vgic_cpu_base;



	if (kvm_vcpu_dabt_iswrite(vcpu)) {

		u32 data = vcpu_data_guest_to_host(vcpu,

						   vcpu_get_reg(vcpu, rd),

						   sizeof(u32));

		u32 data = vcpu_get_reg(vcpu, rd);

		if (__is_be(vcpu)) {

			/* guest pre-swabbed data, undo this for writel() */

			data = swab32(data);

		}

		writel_relaxed(data, addr);

	} else {

		u32 data = readl_relaxed(addr);

		vcpu_set_reg(vcpu, rd, vcpu_data_host_to_guest(vcpu, data,

							       sizeof(u32)));

		if (__is_be(vcpu)) {

			/* guest expects swabbed data */

			data = swab32(data);

		}

		vcpu_set_reg(vcpu, rd, data);

	}



	return 1;

arch/x86/kvm/lapic.c

+20 −17
Original line number Diff line number Diff line
@@ -1463,23 +1463,6 @@ static void start_sw_tscdeadline(struct kvm_lapic *apic) 
	local_irq_restore(flags);

}



static void start_sw_period(struct kvm_lapic *apic)

{

	if (!apic->lapic_timer.period)

		return;



	if (apic_lvtt_oneshot(apic) &&

	    ktime_after(ktime_get(),

			apic->lapic_timer.target_expiration)) {

		apic_timer_expired(apic);

		return;

	}



	hrtimer_start(&apic->lapic_timer.timer,

		apic->lapic_timer.target_expiration,

		HRTIMER_MODE_ABS_PINNED);

}



static void update_target_expiration(struct kvm_lapic *apic, uint32_t old_divisor)

{

	ktime_t now, remaining;
@@ -1546,6 +1529,26 @@ static void advance_periodic_target_expiration(struct kvm_lapic *apic) 
				apic->lapic_timer.period);

}



static void start_sw_period(struct kvm_lapic *apic)

{

	if (!apic->lapic_timer.period)

		return;



	if (ktime_after(ktime_get(),

			apic->lapic_timer.target_expiration)) {

		apic_timer_expired(apic);



		if (apic_lvtt_oneshot(apic))

			return;



		advance_periodic_target_expiration(apic);

	}



	hrtimer_start(&apic->lapic_timer.timer,

		apic->lapic_timer.target_expiration,

		HRTIMER_MODE_ABS_PINNED);

}



bool kvm_lapic_hv_timer_in_use(struct kvm_vcpu *vcpu)

{

	if (!lapic_in_kernel(vcpu))

include/kvm/arm_vgic.h

+1 −0
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ struct vgic_irq { 
		u32 mpidr;			/* GICv3 target VCPU */

	};

	u8 source;			/* GICv2 SGIs only */

	u8 active_source;		/* GICv2 SGIs only */

	u8 priority;

	enum vgic_irq_config config;	/* Level or edge */

virt/kvm/arm/vgic/vgic-init.c

+1 −1
Original line number Diff line number Diff line
@@ -423,7 +423,7 @@ static irqreturn_t vgic_maintenance_handler(int irq, void *data) 
	 * We cannot rely on the vgic maintenance interrupt to be

	 * delivered synchronously. This means we can only use it to

	 * exit the VM, and we perform the handling of EOIed

	 * interrupts on the exit path (see vgic_process_maintenance).

	 * interrupts on the exit path (see vgic_fold_lr_state).

	 */

	return IRQ_HANDLED;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE