Commit 1f840c0e 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:
 "x86 host:

   - Expose KVM_CAP_ENABLE_CAP since it is supported

   - Disable KVM_HC_CLOCK_PAIRING in TSC catchup mode

   - Ensure async page fault token is nonzero

   - Fix lockdep false negative

   - Fix FPU migration regression from the AMX changes

  x86 guest:

   - Don't use PV TLB/IPI/yield on uniprocessor guests

  PPC:

   - reserve capability id (topic branch for ppc/kvm)"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: x86: nSVM: disallow userspace setting of MSR_AMD64_TSC_RATIO to non default value when tsc scaling disabled
  KVM: x86/mmu: make apf token non-zero to fix bug
  KVM: PPC: reserve capability 210 for KVM_CAP_PPC_AIL_MODE_3
  x86/kvm: Don't use pv tlb/ipi/sched_yield if on 1 vCPU
  x86/kvm: Fix compilation warning in non-x86_64 builds
  x86/kvm/fpu: Remove kvm_vcpu_arch.guest_supported_xcr0
  x86/kvm/fpu: Limit guest user_xfeatures to supported bits of XCR0
  kvm: x86: Disable KVM_HC_CLOCK_PAIRING if tsc is in always catchup mode
  KVM: Fix lockdep false negative during host resume
  KVM: x86: Add KVM_CAP_ENABLE_CAP to x86
parents d8152cfe e910a53f

Documentation/virt/kvm/api.rst

+15 −1
Original line number Diff line number Diff line
@@ -1394,7 +1394,7 @@ documentation when it pops into existence). 
-------------------



:Capability: KVM_CAP_ENABLE_CAP

:Architectures: mips, ppc, s390

:Architectures: mips, ppc, s390, x86

:Type: vcpu ioctl

:Parameters: struct kvm_enable_cap (in)

:Returns: 0 on success; -1 on error
@@ -6997,6 +6997,20 @@ indicated by the fd to the VM this is called on. 
This is intended to support intra-host migration of VMs between userspace VMMs,

upgrading the VMM process without interrupting the guest.



7.30 KVM_CAP_PPC_AIL_MODE_3

-------------------------------



:Capability: KVM_CAP_PPC_AIL_MODE_3

:Architectures: ppc

:Type: vm



This capability indicates that the kernel supports the mode 3 setting for the

"Address Translation Mode on Interrupt" aka "Alternate Interrupt Location"

resource that is controlled with the H_SET_MODE hypercall.



This capability allows a guest kernel to use a better-performance mode for

handling interrupts and system calls.



8. Other capabilities.

======================

arch/x86/include/asm/kvm_host.h

+0 −1
Original line number Diff line number Diff line
@@ -703,7 +703,6 @@ struct kvm_vcpu_arch { 
	struct fpu_guest guest_fpu;



	u64 xcr0;

	u64 guest_supported_xcr0;



	struct kvm_pio_request pio;

	void *pio_data;

arch/x86/kernel/fpu/xstate.c

+4 −1
Original line number Diff line number Diff line
@@ -1558,7 +1558,10 @@ static int fpstate_realloc(u64 xfeatures, unsigned int ksize, 
		fpregs_restore_userregs();



	newfps->xfeatures = curfps->xfeatures | xfeatures;



	if (!guest_fpu)

		newfps->user_xfeatures = curfps->user_xfeatures | xfeatures;



	newfps->xfd = curfps->xfd & ~xfeatures;



	/* Do the final updates within the locked region */

arch/x86/kernel/kvm.c

+6 −3
Original line number Diff line number Diff line
@@ -462,19 +462,22 @@ static bool pv_tlb_flush_supported(void) 
{

	return (kvm_para_has_feature(KVM_FEATURE_PV_TLB_FLUSH) &&

		!kvm_para_has_hint(KVM_HINTS_REALTIME) &&

		kvm_para_has_feature(KVM_FEATURE_STEAL_TIME));

		kvm_para_has_feature(KVM_FEATURE_STEAL_TIME) &&

		(num_possible_cpus() != 1));

}



static bool pv_ipi_supported(void)

{

	return kvm_para_has_feature(KVM_FEATURE_PV_SEND_IPI);

	return (kvm_para_has_feature(KVM_FEATURE_PV_SEND_IPI) &&

	       (num_possible_cpus() != 1));

}



static bool pv_sched_yield_supported(void)

{

	return (kvm_para_has_feature(KVM_FEATURE_PV_SCHED_YIELD) &&

		!kvm_para_has_hint(KVM_HINTS_REALTIME) &&

	    kvm_para_has_feature(KVM_FEATURE_STEAL_TIME));

	    kvm_para_has_feature(KVM_FEATURE_STEAL_TIME) &&

	    (num_possible_cpus() != 1));

}



#define KVM_IPI_CLUSTER_SIZE	(2 * BITS_PER_LONG)

arch/x86/kvm/cpuid.c

+4 −1
Original line number Diff line number Diff line
@@ -282,6 +282,7 @@ static void kvm_vcpu_after_set_cpuid(struct kvm_vcpu *vcpu) 
{

	struct kvm_lapic *apic = vcpu->arch.apic;

	struct kvm_cpuid_entry2 *best;

	u64 guest_supported_xcr0;



	best = kvm_find_cpuid_entry(vcpu, 1, 0);

	if (best && apic) {
@@ -293,9 +294,11 @@ static void kvm_vcpu_after_set_cpuid(struct kvm_vcpu *vcpu) 
		kvm_apic_set_version(vcpu);

	}



	vcpu->arch.guest_supported_xcr0 =

	guest_supported_xcr0 =

		cpuid_get_supported_xcr0(vcpu->arch.cpuid_entries, vcpu->arch.cpuid_nent);



	vcpu->arch.guest_fpu.fpstate->user_xfeatures = guest_supported_xcr0;



	kvm_update_pv_runtime(vcpu);



	vcpu->arch.maxphyaddr = cpuid_query_maxphyaddr(vcpu);