Re: [PATCH v16 34/51] KVM: nVMX: Advertise new VM-Entry/Exit control bits for CET state
From: Sean Christopherson
Date: Tue Sep 23 2025 - 12:28:11 EST
On Tue, Sep 23, 2025, Chao Gao wrote:
> > /* We support free control of debug control saving. */
> > msrs->exit_ctls_low &= ~VM_EXIT_SAVE_DEBUG_CONTROLS;
> > }
> >@@ -7200,11 +7204,16 @@ static void nested_vmx_setup_entry_ctls(struct vmcs_config *vmcs_conf,
> > #ifdef CONFIG_X86_64
> > VM_ENTRY_IA32E_MODE |
> > #endif
> >- VM_ENTRY_LOAD_IA32_PAT | VM_ENTRY_LOAD_BNDCFGS;
> >+ VM_ENTRY_LOAD_IA32_PAT | VM_ENTRY_LOAD_BNDCFGS |
> >+ VM_ENTRY_LOAD_CET_STATE;
> > msrs->entry_ctls_high |=
> > (VM_ENTRY_ALWAYSON_WITHOUT_TRUE_MSR | VM_ENTRY_LOAD_IA32_EFER |
> > VM_ENTRY_LOAD_IA32_PERF_GLOBAL_CTRL);
> >
> >+ if (!kvm_cpu_cap_has(X86_FEATURE_SHSTK) &&
> >+ !kvm_cpu_cap_has(X86_FEATURE_IBT))
> >+ msrs->exit_ctls_high &= ~VM_ENTRY_LOAD_CET_STATE;
>
> one copy-paste error here. s/exit_ctls_high/entry_ctls_high/
Thank you. I distinctly remember _trying_ to be extra careful. *sigh*
Fixup squashed.