On Thu, 7 May 2026 at 21:22, Ackerley Tng via B4 Relay <[email protected]> wrote: > > From: Ackerley Tng <[email protected]> > > Move kvm_supported_mem_attributes() from kvm_main.c to kvm_host.h and > make it a static inline function. This allows the helper to be used in > other parts of the KVM subsystem outside of kvm_main.c. This helper will be > used later by guest_memfd. > > No functional change intended. > > Signed-off-by: Ackerley Tng <[email protected]>
Reviewed-by: Fuad Tabba <[email protected]> Cheers, /fuad > --- > include/linux/kvm_host.h | 10 ++++++++++ > virt/kvm/kvm_main.c | 10 ---------- > 2 files changed, 10 insertions(+), 10 deletions(-) > > diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h > index 1deab76dc0a2c..f9ea95e33d050 100644 > --- a/include/linux/kvm_host.h > +++ b/include/linux/kvm_host.h > @@ -2529,6 +2529,16 @@ static inline bool kvm_memslot_is_gmem_only(const > struct kvm_memory_slot *slot) > } > > #ifdef CONFIG_KVM_MEMORY_ATTRIBUTES > +static inline u64 kvm_supported_mem_attributes(struct kvm *kvm) > +{ > +#ifdef kvm_arch_has_private_mem > + if (!kvm || kvm_arch_has_private_mem(kvm)) > + return KVM_MEMORY_ATTRIBUTE_PRIVATE; > +#endif > + > + return 0; > +} > + > typedef unsigned long (kvm_get_memory_attributes_t)(struct kvm *kvm, gfn_t > gfn); > DECLARE_STATIC_CALL(__kvm_get_memory_attributes, > kvm_get_memory_attributes_t); > > diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c > index 0a4024948711a..ff20e63143642 100644 > --- a/virt/kvm/kvm_main.c > +++ b/virt/kvm/kvm_main.c > @@ -2428,16 +2428,6 @@ static int kvm_vm_ioctl_clear_dirty_log(struct kvm > *kvm, > #endif /* CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT */ > > #ifdef CONFIG_KVM_MEMORY_ATTRIBUTES > -static u64 kvm_supported_mem_attributes(struct kvm *kvm) > -{ > -#ifdef kvm_arch_has_private_mem > - if (!kvm || kvm_arch_has_private_mem(kvm)) > - return KVM_MEMORY_ATTRIBUTE_PRIVATE; > -#endif > - > - return 0; > -} > - > #ifdef CONFIG_KVM_VM_MEMORY_ATTRIBUTES > static unsigned long kvm_get_vm_memory_attributes(struct kvm *kvm, gfn_t gfn) > { > > -- > 2.54.0.563.g4f69b47b94-goog > >
