userfaultfd-make-functions-that-are-not-used-outside-uffd-static.patch removed from -mm tree
The quilt patch titled
Subject: userfaultfd: make functions that are not used outside uffd static
has been removed from the -mm tree. Its filename was
userfaultfd-make-functions-that-are-not-used-outside-uffd-static.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: "Mike Rapoport (Microsoft)" <[email protected]>
Subject: userfaultfd: make functions that are not used outside uffd static
Date: Sat, 23 May 2026 20:37:59 +0300
After merging fs/userfaultfd.c into mm/userfaultfd.c, several functions that were previously shared between the two files are now only used within mm/userfaultfd.c.
Make them static and remove their declarations from include/linux/userfaultfd_k.h.
---
include/linux/userfaultfd_k.h | 36 -------------------------------- mm/userfaultfd.c | 24 ++++++++++----------- 2 files changed, 12 insertions(+), 48 deletions(-)
include/linux/userfaultfd_k.h renamed from include/linux/userfaultfd_k.h~userfaultfd-make-functions-that-are-not-used-outside-uffd-static +0 -36
@@ -147,26 +147,12 @@ static inline uffd_flags_t uffd_flags_se/* Flags controlling behavior. These behavior changes are mode-independent. */ #define MFILL_ATOMIC_WP MFILL_ATOMIC_FLAG(0) -extern ssize_t mfill_atomic_copy (struct userfaultfd_ctx *ctx,unsigned long dst_start, -unsigned long src_start,unsigned long len, -uffd_flags_t flags); -extern ssize_t mfill_atomic_zeropage (struct userfaultfd_ctx *ctx, -unsigned long dst_start, -unsigned long len); -extern ssize_t mfill_atomic_continue (struct userfaultfd_ctx *ctx,unsigned long dst_start, -unsigned long len,uffd_flags_t flags); -extern ssize_t mfill_atomic_poison (struct userfaultfd_ctx *ctx,unsigned long start, -unsigned long len,uffd_flags_t flags); -extern int mwriteprotect_range (struct userfaultfd_ctx *ctx,unsigned long start, -unsigned long len,bool enable_wp);extern long uffd_wp_range (struct vm_area_struct *vma,unsigned long start,unsigned long len,bool enable_wp);/* move_pages */ void double_pt_lock (spinlock_t *ptl1,spinlock_t *ptl2);void double_pt_unlock (spinlock_t *ptl1,spinlock_t *ptl2); -ssize_t move_pages (struct userfaultfd_ctx *ctx,unsigned long dst_start, -unsigned long src_start,unsigned long len,__u64 flags); int move_pages_huge_pmd(struct mm_struct *mm, pmd_t *dst_pmd, pmd_t *src_pmd, pmd_t dst_pmdval, struct vm_area_struct *dst_vma, struct vm_area_struct *src_vma,
@@ -239,9 +225,6 @@ static inline bool userfaultfd_armed(strreturn vma->vm_flags & __VM_UFFD_FLAGS; } -bool vma_can_userfault (struct vm_area_struct *vma,vm_flags_t vm_flags, -bool wp_async); -static inline bool vma_has_uffd_without_event_remap (struct vm_area_struct *vma) {struct userfaultfd_ctx *uffd_ctx = vma->vm_userfaultfd_ctx.ctx;
@@ -271,25 +254,6 @@ extern void userfaultfd_unmap_complete(sextern bool userfaultfd_wp_unpopulated (struct vm_area_struct *vma);extern bool userfaultfd_wp_async (struct vm_area_struct *vma); -void userfaultfd_reset_ctx (struct vm_area_struct *vma); - -struct vm_area_struct *userfaultfd_clear_vma (struct vma_iterator *vmi, -struct vm_area_struct *prev, -struct vm_area_struct *vma, -unsigned long start, -unsigned long end); - -int userfaultfd_register_range (struct userfaultfd_ctx *ctx, -struct vm_area_struct *vma, -vm_flags_t vm_flags, -unsigned long start,unsigned long end, -bool wp_async); - -void userfaultfd_release_new (struct userfaultfd_ctx *ctx); - -void userfaultfd_release_all (struct mm_struct *mm, -struct userfaultfd_ctx *ctx); -static inline bool userfaultfd_wp_use_markers (struct vm_area_struct *vma) {/* Only wr-protect mode uses pte markers */
mm/userfaultfd.c renamed from mm/userfaultfd.c~userfaultfd-make-functions-that-are-not-used-outside-uffd-static +12 -12
@@ -1033,7 +1033,7 @@ out:return copied ? copied : err; } -ssize_t mfill_atomic_copy (struct userfaultfd_ctx *ctx,unsigned long dst_start, +static ssize_t mfill_atomic_copy (struct userfaultfd_ctx *ctx,unsigned long dst_start,unsigned long src_start,unsigned long len,uffd_flags_t flags) {
@@ -1041,7 +1041,7 @@ ssize_t mfill_atomic_copy(struct userfau uffd_flags_set_mode(flags, MFILL_ATOMIC_COPY)); } -ssize_t mfill_atomic_zeropage (struct userfaultfd_ctx *ctx, +static ssize_t mfill_atomic_zeropage (struct userfaultfd_ctx *ctx,unsigned long start,unsigned long len) {
@@ -1049,7 +1049,7 @@ ssize_t mfill_atomic_zeropage(struct use uffd_flags_set_mode(0, MFILL_ATOMIC_ZEROPAGE)); } -ssize_t mfill_atomic_continue (struct userfaultfd_ctx *ctx,unsigned long start, +static ssize_t mfill_atomic_continue (struct userfaultfd_ctx *ctx,unsigned long start,unsigned long len,uffd_flags_t flags) {
@@ -1065,7 +1065,7 @@ ssize_t mfill_atomic_continue(struct use uffd_flags_set_mode(flags, MFILL_ATOMIC_CONTINUE)); } -ssize_t mfill_atomic_poison (struct userfaultfd_ctx *ctx,unsigned long start, +static ssize_t mfill_atomic_poison (struct userfaultfd_ctx *ctx,unsigned long start,unsigned long len,uffd_flags_t flags) { return mfill_atomic(ctx, start, 0, len,
@@ -1101,7 +1101,7 @@ long uffd_wp_range(struct vm_area_structreturn ret; } -int mwriteprotect_range (struct userfaultfd_ctx *ctx,unsigned long start, +static int mwriteprotect_range (struct userfaultfd_ctx *ctx,unsigned long start,unsigned long len,bool enable_wp) {struct mm_struct *dst_mm = ctx->mm;
@@ -1931,7 +1931,7 @@ static void uffd_move_unlock(struct vm_a* in the regions or not, but preventing the risk of having to split * the hugepmd during the remap. */ -ssize_t move_pages (struct userfaultfd_ctx *ctx,unsigned long dst_start, +static ssize_t move_pages (struct userfaultfd_ctx *ctx,unsigned long dst_start,unsigned long src_start,unsigned long len,__u64 mode) {struct mm_struct *mm = ctx->mm;
@@ -2106,7 +2106,7 @@ out:return moved ? moved : err; } -bool vma_can_userfault (struct vm_area_struct *vma,vm_flags_t vm_flags, +static bool vma_can_userfault (struct vm_area_struct *vma,vm_flags_t vm_flags,bool wp_async) {const struct vm_uffd_ops *ops =vma_uffd_ops (vma);
@@ -2163,12 +2163,12 @@ static void userfaultfd_set_ctx(struct v (vma->vm_flags & ~__VM_UFFD_FLAGS) | vm_flags); } -void userfaultfd_reset_ctx (struct vm_area_struct *vma) +static void userfaultfd_reset_ctx (struct vm_area_struct *vma) {userfaultfd_set_ctx (vma,NULL ,0 ); } -struct vm_area_struct *userfaultfd_clear_vma(struct vma_iterator *vmi, +static struct vm_area_struct *userfaultfd_clear_vma(struct vma_iterator *vmi, struct vm_area_struct *prev, struct vm_area_struct *vma, unsigned long start,
@@ -2207,7 +2207,7 @@ struct vm_area_struct *userfaultfd_clear }/* Assumes mmap write lock taken, and mm_struct pinned. */ -int userfaultfd_register_range(struct userfaultfd_ctx *ctx, +static int userfaultfd_register_range(struct userfaultfd_ctx *ctx, struct vm_area_struct *vma, vm_flags_t vm_flags, unsigned long start, unsigned long end,
@@ -2271,7 +2271,7 @@ skip:return 0 ; } -void userfaultfd_release_new (struct userfaultfd_ctx *ctx) +static void userfaultfd_release_new (struct userfaultfd_ctx *ctx) {struct mm_struct *mm = ctx->mm;struct vm_area_struct *vma;
@@ -2286,7 +2286,7 @@ void userfaultfd_release_new(struct usermmap_write_unlock (mm); } -void userfaultfd_release_all (struct mm_struct *mm, +static void userfaultfd_release_all (struct mm_struct *mm,struct userfaultfd_ctx *ctx) {struct vm_area_struct *vma, *prev;
_
Patches currently in -mm which might be from [email protected] are
selftests-mm-hugetlb-read-hwpoison-add-sigbus-handler.patch selftests-mm-migration-dont-assume-huge-page-is-twomeg.patch selftests-mm-migration-make-nthreads-represent-number-of-working-threads.patch selftests-mm-migration-properly-cleanup-forked-processes.patch selftests-mm-run_vmtestssh-dont-gate-thp-and-ksm-tests-on-have_hugepages.patch selftests-mm-merge-map_hugetlb-into-hugepage-mmap.patch selftests-mm-rename-hugepage-tests-to-hugetlb.patch selftests-mm-hugetlb-shm-use-kselftest-framework.patch selftests-mm-hugetlb-vmemmap-use-kselftest-framework.patch selftests-mm-hugetlb-madvise-use-kselftest-framework.patch selftests-mm-hugetlb_madv_vs_map-use-kselftest-framework.patch selftests-mm-hugetlb-read-hwpoison-use-kselftest-framework.patch selftests-mm-khugepaged-group-tests-in-an-array.patch selftests-mm-khugepaged-use-ksefltest-framework.patch selftests-mm-khugepaged-use-ksefltest-framework-fix.patch selftests-mm-ksm_tests-use-kselftest-framework.patch selftests-mm-protection_keys-use-descriptive-test-names-in-the-output.patch selftests-mm-protection_keys-use-kselftest-framework.patch selftests-mm-uffd-common-use-kselftest-framework.patch selftests-mm-uffd-stress-use-kselftest-framework.patch selftests-mm-uffd-unit-tests-use-kselftest-framework.patch selftests-mm-va_high_addr_switch-use-kselftest-framework.patch selftests-mm-add-atexit-and-signal-handlers-to-thp_settings.patch selftests-mm-rename-thp_settings-to-hugepage_settings.patch selftests-mm-move-hugetlb-helpers-to-hugepage_settings.patch selftests-mm-hugepage_settings-use-unsigned-long-in-detect_hugetlb_page_size.patch selftests-mm-hugepage_settings-add-apis-to-get-and-set-nr_hugepages.patch selftests-mm-hugepage_settings-rename-and-rework-get_free_hugepages.patch selftests-mm-hugepage_settings-add-apis-for-hugetlb-setup-and-teardown.patch selftests-mm-move-read_file-read_num-and-write_num-to-vm_util.patch selftests-mm-vm_util-add-helpers-to-set-and-restore-shm-limits.patch selftests-mm-compaction_test-use-hugetlb-helpers.patch selftests-mm-cow-add-setup-of-hugetlb-pages.patch selftests-mm-gup_longterm-add-setup-of-hugetlb-pages.patch selftests-mm-gup_test-add-setup-of-hugetlb-pages.patch selftests-mm-hmm-tests-add-setup-of-hugetlb-pages.patch selftests-mm-hugepage_dio-add-setup-of-hugetlb-pages.patch selftests-mm-hugetlb_fault_after_madv-add-setup-of-hugetlb-pages.patch selftests-mm-hugetlb-madvise-add-setup-of-hugetlb-pages.patch selftests-mm-hugetlb_madv_vs_map-add-setup-of-hugetlb-pages.patch selftests-mm-hugetlb-mmap-add-setup-of-hugetlb-pages.patch selftests-mm-hugetlb-mremap-add-setup-of-hugetlb-pages.patch selftests-mm-hugetlb-shm-add-setup-of-hugetlb-pages.patch selftests-mm-hugetlb-soft-offline-add-setup-of-hugetlb-pages.patch selftests-mm-hugetlb-vmemmap-add-setup-of-hugetlb-pages.patch selftests-mm-migration-add-setup-of-hugetlb-pages.patch selftests-mm-pagemap_ioctl-add-setup-of-hugetlb-pages.patch selftests-mm-protection_keys-use-library-code-for-hugetlb-setup.patch selftests-mm-thuge-gen-add-setup-of-hugetlb-pages.patch selftests-mm-uffd-stress-use-hugetlb_save-and-alloc-huge-pages.patch selftests-mm-uffd-unit-tests-add-setup-of-hugetlb-pages.patch selftests-mm-uffd-wp-mremap-add-setup-of-hugetlb-pages.patch selftests-mm-va_high_addr_switch-add-setup-of-hugetlb-pages.patch selftests-mm-va_high_addr_switchsh-drop-huge-pages-setup.patch selftests-mm-run_vmtestssh-free-memory-if-available-memory-is-low.patch selftests-mm-run_vmtestssh-drop-detection-and-setup-of-hugetlb.patch xor-use-kmalloc-in-calibrate_xor_blocks.patch raid6-use-kmalloc-in-raid6_select_algo.patch