KVM: VMX: Harden against interpreting TDX vCPU as vcpu_vmx
Subsystems (4)
Sean Christopherson
maintainerv2 cover KVM: VMX: Harden against interpreting TDX vCPU as vcpu_vmx
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/[email protected]
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
Signature · 1 line
2.55.0.887.g758fc8c411-goog
Sean Christopherson
maintainerPATCH v2 1/8 KVM: VMX: Move the shared "IRQs off" exit handler(s) to common code
Move vmx_handle_exit_irqoff() and its helpers to common.h / main.c to capture that it's a common handler and to allow guarding against incorrectly using to_vmx().
Opportunistically use a "vt" prefix instead of "vmx" to communicate that it's a shared handler.
No functional change intended.
--- arch/x86/kvm/vmx/common.h | 6 ++++ arch/x86/kvm/vmx/main.c | 71 +++++++++++++++++++++++++++++++++++- arch/x86/kvm/vmx/vmx.c | 74 -------------------------------------- arch/x86/kvm/vmx/x86_ops.h | 1 - 4 files changed, 76 insertions(+), 76 deletions(-)
arch/x86/kvm/vmx/common.h +6 -0
@@ -74,6 +74,12 @@ static __always_inline bool is_td_vcpu(struct kvm_vcpu *vcpu) { return false; }#endif +static inline bool is_xfd_nm_fault (struct kvm_vcpu *vcpu) +{ +return vcpu->arch.guest_fpu.fpstate->xfd && + !kvm_is_cr0_bit_set (vcpu,X86_CR0_TS ); +} +static inline bool vt_is_tdx_private_gpa (struct kvm *kvm,gpa_t gpa) {/* For TDX the direct mask is the shared mask. */
arch/x86/kvm/vmx/main.c +70 -1
87 lines not on this page · raw message
arch/x86/kvm/vmx/vmx.c +0 -74
86 lines not on this page · raw message
arch/x86/kvm/vmx/x86_ops.h +0 -1
@@ -27,7 +27,6 @@ void vmx_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event);void vmx_vcpu_load (struct kvm_vcpu *vcpu,int cpu);void vmx_vcpu_put (struct kvm_vcpu *vcpu);int vmx_handle_exit (struct kvm_vcpu *vcpu,fastpath_t exit_fastpath); -void vmx_handle_exit_irqoff (struct kvm_vcpu *vcpu);int vmx_skip_emulated_instruction (struct kvm_vcpu *vcpu);void vmx_update_emulated_instruction (struct kvm_vcpu *vcpu);bool vmx_unhandleable_emulation_required (struct kvm_vcpu *vcpu);
Signature · 1 line
2.55.0.887.g758fc8c411-goog
Re: [PATCH v2 1/8] KVM: VMX: Move the shared "IRQs off" exit handler(s) to common code
Quoted 4 lines · Sean Christopherson
Move
vmx_handle_exit_irqoff()and its helpers tocommon.h/main.cto capture that it's a common handler andto allow guarding against incorrectly using
to_vmx().
For this purpose, it seems better to put patch 3 as the first patch?
Quoted 11 lines
Opportunistically use a "vt" prefix instead of "vmx" to communicate that it's a shared handler.
No functional change intended.
Cc Rick Edgecombe <[email protected]>Cc Xiaoyao Li <[email protected]>Cc Binbin Wu <[email protected]>Cc Kai Huang <[email protected]>Cc Yan Zhao <[email protected]>Signed-off-by Sean Christopherson <[email protected]>
Sean Christopherson
maintainerRe: [PATCH v2 1/8] KVM: VMX: Move the shared "IRQs off" exit handler(s) to common code
Quoted 7 lines · Xiaoyao Li
Quoted 4 lines · Sean Christopherson
Move
vmx_handle_exit_irqoff()and its helpers tocommon.h/main.cto capture that it's a common handler andto allow guarding against incorrectly using
to_vmx().For this purpose, it seems better to put patch 3 as the first patch?
Huh, yes. I have no idea why I didn't do that in the first place.
Sean Christopherson
maintainerPATCH v2 2/8 KVM: VMX: Move the shared NMI handler/trampoline to common code
In reply to Sean ChristophersonMove vmx_handle_nmi() to main.c to capture that it's a common handler and to allow guarding against incorrectly using to_vmx().
Opportunistically use a "vt" prefix instead of "vmx" to communicate that it's a shared handler.
No functional change intended.
--- arch/x86/kvm/vmx/common.h | 2 +- arch/x86/kvm/vmx/main.c | 11 +++++++++++ arch/x86/kvm/vmx/tdx.c | 2 +- arch/x86/kvm/vmx/vmx.c | 13 +------------ 4 files changed, 14 insertions(+), 14 deletions(-)
arch/x86/kvm/vmx/common.h +1 -1
@@ -189,6 +189,6 @@ static inline void __vmx_deliver_posted_interrupt(struct kvm_vcpu *vcpu,kvm_vcpu_trigger_posted_interrupt (vcpu,POSTED_INTR_VECTOR ); } -noinstr void vmx_handle_nmi(struct kvm_vcpu *vcpu); +noinstr void vt_handle_nmi(struct kvm_vcpu *vcpu);#endif /* __KVM_X86_VMX_COMMON_H */
arch/x86/kvm/vmx/main.c +11 -0
@@ -945,6 +945,17 @@ static void vt_handle_exit_irqoff(struct kvm_vcpu *vcpu) } } +noinstr void vt_handle_nmi(struct kvm_vcpu *vcpu) +{ +if ((u16 )vmx_get_exit_reason (vcpu).basic !=EXIT_REASON_EXCEPTION_NMI || + !is_nmi (vmx_get_intr_info (vcpu))) +return ; + +kvm_before_interrupt (vcpu,KVM_HANDLING_NMI ); +x86_entry_from_kvm (EVENT_TYPE_NMI ,NMI_VECTOR ); +kvm_after_interrupt (vcpu); +} +#define VMX_REQUIRED_APICV_INHIBITS \ (BIT(APICV_INHIBIT_REASON_DISABLED) | \ BIT(APICV_INHIBIT_REASON_ABSENT) | \
arch/x86/kvm/vmx/tdx.c +1 -1
@@ -974,7 +974,7 @@ static noinstr void tdx_vcpu_enter_exit(struct kvm_vcpu *vcpu) tdx->exit_gpa = tdx->vp_enter_args.r8; vt->exit_intr_info = tdx->vp_enter_args.r9; -vmx_handle_nmi (vcpu); +vt_handle_nmi (vcpu);guest_state_exit_irqoff (); }
arch/x86/kvm/vmx/vmx.c +1 -12
@@ -7363,17 +7363,6 @@ static fastpath_t vmx_exit_handlers_fastpath(struct kvm_vcpu *vcpu, } } -noinstr void vmx_handle_nmi(struct kvm_vcpu *vcpu) -{ -if ((u16 )vmx_get_exit_reason (vcpu).basic !=EXIT_REASON_EXCEPTION_NMI || - !is_nmi (vmx_get_intr_info (vcpu))) -return ; - -kvm_before_interrupt (vcpu,KVM_HANDLING_NMI ); -x86_entry_from_kvm (EVENT_TYPE_NMI ,NMI_VECTOR ); -kvm_after_interrupt (vcpu); -} - static noinstr void vmx_vcpu_enter_exit(struct kvm_vcpu *vcpu,unsigned int flags) {
@@ -7406,7 +7395,7 @@ static noinstr void vmx_vcpu_enter_exit(struct kvm_vcpu *vcpu,if (likely (!vmx_get_exit_reason (vcpu).failed_vmentry)) vmx->idt_vectoring_info =vmcs_read32 (IDT_VECTORING_INFO_FIELD ); -vmx_handle_nmi (vcpu); +vt_handle_nmi (vcpu); out:guest_state_exit_irqoff ();
Signature · 1 line
2.55.0.887.g758fc8c411-goog
Re: [PATCH v2 2/8] KVM: VMX: Move the shared NMI handler/trampoline to common code
Quoted 9 lines · Sean Christopherson
Move
vmx_handle_nmi()tomain.cto capture that it's a common handler and to allow guarding against incorrectly usingto_vmx().Opportunistically use a "vt" prefix instead of "vmx" to communicate that it's a shared handler.
No functional change intended.
Signed-off-by Sean Christopherson<[email protected]>
Sean Christopherson
maintainerPATCH v2 3/8 KVM: VMX: Disallowing using to_vmx() in common VT code
In reply to Sean ChristophersonPoison to_vmx() in main.c and posted_intr.c so that attempting to interpret the vCPU as a VMX vCPU will fail at compile time, as opposed to failing at runtime, or worse corrupting state without outright failing.
Note, to_tdx() is buried in tdx.c, i.e. isn't broadly reachable, and so doesn't need the same treatment as to_vmx().
--- arch/x86/kvm/vmx/main.c | 2 ++ arch/x86/kvm/vmx/posted_intr.c | 2 ++ 2 files changed, 4 insertions(+)
arch/x86/kvm/vmx/main.c +2 -0
@@ -11,6 +11,8 @@#include "tdx.h" #include "tdx_arch.h" +#pragma GCC poison to_vmx +#ifdef CONFIG_KVM_INTEL_TDX static_assert (offsetof(struct vcpu_vmx , vt) == offsetof(struct vcpu_tdx , vt));
arch/x86/kvm/vmx/posted_intr.c +2 -0
@@ -14,6 +14,8 @@#include "vmx.h" #include "tdx.h" +#pragma GCC poison to_vmx +/* * Maintain a per-CPU list of vCPUs that need to be awakened by wakeup_handler() * when a WAKEUP_VECTOR interrupted is posted. vCPUs are added to the list when
Signature · 1 line
2.55.0.887.g758fc8c411-goog
Re: [PATCH v2 3/8] KVM: VMX: Disallowing using to_vmx() in common VT code
Quoted 9 lines · Sean Christopherson
Poison
to_vmx()inmain.candposted_intr.cso that attempting to interpret the vCPU as a VMX vCPU will fail at compile time, as opposed to failing at runtime, or worse corrupting state without outright failing.Note,
to_tdx()is buried intdx.c, i.e. isn't broadly reachable, and so doesn't need the same treatment asto_vmx().Signed-off-by Sean Christopherson <[email protected]>
Nit: as Binbin mentioned in v1:
"Disallowing" -> "Disallow" in short-log.
Re: [PATCH v2 3/8] KVM: VMX: Disallowing using to_vmx() in common VT code
In reply to Sean ChristophersonQuoted 8 lines · Sean Christopherson
Poison
to_vmx()inmain.candposted_intr.cso that attempting to interpret the vCPU as a VMX vCPU will fail at compile time, as opposed to failing at runtime, or worse corrupting state without outright failing.Note,
to_tdx()is buried intdx.c, i.e. isn't broadly reachable, and so doesn't need the same treatment asto_vmx().Signed-off-by Sean Christopherson<[email protected]>
Sean Christopherson
maintainerPATCH v2 4/8 KVM: VMX: Rename posted interrupt prefixes from "vmx" to "vt"
In reply to Sean ChristophersonRename all common posted interrupt APIs that use a "vmx" prefix to instead use a "vt" prefix to capture that they are used for both VMX and TDX vCPUs.
No functional change intended.
--- arch/x86/kvm/vmx/common.h | 4 ++-- arch/x86/kvm/vmx/main.c | 4 ++-- arch/x86/kvm/vmx/posted_intr.c | 18 +++++++++--------- arch/x86/kvm/vmx/posted_intr.h | 8 ++++---- arch/x86/kvm/vmx/tdx.c | 6 +++--- arch/x86/kvm/vmx/vmx.c | 6 +++--- 6 files changed, 23 insertions(+), 23 deletions(-)
arch/x86/kvm/vmx/common.h +2 -2
@@ -170,8 +170,8 @@ static inline void kvm_vcpu_trigger_posted_interrupt(struct kvm_vcpu *vcpu,* Post an interrupt to a vCPU's PIR and trigger the vCPU to process the * interrupt if necessary. */ -static inline void __vmx_deliver_posted_interrupt (struct kvm_vcpu *vcpu, -struct pi_desc *pi_desc,int vector) +static inline void __vt_deliver_posted_interrupt (struct kvm_vcpu *vcpu, +struct pi_desc *pi_desc,int vector) {if (pi_test_and_set_pir (vector, pi_desc))return ;
arch/x86/kvm/vmx/main.c +2 -2
@@ -1086,8 +1086,8 @@ struct kvm_x86_ops vt_x86_ops __initdata = { .update_cpu_dirty_logging = vt_op(update_cpu_dirty_logging), - .pi_update_irte = vmx_pi_update_irte, - .pi_start_bypass = vmx_pi_start_bypass, + .pi_update_irte = vt_pi_update_irte, + .pi_start_bypass = vt_pi_start_bypass, #ifdef CONFIG_X86_64 .set_hv_timer = vt_op(set_hv_timer),
arch/x86/kvm/vmx/posted_intr.c +9 -9
@@ -56,7 +56,7 @@ static int pi_try_set_control(struct pi_desc *pi_desc, u64 *pold, u64 new)return 0 ; } -void vmx_vcpu_pi_load (struct kvm_vcpu *vcpu,int cpu) +void vt_vcpu_pi_load (struct kvm_vcpu *vcpu,int cpu) {struct pi_desc *pi_desc =vcpu_to_pi_desc (vcpu);struct vcpu_vt *vt =to_vt (vcpu);
@@ -146,11 +146,11 @@ void vmx_vcpu_pi_load(struct kvm_vcpu *vcpu, int cpu)pi_set_on (pi_desc); } -static bool vmx_can_use_vtd_pi (struct kvm *kvm) +static bool vt_can_use_vtd_pi (struct kvm *kvm) {/* * Note, reading the number of possible bypass IRQs can race with a -* bypass IRQ being attached to the VM. vmx_pi_start_bypass() ensures +* bypass IRQ being attached to the VM. vt_pi_start_bypass() ensures * blockng vCPUs will see an elevated count or get KVM_REQ_UNBLOCK. */ return irqchip_in_kernel(kvm) && kvm_arch_has_irq_bypass() &&
@@ -219,10 +219,10 @@ static bool vmx_needs_pi_wakeup(struct kvm_vcpu *vcpu)* back to the pi_wakeup_handler() function. */ return (vmx_can_use_ipiv (vcpu) && !is_td_vcpu (vcpu)) || -vmx_can_use_vtd_pi (vcpu->kvm); +vt_can_use_vtd_pi (vcpu->kvm); } -void vmx_vcpu_pi_put (struct kvm_vcpu *vcpu) +void vt_vcpu_pi_put (struct kvm_vcpu *vcpu) {struct pi_desc *pi_desc =vcpu_to_pi_desc (vcpu);
@@ -294,17 +294,17 @@ bool pi_has_pending_interrupt(struct kvm_vcpu *vcpu)/* * Kick all vCPUs when the first possible bypass IRQ is attached to a VM, as * blocking vCPUs may scheduled out without reconfiguring PID.NV to the wakeup -* vector, i.e. if the bypass IRQ came along after vmx_vcpu_pi_put(). +* vector, i.e. if the bypass IRQ came along after vt_vcpu_pi_put(). */ -void vmx_pi_start_bypass (struct kvm *kvm) +void vt_pi_start_bypass (struct kvm *kvm) { -if (WARN_ON_ONCE (!vmx_can_use_vtd_pi (kvm))) +if (WARN_ON_ONCE (!vt_can_use_vtd_pi (kvm)))return ;kvm_make_all_cpus_request (kvm,KVM_REQ_UNBLOCK ); } -int vmx_pi_update_irte (struct kvm_kernel_irqfd *irqfd,struct kvm *kvm, +int vt_pi_update_irte (struct kvm_kernel_irqfd *irqfd,struct kvm *kvm,unsigned int host_irq,uint32_t guest_irq,struct kvm_vcpu *vcpu,u32 vector) {
arch/x86/kvm/vmx/posted_intr.h +4 -4
@@ -8,16 +8,16 @@#include <asm/posted_intr.h> -void vmx_vcpu_pi_load (struct kvm_vcpu *vcpu,int cpu); -void vmx_vcpu_pi_put (struct kvm_vcpu *vcpu); +void vt_vcpu_pi_load (struct kvm_vcpu *vcpu,int cpu); +void vt_vcpu_pi_put (struct kvm_vcpu *vcpu);void pi_wakeup_handler (void );void __init pi_init_cpu (int cpu);void pi_apicv_pre_state_restore (struct kvm_vcpu *vcpu);bool pi_has_pending_interrupt (struct kvm_vcpu *vcpu); -int vmx_pi_update_irte (struct kvm_kernel_irqfd *irqfd,struct kvm *kvm, +int vt_pi_update_irte (struct kvm_kernel_irqfd *irqfd,struct kvm *kvm,unsigned int host_irq,uint32_t guest_irq,struct kvm_vcpu *vcpu,u32 vector); -void vmx_pi_start_bypass (struct kvm *kvm); +void vt_pi_start_bypass (struct kvm *kvm);static inline int pi_find_highest_vector (struct pi_desc *pi_desc) {
arch/x86/kvm/vmx/tdx.c +3 -3
@@ -716,7 +716,7 @@ void tdx_vcpu_load(struct kvm_vcpu *vcpu, int cpu) {struct vcpu_tdx *tdx =to_tdx (vcpu); -vmx_vcpu_pi_load (vcpu, cpu); +vt_vcpu_pi_load (vcpu, cpu);if (vcpu->cpu == cpu || !is_hkid_assigned (to_kvm_tdx (vcpu->kvm)))return ;
@@ -826,7 +826,7 @@ static void tdx_prepare_switch_to_host(struct kvm_vcpu *vcpu)void tdx_vcpu_put (struct kvm_vcpu *vcpu) { -vmx_vcpu_pi_put (vcpu); +vt_vcpu_pi_put (vcpu);tdx_prepare_switch_to_host (vcpu); }
@@ -1895,7 +1895,7 @@ void tdx_deliver_interrupt(struct kvm_lapic *apic, int delivery_mode,struct vcpu_tdx *tdx =to_tdx (vcpu);/* TDX supports only posted interrupt. No lapic emulation. */ -__vmx_deliver_posted_interrupt (vcpu, &tdx->vt.pi_desc, vector); +__vt_deliver_posted_interrupt (vcpu, &tdx->vt.pi_desc, vector);trace_kvm_apicv_accept_irq (vcpu->vcpu_id, delivery_mode, trig_mode, vector); }
arch/x86/kvm/vmx/vmx.c +3 -3
@@ -1577,12 +1577,12 @@ void vmx_vcpu_load(struct kvm_vcpu *vcpu, int cpu)vmx_vcpu_load_vmcs (vcpu, cpu); -vmx_vcpu_pi_load (vcpu, cpu); +vt_vcpu_pi_load (vcpu, cpu); }void vmx_vcpu_put (struct kvm_vcpu *vcpu) { -vmx_vcpu_pi_put (vcpu); +vt_vcpu_pi_put (vcpu);vmx_prepare_switch_to_host (to_vmx (vcpu)); }
@@ -4424,7 +4424,7 @@ static int vmx_deliver_posted_interrupt(struct kvm_vcpu *vcpu, int vector)if (!vcpu->arch.apic->apicv_active)return -1 ; -__vmx_deliver_posted_interrupt (vcpu, &vt->pi_desc, vector); +__vt_deliver_posted_interrupt (vcpu, &vt->pi_desc, vector);return 0 ; }
Signature · 1 line
2.55.0.887.g758fc8c411-goog
[email protected]
AI reviewRe: [PATCH v2 4/8] KVM: VMX: Rename posted interrupt prefixes from "vmx" to "vt"
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider: - [Low] Incomplete refactoring: The common helper function `vmx_needs_pi_wakeup` was not renamed to…
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [Low] Incomplete refactoring: The common helper function vmx_needs_pi_wakeup was not renamed to vt_needs_pi_wakeup. --
commit 3f6ac2d22873c9d6eb23bb3aab8ab0ad05bd4863
Author: Sean Christopherson <[email protected]>
KVM: VMX: Rename posted interrupt prefixes from "vmx" to "vt"
This commit renames posted interrupt APIs that are shared between VMX and TDX to use the "vt" prefix instead of "vmx". This is a non-functional change.
Quoted 4 lines
arch/x86/kvm/vmx/posted_intr.c +0
-0
[ ... ]
arch/x86/kvm/vmx/posted_intr.c static bool vmx_needs_pi_wakeup(struct kvm_vcpu *vcpu) · line 223
Quoted 7 lines
arch/x86/kvm/vmx/posted_intr.c +1
-1@@ -219,10 +219,10 @@ static bool vmx_needs_pi_wakeup(struct kvm_vcpu *vcpu)* back to the pi_wakeup_handler() function. */ return (vmx_can_use_ipiv (vcpu) && !is_td_vcpu (vcpu)) || -vmx_can_use_vtd_pi (vcpu->kvm); +vt_can_use_vtd_pi (vcpu->kvm); }
[Severity: Low]
This isn't a bug, but does vmx_needs_pi_wakeup() also need to be renamed to vt_needs_pi_wakeup()?
The "vmx_" prefix is left on a function that is actively shared with TDX (it checks is_td_vcpu()) and is used by the common vt_vcpu_pi_put() API below, missing the stated goal of the patch to rename all common posted interrupt APIs.
Quoted 5 lines
arch/x86/kvm/vmx/posted_intr.c +1
-1-void vmx_vcpu_pi_put (struct kvm_vcpu *vcpu) +void vt_vcpu_pi_put (struct kvm_vcpu *vcpu) {struct pi_desc *pi_desc =vcpu_to_pi_desc (vcpu);
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=4
Sean Christopherson
maintainerRe: [PATCH v2 4/8] KVM: VMX: Rename posted interrupt prefixes from "vmx" to "vt"
Quoted 17 lines · On Wed, Aug 26, 2026, [email protected] wrote:
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [Low] Incomplete refactoring: The common helper functionvmx_needs_pi_wakeupwas not renamed tovt_needs_pi_wakeup. --commit
3f6ac2d22873c9d6eb23bb3aab8ab0ad05bd4863
Author: Sean Christopherson <[email protected]>KVM: VMX: Rename posted interrupt prefixes from "vmx" to "vt"
This commit renames posted interrupt APIs that are shared between VMX and TDX to use the "vt" prefix instead of "vmx". This is a non-functional change.
Quoted 4 lines
arch/x86/kvm/vmx/posted_intr.c +0
-0[ ... ]
Quoted 11 lines
arch/x86/kvm/vmx/posted_intr.c static bool vmx_needs_pi_wakeup(struct kvm_vcpu *vcpu) · line 223
Quoted 7 lines
arch/x86/kvm/vmx/posted_intr.c +1
-1@@ -219,10 +219,10 @@ static bool vmx_needs_pi_wakeup(struct kvm_vcpu *vcpu)* back to the pi_wakeup_handler() function. */ return (vmx_can_use_ipiv (vcpu) && !is_td_vcpu (vcpu)) || -vmx_can_use_vtd_pi (vcpu->kvm); +vt_can_use_vtd_pi (vcpu->kvm); }[Severity: Low]
This isn't a bug, but doesvmx_needs_pi_wakeup()also need to be renamed tovt_needs_pi_wakeup()?
Doh, yes. I meant to change it, but got distracted by vmx_can_use_ipiv(), which _is_ VMX specific, and forgot to revisit vmx_needs_pi_wakeup().
If there are no other issues in the series, I'll just fix this one up when applying.
Re: [PATCH v2 4/8] KVM: VMX: Rename posted interrupt prefixes from "vmx" to "vt"
In reply to Sean ChristophersonQuoted 5 lines · Sean Christopherson
(quoted diff) +1
-1-int vmx_pi_update_irte(struct kvm_kernel_irqfd *irqfd, struct kvm *kvm, +int vt_pi_update_irte(struct kvm_kernel_irqfd *irqfd, struct kvm *kvm,unsigned int
host_irq,uint32_tguest_irq, structkvm_vcpu*vcpu, u32 vector) {
Nit: seems the second and the third line of function parameters need to be re- aligned after the renaming (one character shorter).
Re: [PATCH v2 4/8] KVM: VMX: Rename posted interrupt prefixes from "vmx" to "vt"
In reply to Sean ChristophersonQuoted 6 lines · Sean Christopherson
Rename all common posted interrupt APIs that use a "vmx" prefix to instead use a "vt" prefix to capture that they are used for both VMX and TDX vCPUs.
No functional change intended.
Signed-off-by Sean Christopherson <[email protected]>
With renaming vmx_needs_pi_wakeup() to vt_needs_pi_wakeup(),
Quoted 14 lines
--- arch/x86/kvm/vmx/common.h | 4 ++-- arch/x86/kvm/vmx/main.c | 4 ++-- arch/x86/kvm/vmx/posted_intr.c | 18 +++++++++--------- arch/x86/kvm/vmx/posted_intr.h | 8 ++++---- arch/x86/kvm/vmx/tdx.c | 6 +++--- arch/x86/kvm/vmx/vmx.c | 6 +++--- 6 files changed, 23 insertions(+), 23 deletions(-)arch/x86/kvm/vmx/common.h +0
-0
arch/x86/kvm/vmx/common.h static inline void kvm_vcpu_trigger_posted_interrupt(struct kvm_vcpu *vcpu, · line 174
Quoted 7 lines
arch/x86/kvm/vmx/common.h +2
-2@@ -170,8 +170,8 @@ static inline void kvm_vcpu_trigger_posted_interrupt(struct kvm_vcpu *vcpu,* Post an interrupt to a vCPU's PIR and trigger the vCPU to process the * interrupt if necessary. */ -static inline void __vmx_deliver_posted_interrupt (struct kvm_vcpu *vcpu, -struct pi_desc *pi_desc,int vector) +static inline void __vt_deliver_posted_interrupt (struct kvm_vcpu *vcpu, +struct pi_desc *pi_desc,int vector)
Nit: Maybe we can just name it vt_deliver_posted_interrupt() without underscore since no collide with vmx_deliver_posted_interrupt() anymore?
But it's OK to keep the underscore to indicate it's an common inner helper.
Sean Christopherson
maintainerRe: [PATCH v2 4/8] KVM: VMX: Rename posted interrupt prefixes from "vmx" to "vt"
Quoted 17 lines · Xiaoyao Li
arch/x86/kvm/vmx/common.h static inline void kvm_vcpu_trigger_posted_interrupt(struct kvm_vcpu *vcpu, · line 174
Quoted 12 lines · Sean Christopherson
arch/x86/kvm/vmx/common.h +2
-2@@ -170,8 +170,8 @@ static inline void kvm_vcpu_trigger_posted_interrupt(struct kvm_vcpu *vcpu,* Post an interrupt to a vCPU's PIR and trigger the vCPU to process the * interrupt if necessary. */ -static inline void __vmx_deliver_posted_interrupt (struct kvm_vcpu *vcpu, -struct pi_desc *pi_desc,int vector) +static inline void __vt_deliver_posted_interrupt (struct kvm_vcpu *vcpu, +struct pi_desc *pi_desc,int vector)Nit: Maybe we can just name it
vt_deliver_posted_interrupt()without underscore since no collide withvmx_deliver_posted_interrupt()anymore?
Quoted 1 line
But it's OK to keep the underscore to indicate it's an common inner helper.
Yeah, I went through pretty much the exact same sequence of thoughts. I'll keep the underscores unless someone feels strongly that they do more harm than good. They're a bit odd, here and in the EPT violation handler, but I do think it helps communicate/capture that VMX/TDX-specific code needs to run before/after invoking the inner helper.
Sean Christopherson
maintainerPATCH v2 5/8 KVM: VMX: Rename EPT violation handler prefix from "vmx" to "vt"
In reply to Sean ChristophersonRename __vmx_handle_ept_violation() to __vt_handle_ept_violation to capture that it is shared between VMX and TDX.
No functional change intended.
--- arch/x86/kvm/vmx/common.h | 4 ++-- arch/x86/kvm/vmx/tdx.c | 2 +- arch/x86/kvm/vmx/vmx.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
arch/x86/kvm/vmx/common.h +2 -2
@@ -86,8 +86,8 @@ static inline bool vt_is_tdx_private_gpa(struct kvm *kvm, gpa_t gpa)return !kvm_is_addr_direct (kvm, gpa); } -static inline int __vmx_handle_ept_violation (struct kvm_vcpu *vcpu,gpa_t gpa, -unsigned long exit_qualification) +static inline int __vt_handle_ept_violation (struct kvm_vcpu *vcpu,gpa_t gpa, +unsigned long exit_qualification) {u64 error_code;
arch/x86/kvm/vmx/tdx.c +1 -1
@@ -1987,7 +1987,7 @@ static int tdx_handle_ept_violation(struct kvm_vcpu *vcpu)while (1 ) {struct kvm_memory_slot *slot; - ret =__vmx_handle_ept_violation (vcpu, gpa, exit_qual); + ret =__vt_handle_ept_violation (vcpu, gpa, exit_qual);if (ret !=RET_PF_RETRY || !local_retry)break ;
arch/x86/kvm/vmx/vmx.c +1 -1
@@ -5991,7 +5991,7 @@ static int handle_ept_violation(struct kvm_vcpu *vcpu)if (unlikely (allow_smaller_maxphyaddr && !kvm_vcpu_is_legal_gpa (vcpu, gpa)))return kvm_emulate_instruction (vcpu,0 ); -return __vmx_handle_ept_violation (vcpu, gpa, exit_qualification); +return __vt_handle_ept_violation (vcpu, gpa, exit_qualification); }static int handle_ept_misconfig (struct kvm_vcpu *vcpu)
Signature · 1 line
2.55.0.887.g758fc8c411-goog
Re: [PATCH v2 5/8] KVM: VMX: Rename EPT violation handler prefix from "vmx" to "vt"
Quoted 2 lines · Sean Christopherson
Rename
__vmx_handle_ept_violation()to__vt_handle_ept_violationto capture that it is shared between VMX and TDX.
Nit: __vt_handle_ept_violation -> __vt_handle_ept_violation() ?
Re: [PATCH v2 5/8] KVM: VMX: Rename EPT violation handler prefix from "vmx" to "vt"
In reply to Sean ChristophersonQuoted 2 lines · Sean Christopherson
Rename
__vmx_handle_ept_violation()to__vt_handle_ept_violationto capture that it is shared between VMX and TDX.
Similar nit as what for __vt_deliver_posted_interrupt() in patch 4, maybe just name it vt_handle_ept_violation()?
Quoted 3 lines
No functional change intended.
Signed-off-by Sean Christopherson <[email protected]>
Quoted 47 lines
--- arch/x86/kvm/vmx/common.h | 4 ++-- arch/x86/kvm/vmx/tdx.c | 2 +- arch/x86/kvm/vmx/vmx.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)arch/x86/kvm/vmx/common.h +2
-2@@ -86,8 +86,8 @@ static inline bool vt_is_tdx_private_gpa(struct kvm *kvm, gpa_t gpa)return !kvm_is_addr_direct (kvm, gpa); } -static inline int __vmx_handle_ept_violation (struct kvm_vcpu *vcpu,gpa_t gpa, -unsigned long exit_qualification) +static inline int __vt_handle_ept_violation (struct kvm_vcpu *vcpu,gpa_t gpa, +unsigned long exit_qualification) {u64 error_code;arch/x86/kvm/vmx/tdx.c +1
-1@@ -1987,7 +1987,7 @@ static int tdx_handle_ept_violation(struct kvm_vcpu *vcpu)while (1 ) {struct kvm_memory_slot *slot; - ret =__vmx_handle_ept_violation (vcpu, gpa, exit_qual); + ret =__vt_handle_ept_violation (vcpu, gpa, exit_qual);if (ret !=RET_PF_RETRY || !local_retry)break ;arch/x86/kvm/vmx/vmx.c +1
-1@@ -5991,7 +5991,7 @@ static int handle_ept_violation(struct kvm_vcpu *vcpu)if (unlikely (allow_smaller_maxphyaddr && !kvm_vcpu_is_legal_gpa (vcpu, gpa)))return kvm_emulate_instruction (vcpu,0 ); -return __vmx_handle_ept_violation (vcpu, gpa, exit_qualification); +return __vt_handle_ept_violation (vcpu, gpa, exit_qualification); }static int handle_ept_misconfig (struct kvm_vcpu *vcpu)
Sean Christopherson
maintainerPATCH v2 6/8 KVM: VMX: Use dummy pseudo-overlay struct for to_vt() and vt_to_vcpu()
In reply to Sean ChristophersonDefine a combined vcpu_vmx_tdx structure to represent the common layout of vcpu_vmx and vcpu_tdx, instead of having vcpu_tdx piggyback vcpu_vmx. I.e. require VMX and TDX to match the common definition, not for TDX to match VMX. This will allow moving to_vt() and vt_to_vcpu() to common.h where they belong.
No functional change intended.
--- arch/x86/kvm/vmx/main.c | 4 +++- arch/x86/kvm/vmx/vmx.h | 9 +++++++-- 2 files changed, 10 insertions(+), 3 deletions(-)
arch/x86/kvm/vmx/main.c +3 -1
@@ -13,8 +13,10 @@#pragma GCC poison to_vmx +static_assert (offsetof(struct vcpu_vmx_tdx , vt) == offsetof(struct vcpu_vmx , vt)); +#ifdef CONFIG_KVM_INTEL_TDX -static_assert (offsetof(struct vcpu_vmx , vt) == offsetof(struct vcpu_tdx , vt)); +static_assert (offsetof(struct vcpu_vmx_tdx , vt) == offsetof(struct vcpu_tdx , vt));static void vt_disable_virtualization_cpu (void ) {
arch/x86/kvm/vmx/vmx.h +7 -2
@@ -304,14 +304,19 @@ struct kvm_vmx {u64 *pid_table; }; +struct vcpu_vmx_tdx { +struct kvm_vcpu vcpu; +struct vcpu_vt vt; +}; + static __always_inline struct vcpu_vt *to_vt(struct kvm_vcpu *vcpu) { - return &(container_of(vcpu, struct vcpu_vmx, vcpu)->vt); + return &(container_of(vcpu, struct vcpu_vmx_tdx, vcpu)->vt); } static __always_inline struct kvm_vcpu *vt_to_vcpu(struct vcpu_vt *vt) { - return &(container_of(vt, struct vcpu_vmx, vt)->vcpu); + return &(container_of(vt, struct vcpu_vmx_tdx, vt)->vcpu); } static __always_inline union vmx_exit_reason vmx_get_exit_reason(struct kvm_vcpu *vcpu)
Signature · 1 line
2.55.0.887.g758fc8c411-goog
Re: [PATCH v2 6/8] KVM: VMX: Use dummy pseudo-overlay struct for to_vt() and vt_to_vcpu()
Quoted 9 lines · Sean Christopherson
Define a combined
vcpu_vmx_tdxstructure to represent the common layout ofvcpu_vmxandvcpu_tdx, instead of havingvcpu_tdxpiggybackvcpu_vmx. I.e. require VMX and TDX to match the common definition, not for TDX to match VMX. This will allow movingto_vt()andvt_to_vcpu()tocommon.hwhere they belong.No functional change intended.
Signed-off-by Sean Christopherson <[email protected]>
Sean Christopherson
maintainerPATCH v2 7/8 KVM: VMX: Move common VT getters/converters to common.h
In reply to Sean ChristophersonMove the "to" vCPU converters and common exit information getters from vmx.h to common.h to capture that they are indeed common VT code. Defer renaming their prefixes to isolate the code movement from the massive churn that will result from said renaming.
No functional change intended.
--- arch/x86/kvm/vmx/common.h | 44 +++++++++++++++++++++++++++++++++++++++ arch/x86/kvm/vmx/vmx.h | 42 ------------------------------------- 2 files changed, 44 insertions(+), 42 deletions(-)
arch/x86/kvm/vmx/common.h +44 -0
@@ -2,10 +2,12 @@ #ifndef __KVM_X86_VMX_COMMON_H #define __KVM_X86_VMX_COMMON_H +#include <linux/container_of.h> #include <linux/kvm_host.h> #include <asm/posted_intr.h> #include "mmu.h" +#include "vmx_ops.h" union vmx_exit_reason { struct {
@@ -74,6 +76,48 @@ static __always_inline bool is_td_vcpu(struct kvm_vcpu *vcpu) { return false; }#endif +struct vcpu_vmx_tdx { +struct kvm_vcpu vcpu; +struct vcpu_vt vt; +}; + +static __always_inline struct vcpu_vt *to_vt(struct kvm_vcpu *vcpu) +{ + return &(container_of(vcpu, struct vcpu_vmx_tdx, vcpu)->vt); +} + +static __always_inline struct kvm_vcpu *vt_to_vcpu(struct vcpu_vt *vt) +{ + return &(container_of(vt, struct vcpu_vmx_tdx, vt)->vcpu); +} + +static __always_inline union vmx_exit_reason vmx_get_exit_reason(struct kvm_vcpu *vcpu) +{ +return to_vt (vcpu)->exit_reason; +} + +static __always_inline unsigned long vmx_get_exit_qual (struct kvm_vcpu *vcpu) +{ +struct vcpu_vt *vt =to_vt (vcpu); + +if (!kvm_register_test_and_mark_available (vcpu,VCPU_REG_EXIT_INFO_1 ) && + !WARN_ON_ONCE (is_td_vcpu (vcpu))) + vt->exit_qualification =vmcs_readl (EXIT_QUALIFICATION ); + +return vt->exit_qualification; +} + +static __always_inline u32 vmx_get_intr_info(struct kvm_vcpu *vcpu) +{ +struct vcpu_vt *vt =to_vt (vcpu); + +if (!kvm_register_test_and_mark_available (vcpu,VCPU_REG_EXIT_INFO_2 ) && + !WARN_ON_ONCE (is_td_vcpu (vcpu))) + vt->exit_intr_info =vmcs_read32 (VM_EXIT_INTR_INFO ); + +return vt->exit_intr_info; +} +static inline bool is_xfd_nm_fault (struct kvm_vcpu *vcpu) { return vcpu->arch.guest_fpu.fpstate->xfd &&
arch/x86/kvm/vmx/vmx.h +0 -42
48 lines not on this page · raw message
Signature · 1 line
2.55.0.887.g758fc8c411-goog
Re: [PATCH v2 7/8] KVM: VMX: Move common VT getters/converters to common.h
Quoted 8 lines · Sean Christopherson
Move the "to" vCPU converters and common exit information getters from
vmx.htocommon.hto capture that they are indeed common VT code. Defer renaming their prefixes to isolate the code movement from the massive churn that will result from said renaming.No functional change intended.
Signed-off-by Sean Christopherson<[email protected]>
Sean Christopherson
maintainerPATCH v2 8/8 KVM: VMX: Rename common exit info getters prefixes from "vmx" to "vt"
In reply to Sean ChristophersonRename all common prefixes for the APIs that get exit information common to VMX and TDX from "vmx" to "vt" to capture that they are used for both VMX and TDX vCPUs.
No functional change intended.
--- arch/x86/kvm/vmx/common.h | 6 ++-- arch/x86/kvm/vmx/main.c | 10 +++---- arch/x86/kvm/vmx/nested.c | 36 +++++++++++------------ arch/x86/kvm/vmx/tdx.c | 22 +++++++------- arch/x86/kvm/vmx/vmx.c | 60 +++++++++++++++++++-------------------- 5 files changed, 67 insertions(+), 67 deletions(-)
arch/x86/kvm/vmx/common.h +3 -3
@@ -91,12 +91,12 @@ static __always_inline struct kvm_vcpu *vt_to_vcpu(struct vcpu_vt *vt) return &(container_of(vt, struct vcpu_vmx_tdx, vt)->vcpu); } -static __always_inline union vmx_exit_reason vmx_get_exit_reason(struct kvm_vcpu *vcpu) +static __always_inline union vmx_exit_reason vt_get_exit_reason(struct kvm_vcpu *vcpu) {return to_vt (vcpu)->exit_reason; } -static __always_inline unsigned long vmx_get_exit_qual (struct kvm_vcpu *vcpu) +static __always_inline unsigned long vt_get_exit_qual (struct kvm_vcpu *vcpu) {struct vcpu_vt *vt =to_vt (vcpu);
@@ -107,7 +107,7 @@ static __always_inline unsigned long vmx_get_exit_qual(struct kvm_vcpu *vcpu)return vt->exit_qualification; } -static __always_inline u32 vmx_get_intr_info(struct kvm_vcpu *vcpu) +static __always_inline u32 vt_get_intr_info(struct kvm_vcpu *vcpu) {struct vcpu_vt *vt =to_vt (vcpu);
arch/x86/kvm/vmx/main.c +5 -5
@@ -934,12 +934,12 @@ static void vt_handle_exit_irqoff(struct kvm_vcpu *vcpu)if (to_vt (vcpu)->emulation_required)return ; -switch (vmx_get_exit_reason (vcpu).basic) { +switch (vt_get_exit_reason (vcpu).basic) {case EXIT_REASON_EXTERNAL_INTERRUPT : -handle_external_interrupt_irqoff (vcpu,vmx_get_intr_info (vcpu)); +handle_external_interrupt_irqoff (vcpu,vt_get_intr_info (vcpu));break ;case EXIT_REASON_EXCEPTION_NMI : -handle_exception_irqoff (vcpu,vmx_get_intr_info (vcpu)); +handle_exception_irqoff (vcpu,vt_get_intr_info (vcpu));break ;case EXIT_REASON_MCE_DURING_VMENTRY :kvm_machine_check ();
@@ -951,8 +951,8 @@ static void vt_handle_exit_irqoff(struct kvm_vcpu *vcpu) noinstr void vt_handle_nmi(struct kvm_vcpu *vcpu) { -if ((u16 )vmx_get_exit_reason (vcpu).basic !=EXIT_REASON_EXCEPTION_NMI || - !is_nmi (vmx_get_intr_info (vcpu))) +if ((u16 )vt_get_exit_reason (vcpu).basic !=EXIT_REASON_EXCEPTION_NMI || + !is_nmi (vt_get_intr_info (vcpu)))return ;kvm_before_interrupt (vcpu,KVM_HANDLING_NMI );
arch/x86/kvm/vmx/nested.c +18 -18
@@ -446,7 +446,7 @@ static void nested_ept_inject_page_fault(struct kvm_vcpu *vcpu,* "NMI unblocking due to IRET", i.e. the bit can be propagated * as-is from the original EXIT_QUALIFICATION. */ - exit_qualification =vmx_get_exit_qual (vcpu) &INTR_INFO_UNBLOCK_NMI ; + exit_qualification =vt_get_exit_qual (vcpu) &INTR_INFO_UNBLOCK_NMI ; }else {if (fault->error_code &PFERR_RSVD_MASK ) { vm_exit_reason =EXIT_REASON_EPT_MISCONFIG ;
@@ -472,7 +472,7 @@ static void nested_ept_inject_page_fault(struct kvm_vcpu *vcpu,* and walks the faulting GPA. */ if (from_hardware) - exit_qualification |=vmx_get_exit_qual (vcpu) & mask; + exit_qualification |=vt_get_exit_qual (vcpu) & mask;else exit_qualification |= fault->exit_qualification & mask;
@@ -4747,7 +4747,7 @@ static void prepare_vmcs12(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12, {/* update exit information fields: */ vmcs12->vm_exit_reason = vm_exit_reason; -if (vmx_get_exit_reason (vcpu).enclave_mode) +if (vt_get_exit_reason (vcpu).enclave_mode) vmcs12->vm_exit_reason |=VMX_EXIT_REASONS_SGX_ENCLAVE_MODE ; vmcs12->exit_qualification = exit_qualification;
@@ -5373,7 +5373,7 @@ static int nested_vmx_get_vmptr(struct kvm_vcpu *vcpu, gpa_t *vmpointer,struct x86_exception e;int r; -if (get_vmx_mem_address (vcpu,vmx_get_exit_qual (vcpu), +if (get_vmx_mem_address (vcpu,vt_get_exit_qual (vcpu),vmcs_read32 (VMX_INSTRUCTION_INFO ), false,sizeof (*vmpointer), &gva)) { *ret =1 ;
@@ -5665,7 +5665,7 @@ static int handle_vmread(struct kvm_vcpu *vcpu) {struct vmcs12 *vmcs12 =is_guest_mode (vcpu) ?get_shadow_vmcs12 (vcpu) :get_vmcs12 (vcpu); -unsigned long exit_qualification =vmx_get_exit_qual (vcpu); +unsigned long exit_qualification =vt_get_exit_qual (vcpu);u32 instr_info =vmcs_read32 (VMX_INSTRUCTION_INFO );struct vcpu_vmx *vmx =to_vmx (vcpu);struct x86_exception e;
@@ -5771,7 +5771,7 @@ static int handle_vmwrite(struct kvm_vcpu *vcpu) {struct vmcs12 *vmcs12 =is_guest_mode (vcpu) ?get_shadow_vmcs12 (vcpu) :get_vmcs12 (vcpu); -unsigned long exit_qualification =vmx_get_exit_qual (vcpu); +unsigned long exit_qualification =vt_get_exit_qual (vcpu);u32 instr_info =vmcs_read32 (VMX_INSTRUCTION_INFO );struct vcpu_vmx *vmx =to_vmx (vcpu);struct x86_exception e;
@@ -5960,7 +5960,7 @@ static int handle_vmptrld(struct kvm_vcpu *vcpu)/* Emulate the VMPTRST instruction */ static int handle_vmptrst (struct kvm_vcpu *vcpu) { -unsigned long exit_qual =vmx_get_exit_qual (vcpu); +unsigned long exit_qual =vt_get_exit_qual (vcpu);u32 instr_info =vmcs_read32 (VMX_INSTRUCTION_INFO );gpa_t current_vmptr =to_vmx (vcpu)->nested.current_vmptr;struct x86_exception e;
@@ -6021,7 +6021,7 @@ static int handle_invept(struct kvm_vcpu *vcpu)/* According to the Intel VMX instruction reference, the memory * operand is read even if it isn't needed (e.g., for type==global) */ -if (get_vmx_mem_address (vcpu,vmx_get_exit_qual (vcpu), +if (get_vmx_mem_address (vcpu,vt_get_exit_qual (vcpu), vmx_instruction_info, false,sizeof (operand), &gva))return 1 ; r =kvm_read_guest_virt (vcpu, gva, &operand,sizeof (operand), &e);
@@ -6104,7 +6104,7 @@ static int handle_invvpid(struct kvm_vcpu *vcpu)/* according to the intel vmx instruction reference, the memory * operand is read even if it isn't needed (e.g., for type==global) */ -if (get_vmx_mem_address (vcpu,vmx_get_exit_qual (vcpu), +if (get_vmx_mem_address (vcpu,vt_get_exit_qual (vcpu), vmx_instruction_info, false,sizeof (operand), &gva))return 1 ; r =kvm_read_guest_virt (vcpu, gva, &operand,sizeof (operand), &e);
@@ -6236,8 +6236,8 @@ static int handle_vmfunc(struct kvm_vcpu *vcpu)* EXIT_REASON_VMFUNC as the exit reason. */ nested_vmx_vmexit (vcpu, vmx->vt.exit_reason.full, -vmx_get_intr_info (vcpu), -vmx_get_exit_qual (vcpu)); +vt_get_intr_info (vcpu), +vt_get_exit_qual (vcpu));return 1 ; }
@@ -6288,7 +6288,7 @@ static bool nested_vmx_exit_handled_io(struct kvm_vcpu *vcpu,if (!nested_cpu_has (vmcs12,CPU_BASED_USE_IO_BITMAPS ))return nested_cpu_has (vmcs12,CPU_BASED_UNCOND_IO_EXITING ); - exit_qualification =vmx_get_exit_qual (vcpu); + exit_qualification =vt_get_exit_qual (vcpu); port = exit_qualification >>16 ; size = (exit_qualification &7 ) +1 ;
@@ -6314,7 +6314,7 @@ static bool nested_vmx_exit_handled_msr(struct kvm_vcpu *vcpu,if (exit_reason.basic ==EXIT_REASON_MSR_READ_IMM || exit_reason.basic ==EXIT_REASON_MSR_WRITE_IMM ) - msr_index =vmx_get_exit_qual (vcpu); + msr_index =vt_get_exit_qual (vcpu);else msr_index =kvm_ecx_read (vcpu);
@@ -6350,7 +6350,7 @@ static bool nested_vmx_exit_handled_msr(struct kvm_vcpu *vcpu,static bool nested_vmx_exit_handled_cr (struct kvm_vcpu *vcpu,struct vmcs12 *vmcs12) { -unsigned long exit_qualification =vmx_get_exit_qual (vcpu); +unsigned long exit_qualification =vt_get_exit_qual (vcpu);int cr = exit_qualification &15 ;int reg;unsigned long val;
@@ -6484,7 +6484,7 @@ static bool nested_vmx_l0_wants_exit(struct kvm_vcpu *vcpu,switch ((u16 )exit_reason.basic) {case EXIT_REASON_EXCEPTION_NMI : - intr_info =vmx_get_intr_info (vcpu); + intr_info =vt_get_intr_info (vcpu);if (is_nmi (intr_info))return true;else if (is_page_fault (intr_info))
@@ -6567,7 +6567,7 @@ static bool nested_vmx_l1_wants_exit(struct kvm_vcpu *vcpu,switch ((u16 )exit_reason.basic) {case EXIT_REASON_EXCEPTION_NMI : - intr_info =vmx_get_intr_info (vcpu); + intr_info =vt_get_intr_info (vcpu);if (is_nmi (intr_info))return true;else if (is_page_fault (intr_info))
@@ -6737,14 +6737,14 @@ bool nested_vmx_reflect_vmexit(struct kvm_vcpu *vcpu)* need to be synthesized by querying the in-kernel LAPIC, but external * interrupts are never reflected to L1 so it's a non-issue. */ - exit_intr_info =vmx_get_intr_info (vcpu); + exit_intr_info =vt_get_intr_info (vcpu);if (is_exception_with_error_code (exit_intr_info)) {struct vmcs12 *vmcs12 =get_vmcs12 (vcpu); vmcs12->vm_exit_intr_error_code =vmcs_read32 (VM_EXIT_INTR_ERROR_CODE ); } - exit_qual =vmx_get_exit_qual (vcpu); + exit_qual =vt_get_exit_qual (vcpu); reflect_vmexit:nested_vmx_vmexit (vcpu, exit_reason.full, exit_intr_info, exit_qual);
arch/x86/kvm/vmx/tdx.c +11 -11
@@ -741,7 +741,7 @@ bool tdx_interrupt_allowed(struct kvm_vcpu *vcpu)* interrupt is always allowed unless TDX guest calls TDVMCALL with HLT, * which passes the interrupt blocked flag. */ -return vmx_get_exit_reason (vcpu).basic !=EXIT_REASON_HLT || +return vt_get_exit_reason (vcpu).basic !=EXIT_REASON_HLT || !to_tdx (vcpu)->vp_enter_args.r12; }
@@ -759,7 +759,7 @@ static bool tdx_protected_apic_has_interrupt(struct kvm_vcpu *vcpu)* otherwise the interrupt would have been serviced at the instruction * boundary. */ -if (vmx_get_exit_reason (vcpu).basic !=EXIT_REASON_HLT || +if (vt_get_exit_reason (vcpu).basic !=EXIT_REASON_HLT ||to_tdx (vcpu)->vp_enter_args.r12)return false;
@@ -981,8 +981,8 @@ static noinstr void tdx_vcpu_enter_exit(struct kvm_vcpu *vcpu)static bool tdx_failed_vmentry (struct kvm_vcpu *vcpu) { -return vmx_get_exit_reason (vcpu).failed_vmentry && -vmx_get_exit_reason (vcpu).full !=-1u ; +return vt_get_exit_reason (vcpu).failed_vmentry && +vt_get_exit_reason (vcpu).full !=-1u ; }static fastpath_t tdx_exit_handlers_fastpath (struct kvm_vcpu *vcpu)
@@ -1131,7 +1131,7 @@ void tdx_inject_nmi(struct kvm_vcpu *vcpu)static int tdx_handle_exception_nmi (struct kvm_vcpu *vcpu) { -u32 intr_info =vmx_get_intr_info (vcpu); +u32 intr_info =vt_get_intr_info (vcpu);/* * Machine checks are handled by handle_exception_irqoff(), or by
@@ -1903,7 +1903,7 @@ void tdx_deliver_interrupt(struct kvm_lapic *apic, int delivery_mode,static inline bool tdx_is_sept_violation_unexpected_pending (struct kvm_vcpu *vcpu) {u64 eeq_type =to_tdx (vcpu)->ext_exit_qualification &TDX_EXT_EXIT_QUAL_TYPE_MASK ; -u64 eq =vmx_get_exit_qual (vcpu); +u64 eq =vt_get_exit_qual (vcpu);if (eeq_type !=TDX_EXT_EXIT_QUAL_TYPE_PENDING_EPT_VIOLATION )return false;
@@ -1939,7 +1939,7 @@ static int tdx_handle_ept_violation(struct kvm_vcpu *vcpu)/* Only private GPA triggers zero-step mitigation */ local_retry = true; }else { - exit_qual =vmx_get_exit_qual (vcpu); + exit_qual =vt_get_exit_qual (vcpu);/* * EPT violation due to instruction fetch should never be * triggered from shared memory in TDX guest. If such EPT
@@ -2021,7 +2021,7 @@ int tdx_complete_emulated_msr(struct kvm_vcpu *vcpu, int err)return 1 ; } -if (vmx_get_exit_reason (vcpu).basic ==EXIT_REASON_MSR_READ ) +if (vt_get_exit_reason (vcpu).basic ==EXIT_REASON_MSR_READ )tdvmcall_set_return_val (vcpu,kvm_read_edx_eax (vcpu));return 1 ;
@@ -2032,7 +2032,7 @@ int tdx_handle_exit(struct kvm_vcpu *vcpu, fastpath_t fastpath) {struct vcpu_tdx *tdx =to_tdx (vcpu);u64 vp_enter_ret = tdx->vp_enter_ret; -union vmx_exit_reason exit_reason =vmx_get_exit_reason (vcpu); +union vmx_exit_reason exit_reason =vt_get_exit_reason (vcpu);if (fastpath !=EXIT_FASTPATH_NONE )return 1 ;
@@ -2142,9 +2142,9 @@ void tdx_get_exit_info(struct kvm_vcpu *vcpu, u32 *reason, *reason = tdx->vt.exit_reason.full;if (*reason !=-1u ) { - *info1 =vmx_get_exit_qual (vcpu); + *info1 =vt_get_exit_qual (vcpu); *info2 = tdx->ext_exit_qualification; - *intr_info =vmx_get_intr_info (vcpu); + *intr_info =vt_get_intr_info (vcpu); }else { *info1 =0 ; *info2 =0 ;
arch/x86/kvm/vmx/vmx.c +30 -30
228 lines not on this page · raw message
Signature · 1 line
2.55.0.887.g758fc8c411-goog
Re: [PATCH v2 8/8] KVM: VMX: Rename common exit info getters prefixes from "vmx" to "vt"
Quoted 7 lines · Sean Christopherson
Rename all common prefixes for the APIs that get exit information common to VMX and TDX from "vmx" to "vt" to capture that they are used for both VMX and TDX vCPUs.
No functional change intended.
Signed-off-by Sean Christopherson<[email protected]>
I like the rename!
Quoted 7 lines · Sean Christopherson
Move and rename "all" (read: everything I could find) common helpers out of
vmx.cand/or replace theirvmx_prefix withvt_, and then poisonto_vmx()for all common .c files to harden KVM against misinterpreting a TDX vCPU as a VMX vCPU, i.e. consumingto_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: