On Thu, 2023-09-14 at 02:33 -0400, Yang Weijiang wrote: > Use the governed feature framework to track whether X86_FEATURE_SHSTK > and X86_FEATURE_IBT features can be used by userspace and guest, i.e., > the features can be used iff both KVM and guest CPUID can support them. > > Signed-off-by: Yang Weijiang <weijiang.yang@xxxxxxxxx> > --- > arch/x86/kvm/governed_features.h | 2 ++ > arch/x86/kvm/vmx/vmx.c | 2 ++ > 2 files changed, 4 insertions(+) > > diff --git a/arch/x86/kvm/governed_features.h b/arch/x86/kvm/governed_features.h > index 423a73395c10..db7e21c5ecc2 100644 > --- a/arch/x86/kvm/governed_features.h > +++ b/arch/x86/kvm/governed_features.h > @@ -16,6 +16,8 @@ KVM_GOVERNED_X86_FEATURE(PAUSEFILTER) > KVM_GOVERNED_X86_FEATURE(PFTHRESHOLD) > KVM_GOVERNED_X86_FEATURE(VGIF) > KVM_GOVERNED_X86_FEATURE(VNMI) > +KVM_GOVERNED_X86_FEATURE(SHSTK) > +KVM_GOVERNED_X86_FEATURE(IBT) > > #undef KVM_GOVERNED_X86_FEATURE > #undef KVM_GOVERNED_FEATURE > diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c > index 9409753f45b0..fd5893b3a2c8 100644 > --- a/arch/x86/kvm/vmx/vmx.c > +++ b/arch/x86/kvm/vmx/vmx.c > @@ -7765,6 +7765,8 @@ static void vmx_vcpu_after_set_cpuid(struct kvm_vcpu *vcpu) > kvm_governed_feature_check_and_set(vcpu, X86_FEATURE_XSAVES); > > kvm_governed_feature_check_and_set(vcpu, X86_FEATURE_VMX); > + kvm_governed_feature_check_and_set(vcpu, X86_FEATURE_SHSTK); > + kvm_governed_feature_check_and_set(vcpu, X86_FEATURE_IBT); > > vmx_setup_uret_msrs(vmx); > Reviewed-by: Maxim Levitsky <mlevitsk@xxxxxxxxxx> PS: IMHO The whole 'governed feature framework' is very confusing and somewhat poorly documented. Currently the only partial explanation of it, is at 'governed_features', which doesn't explain how to use it. For the reference this is how KVM expects governed features to be used in the common case (there are some exceptions to this but they are rare) 1. If a feature is not enabled in host CPUID or KVM doesn't support it, KVM is expected to not enable it in KVM cpu caps. 2. Userspace uploads guest CPUID. 3. After the guest CPUID upload, the vendor code calls kvm_governed_feature_check_and_set() which sets governed features = True iff feature is supported in both kvm cpu caps and in guest CPUID. 4. kvm/vendor code uses 'guest_can_use()' to query the value of the governed feature instead of reading guest CPUID. It might make sense to document the above somewhere at least. Now about another thing I am thinking: I do know that the mess of boolean flags that svm had is worse than these governed features and functionality wise these are equivalent. However thinking again about the whole thing: IMHO the 'governed features' is another quite confusing term that a KVM developer will need to learn and keep in memory. Because of that, can't we just use guest CPUID as a single source of truth and drop all the governed features code? In most cases, when the governed feature value will differ from the guest CPUID is when a feature is enabled in the guest CPUID, but not enabled in the KVM caps. I do see two exceptions to this: XSAVES on AMD and X86_FEATURE_GBPAGES, in which the opposite happens, governed feature is enabled, even when the feature is hidden from the guest CPUID, but it might be better from readability wise point, to deal with these cases manually and we unlikely to have many new such cases in the future. So for the common case of CPUID mismatch, when the governed feature is disabled but guest CPUID is enabled, does it make sense to allow this? Such a feature which is advertised as supported but not really working is a recipe of hard to find guest bugs IMHO. IMHO it would be much better to just check this condition and do kvm_vm_bugged() or something in case when a feature is enabled in the guest CPUID but KVM can't support it, and then just use guest CPUID in 'guest_can_use()'. Best regards, Maxim Levitsky
