Commit b2626f1e 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 more kvm fixes from Paolo Bonzini:
 "Small x86 fixes"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: selftests: Ensure all migrations are performed when test is affined
  KVM: x86: Swap order of CPUID entry "index" vs. "significant flag" checks
  ptp: Fix ptp_kvm_getcrosststamp issue for x86 ptp_kvm
  x86/kvmclock: Move this_cpu_pvti into kvmclock.h
  selftests: KVM: Don't clobber XMM register when read
  KVM: VMX: Fix a TSX_CTRL_CPUID_CLEAR field mask issue
parents 24f67d82 7b0035ea

arch/x86/include/asm/kvmclock.h

+14 −0
Original line number Diff line number Diff line
@@ -2,6 +2,20 @@ 
#ifndef _ASM_X86_KVM_CLOCK_H

#define _ASM_X86_KVM_CLOCK_H



#include <linux/percpu.h>



extern struct clocksource kvm_clock;



DECLARE_PER_CPU(struct pvclock_vsyscall_time_info *, hv_clock_per_cpu);



static inline struct pvclock_vcpu_time_info *this_cpu_pvti(void)

{

	return &this_cpu_read(hv_clock_per_cpu)->pvti;

}



static inline struct pvclock_vsyscall_time_info *this_cpu_hvclock(void)

{

	return this_cpu_read(hv_clock_per_cpu);

}



#endif /* _ASM_X86_KVM_CLOCK_H */

arch/x86/kernel/kvmclock.c

+2 −11
Original line number Diff line number Diff line
@@ -49,18 +49,9 @@ early_param("no-kvmclock-vsyscall", parse_no_kvmclock_vsyscall); 
static struct pvclock_vsyscall_time_info

			hv_clock_boot[HVC_BOOT_ARRAY_SIZE] __bss_decrypted __aligned(PAGE_SIZE);

static struct pvclock_wall_clock wall_clock __bss_decrypted;

static DEFINE_PER_CPU(struct pvclock_vsyscall_time_info *, hv_clock_per_cpu);

static struct pvclock_vsyscall_time_info *hvclock_mem;



static inline struct pvclock_vcpu_time_info *this_cpu_pvti(void)

{

	return &this_cpu_read(hv_clock_per_cpu)->pvti;

}



static inline struct pvclock_vsyscall_time_info *this_cpu_hvclock(void)

{

	return this_cpu_read(hv_clock_per_cpu);

}

DEFINE_PER_CPU(struct pvclock_vsyscall_time_info *, hv_clock_per_cpu);

EXPORT_PER_CPU_SYMBOL_GPL(hv_clock_per_cpu);



/*

 * The wallclock is the time of day when we booted. Since then, some time may

arch/x86/kvm/cpuid.c

+2 −2
Original line number Diff line number Diff line
@@ -65,8 +65,8 @@ static inline struct kvm_cpuid_entry2 *cpuid_entry2_find( 
	for (i = 0; i < nent; i++) {

		e = &entries[i];



		if (e->function == function && (e->index == index ||

		    !(e->flags & KVM_CPUID_FLAG_SIGNIFCANT_INDEX)))

		if (e->function == function &&

		    (!(e->flags & KVM_CPUID_FLAG_SIGNIFCANT_INDEX) || e->index == index))

			return e;

	}

arch/x86/kvm/vmx/vmx.c

+1 −1
Original line number Diff line number Diff line
@@ -6848,7 +6848,7 @@ static int vmx_create_vcpu(struct kvm_vcpu *vcpu) 
		 */

		tsx_ctrl = vmx_find_uret_msr(vmx, MSR_IA32_TSX_CTRL);

		if (tsx_ctrl)

			vmx->guest_uret_msrs[i].mask = ~(u64)TSX_CTRL_CPUID_CLEAR;

			tsx_ctrl->mask = ~(u64)TSX_CTRL_CPUID_CLEAR;

	}



	err = alloc_loaded_vmcs(&vmx->vmcs01);

drivers/ptp/ptp_kvm_x86.c

+2 −7
Original line number Diff line number Diff line
@@ -15,8 +15,6 @@ 
#include <linux/ptp_clock_kernel.h>

#include <linux/ptp_kvm.h>



struct pvclock_vsyscall_time_info *hv_clock;



static phys_addr_t clock_pair_gpa;

static struct kvm_clock_pairing clock_pair;
@@ -28,8 +26,7 @@ int kvm_arch_ptp_init(void) 
		return -ENODEV;



	clock_pair_gpa = slow_virt_to_phys(&clock_pair);

	hv_clock = pvclock_get_pvti_cpu0_va();

	if (!hv_clock)

	if (!pvclock_get_pvti_cpu0_va())

		return -ENODEV;



	ret = kvm_hypercall2(KVM_HC_CLOCK_PAIRING, clock_pair_gpa,
@@ -64,10 +61,8 @@ int kvm_arch_ptp_get_crosststamp(u64 *cycle, struct timespec64 *tspec, 
	struct pvclock_vcpu_time_info *src;

	unsigned int version;

	long ret;

	int cpu;



	cpu = smp_processor_id();

	src = &hv_clock[cpu].pvti;

	src = this_cpu_pvti();



	do {

		/*