Commit dce9ce36 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull KVM fixes from Radim Krčmář:
 "ARM:
   - Fix handling of the 32bit cycle counter
   - Fix cycle counter filtering

  x86:
   - Fix a race leading to double unregistering of user notifiers
   - Amend oversight in kvm_arch_set_irq that turned Hyper-V code dead
   - Use SRCU around kvm_lapic_set_vapic_addr
   - Avoid recursive flushing of asynchronous page faults
   - Do not rely on deferred update in KVM_GET_CLOCK, which fixes #GP
   - Let userspace know that KVM_GET_CLOCK is useful with master clock;
     4.9 changed the return value to better match the guest clock, but
     didn't provide means to let guests take advantage of it"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  kvm: x86: merge kvm_arch_set_irq and kvm_arch_set_irq_inatomic
  KVM: x86: fix missed SRCU usage in kvm_lapic_set_vapic_addr
  KVM: async_pf: avoid recursive flushing of work items
  kvm: kvmclock: let KVM_GET_CLOCK return whether the master clock is in use
  KVM: Disable irq while unregistering user notifier
  KVM: x86: do not go through vcpu in __get_kvmclock_ns
  KVM: arm64: Fix the issues when guest PMCCFILTR is configured
  arm64: KVM: pmu: Fix AArch32 cycle counter access
parents f6918382 a2b07739

Documentation/virtual/kvm/api.txt

+11 −0
Original line number Diff line number Diff line
@@ -777,6 +777,17 @@ Gets the current timestamp of kvmclock as seen by the current guest. In 
conjunction with KVM_SET_CLOCK, it is used to ensure monotonicity on scenarios

such as migration.



When KVM_CAP_ADJUST_CLOCK is passed to KVM_CHECK_EXTENSION, it returns the

set of bits that KVM can return in struct kvm_clock_data's flag member.



The only flag defined now is KVM_CLOCK_TSC_STABLE.  If set, the returned

value is the exact kvmclock value seen by all VCPUs at the instant

when KVM_GET_CLOCK was called.  If clear, the returned value is simply

CLOCK_MONOTONIC plus a constant offset; the offset can be modified

with KVM_SET_CLOCK.  KVM will try to make all VCPUs follow this clock,

but the exact value read by each VCPU could differ, because the host

TSC is not stable.



struct kvm_clock_data {

	__u64 clock;  /* kvmclock current value */

