From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1235337FF52 for ; Mon, 30 Mar 2026 19:34:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774899253; cv=none; b=Et4ntmRMl/drPHsJZDFsSQfB9H0/BeJVg7KJiSqDr1uyYpqqlqLtn2ax47HGxl4P8PfVOfXcu8Snn7KAHPwmxONlzJMoos7f44QN4ng+cZLtU6HEeM73I1FOMqIgL5pJJG4M804JEoD/0mKKO+vPmOrVcWPn4wn09miww2mYtTI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774899253; c=relaxed/simple; bh=U8PMCSHC/pnSjJJD6irLU5UvnMEPT2Oigrb+nCPIRlM=; h=Date:To:From:Subject:Message-Id; b=A9xyXVH2sNKD7LYUp+YZ5kQy++22SW9fyVxDhlICTZ/wH2kUaQOncU5HCZxUWS5E3cNWWI6hZAmTSriN6yb1Y4pouIvogCHEMi1lJnkAJ7qDWLytdka4Yhncgu8VdhnN8LuHRe/ygBQ9fgpy0ZYgd26iJXYeblij8huxBnaMzT8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b=ysNK6SnU; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="ysNK6SnU" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C5ABAC4CEF7; Mon, 30 Mar 2026 19:34:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1774899252; bh=U8PMCSHC/pnSjJJD6irLU5UvnMEPT2Oigrb+nCPIRlM=; h=Date:To:From:Subject:From; b=ysNK6SnUF9sw2a70lyOj1Y5Z+0sVU46U7dFrrTLzuBzdq7XgB86wtwEs/ibqmViBL xX443WdrCk66FGk2zrpzNG1qrwRMvNQ4XFS+SfLoRpGFmTJ07AIxLWMUT/oansSxaV t3T8g/T1KIttTJyKqa1rpGczE5QqLkCyFzxOwP5c= Date: Mon, 30 Mar 2026 12:34:12 -0700 To: mm-commits@vger.kernel.org,kalyazin@amazon.com,akpm@linux-foundation.org From: Andrew Morton Subject: [to-be-updated] kvm-guest_memfd-implement-userfaultfd-operations.patch removed from -mm tree Message-Id: <20260330193412.C5ABAC4CEF7@smtp.kernel.org> Precedence: bulk X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: The quilt patch titled Subject: KVM: guest_memfd: implement userfaultfd operations has been removed from the -mm tree. Its filename was kvm-guest_memfd-implement-userfaultfd-operations.patch This patch was dropped because an updated version will be issued ------------------------------------------------------ From: Nikita Kalyazin Subject: KVM: guest_memfd: implement userfaultfd operations Date: Fri, 6 Mar 2026 19:18:13 +0200 userfaultfd notifications about page faults used for live migration and snapshotting of VMs. MISSING mode allows post-copy live migration and MINOR mode allows optimization for post-copy live migration for VMs backed with shared hugetlbfs or tmpfs mappings as described in detail in commit 7677f7fd8be7 ("userfaultfd: add minor fault registration mode"). To use the same mechanisms for VMs that use guest_memfd to map their memory, guest_memfd should support userfaultfd operations. Add implementation of vm_uffd_ops to guest_memfd. Link: https://lkml.kernel.org/r/20260306171815.3160826-14-rppt@kernel.org Signed-off-by: Nikita Kalyazin Co-developed-by: Mike Rapoport (Microsoft) Signed-off-by: Mike Rapoport (Microsoft) Cc: Andrea Arcangeli Cc: Axel Rasmussen Cc: Baolin Wang Cc: David Hildenbrand Cc: Hugh Dickins Cc: James Houghton Cc: Liam Howlett Cc: Lorenzo Stoakes (Oracle) Cc: Matthew Wilcox (Oracle) Cc: Michal Hocko Cc: Muchun Song Cc: Oscar Salvador Cc: Paolo Bonzini Cc: Peter Xu Cc: Sean Christopherson Cc: Shuah Khan Cc: Suren Baghdasaryan Cc: Vlastimil Babka Signed-off-by: Andrew Morton --- mm/filemap.c | 1 virt/kvm/guest_memfd.c | 84 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 83 insertions(+), 2 deletions(-) --- a/mm/filemap.c~kvm-guest_memfd-implement-userfaultfd-operations +++ a/mm/filemap.c @@ -262,6 +262,7 @@ void filemap_remove_folio(struct folio * filemap_free_folio(mapping, folio); } +EXPORT_SYMBOL_FOR_MODULES(filemap_remove_folio, "kvm"); /* * page_cache_delete_batch - delete several folios from page cache --- a/virt/kvm/guest_memfd.c~kvm-guest_memfd-implement-userfaultfd-operations +++ a/virt/kvm/guest_memfd.c @@ -7,6 +7,7 @@ #include #include #include +#include #include "kvm_mm.h" @@ -107,6 +108,12 @@ static int kvm_gmem_prepare_folio(struct return __kvm_gmem_prepare_folio(kvm, slot, index, folio); } +static struct folio *kvm_gmem_get_folio_noalloc(struct inode *inode, pgoff_t pgoff) +{ + return __filemap_get_folio(inode->i_mapping, pgoff, + FGP_LOCK | FGP_ACCESSED, 0); +} + /* * Returns a locked folio on success. The caller is responsible for * setting the up-to-date flag before the memory is mapped into the guest. @@ -126,8 +133,7 @@ static struct folio *kvm_gmem_get_folio( * Fast-path: See if folio is already present in mapping to avoid * policy_lookup. */ - folio = __filemap_get_folio(inode->i_mapping, index, - FGP_LOCK | FGP_ACCESSED, 0); + folio = kvm_gmem_get_folio_noalloc(inode, index); if (!IS_ERR(folio)) return folio; @@ -457,12 +463,86 @@ static struct mempolicy *kvm_gmem_get_po } #endif /* CONFIG_NUMA */ +#ifdef CONFIG_USERFAULTFD +static bool kvm_gmem_can_userfault(struct vm_area_struct *vma, vm_flags_t vm_flags) +{ + struct inode *inode = file_inode(vma->vm_file); + + /* + * Only support userfaultfd for guest_memfd with INIT_SHARED flag. + * This ensures the memory can be mapped to userspace. + */ + if (!(GMEM_I(inode)->flags & GUEST_MEMFD_FLAG_INIT_SHARED)) + return false; + + return true; +} + +static struct folio *kvm_gmem_folio_alloc(struct vm_area_struct *vma, + unsigned long addr) +{ + struct inode *inode = file_inode(vma->vm_file); + pgoff_t pgoff = linear_page_index(vma, addr); + struct mempolicy *mpol; + struct folio *folio; + gfp_t gfp; + + if (unlikely(pgoff >= (i_size_read(inode) >> PAGE_SHIFT))) + return NULL; + + gfp = mapping_gfp_mask(inode->i_mapping); + mpol = mpol_shared_policy_lookup(&GMEM_I(inode)->policy, pgoff); + mpol = mpol ?: get_task_policy(current); + folio = filemap_alloc_folio(gfp, 0, mpol); + mpol_cond_put(mpol); + + return folio; +} + +static int kvm_gmem_filemap_add(struct folio *folio, + struct vm_area_struct *vma, + unsigned long addr) +{ + struct inode *inode = file_inode(vma->vm_file); + struct address_space *mapping = inode->i_mapping; + pgoff_t pgoff = linear_page_index(vma, addr); + int err; + + __folio_set_locked(folio); + err = filemap_add_folio(mapping, folio, pgoff, GFP_KERNEL); + if (err) { + folio_unlock(folio); + return err; + } + + return 0; +} + +static void kvm_gmem_filemap_remove(struct folio *folio, + struct vm_area_struct *vma) +{ + filemap_remove_folio(folio); + folio_unlock(folio); +} + +static const struct vm_uffd_ops kvm_gmem_uffd_ops = { + .can_userfault = kvm_gmem_can_userfault, + .get_folio_noalloc = kvm_gmem_get_folio_noalloc, + .alloc_folio = kvm_gmem_folio_alloc, + .filemap_add = kvm_gmem_filemap_add, + .filemap_remove = kvm_gmem_filemap_remove, +}; +#endif /* CONFIG_USERFAULTFD */ + static const struct vm_operations_struct kvm_gmem_vm_ops = { .fault = kvm_gmem_fault_user_mapping, #ifdef CONFIG_NUMA .get_policy = kvm_gmem_get_policy, .set_policy = kvm_gmem_set_policy, #endif +#ifdef CONFIG_USERFAULTFD + .uffd_ops = &kvm_gmem_uffd_ops, +#endif }; static int kvm_gmem_mmap(struct file *file, struct vm_area_struct *vma) _ Patches currently in -mm which might be from kalyazin@amazon.com are kvm-selftests-test-userfaultfd-minor-for-guest_memfd.patch kvm-selftests-test-userfaultfd-missing-for-guest_memfd.patch