mm-treewide-rename-config_have_fast_gup-to-config_have_gup_fast.patch removed from -mm tree
The quilt patch titled
Subject: mm/treewide: rename CONFIG_HAVE_FAST_GUP to CONFIG_HAVE_GUP_FAST
has been removed from the -mm tree. Its filename was
mm-treewide-rename-config_have_fast_gup-to-config_have_gup_fast.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: David Hildenbrand <[email protected]>
Subject: mm/treewide: rename CONFIG_HAVE_FAST_GUP to CONFIG_HAVE_GUP_FAST
Date: Tue, 2 Apr 2024 14:55:15 +0200
Nowadays, we call it "GUP-fast", the external interface includes functions like "get_user_pages_fast()", and we renamed all internal functions to reflect that as well.
Let's make the config option reflect that.
---
arch/arm/Kconfig | 2 +- arch/arm64/Kconfig | 2 +- arch/loongarch/Kconfig | 2 +- arch/mips/Kconfig | 2 +- arch/powerpc/Kconfig | 2 +- arch/riscv/Kconfig | 2 +- arch/s390/Kconfig | 2 +- arch/sh/Kconfig | 2 +- arch/x86/Kconfig | 2 +- include/linux/rmap.h | 8 ++++---- kernel/events/core.c | 4 ++-- mm/Kconfig | 2 +- mm/gup.c | 10 +++++----- mm/internal.h | 2 +- 14 files changed, 22 insertions(+), 22 deletions(-)
arch/arm64/Kconfig renamed from arch/arm64/Kconfig~mm-treewide-rename-config_have_fast_gup-to-config_have_gup_fast +1 -1
@@ -205,7 +205,7 @@ config ARM64 select HAVE_SAMPLE_FTRACE_DIRECT select HAVE_SAMPLE_FTRACE_DIRECT_MULTI select HAVE_EFFICIENT_UNALIGNED_ACCESS - select HAVE_FAST_GUP + select HAVE_GUP_FAST select HAVE_FTRACE_MCOUNT_RECORD select HAVE_FUNCTION_TRACER select HAVE_FUNCTION_ERROR_INJECTION
arch/arm/Kconfig renamed from arch/arm/Kconfig~mm-treewide-rename-config_have_fast_gup-to-config_have_gup_fast +1 -1
@@ -99,7 +99,7 @@ config ARM select HAVE_DYNAMIC_FTRACE_WITH_REGS if HAVE_DYNAMIC_FTRACE select HAVE_EFFICIENT_UNALIGNED_ACCESS if (CPU_V6 || CPU_V6K || CPU_V7) && MMU select HAVE_EXIT_THREAD - select HAVE_FAST_GUP if ARM_LPAE + select HAVE_GUP_FAST if ARM_LPAE select HAVE_FTRACE_MCOUNT_RECORD if !XIP_KERNEL select HAVE_FUNCTION_ERROR_INJECTION select HAVE_FUNCTION_GRAPH_TRACER
arch/loongarch/Kconfig renamed from arch/loongarch/Kconfig~mm-treewide-rename-config_have_fast_gup-to-config_have_gup_fast +1 -1
@@ -119,7 +119,7 @@ config LOONGARCH select HAVE_EBPF_JIT select HAVE_EFFICIENT_UNALIGNED_ACCESS if !ARCH_STRICT_ALIGN select HAVE_EXIT_THREAD - select HAVE_FAST_GUP + select HAVE_GUP_FAST select HAVE_FTRACE_MCOUNT_RECORD select HAVE_FUNCTION_ARG_ACCESS_API select HAVE_FUNCTION_ERROR_INJECTION
arch/mips/Kconfig renamed from arch/mips/Kconfig~mm-treewide-rename-config_have_fast_gup-to-config_have_gup_fast +1 -1
@@ -68,7 +68,7 @@ config MIPS select HAVE_DYNAMIC_FTRACE select HAVE_EBPF_JIT if !CPU_MICROMIPS select HAVE_EXIT_THREAD - select HAVE_FAST_GUP + select HAVE_GUP_FAST select HAVE_FTRACE_MCOUNT_RECORD select HAVE_FUNCTION_GRAPH_TRACER select HAVE_FUNCTION_TRACER
arch/powerpc/Kconfig renamed from arch/powerpc/Kconfig~mm-treewide-rename-config_have_fast_gup-to-config_have_gup_fast +1 -1
@@ -236,7 +236,7 @@ config PPC select HAVE_DYNAMIC_FTRACE_WITH_REGS if ARCH_USING_PATCHABLE_FUNCTION_ENTRY || MPROFILE_KERNEL || PPC32 select HAVE_EBPF_JIT select HAVE_EFFICIENT_UNALIGNED_ACCESS - select HAVE_FAST_GUP + select HAVE_GUP_FAST select HAVE_FTRACE_MCOUNT_RECORD select HAVE_FUNCTION_ARG_ACCESS_API select HAVE_FUNCTION_DESCRIPTORS if PPC64_ELF_ABI_V1
arch/riscv/Kconfig renamed from arch/riscv/Kconfig~mm-treewide-rename-config_have_fast_gup-to-config_have_gup_fast +1 -1
@@ -132,7 +132,7 @@ config RISCV select HAVE_FUNCTION_GRAPH_RETVAL if HAVE_FUNCTION_GRAPH_TRACER select HAVE_FUNCTION_TRACER if !XIP_KERNEL && !PREEMPTION select HAVE_EBPF_JIT if MMU - select HAVE_FAST_GUP if MMU + select HAVE_GUP_FAST if MMU select HAVE_FUNCTION_ARG_ACCESS_API select HAVE_FUNCTION_ERROR_INJECTION select HAVE_GCC_PLUGINS
arch/s390/Kconfig renamed from arch/s390/Kconfig~mm-treewide-rename-config_have_fast_gup-to-config_have_gup_fast +1 -1
@@ -174,7 +174,7 @@ config S390 select HAVE_DYNAMIC_FTRACE_WITH_REGS select HAVE_EBPF_JIT if HAVE_MARCH_Z196_FEATURES select HAVE_EFFICIENT_UNALIGNED_ACCESS - select HAVE_FAST_GUP + select HAVE_GUP_FAST select HAVE_FENTRY select HAVE_FTRACE_MCOUNT_RECORD select HAVE_FUNCTION_ARG_ACCESS_API
arch/sh/Kconfig renamed from arch/sh/Kconfig~mm-treewide-rename-config_have_fast_gup-to-config_have_gup_fast +1 -1
@@ -38,7 +38,7 @@ config SUPERH select HAVE_DEBUG_BUGVERBOSE select HAVE_DEBUG_KMEMLEAK select HAVE_DYNAMIC_FTRACE - select HAVE_FAST_GUP if MMU + select HAVE_GUP_FAST if MMU select HAVE_FUNCTION_GRAPH_TRACER select HAVE_FUNCTION_TRACER select HAVE_FTRACE_MCOUNT_RECORD
arch/x86/Kconfig renamed from arch/x86/Kconfig~mm-treewide-rename-config_have_fast_gup-to-config_have_gup_fast +1 -1
@@ -221,7 +221,7 @@ config X86 select HAVE_EFFICIENT_UNALIGNED_ACCESS select HAVE_EISA select HAVE_EXIT_THREAD - select HAVE_FAST_GUP + select HAVE_GUP_FAST select HAVE_FENTRY if X86_64 || DYNAMIC_FTRACE select HAVE_FTRACE_MCOUNT_RECORD select HAVE_FUNCTION_GRAPH_RETVAL if HAVE_FUNCTION_GRAPH_TRACER
include/linux/rmap.h renamed from include/linux/rmap.h~mm-treewide-rename-config_have_fast_gup-to-config_have_gup_fast +4 -4
@@ -284,7 +284,7 @@ static inline int hugetlb_try_share_anonVM_WARN_ON_FOLIO (!PageAnonExclusive (&folio->page), folio);/* Paired with the memory barrier in try_grab_folio(). */ -if (IS_ENABLED (CONFIG_HAVE_FAST_GUP )) +if (IS_ENABLED (CONFIG_HAVE_GUP_FAST ))smp_mb ();if (unlikely (folio_maybe_dma_pinned (folio)))
@@ -295,7 +295,7 @@ static inline int hugetlb_try_share_anon* This is conceptually a smp_wmb() paired with the smp_rmb() in * gup_must_unshare(). */ -if (IS_ENABLED (CONFIG_HAVE_FAST_GUP )) +if (IS_ENABLED (CONFIG_HAVE_GUP_FAST ))smp_mb__after_atomic ();return 0 ; }
@@ -541,7 +541,7 @@ static __always_inline int __folio_try_s*/ /* Paired with the memory barrier in try_grab_folio(). */ -if (IS_ENABLED (CONFIG_HAVE_FAST_GUP )) +if (IS_ENABLED (CONFIG_HAVE_GUP_FAST ))smp_mb ();if (unlikely (folio_maybe_dma_pinned (folio)))
@@ -552,7 +552,7 @@ static __always_inline int __folio_try_s* This is conceptually a smp_wmb() paired with the smp_rmb() in * gup_must_unshare(). */ -if (IS_ENABLED (CONFIG_HAVE_FAST_GUP )) +if (IS_ENABLED (CONFIG_HAVE_GUP_FAST ))smp_mb__after_atomic ();return 0 ; }
kernel/events/core.c renamed from kernel/events/core.c~mm-treewide-rename-config_have_fast_gup-to-config_have_gup_fast +2 -2
@@ -7539,7 +7539,7 @@ static u64 perf_get_pgtable_size(struct {u64 size =0 ; -#ifdef CONFIG_HAVE_FAST_GUP +#ifdef CONFIG_HAVE_GUP_FAST pgd_t *pgdp, pgd;p4d_t *p4dp, p4d;pud_t *pudp, pud;
@@ -7587,7 +7587,7 @@ again:if (pte_present (pte)) size =pte_leaf_size (pte);pte_unmap (ptep); -#endif /* CONFIG_HAVE_FAST_GUP */ +#endif /* CONFIG_HAVE_GUP_FAST */ return size; }
mm/gup.c renamed from mm/gup.c~mm-treewide-rename-config_have_fast_gup-to-config_have_gup_fast +5 -5
@@ -501,7 +501,7 @@ static inline void mm_set_has_pinned_fla#ifdef CONFIG_MMU -#if defined(CONFIG_ARCH_HAS_HUGEPD ) || defined(CONFIG_HAVE_FAST_GUP ) +#if defined(CONFIG_ARCH_HAS_HUGEPD ) || defined(CONFIG_HAVE_GUP_FAST )static int record_subpages (struct page *page,unsigned long sz,unsigned long addr,unsigned long end,struct page **pages)
@@ -515,7 +515,7 @@ static int record_subpages(struct page *return nr; } -#endif /* CONFIG_ARCH_HAS_HUGEPD || CONFIG_HAVE_FAST_GUP */ +#endif /* CONFIG_ARCH_HAS_HUGEPD || CONFIG_HAVE_GUP_FAST */ #ifdef CONFIG_ARCH_HAS_HUGEPD static unsigned long hugepte_addr_end(unsigned long addr, unsigned long end,
@@ -2782,7 +2782,7 @@ EXPORT_SYMBOL(get_user_pages_unlocked);* * This code is based heavily on the PowerPC implementation by Nick Piggin. */ -#ifdef CONFIG_HAVE_FAST_GUP +#ifdef CONFIG_HAVE_GUP_FAST /* * Used in the GUP-fast path to determine whether GUP is permitted to work on
@@ -3361,7 +3361,7 @@ static inline void gup_fast_pgd_range(un unsigned int flags, struct page **pages, int *nr) { } -#endif /* CONFIG_HAVE_FAST_GUP */ +#endif /* CONFIG_HAVE_GUP_FAST */ #ifndef gup_fast_permitted/*
@@ -3381,7 +3381,7 @@ static unsigned long gup_fast(unsigned lint nr_pinned =0 ;unsigned seq; -if (!IS_ENABLED (CONFIG_HAVE_FAST_GUP ) || +if (!IS_ENABLED (CONFIG_HAVE_GUP_FAST ) || !gup_fast_permitted (start, end))return 0 ;
mm/internal.h renamed from mm/internal.h~mm-treewide-rename-config_have_fast_gup-to-config_have_gup_fast +1 -1
@@ -1265,7 +1265,7 @@ static inline bool gup_must_unshare(stru }/* Paired with a memory barrier in folio_try_share_anon_rmap_*(). */ -if (IS_ENABLED (CONFIG_HAVE_FAST_GUP )) +if (IS_ENABLED (CONFIG_HAVE_GUP_FAST ))smp_rmb ();/*
mm/Kconfig renamed from mm/Kconfig~mm-treewide-rename-config_have_fast_gup-to-config_have_gup_fast +1 -1
@@ -473,7 +473,7 @@ config ARCH_WANT_OPTIMIZE_HUGETLB_VMEMMA config HAVE_MEMBLOCK_PHYS_MAP bool -config HAVE_FAST_GUP +config HAVE_GUP_FAST depends on MMU bool
_
Patches currently in -mm which might be from [email protected] are
drivers-virt-acrn-fix-pfnmap-pte-checks-in-acrn_vm_ram_map.patch mm-pass-vma-instead-of-mm-to-follow_pte.patch mm-follow_pte-improvements.patch mm-allow-for-detecting-underflows-with-page_mapcount-again.patch mm-allow-for-detecting-underflows-with-page_mapcount-again-fix.patch mm-rmap-always-inline-anon-file-rmap-duplication-of-a-single-pte.patch mm-rmap-add-fast-path-for-small-folios-when-adding-removing-duplicating.patch mm-track-mapcount-of-large-folios-in-single-value.patch mm-improve-folio_likely_mapped_shared-using-the-mapcount-of-large-folios.patch mm-make-folio_mapcount-return-0-for-small-typed-folios.patch mm-make-folio_mapcount-return-0-for-small-typed-folios-fix.patch mm-memory-use-folio_mapcount-in-zap_present_folio_ptes.patch mm-huge_memory-use-folio_mapcount-in-zap_huge_pmd-sanity-check.patch mm-memory-failure-use-folio_mapcount-in-hwpoison_user_mappings.patch mm-page_alloc-use-folio_mapped-in-__alloc_contig_migrate_range.patch mm-migrate-use-folio_likely_mapped_shared-in-add_page_for_migration.patch sh-mm-cache-use-folio_mapped-in-copy_from_user_page.patch mm-filemap-use-folio_mapcount-in-filemap_unaccount_folio.patch mm-migrate_device-use-folio_mapcount-in-migrate_vma_check_page.patch trace-events-page_ref-trace-the-raw-page-mapcount-value.patch xtensa-mm-convert-check_tlb_entry-to-sanity-check-folios.patch mm-debug-print-only-page-mapcount-excluding-folio-entire-mapcount-in-__dump_folio.patch documentation-admin-guide-cgroup-v1-memoryrst-dont-reference-page_mapcount.patch mm-ksm-rename-get_ksm_page_flags-to-ksm_get_folio_flags.patch mm-ksm-remove-page_mapcount-usage-in-stable_tree_search.patch fs-proc-task_mmu-convert-pagemap_hugetlb_range-to-work-on-folios.patch fs-proc-task_mmu-convert-smaps_hugetlb_range-to-work-on-folios.patch mm-huge_memory-improve-split_huge_page_to_list_to_order-return-value-documentation.patch mm-huge_memory-improve-split_huge_page_to_list_to_order-return-value-documentation-v2.patch mm-khugepaged-replace-page_mapcount-check-by-folio_likely_mapped_shared.patch loongarch-tlb-fix-error-parameter-ptep-set-but-not-used-due-to-__tlb_remove_tlb_entry.patch