On Thu, 2024-04-04 at 08:13 -0400, Paolo Bonzini wrote: > > struct kvm_arch { > - unsigned long vm_type; > unsigned long n_used_mmu_pages; > unsigned long n_requested_mmu_pages; > unsigned long n_max_mmu_pages; > unsigned int indirect_shadow_pages; > u8 mmu_valid_gen; > + u8 vm_type; > + bool has_private_mem; > + bool has_protected_state; I'm a little late to this conversation, so hopefully not just complicating things. But why not deduce has_private_mem and has_protected_state from the vm_type during runtime? Like if kvm.arch.vm_type was instead a bit mask with the bit position of the KVM_X86_*_VM set, kvm_arch_has_private_mem() could bitwise-and with a compile time mask of vm_types that have primate memory. This also prevents it from ever transitioning through non-nonsensical states like vm_type == KVM_X86_TDX_VM, but !has_private_memory, so would be a little more robust. Partly why I ask is there is logic in the x86 MMU TDX changes that tries to be generic but still needs special handling for it. The current solution is to look at kvm_gfn_shared_mask() as TDX is the only vm type that sets it, but Isaku and I were discussing if we should check something else, that didn't appear to be tying together to unrelated concepts: https://lore.kernel.org/kvm/20240319235654.GC1994522@xxxxxxxxxxxxxxxxxxxxx/ Since it's down the mail, the relevant snippet: " > > void kvm_arch_flush_shadow_memslot(struct kvm *kvm, > > struct kvm_memory_slot *slot) > > { > > - kvm_mmu_zap_all_fast(kvm); > > + if (kvm_gfn_shared_mask(kvm)) > > There seems to be an attempt to abstract away the existence of Secure- > EPT in mmu.c, that is not fully successful. In this case the code > checks kvm_gfn_shared_mask() to see if it needs to handle the zapping > in a way specific needed by S-EPT. It ends up being a little confusing > because the actual check is about whether there is a shared bit. It > only works because only S-EPT is the only thing that has a > kvm_gfn_shared_mask(). > > Doing something like (kvm->arch.vm_type == KVM_X86_TDX_VM) looks wrong, > but is more honest about what we are getting up to here. I'm not sure > though, what do you think? Right, I attempted and failed in zapping case. This is due to the restriction that the Secure-EPT pages must be removed from the leaves. the VMX case (also NPT, even SNP) heavily depends on zapping root entry as optimization. I can think of - add TDX check. Looks wrong - Use kvm_gfn_shared_mask(kvm). confusing - Give other name for this check like zap_from_leafs (or better name?) The implementation is same to kvm_gfn_shared_mask() with comment. - Or we can add a boolean variable to struct kvm " This patch seems like the convention would be to add and check a "zap_leafs_only" bool. But it starts to become a lot of bools. If instead we added an arch_zap_leafs_only(struct kvm *kvm), that checked the vm_type was KVM_X86_TDX_VM, it could make the calling code more clear. But then I wonder why not do the same for has_private_mem and has_protected_state? Of course TDX can adjust for any format of the state. Just seems cleaner to me.