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

Commit 1a0a02d1 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 Paolo Bonzini:
 "ARM and x86 fixes"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: nVMX: VMX instructions: fix segment checks when L1 is in long mode.
  KVM: LAPIC: cap __delay at lapic_timer_advance_ns
  KVM: x86: move nsec_to_cycles from x86.c to x86.h
  pvclock: Get rid of __pvclock_read_cycles in function pvclock_read_flags
  pvclock: Cleanup to remove function pvclock_get_nsec_offset
  pvclock: Add CPU barriers to get correct version value
  KVM: arm/arm64: Stop leaking vcpu pid references
  arm64: KVM: fix build with CONFIG_ARM_PMU disabled
parents 284341d2 f5c5c225

arch/arm/kvm/arm.c

+1 −0
Original line number Diff line number Diff line
@@ -263,6 +263,7 @@ void kvm_arch_vcpu_free(struct kvm_vcpu *vcpu) 
	kvm_timer_vcpu_terminate(vcpu);

	kvm_vgic_vcpu_destroy(vcpu);

	kvm_pmu_vcpu_destroy(vcpu);

	kvm_vcpu_uninit(vcpu);

	kmem_cache_free(kvm_vcpu_cache, vcpu);

}

arch/x86/include/asm/pvclock.h

+9 −16
Original line number Diff line number Diff line
@@ -68,30 +68,23 @@ static inline u64 pvclock_scale_delta(u64 delta, u32 mul_frac, int shift) 
	return product;

}



static __always_inline

u64 pvclock_get_nsec_offset(const struct pvclock_vcpu_time_info *src)

{

	u64 delta = rdtsc_ordered() - src->tsc_timestamp;

	return pvclock_scale_delta(delta, src->tsc_to_system_mul,

				   src->tsc_shift);

}



static __always_inline

unsigned __pvclock_read_cycles(const struct pvclock_vcpu_time_info *src,

			       cycle_t *cycles, u8 *flags)

{

	unsigned version;

	cycle_t ret, offset;

	u8 ret_flags;

	cycle_t offset;

	u64 delta;



	version = src->version;

	/* Make the latest version visible */

	smp_rmb();



	offset = pvclock_get_nsec_offset(src);

	ret = src->system_time + offset;

	ret_flags = src->flags;



	*cycles = ret;

	*flags = ret_flags;

	delta = rdtsc_ordered() - src->tsc_timestamp;

	offset = pvclock_scale_delta(delta, src->tsc_to_system_mul,

				   src->tsc_shift);

	*cycles = src->system_time + offset;

	*flags = src->flags;

	return version;

}

arch/x86/kernel/pvclock.c

+9 −2
Original line number Diff line number Diff line
@@ -61,11 +61,16 @@ void pvclock_resume(void) 
u8 pvclock_read_flags(struct pvclock_vcpu_time_info *src)

{

	unsigned version;

	cycle_t ret;

	u8 flags;



	do {

		version = __pvclock_read_cycles(src, &ret, &flags);

		version = src->version;

		/* Make the latest version visible */

		smp_rmb();



		flags = src->flags;

		/* Make sure that the version double-check is last. */

		smp_rmb();

	} while ((src->version & 1) || version != src->version);



	return flags & valid_flags;
@@ -80,6 +85,8 @@ cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src) 


	do {

		version = __pvclock_read_cycles(src, &ret, &flags);

		/* Make sure that the version double-check is last. */

		smp_rmb();

	} while ((src->version & 1) || version != src->version);



	if (unlikely((flags & PVCLOCK_GUEST_STOPPED) != 0)) {

arch/x86/kvm/lapic.c

+2 −1
Original line number Diff line number Diff line
@@ -1310,7 +1310,8 @@ void wait_lapic_expire(struct kvm_vcpu *vcpu) 


	/* __delay is delay_tsc whenever the hardware has TSC, thus always.  */

	if (guest_tsc < tsc_deadline)

		__delay(tsc_deadline - guest_tsc);

		__delay(min(tsc_deadline - guest_tsc,

			nsec_to_cycles(vcpu, lapic_timer_advance_ns)));

}



static void start_apic_timer(struct kvm_lapic *apic)

arch/x86/kvm/vmx.c

+11 −12
Original line number Diff line number Diff line
@@ -6671,7 +6671,13 @@ static int get_vmx_mem_address(struct kvm_vcpu *vcpu, 


	/* Checks for #GP/#SS exceptions. */

	exn = false;

	if (is_protmode(vcpu)) {

	if (is_long_mode(vcpu)) {

		/* Long mode: #GP(0)/#SS(0) if the memory address is in a

		 * non-canonical form. This is the only check on the memory

		 * destination for long mode!

		 */

		exn = is_noncanonical_address(*ret);

	} else if (is_protmode(vcpu)) {

		/* Protected mode: apply checks for segment validity in the

		 * following order:

		 * - segment type check (#GP(0) may be thrown)
@@ -6688,17 +6694,10 @@ static int get_vmx_mem_address(struct kvm_vcpu *vcpu, 
			 * execute-only code segment

			 */

			exn = ((s.type & 0xa) == 8);

	}

		if (exn) {

			kvm_queue_exception_e(vcpu, GP_VECTOR, 0);

			return 1;

		}

	if (is_long_mode(vcpu)) {

		/* Long mode: #GP(0)/#SS(0) if the memory address is in a

		 * non-canonical form. This is an only check for long mode.

		 */

		exn = is_noncanonical_address(*ret);

	} else if (is_protmode(vcpu)) {

		/* Protected mode: #GP(0)/#SS(0) if the segment is unusable.

		 */

		exn = (s.unusable != 0);