| Message ID | 20250527180245.1413463-1-tabba@google.com |
|---|---|
| Headers | show |
| Series | KVM: Mapping guest_memfd backed memory at the host for software protected VMs | expand |
On 5/27/2025 11:32 PM, Fuad Tabba wrote: > The option KVM_PRIVATE_MEM enables guest_memfd in general. Subsequent > patches add shared memory support to guest_memfd. Therefore, rename it > to KVM_GMEM to make its purpose clearer. > > Reviewed-by: Gavin Shan <gshan@redhat.com> > Reviewed-by: Ira Weiny <ira.weiny@intel.com> > Co-developed-by: David Hildenbrand <david@redhat.com> > Signed-off-by: David Hildenbrand <david@redhat.com> > Signed-off-by: Fuad Tabba <tabba@google.com> > --- > arch/x86/include/asm/kvm_host.h | 2 +- > include/linux/kvm_host.h | 10 +++++----- > virt/kvm/Kconfig | 8 ++++---- > virt/kvm/Makefile.kvm | 2 +- > virt/kvm/kvm_main.c | 4 ++-- > virt/kvm/kvm_mm.h | 4 ++-- > 6 files changed, 15 insertions(+), 15 deletions(-) > > diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h > index 7bc174a1f1cb..52f6f6d08558 100644 > --- a/arch/x86/include/asm/kvm_host.h > +++ b/arch/x86/include/asm/kvm_host.h > @@ -2253,7 +2253,7 @@ void kvm_configure_mmu(bool enable_tdp, int tdp_forced_root_level, > int tdp_max_root_level, int tdp_huge_page_level); > > > -#ifdef CONFIG_KVM_PRIVATE_MEM > +#ifdef CONFIG_KVM_GMEM > #define kvm_arch_has_private_mem(kvm) ((kvm)->arch.has_private_mem) > #else > #define kvm_arch_has_private_mem(kvm) false > diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h > index 291d49b9bf05..d6900995725d 100644 > --- a/include/linux/kvm_host.h > +++ b/include/linux/kvm_host.h > @@ -601,7 +601,7 @@ struct kvm_memory_slot { > short id; > u16 as_id; > > -#ifdef CONFIG_KVM_PRIVATE_MEM > +#ifdef CONFIG_KVM_GMEM > struct { > /* > * Writes protected by kvm->slots_lock. Acquiring a > @@ -722,7 +722,7 @@ static inline int kvm_arch_vcpu_memslots_id(struct kvm_vcpu *vcpu) > * Arch code must define kvm_arch_has_private_mem if support for private memory > * is enabled. > */ > -#if !defined(kvm_arch_has_private_mem) && !IS_ENABLED(CONFIG_KVM_PRIVATE_MEM) > +#if !defined(kvm_arch_has_private_mem) && !IS_ENABLED(CONFIG_KVM_GMEM) > static inline bool kvm_arch_has_private_mem(struct kvm *kvm) > { > return false; > @@ -2504,7 +2504,7 @@ bool kvm_arch_post_set_memory_attributes(struct kvm *kvm, > > static inline bool kvm_mem_is_private(struct kvm *kvm, gfn_t gfn) > { > - return IS_ENABLED(CONFIG_KVM_PRIVATE_MEM) && > + return IS_ENABLED(CONFIG_KVM_GMEM) && > kvm_get_memory_attributes(kvm, gfn) & KVM_MEMORY_ATTRIBUTE_PRIVATE; > } > #else > @@ -2514,7 +2514,7 @@ static inline bool kvm_mem_is_private(struct kvm *kvm, gfn_t gfn) > } > #endif /* CONFIG_KVM_GENERIC_MEMORY_ATTRIBUTES */ > > -#ifdef CONFIG_KVM_PRIVATE_MEM > +#ifdef CONFIG_KVM_GMEM > int kvm_gmem_get_pfn(struct kvm *kvm, struct kvm_memory_slot *slot, > gfn_t gfn, kvm_pfn_t *pfn, struct page **page, > int *max_order); > @@ -2527,7 +2527,7 @@ static inline int kvm_gmem_get_pfn(struct kvm *kvm, > KVM_BUG_ON(1, kvm); > return -EIO; > } > -#endif /* CONFIG_KVM_PRIVATE_MEM */ > +#endif /* CONFIG_KVM_GMEM */ > > #ifdef CONFIG_HAVE_KVM_ARCH_GMEM_PREPARE > int kvm_arch_gmem_prepare(struct kvm *kvm, gfn_t gfn, kvm_pfn_t pfn, int max_order); > diff --git a/virt/kvm/Kconfig b/virt/kvm/Kconfig > index 727b542074e7..49df4e32bff7 100644 > --- a/virt/kvm/Kconfig > +++ b/virt/kvm/Kconfig > @@ -112,19 +112,19 @@ config KVM_GENERIC_MEMORY_ATTRIBUTES > depends on KVM_GENERIC_MMU_NOTIFIER > bool > > -config KVM_PRIVATE_MEM > +config KVM_GMEM > select XARRAY_MULTI > bool > > config KVM_GENERIC_PRIVATE_MEM > select KVM_GENERIC_MEMORY_ATTRIBUTES > - select KVM_PRIVATE_MEM > + select KVM_GMEM > bool > > config HAVE_KVM_ARCH_GMEM_PREPARE > bool > - depends on KVM_PRIVATE_MEM > + depends on KVM_GMEM > > config HAVE_KVM_ARCH_GMEM_INVALIDATE > bool > - depends on KVM_PRIVATE_MEM > + depends on KVM_GMEM > diff --git a/virt/kvm/Makefile.kvm b/virt/kvm/Makefile.kvm > index 724c89af78af..8d00918d4c8b 100644 > --- a/virt/kvm/Makefile.kvm > +++ b/virt/kvm/Makefile.kvm > @@ -12,4 +12,4 @@ kvm-$(CONFIG_KVM_ASYNC_PF) += $(KVM)/async_pf.o > kvm-$(CONFIG_HAVE_KVM_IRQ_ROUTING) += $(KVM)/irqchip.o > kvm-$(CONFIG_HAVE_KVM_DIRTY_RING) += $(KVM)/dirty_ring.o > kvm-$(CONFIG_HAVE_KVM_PFNCACHE) += $(KVM)/pfncache.o > -kvm-$(CONFIG_KVM_PRIVATE_MEM) += $(KVM)/guest_memfd.o > +kvm-$(CONFIG_KVM_GMEM) += $(KVM)/guest_memfd.o > diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c > index e85b33a92624..4996cac41a8f 100644 > --- a/virt/kvm/kvm_main.c > +++ b/virt/kvm/kvm_main.c > @@ -4842,7 +4842,7 @@ static int kvm_vm_ioctl_check_extension_generic(struct kvm *kvm, long arg) > case KVM_CAP_MEMORY_ATTRIBUTES: > return kvm_supported_mem_attributes(kvm); > #endif > -#ifdef CONFIG_KVM_PRIVATE_MEM > +#ifdef CONFIG_KVM_GMEM > case KVM_CAP_GUEST_MEMFD: > return !kvm || kvm_arch_has_private_mem(kvm); > #endif > @@ -5276,7 +5276,7 @@ static long kvm_vm_ioctl(struct file *filp, > case KVM_GET_STATS_FD: > r = kvm_vm_ioctl_get_stats_fd(kvm); > break; > -#ifdef CONFIG_KVM_PRIVATE_MEM > +#ifdef CONFIG_KVM_GMEM > case KVM_CREATE_GUEST_MEMFD: { > struct kvm_create_guest_memfd guest_memfd; > > diff --git a/virt/kvm/kvm_mm.h b/virt/kvm/kvm_mm.h > index acef3f5c582a..ec311c0d6718 100644 > --- a/virt/kvm/kvm_mm.h > +++ b/virt/kvm/kvm_mm.h > @@ -67,7 +67,7 @@ static inline void gfn_to_pfn_cache_invalidate_start(struct kvm *kvm, > } > #endif /* HAVE_KVM_PFNCACHE */ > > -#ifdef CONFIG_KVM_PRIVATE_MEM > +#ifdef CONFIG_KVM_GMEM > void kvm_gmem_init(struct module *module); > int kvm_gmem_create(struct kvm *kvm, struct kvm_create_guest_memfd *args); > int kvm_gmem_bind(struct kvm *kvm, struct kvm_memory_slot *slot, > @@ -91,6 +91,6 @@ static inline void kvm_gmem_unbind(struct kvm_memory_slot *slot) > { > WARN_ON_ONCE(1); > } > -#endif /* CONFIG_KVM_PRIVATE_MEM */ > +#endif /* CONFIG_KVM_GMEM */ > > #endif /* __KVM_MM_H__ */ Reviewed-by: Shivank Garg <shivankg@amd.com>
On 5/27/2025 11:32 PM, Fuad Tabba wrote: > The function kvm_arch_has_private_mem() is used to indicate whether > guest_memfd is supported by the architecture, which until now implies > that its private. To decouple guest_memfd support from whether the > memory is private, rename this function to kvm_arch_supports_gmem(). > > Reviewed-by: Gavin Shan <gshan@redhat.com> > Reviewed-by: Ira Weiny <ira.weiny@intel.com> > Co-developed-by: David Hildenbrand <david@redhat.com> > Signed-off-by: David Hildenbrand <david@redhat.com> > Signed-off-by: Fuad Tabba <tabba@google.com> > --- > arch/x86/include/asm/kvm_host.h | 8 ++++---- > arch/x86/kvm/mmu/mmu.c | 8 ++++---- > include/linux/kvm_host.h | 6 +++--- > virt/kvm/kvm_main.c | 6 +++--- > 4 files changed, 14 insertions(+), 14 deletions(-) > > diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h > index 52f6f6d08558..4a83fbae7056 100644 > --- a/arch/x86/include/asm/kvm_host.h > +++ b/arch/x86/include/asm/kvm_host.h > @@ -2254,9 +2254,9 @@ void kvm_configure_mmu(bool enable_tdp, int tdp_forced_root_level, > > > #ifdef CONFIG_KVM_GMEM > -#define kvm_arch_has_private_mem(kvm) ((kvm)->arch.has_private_mem) > +#define kvm_arch_supports_gmem(kvm) ((kvm)->arch.has_private_mem) > #else > -#define kvm_arch_has_private_mem(kvm) false > +#define kvm_arch_supports_gmem(kvm) false > #endif > > #define kvm_arch_has_readonly_mem(kvm) (!(kvm)->arch.has_protected_state) > @@ -2309,8 +2309,8 @@ enum { > #define HF_SMM_INSIDE_NMI_MASK (1 << 2) > > # define KVM_MAX_NR_ADDRESS_SPACES 2 > -/* SMM is currently unsupported for guests with private memory. */ > -# define kvm_arch_nr_memslot_as_ids(kvm) (kvm_arch_has_private_mem(kvm) ? 1 : 2) > +/* SMM is currently unsupported for guests with guest_memfd (esp private) memory. */ > +# define kvm_arch_nr_memslot_as_ids(kvm) (kvm_arch_supports_gmem(kvm) ? 1 : 2) > # define kvm_arch_vcpu_memslots_id(vcpu) ((vcpu)->arch.hflags & HF_SMM_MASK ? 1 : 0) > # define kvm_memslots_for_spte_role(kvm, role) __kvm_memslots(kvm, (role).smm) > #else > diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c > index 8d1b632e33d2..b66f1bf24e06 100644 > --- a/arch/x86/kvm/mmu/mmu.c > +++ b/arch/x86/kvm/mmu/mmu.c > @@ -4917,7 +4917,7 @@ long kvm_arch_vcpu_pre_fault_memory(struct kvm_vcpu *vcpu, > if (r) > return r; > > - if (kvm_arch_has_private_mem(vcpu->kvm) && > + if (kvm_arch_supports_gmem(vcpu->kvm) && > kvm_mem_is_private(vcpu->kvm, gpa_to_gfn(range->gpa))) > error_code |= PFERR_PRIVATE_ACCESS; > > @@ -7705,7 +7705,7 @@ bool kvm_arch_pre_set_memory_attributes(struct kvm *kvm, > * Zapping SPTEs in this case ensures KVM will reassess whether or not > * a hugepage can be used for affected ranges. > */ > - if (WARN_ON_ONCE(!kvm_arch_has_private_mem(kvm))) > + if (WARN_ON_ONCE(!kvm_arch_supports_gmem(kvm))) > return false; > > if (WARN_ON_ONCE(range->end <= range->start)) > @@ -7784,7 +7784,7 @@ bool kvm_arch_post_set_memory_attributes(struct kvm *kvm, > * a range that has PRIVATE GFNs, and conversely converting a range to > * SHARED may now allow hugepages. > */ > - if (WARN_ON_ONCE(!kvm_arch_has_private_mem(kvm))) > + if (WARN_ON_ONCE(!kvm_arch_supports_gmem(kvm))) > return false; > > /* > @@ -7840,7 +7840,7 @@ void kvm_mmu_init_memslot_memory_attributes(struct kvm *kvm, > { > int level; > > - if (!kvm_arch_has_private_mem(kvm)) > + if (!kvm_arch_supports_gmem(kvm)) > return; > > for (level = PG_LEVEL_2M; level <= KVM_MAX_HUGEPAGE_LEVEL; level++) { > diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h > index 7ca23837fa52..6ca7279520cf 100644 > --- a/include/linux/kvm_host.h > +++ b/include/linux/kvm_host.h > @@ -719,11 +719,11 @@ static inline int kvm_arch_vcpu_memslots_id(struct kvm_vcpu *vcpu) > #endif > > /* > - * Arch code must define kvm_arch_has_private_mem if support for private memory > + * Arch code must define kvm_arch_supports_gmem if support for guest_memfd > * is enabled. > */ > -#if !defined(kvm_arch_has_private_mem) && !IS_ENABLED(CONFIG_KVM_GMEM) > -static inline bool kvm_arch_has_private_mem(struct kvm *kvm) > +#if !defined(kvm_arch_supports_gmem) && !IS_ENABLED(CONFIG_KVM_GMEM) > +static inline bool kvm_arch_supports_gmem(struct kvm *kvm) > { > return false; > } > diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c > index 4996cac41a8f..2468d50a9ed4 100644 > --- a/virt/kvm/kvm_main.c > +++ b/virt/kvm/kvm_main.c > @@ -1531,7 +1531,7 @@ static int check_memory_region_flags(struct kvm *kvm, > { > u32 valid_flags = KVM_MEM_LOG_DIRTY_PAGES; > > - if (kvm_arch_has_private_mem(kvm)) > + if (kvm_arch_supports_gmem(kvm)) > valid_flags |= KVM_MEM_GUEST_MEMFD; > > /* Dirty logging private memory is not currently supported. */ > @@ -2362,7 +2362,7 @@ static int kvm_vm_ioctl_clear_dirty_log(struct kvm *kvm, > #ifdef CONFIG_KVM_GENERIC_MEMORY_ATTRIBUTES > static u64 kvm_supported_mem_attributes(struct kvm *kvm) > { > - if (!kvm || kvm_arch_has_private_mem(kvm)) > + if (!kvm || kvm_arch_supports_gmem(kvm)) > return KVM_MEMORY_ATTRIBUTE_PRIVATE; > > return 0; > @@ -4844,7 +4844,7 @@ static int kvm_vm_ioctl_check_extension_generic(struct kvm *kvm, long arg) > #endif > #ifdef CONFIG_KVM_GMEM > case KVM_CAP_GUEST_MEMFD: > - return !kvm || kvm_arch_has_private_mem(kvm); > + return !kvm || kvm_arch_supports_gmem(kvm); > #endif > default: > break; Reviewed-by: Shivank Garg <shivankg@amd.com>
On 5/27/2025 11:32 PM, Fuad Tabba wrote: > The function kvm_slot_can_be_private() is used to check whether a memory > slot is backed by guest_memfd. Rename it to kvm_slot_has_gmem() to make > that clearer and to decouple memory being private from guest_memfd. > > Reviewed-by: Gavin Shan <gshan@redhat.com> > Reviewed-by: Ira Weiny <ira.weiny@intel.com> > Co-developed-by: David Hildenbrand <david@redhat.com> > Signed-off-by: David Hildenbrand <david@redhat.com> > Signed-off-by: Fuad Tabba <tabba@google.com> > --- > arch/x86/kvm/mmu/mmu.c | 4 ++-- > arch/x86/kvm/svm/sev.c | 4 ++-- > include/linux/kvm_host.h | 2 +- > virt/kvm/guest_memfd.c | 2 +- > 4 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c > index 69bf2ef22ed0..2b6376986f96 100644 > --- a/arch/x86/kvm/mmu/mmu.c > +++ b/arch/x86/kvm/mmu/mmu.c > @@ -3283,7 +3283,7 @@ static int __kvm_mmu_max_mapping_level(struct kvm *kvm, > int kvm_mmu_max_mapping_level(struct kvm *kvm, > const struct kvm_memory_slot *slot, gfn_t gfn) > { > - bool is_private = kvm_slot_can_be_private(slot) && > + bool is_private = kvm_slot_has_gmem(slot) && > kvm_mem_is_private(kvm, gfn); > > return __kvm_mmu_max_mapping_level(kvm, slot, gfn, PG_LEVEL_NUM, is_private); > @@ -4496,7 +4496,7 @@ static int kvm_mmu_faultin_pfn_private(struct kvm_vcpu *vcpu, > { > int max_order, r; > > - if (!kvm_slot_can_be_private(fault->slot)) { > + if (!kvm_slot_has_gmem(fault->slot)) { > kvm_mmu_prepare_memory_fault_exit(vcpu, fault); > return -EFAULT; > } > diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c > index a7a7dc507336..27759ca6d2f2 100644 > --- a/arch/x86/kvm/svm/sev.c > +++ b/arch/x86/kvm/svm/sev.c > @@ -2378,7 +2378,7 @@ static int snp_launch_update(struct kvm *kvm, struct kvm_sev_cmd *argp) > mutex_lock(&kvm->slots_lock); > > memslot = gfn_to_memslot(kvm, params.gfn_start); > - if (!kvm_slot_can_be_private(memslot)) { > + if (!kvm_slot_has_gmem(memslot)) { > ret = -EINVAL; > goto out; > } > @@ -4688,7 +4688,7 @@ void sev_handle_rmp_fault(struct kvm_vcpu *vcpu, gpa_t gpa, u64 error_code) > } > > slot = gfn_to_memslot(kvm, gfn); > - if (!kvm_slot_can_be_private(slot)) { > + if (!kvm_slot_has_gmem(slot)) { > pr_warn_ratelimited("SEV: Unexpected RMP fault, non-private slot for GPA 0x%llx\n", > gpa); > return; > diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h > index 6ca7279520cf..d9616ee6acc7 100644 > --- a/include/linux/kvm_host.h > +++ b/include/linux/kvm_host.h > @@ -614,7 +614,7 @@ struct kvm_memory_slot { > #endif > }; > > -static inline bool kvm_slot_can_be_private(const struct kvm_memory_slot *slot) > +static inline bool kvm_slot_has_gmem(const struct kvm_memory_slot *slot) > { > return slot && (slot->flags & KVM_MEM_GUEST_MEMFD); > } > diff --git a/virt/kvm/guest_memfd.c b/virt/kvm/guest_memfd.c > index befea51bbc75..6db515833f61 100644 > --- a/virt/kvm/guest_memfd.c > +++ b/virt/kvm/guest_memfd.c > @@ -654,7 +654,7 @@ long kvm_gmem_populate(struct kvm *kvm, gfn_t start_gfn, void __user *src, long > return -EINVAL; > > slot = gfn_to_memslot(kvm, start_gfn); > - if (!kvm_slot_can_be_private(slot)) > + if (!kvm_slot_has_gmem(slot)) > return -EINVAL; > > file = kvm_gmem_get_file(slot); Reviewed-by: Shivank Garg <shivankg@amd.com>
On 5/27/2025 11:32 PM, Fuad Tabba wrote: > The comment that refers to the path where the user-visible memslot flags > are refers to an outdated path and has a typo. Make it refer to the > correct path. > > Signed-off-by: Fuad Tabba <tabba@google.com> > --- > include/linux/kvm_host.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h > index ae70e4e19700..80371475818f 100644 > --- a/include/linux/kvm_host.h > +++ b/include/linux/kvm_host.h > @@ -52,7 +52,7 @@ > /* > * The bit 16 ~ bit 31 of kvm_userspace_memory_region::flags are internally > * used in kvm, other bits are visible for userspace which are defined in > - * include/linux/kvm_h. > + * include/uapi/linux/kvm.h. Reviewed-by: Shivank Garg <shivankg@amd.com> > */ > #define KVM_MEMSLOT_INVALID (1UL << 16) >
Main changes since v9 [1]: - Dropped best-effort validation that the userspace memory address range matches the shared memory backed by guest_memfd - Rework handling faults for shared guest_memfd memory in arm64 - Track in the memslot whether it's backed by guest_memfd with shared memory support - Various fixes based on feedback from v9 - Rebase on Linux 6.15 The purpose of this series is to allow mapping guest_memfd backed memory at the host. This support enables VMMs like Firecracker to run guests backed completely by guest_memfd [2]. Combined with Patrick's series for direct map removal in guest_memfd [3], this would allow running VMs that offer additional hardening against Spectre-like transient execution attacks. This series will also serve as a base for _restricted_ mmap() support for guest_memfd backed memory at the host for CoCos that allow sharing guest memory in-place with the host [4]. Patches 1 to 7 are mainly about decoupling the concept of guest memory being private vs guest memory being backed by guest_memfd. They are mostly refactoring and renaming. Patches 8 and 9 add support for in-place shared memory, as well as the ability to map it by the host as long as it is shared, gated by a new configuration option, toggled by a new flag, and advertised to userspace by a new capability (introduced in patch 15). Patches 10 to 14 add x86 and arm64 support for in-place shared memory. Patch 15 introduces the capability that advertises support for in-place shared memory, and updates the documentation. Patch 16 adds selftests for the new features. For details on how to test this patch series, and on how to boot a guest has uses the new features, please refer to v8 [5]. Cheers, /fuad [1] https://lore.kernel.org/all/20250513163438.3942405-1-tabba@google.com/ [2] https://github.com/firecracker-microvm/firecracker/tree/feature/secret-hiding [3] https://lore.kernel.org/all/20250221160728.1584559-1-roypat@amazon.co.uk/ [4] https://lore.kernel.org/all/20250328153133.3504118-1-tabba@google.com/ [5] https://lore.kernel.org/all/20250430165655.605595-1-tabba@google.com/ Ackerley Tng (2): KVM: x86/mmu: Handle guest page faults for guest_memfd with shared memory KVM: x86: Compute max_mapping_level with input from guest_memfd Fuad Tabba (14): KVM: Rename CONFIG_KVM_PRIVATE_MEM to CONFIG_KVM_GMEM KVM: Rename CONFIG_KVM_GENERIC_PRIVATE_MEM to CONFIG_KVM_GENERIC_GMEM_POPULATE KVM: Rename kvm_arch_has_private_mem() to kvm_arch_supports_gmem() KVM: x86: Rename kvm->arch.has_private_mem to kvm->arch.supports_gmem KVM: Rename kvm_slot_can_be_private() to kvm_slot_has_gmem() KVM: Fix comments that refer to slots_lock KVM: Fix comment that refers to kvm uapi header path KVM: guest_memfd: Allow host to map guest_memfd pages KVM: guest_memfd: Track shared memory support in memslot KVM: arm64: Refactor user_mem_abort() calculation of force_pte KVM: arm64: Handle guest_memfd-backed guest page faults KVM: arm64: Enable mapping guest_memfd in arm64 KVM: Introduce the KVM capability KVM_CAP_GMEM_SHARED_MEM KVM: selftests: guest_memfd mmap() test when mapping is allowed Documentation/virt/kvm/api.rst | 9 + arch/arm64/include/asm/kvm_host.h | 5 + arch/arm64/kvm/Kconfig | 1 + arch/arm64/kvm/mmu.c | 109 ++++++++++-- arch/x86/include/asm/kvm_host.h | 22 ++- arch/x86/kvm/Kconfig | 4 +- arch/x86/kvm/mmu/mmu.c | 135 +++++++++------ arch/x86/kvm/svm/sev.c | 4 +- arch/x86/kvm/svm/svm.c | 4 +- arch/x86/kvm/x86.c | 4 +- include/linux/kvm_host.h | 80 +++++++-- include/uapi/linux/kvm.h | 2 + tools/testing/selftests/kvm/Makefile.kvm | 1 + .../testing/selftests/kvm/guest_memfd_test.c | 162 +++++++++++++++--- virt/kvm/Kconfig | 15 +- virt/kvm/Makefile.kvm | 2 +- virt/kvm/guest_memfd.c | 101 ++++++++++- virt/kvm/kvm_main.c | 16 +- virt/kvm/kvm_mm.h | 4 +- 19 files changed, 553 insertions(+), 127 deletions(-) base-commit: 0ff41df1cb268fc69e703a08a57ee14ae967d0ca