Commit f292dc8a authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvm-x86-misc-6.7' of https://github.com/kvm-x86/linux into HEAD 

KVM x86 misc changes for 6.7:

 - Add CONFIG_KVM_MAX_NR_VCPUS to allow supporting up to 4096 vCPUs without
   forcing more common use cases to eat the extra memory overhead.

 - Add IBPB and SBPB virtualization support.

 - Fix a bug where restoring a vCPU snapshot that was taken within 1 second of
   creating the original vCPU would cause KVM to try to synchronize the vCPU's
   TSC and thus clobber the correct TSC being set by userspace.

 - Compute guest wall clock using a single TSC read to avoid generating an
   inaccurate time, e.g. if the vCPU is preempted between multiple TSC reads.

 - "Virtualize" HWCR.TscFreqSel to make Linux guests happy, which complain
    about a "Firmware Bug" if the bit isn't set for select F/M/S combos.

 - Don't apply side effects to Hyper-V's synthetic timer on writes from
   userspace to fix an issue where the auto-enable behavior can trigger
   spurious interrupts, i.e. do auto-enabling only for guest writes.

 - Remove an unnecessary kick of all vCPUs when synchronizing the dirty log
   without PML enabled.

 - Advertise "support" for non-serializing FS/GS base MSR writes as appropriate.

 - Use octal notation for file permissions through KVM x86.

 - Fix a handful of typo fixes and warts.
parents fadaf574 2770d472

arch/x86/include/asm/cpufeatures.h

+1 −0
Original line number Diff line number Diff line
@@ -443,6 +443,7 @@ 


/* AMD-defined Extended Feature 2 EAX, CPUID level 0x80000021 (EAX), word 20 */

#define X86_FEATURE_NO_NESTED_DATA_BP	(20*32+ 0) /* "" No Nested Data Breakpoints */

#define X86_FEATURE_WRMSR_XX_BASE_NS	(20*32+ 1) /* "" WRMSR to {FS,GS,KERNEL_GS}_BASE is non-serializing */

#define X86_FEATURE_LFENCE_RDTSC	(20*32+ 2) /* "" LFENCE always serializing / synchronizes RDTSC */

#define X86_FEATURE_NULL_SEL_CLR_BASE	(20*32+ 6) /* "" Null Selector Clears Base */

#define X86_FEATURE_AUTOIBRS		(20*32+ 8) /* "" Automatic IBRS */

arch/x86/include/asm/kvm_host.h

+10 −2
Original line number Diff line number Diff line
@@ -39,7 +39,15 @@ 


#define __KVM_HAVE_ARCH_VCPU_DEBUGFS



/*

 * CONFIG_KVM_MAX_NR_VCPUS is defined iff CONFIG_KVM!=n, provide a dummy max if

 * KVM is disabled (arbitrarily use the default from CONFIG_KVM_MAX_NR_VCPUS).

 */

#ifdef CONFIG_KVM_MAX_NR_VCPUS

#define KVM_MAX_VCPUS CONFIG_KVM_MAX_NR_VCPUS

#else

#define KVM_MAX_VCPUS 1024

#endif



/*

 * In x86, the VCPU ID corresponds to the APIC ID, and APIC IDs
@@ -1275,7 +1283,6 @@ struct kvm_arch { 
	 */

	spinlock_t mmu_unsync_pages_lock;



	struct list_head assigned_dev_head;

	struct iommu_domain *iommu_domain;

	bool iommu_noncoherent;

#define __KVM_HAVE_ARCH_NONCOHERENT_DMA
@@ -1323,6 +1330,7 @@ struct kvm_arch { 
	int nr_vcpus_matched_tsc;



	u32 default_tsc_khz;

	bool user_set_tsc;



	seqcount_raw_spinlock_t pvclock_sc;

	bool use_master_clock;
@@ -1691,7 +1699,7 @@ struct kvm_x86_ops { 


	void (*request_immediate_exit)(struct kvm_vcpu *vcpu);



	void (*sched_in)(struct kvm_vcpu *kvm, int cpu);

	void (*sched_in)(struct kvm_vcpu *vcpu, int cpu);



	/*

	 * Size of the CPU's dirty log buffer, i.e. VMX's PML buffer.  A zero

arch/x86/include/asm/msr-index.h

+1 −0
Original line number Diff line number Diff line
@@ -553,6 +553,7 @@ 
#define MSR_AMD64_CPUID_FN_1		0xc0011004

#define MSR_AMD64_LS_CFG		0xc0011020

#define MSR_AMD64_DC_CFG		0xc0011022

#define MSR_AMD64_TW_CFG		0xc0011023



#define MSR_AMD64_DE_CFG		0xc0011029

#define MSR_AMD64_DE_CFG_LFENCE_SERIALIZE_BIT	 1

arch/x86/kvm/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -154,4 +154,15 @@ config KVM_PROVE_MMU 
config KVM_EXTERNAL_WRITE_TRACKING

	bool



config KVM_MAX_NR_VCPUS

	int "Maximum number of vCPUs per KVM guest"

	depends on KVM

	range 1024 4096

	default 4096 if MAXSMP

	default 1024

	help

	  Set the maximum number of vCPUs per KVM guest. Larger values will increase

	  the memory footprint of each KVM guest, regardless of how many vCPUs are

	  created for a given VM.



endif # VIRTUALIZATION

arch/x86/kvm/cpuid.c

+5 −3
Original line number Diff line number Diff line
@@ -753,11 +753,13 @@ void kvm_set_cpu_caps(void) 


	kvm_cpu_cap_mask(CPUID_8000_0021_EAX,

		F(NO_NESTED_DATA_BP) | F(LFENCE_RDTSC) | 0 /* SmmPgCfgLock */ |

		F(NULL_SEL_CLR_BASE) | F(AUTOIBRS) | 0 /* PrefetchCtlMsr */

		F(NULL_SEL_CLR_BASE) | F(AUTOIBRS) | 0 /* PrefetchCtlMsr */ |

		F(WRMSR_XX_BASE_NS)

	);



	if (cpu_feature_enabled(X86_FEATURE_SRSO_NO))

		kvm_cpu_cap_set(X86_FEATURE_SRSO_NO);

	kvm_cpu_cap_check_and_set(X86_FEATURE_SBPB);

	kvm_cpu_cap_check_and_set(X86_FEATURE_IBPB_BRTYPE);

	kvm_cpu_cap_check_and_set(X86_FEATURE_SRSO_NO);



	kvm_cpu_cap_init_kvm_defined(CPUID_8000_0022_EAX,

		F(PERFMON_V2)