[PATCH v2 0/8] KVM: VMX: Harden against interpreting TDX vCPU as vcpu_vmx

Sean Christopherson posted 8 patches 1 month ago
There is a newer version of this series
arch/x86/kvm/vmx/common.h      |  60 +++++++++++--
arch/x86/kvm/vmx/main.c        |  92 ++++++++++++++++++-
arch/x86/kvm/vmx/nested.c      |  36 ++++----
arch/x86/kvm/vmx/posted_intr.c |  20 +++--
arch/x86/kvm/vmx/posted_intr.h |   8 +-
arch/x86/kvm/vmx/tdx.c         |  32 +++----
arch/x86/kvm/vmx/vmx.c         | 155 ++++++++-------------------------
arch/x86/kvm/vmx/vmx.h         |  37 --------
arch/x86/kvm/vmx/x86_ops.h     |   1 -
9 files changed, 227 insertions(+), 214 deletions(-)
[PATCH v2 0/8] KVM: VMX: Harden against interpreting TDX vCPU as vcpu_vmx
Posted by Sean Christopherson 1 month ago
Move and rename "all" (read: everything I could find) common helpers out of
vmx.c and/or replace their vmx_ prefix with vt_, and then poison to_vmx() for
all common .c files to harden KVM against misinterpreting a TDX vCPU as a VMX
vCPU, i.e. consuming to_vmx() on a TDX vCPU.  Spotted when working through
the bus lock series.

As with v1, the TDX changes are compile-tested only.

v2:
 - Complete my train of though in patch 1's changelog. [Binbin]
 - Rename vmx_handle_exit_irqoff() => vt_handle_exit_irqoff. [Binbin, Sashiko]
 - Collect a review. [Binbin]
 - Move and rename everything I could find, using a dummy "struct vcpu_vmx_tdx"
   to allow relocating common inline helpers from vmx.h to common.h.

v1: https://lore.kernel.org/all/20260814161129.2177118-1-seanjc@google.com

Sean Christopherson (8):
  KVM: VMX: Move the shared "IRQs off" exit handler(s) to common code
  KVM: VMX: Move the shared NMI handler/trampoline to common code
  KVM: VMX: Disallowing using to_vmx() in common VT code
  KVM: VMX: Rename posted interrupt prefixes from "vmx" to "vt"
  KVM: VMX: Rename EPT violation handler prefix from "vmx" to "vt"
  KVM: VMX: Use dummy pseudo-overlay struct for to_vt() and vt_to_vcpu()
  KVM: VMX: Move common VT getters/converters to common.h
  KVM: VMX: Rename common exit info getters prefixes from "vmx" to "vt"

 arch/x86/kvm/vmx/common.h      |  60 +++++++++++--
 arch/x86/kvm/vmx/main.c        |  92 ++++++++++++++++++-
 arch/x86/kvm/vmx/nested.c      |  36 ++++----
 arch/x86/kvm/vmx/posted_intr.c |  20 +++--
 arch/x86/kvm/vmx/posted_intr.h |   8 +-
 arch/x86/kvm/vmx/tdx.c         |  32 +++----
 arch/x86/kvm/vmx/vmx.c         | 155 ++++++++-------------------------
 arch/x86/kvm/vmx/vmx.h         |  37 --------
 arch/x86/kvm/vmx/x86_ops.h     |   1 -
 9 files changed, 227 insertions(+), 214 deletions(-)


base-commit: 76671054f9a1ff6abb976583cd8da37650acdc97
-- 
2.55.0.887.g758fc8c411-goog
Re: [PATCH v2 0/8] KVM: VMX: Harden against interpreting TDX vCPU as vcpu_vmx
Posted by Huang, Kai 1 month ago
On Wed, 2026-08-26 at 10:12 -0700, Sean Christopherson wrote:
> Move and rename "all" (read: everything I could find) common helpers out of
> vmx.c and/or replace their vmx_ prefix with vt_, and then poison to_vmx() for
> all common .c files to harden KVM against misinterpreting a TDX vCPU as a VMX
> vCPU, i.e. consuming to_vmx() on a TDX vCPU.  Spotted when working through
> the bus lock series.
> 
> As with v1, the TDX changes are compile-tested only.

Sanity tested creating/destroying/short-running both VMX and TDX guests worked
fine on one GNR machine.  For this series:

Reviewed-by: Kai Huang <kai.huang@intel.com>
Tested-by: Kai Huang <kai.huang@intel.com>