Commit 6157ce59 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 has lots of small bugfixes, mostly one liners. It's quite late in
  5.11-rc but none of them are related to this merge window; it's just
  bugs coming in at the wrong time.

  Of note among the others is "KVM: x86: Allow guests to see
  MSR_IA32_TSX_CTRL even if tsx=off" that fixes a live migration failure
  seen on distros that hadn't switched to tsx=off right away.

  ARM:
  - Avoid clobbering extra registers on initialisation"

[ Sean Christopherson notes that commit 943dea8a ("KVM: x86: Update
  emulator context mode if SYSENTER xfers to 64-bit mode") should have
  had authorship credited to Jonny Barker, not to him.  - Linus ]

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: x86: Set so called 'reserved CR3 bits in LM mask' at vCPU reset
  KVM: x86/mmu: Fix TDP MMU zap collapsible SPTEs
  KVM: x86: cleanup CR3 reserved bits checks
  KVM: SVM: Treat SVM as unsupported when running as an SEV guest
  KVM: x86: Update emulator context mode if SYSENTER xfers to 64-bit mode
  KVM: x86: Supplement __cr4_reserved_bits() with X86_FEATURE_PCID check
  KVM/x86: assign hva with the right value to vm_munmap the pages
  KVM: x86: Allow guests to see MSR_IA32_TSX_CTRL even if tsx=off
  Fix unsynchronized access to sev members through svm_register_enc_region
  KVM: Documentation: Fix documentation for nested.
  KVM: x86: fix CPUID entries returned by KVM_GET_CPUID2 ioctl
  KVM: arm64: Don't clobber x4 in __do_hyp_init
parents 97ba0c74 031b91a5

Documentation/virt/kvm/nested-vmx.rst

+4 −2
Original line number Diff line number Diff line
@@ -37,8 +37,10 @@ call L2. 
Running nested VMX

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



The nested VMX feature is disabled by default. It can be enabled by giving

the "nested=1" option to the kvm-intel module.

The nested VMX feature is enabled by default since Linux kernel v4.20. For

older Linux kernel, it can be enabled by giving the "nested=1" option to the

kvm-intel module.





No modifications are required to user space (qemu). However, qemu's default

emulated CPU type (qemu64) does not list the "VMX" CPU feature, so it must be

Documentation/virt/kvm/running-nested-guests.rst

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ few: 
Enabling "nested" (x86)

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



From Linux kernel v4.19 onwards, the ``nested`` KVM parameter is enabled

From Linux kernel v4.20 onwards, the ``nested`` KVM parameter is enabled

by default for Intel and AMD.  (Though your Linux distribution might

override this default.)

arch/arm64/kvm/hyp/nvhe/hyp-init.S

+11 −9
Original line number Diff line number Diff line
@@ -47,6 +47,8 @@ __invalid: 
	b	.



	/*

	 * Only uses x0..x3 so as to not clobber callee-saved SMCCC registers.

	 *

	 * x0: SMCCC function ID

	 * x1: struct kvm_nvhe_init_params PA

	 */
@@ -70,9 +72,9 @@ __do_hyp_init: 
	eret



1:	mov	x0, x1

	mov	x4, lr

	bl	___kvm_hyp_init

	mov	lr, x4

	mov	x3, lr

	bl	___kvm_hyp_init			// Clobbers x0..x2

	mov	lr, x3



	/* Hello, World! */

	mov	x0, #SMCCC_RET_SUCCESS
@@ -82,8 +84,8 @@ SYM_CODE_END(__kvm_hyp_init) 
/*

 * Initialize the hypervisor in EL2.

 *

 * Only uses x0..x3 so as to not clobber callee-saved SMCCC registers

 * and leave x4 for the caller.

 * Only uses x0..x2 so as to not clobber callee-saved SMCCC registers

 * and leave x3 for the caller.

 *

 * x0: struct kvm_nvhe_init_params PA

 */
@@ -112,9 +114,9 @@ alternative_else_nop_endif 
	/*

	 * Set the PS bits in TCR_EL2.

	 */

	ldr	x1, [x0, #NVHE_INIT_TCR_EL2]

	tcr_compute_pa_size x1, #TCR_EL2_PS_SHIFT, x2, x3

	msr	tcr_el2, x1

	ldr	x0, [x0, #NVHE_INIT_TCR_EL2]

	tcr_compute_pa_size x0, #TCR_EL2_PS_SHIFT, x1, x2

	msr	tcr_el2, x0



	isb
@@ -193,7 +195,7 @@ SYM_CODE_START_LOCAL(__kvm_hyp_init_cpu) 


	/* Enable MMU, set vectors and stack. */

	mov	x0, x28

	bl	___kvm_hyp_init			// Clobbers x0..x3

	bl	___kvm_hyp_init			// Clobbers x0..x2



	/* Leave idmap. */

	mov	x0, x29

arch/x86/kvm/cpuid.c

+1 −1
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ int kvm_vcpu_ioctl_get_cpuid2(struct kvm_vcpu *vcpu, 
	if (cpuid->nent < vcpu->arch.cpuid_nent)

		goto out;

	r = -EFAULT;

	if (copy_to_user(entries, &vcpu->arch.cpuid_entries,

	if (copy_to_user(entries, vcpu->arch.cpuid_entries,

			 vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))

		goto out;

	return 0;

arch/x86/kvm/emulate.c

+2 −0
Original line number Diff line number Diff line
@@ -2879,6 +2879,8 @@ static int em_sysenter(struct x86_emulate_ctxt *ctxt) 
	ops->get_msr(ctxt, MSR_IA32_SYSENTER_ESP, &msr_data);

	*reg_write(ctxt, VCPU_REGS_RSP) = (efer & EFER_LMA) ? msr_data :

							      (u32)msr_data;

	if (efer & EFER_LMA)

		ctxt->mode = X86EMUL_MODE_PROT64;



	return X86EMUL_CONTINUE;

}