On Tue, Oct 31, 2023, Maxim Levitsky wrote: > 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. To be honest, terrible name aside, I thought kvm_governed_feature_check_and_set() would be fairly self-explanatory, at least relative to all the other CPUID handling in KVM. > 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. I 100% agree, but I explicitly called out the terrible name in the v1 and v2 cover letters[1][2], and the patches were on the list for 6 months before I applied them. I'm definitely still open to a better name, but I'm also not exactly chomping at the bit to get behind the bikehsed. v1: : Note, I don't like the name "governed", but it was the least awful thing I : could come up with. Suggestions most definitely welcome. v2: : Note, I still don't like the name "governed", but no one has suggested : anything else, let alone anything better :-) [1] https://lore.kernel.org/all/20230217231022.816138-1-seanjc@xxxxxxxxxx [2] https://lore.kernel.org/all/20230729011608.1065019-1-seanjc@xxxxxxxxxx > Because of that, can't we just use guest CPUID as a single source of truth > and drop all the governed features code? No, not without a rather massive ABI break. To make guest CPUID the single source of true, KVM would need to modify guest CPUID to squash features that userspace has set, but that are not supported by hardware. And that is most definitely a can of worms I don't want to reopen, e.g. see the mess that got created when KVM tried to "help" userspace by mucking with VMX capability MSRs in response to CPUID changes. There aren't many real use cases for advertising "unsupported" features via guest CPUID, but there are some, and I have definitely abused KVM_SET_CPUID2 for testing purposes. And as above, that doesn't work for X86_FEATURE_XSAVES or X86_FEATURE_GBPAGES. We'd also have to overhaul guest CPUID lookups to be significantly faster (which is doable), as one of the motiviations for the framework was to avoid the overhead of looking through guest CPUID without needing one-off boolean fields. > 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? Yes and no. For "governed features", probably not. But for CPUID as a whole, there are legimiate cases where userspace needs to enumerate things that aren't officially "supported" by KVM. E.g. topology, core crystal frequency (CPUID 0x15), defeatures that KVM hasn't yet learned about, features that don't have virtualization controls and KVM hasn't yet learned about, etc. And for things like Xen and Hyper-V paravirt features, it's very doable to implement features that are enumerate by CPUID fully in userspace, e.g. using MSR filters. But again, it's a moot point because KVM has (mostly) allowed userspace to fully control guest CPUID for a very long time. > 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()'. Maybe, if we were creating KVM from scratch, e.g. didn't have to worry about existing uesrspace behavior and could implement a more forward-looking API than KVM_GET_SUPPORTED_CPUID. But even then the enforcement would need to be limited to "pure" hardware-defined feature bits, and I suspect that there would still be exceptions. And there would likely be complexitly in dealing with CPUID leafs that are completely unknown to KVM, e.g. unless KVM completely disallowed non-zero values for unknown CPUID leafs, adding restrictions when a feature is defined by Intel or AMD would be at constant risk of breaking userspace.