	__u32 flags;

arch/arm64/include/asm/perf_event.h

+9 −1
Original line number Diff line number Diff line
@@ -46,7 +46,15 @@ 
#define	ARMV8_PMU_EVTYPE_MASK	0xc800ffff	/* Mask for writable bits */

#define	ARMV8_PMU_EVTYPE_EVENT	0xffff		/* Mask for EVENT bits */



#define ARMV8_PMU_EVTYPE_EVENT_SW_INCR	0	/* Software increment event */

/*

 * PMUv3 event types: required events

 */

#define ARMV8_PMUV3_PERFCTR_SW_INCR				0x00

#define ARMV8_PMUV3_PERFCTR_L1D_CACHE_REFILL			0x03

#define ARMV8_PMUV3_PERFCTR_L1D_CACHE				0x04

#define ARMV8_PMUV3_PERFCTR_BR_MIS_PRED				0x10

#define ARMV8_PMUV3_PERFCTR_CPU_CYCLES				0x11

#define ARMV8_PMUV3_PERFCTR_BR_PRED				0x12



/*

 * Event filters for PMUv3

arch/arm64/kernel/perf_event.c

+1 −9
Original line number Diff line number Diff line
@@ -31,17 +31,9 @@ 


/*

 * ARMv8 PMUv3 Performance Events handling code.

 * Common event types.

 * Common event types (some are defined in asm/perf_event.h).

 */



/* Required events. */

#define ARMV8_PMUV3_PERFCTR_SW_INCR				0x00

#define ARMV8_PMUV3_PERFCTR_L1D_CACHE_REFILL			0x03

#define ARMV8_PMUV3_PERFCTR_L1D_CACHE				0x04

#define ARMV8_PMUV3_PERFCTR_BR_MIS_PRED				0x10

#define ARMV8_PMUV3_PERFCTR_CPU_CYCLES				0x11

#define ARMV8_PMUV3_PERFCTR_BR_PRED				0x12



/* At least one of the following is required. */

#define ARMV8_PMUV3_PERFCTR_INST_RETIRED			0x08

#define ARMV8_PMUV3_PERFCTR_INST_SPEC				0x1B

arch/arm64/kvm/sys_regs.c

+8 −2
Original line number Diff line number Diff line
@@ -597,8 +597,14 @@ static bool access_pmu_evcntr(struct kvm_vcpu *vcpu, 


			idx = ARMV8_PMU_CYCLE_IDX;

		} else {

			BUG();

			return false;

		}

	} else if (r->CRn == 0 && r->CRm == 9) {

		/* PMCCNTR */

		if (pmu_access_event_counter_el0_disabled(vcpu))

			return false;



		idx = ARMV8_PMU_CYCLE_IDX;

	} else if (r->CRn == 14 && (r->CRm & 12) == 8) {

		/* PMEVCNTRn_EL0 */

		if (pmu_access_event_counter_el0_disabled(vcpu))
@@ -606,7 +612,7 @@ static bool access_pmu_evcntr(struct kvm_vcpu *vcpu, 


		idx = ((r->CRm & 3) << 3) | (r->Op2 & 7);

	} else {

		BUG();

		return false;

	}



	if (!pmu_counter_idx_valid(vcpu, idx))

arch/x86/kvm/irq_comm.c

+27 −31
Original line number Diff line number Diff line
@@ -156,6 +156,16 @@ int kvm_set_msi(struct kvm_kernel_irq_routing_entry *e, 
}





static int kvm_hv_set_sint(struct kvm_kernel_irq_routing_entry *e,

		    struct kvm *kvm, int irq_source_id, int level,

		    bool line_status)

{

	if (!level)

		return -1;



	return kvm_hv_synic_set_irq(kvm, e->hv_sint.vcpu, e->hv_sint.sint);

}



int kvm_arch_set_irq_inatomic(struct kvm_kernel_irq_routing_entry *e,

			      struct kvm *kvm, int irq_source_id, int level,

			      bool line_status)
@@ -163,9 +173,12 @@ int kvm_arch_set_irq_inatomic(struct kvm_kernel_irq_routing_entry *e, 
	struct kvm_lapic_irq irq;

	int r;



	if (unlikely(e->type != KVM_IRQ_ROUTING_MSI))

		return -EWOULDBLOCK;

	switch (e->type) {

	case KVM_IRQ_ROUTING_HV_SINT:

		return kvm_hv_set_sint(e, kvm, irq_source_id, level,

				       line_status);



	case KVM_IRQ_ROUTING_MSI:

		if (kvm_msi_route_invalid(kvm, e))

			return -EINVAL;
@@ -173,7 +186,12 @@ int kvm_arch_set_irq_inatomic(struct kvm_kernel_irq_routing_entry *e, 


		if (kvm_irq_delivery_to_apic_fast(kvm, NULL, &irq, &r, NULL))

			return r;

	else

		break;



	default:

		break;

	}



	return -EWOULDBLOCK;

}
@@ -254,16 +272,6 @@ void kvm_fire_mask_notifiers(struct kvm *kvm, unsigned irqchip, unsigned pin, 
	srcu_read_unlock(&kvm->irq_srcu, idx);

}



static int kvm_hv_set_sint(struct kvm_kernel_irq_routing_entry *e,

		    struct kvm *kvm, int irq_source_id, int level,

		    bool line_status)

{

	if (!level)

		return -1;



	return kvm_hv_synic_set_irq(kvm, e->hv_sint.vcpu, e->hv_sint.sint);

}



int kvm_set_routing_entry(struct kvm *kvm,

			  struct kvm_kernel_irq_routing_entry *e,

			  const struct kvm_irq_routing_entry *ue)
@@ -423,18 +431,6 @@ void kvm_scan_ioapic_routes(struct kvm_vcpu *vcpu, 
	srcu_read_unlock(&kvm->irq_srcu, idx);

}



int kvm_arch_set_irq(struct kvm_kernel_irq_routing_entry *irq, struct kvm *kvm,

		     int irq_source_id, int level, bool line_status)

{

	switch (irq->type) {

	case KVM_IRQ_ROUTING_HV_SINT:

		return kvm_hv_set_sint(irq, kvm, irq_source_id, level,

				       line_status);

	default:

		return -EWOULDBLOCK;

	}

}



void kvm_arch_irq_routing_update(struct kvm *kvm)

{

	kvm_hv_irq_routing_update(kvm);

CRA Git | Maintained and supported by SUSTech CRA and CCSE