From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 9 Oct 2022 16:39:55 +0000 (-0700)
Subject: Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
X-Git-Tag: v6.1-rc1~107
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/ef688f8b8cd3eb20547a6543f03e3d8952b87769

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

Pull kvm updates from Paolo Bonzini:
 "The first batch of KVM patches, mostly covering x86.

  ARM:

   - Account stage2 page table allocations in memory stats

  x86:

   - Account EPT/NPT arm64 page table allocations in memory stats

   - Tracepoint cleanups/fixes for nested VM-Enter and emulated MSR
     accesses

   - Drop eVMCS controls filtering for KVM on Hyper-V, all known
     versions of Hyper-V now support eVMCS fields associated with
     features that are enumerated to the guest

   - Use KVM's sanitized VMCS config as the basis for the values of
     nested VMX capabilities MSRs

   - A myriad event/exception fixes and cleanups. Most notably, pending
     exceptions morph into VM-Exits earlier, as soon as the exception is
     queued, instead of waiting until the next vmentry. This fixed a
     longstanding issue where the exceptions would incorrecly become
     double-faults instead of triggering a vmexit; the common case of
     page-fault vmexits had a special workaround, but now it's fixed for
     good

   - A handful of fixes for memory leaks in error paths

   - Cleanups for VMREAD trampoline and VMX's VM-Exit assembly flow

   - Never write to memory from non-sleepable kvm_vcpu_check_block()

   - Selftests refinements and cleanups

   - Misc typo cleanups

  Generic:

   - remove KVM_REQ_UNHALT"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (94 commits)
  KVM: remove KVM_REQ_UNHALT
  KVM: mips, x86: do not rely on KVM_REQ_UNHALT
  KVM: x86: never write to memory from kvm_vcpu_check_block()
  KVM: x86: Don't snapshot pending INIT/SIPI prior to checking nested events
  KVM: nVMX: Make event request on VMXOFF iff INIT/SIPI is pending
  KVM: nVMX: Make an event request if INIT or SIPI is pending on VM-Enter
  KVM: SVM: Make an event request if INIT or SIPI is pending when GIF is set
  KVM: x86: lapic does not have to process INIT if it is blocked
  KVM: x86: Rename kvm_apic_has_events() to make it INIT/SIPI specific
  KVM: x86: Rename and expose helper to detect if INIT/SIPI are allowed
  KVM: nVMX: Make an event request when pending an MTF nested VM-Exit
  KVM: x86: make vendor code check for all nested events
  mailmap: Update Oliver's email address
  KVM: x86: Allow force_emulation_prefix to be written without a reload
  KVM: selftests: Add an x86-only test to verify nested exception queueing
  KVM: selftests: Use uapi header to get VMX and SVM exit reasons/codes
  KVM: x86: Rename inject_pending_events() to kvm_check_and_inject_events()
  KVM: VMX: Update MTF and ICEBP comments to document KVM's subtle behavior
  KVM: x86: Treat pending TRIPLE_FAULT requests as pending exceptions
  KVM: x86: Morph pending exceptions to pending VM-Exits at queue time
  ...
---

ef688f8b8cd3eb20547a6543f03e3d8952b87769
diff --cc arch/x86/kvm/x86.c
index b0c47b41c264,eb9d2c23fb04..4bd5f8a751de
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@@ -11107,29 -11302,17 +11316,30 @@@ int kvm_arch_vcpu_ioctl_set_mpstate(str
  
  	vcpu_load(vcpu);
  
 -	if (!lapic_in_kernel(vcpu) &&
 -	    mp_state->mp_state != KVM_MP_STATE_RUNNABLE)
 +	switch (mp_state->mp_state) {
 +	case KVM_MP_STATE_UNINITIALIZED:
 +	case KVM_MP_STATE_HALTED:
 +	case KVM_MP_STATE_AP_RESET_HOLD:
 +	case KVM_MP_STATE_INIT_RECEIVED:
 +	case KVM_MP_STATE_SIPI_RECEIVED:
 +		if (!lapic_in_kernel(vcpu))
 +			goto out;
 +		break;
 +
 +	case KVM_MP_STATE_RUNNABLE:
 +		break;
 +
 +	default:
  		goto out;
 +	}
  
  	/*
- 	 * KVM_MP_STATE_INIT_RECEIVED means the processor is in
- 	 * INIT state; latched init should be reported using
- 	 * KVM_SET_VCPU_EVENTS, so reject it here.
+ 	 * Pending INITs are reported using KVM_SET_VCPU_EVENTS, disallow
+ 	 * forcing the guest into INIT/SIPI if those events are supposed to be
+ 	 * blocked.  KVM prioritizes SMI over INIT, so reject INIT/SIPI state
+ 	 * if an SMI is pending as well.
  	 */
- 	if ((kvm_vcpu_latch_init(vcpu) || vcpu->arch.smi_pending) &&
+ 	if ((!kvm_apic_init_sipi_allowed(vcpu) || vcpu->arch.smi_pending) &&
  	    (mp_state->mp_state == KVM_MP_STATE_SIPI_RECEIVED ||
  	     mp_state->mp_state == KVM_MP_STATE_INIT_RECEIVED))
  		goto out;