tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

mm/treewide: rename CONFIG_HAVE_FAST_GUP to CONFIG_HAVE_GUP_FAST

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.

Link: https://lkml.kernel.org/r/20240402125516.223131-3-david@redhat.com
Signed-off-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Mike Rapoport (IBM) <rppt@kernel.org>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Reviewed-by: John Hubbard <jhubbard@nvidia.com>
Cc: Peter Xu <peterx@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

authored by

David Hildenbrand and committed by
Andrew Morton 25176ad0 23babe19

+22 -22
+1 -1
arch/arm/Kconfig
··· 99 99 select HAVE_DYNAMIC_FTRACE_WITH_REGS if HAVE_DYNAMIC_FTRACE 100 100 select HAVE_EFFICIENT_UNALIGNED_ACCESS if (CPU_V6 || CPU_V6K || CPU_V7) && MMU 101 101 select HAVE_EXIT_THREAD 102 - select HAVE_FAST_GUP if ARM_LPAE 102 + select HAVE_GUP_FAST if ARM_LPAE 103 103 select HAVE_FTRACE_MCOUNT_RECORD if !XIP_KERNEL 104 104 select HAVE_FUNCTION_ERROR_INJECTION 105 105 select HAVE_FUNCTION_GRAPH_TRACER
+1 -1
arch/arm64/Kconfig
··· 205 205 select HAVE_SAMPLE_FTRACE_DIRECT 206 206 select HAVE_SAMPLE_FTRACE_DIRECT_MULTI 207 207 select HAVE_EFFICIENT_UNALIGNED_ACCESS 208 - select HAVE_FAST_GUP 208 + select HAVE_GUP_FAST 209 209 select HAVE_FTRACE_MCOUNT_RECORD 210 210 select HAVE_FUNCTION_TRACER 211 211 select HAVE_FUNCTION_ERROR_INJECTION
+1 -1
arch/loongarch/Kconfig
··· 119 119 select HAVE_EBPF_JIT 120 120 select HAVE_EFFICIENT_UNALIGNED_ACCESS if !ARCH_STRICT_ALIGN 121 121 select HAVE_EXIT_THREAD 122 - select HAVE_FAST_GUP 122 + select HAVE_GUP_FAST 123 123 select HAVE_FTRACE_MCOUNT_RECORD 124 124 select HAVE_FUNCTION_ARG_ACCESS_API 125 125 select HAVE_FUNCTION_ERROR_INJECTION
+1 -1
arch/mips/Kconfig
··· 68 68 select HAVE_DYNAMIC_FTRACE 69 69 select HAVE_EBPF_JIT if !CPU_MICROMIPS 70 70 select HAVE_EXIT_THREAD 71 - select HAVE_FAST_GUP 71 + select HAVE_GUP_FAST 72 72 select HAVE_FTRACE_MCOUNT_RECORD 73 73 select HAVE_FUNCTION_GRAPH_TRACER 74 74 select HAVE_FUNCTION_TRACER
+1 -1
arch/powerpc/Kconfig
··· 236 236 select HAVE_DYNAMIC_FTRACE_WITH_REGS if ARCH_USING_PATCHABLE_FUNCTION_ENTRY || MPROFILE_KERNEL || PPC32 237 237 select HAVE_EBPF_JIT 238 238 select HAVE_EFFICIENT_UNALIGNED_ACCESS 239 - select HAVE_FAST_GUP 239 + select HAVE_GUP_FAST 240 240 select HAVE_FTRACE_MCOUNT_RECORD 241 241 select HAVE_FUNCTION_ARG_ACCESS_API 242 242 select HAVE_FUNCTION_DESCRIPTORS if PPC64_ELF_ABI_V1
+1 -1
arch/riscv/Kconfig
··· 132 132 select HAVE_FUNCTION_GRAPH_RETVAL if HAVE_FUNCTION_GRAPH_TRACER 133 133 select HAVE_FUNCTION_TRACER if !XIP_KERNEL && !PREEMPTION 134 134 select HAVE_EBPF_JIT if MMU 135 - select HAVE_FAST_GUP if MMU 135 + select HAVE_GUP_FAST if MMU 136 136 select HAVE_FUNCTION_ARG_ACCESS_API 137 137 select HAVE_FUNCTION_ERROR_INJECTION 138 138 select HAVE_GCC_PLUGINS
+1 -1
arch/s390/Kconfig
··· 174 174 select HAVE_DYNAMIC_FTRACE_WITH_REGS 175 175 select HAVE_EBPF_JIT if HAVE_MARCH_Z196_FEATURES 176 176 select HAVE_EFFICIENT_UNALIGNED_ACCESS 177 - select HAVE_FAST_GUP 177 + select HAVE_GUP_FAST 178 178 select HAVE_FENTRY 179 179 select HAVE_FTRACE_MCOUNT_RECORD 180 180 select HAVE_FUNCTION_ARG_ACCESS_API
+1 -1
arch/sh/Kconfig
··· 38 38 select HAVE_DEBUG_BUGVERBOSE 39 39 select HAVE_DEBUG_KMEMLEAK 40 40 select HAVE_DYNAMIC_FTRACE 41 - select HAVE_FAST_GUP if MMU 41 + select HAVE_GUP_FAST if MMU 42 42 select HAVE_FUNCTION_GRAPH_TRACER 43 43 select HAVE_FUNCTION_TRACER 44 44 select HAVE_FTRACE_MCOUNT_RECORD
+1 -1
arch/x86/Kconfig
··· 221 221 select HAVE_EFFICIENT_UNALIGNED_ACCESS 222 222 select HAVE_EISA 223 223 select HAVE_EXIT_THREAD 224 - select HAVE_FAST_GUP 224 + select HAVE_GUP_FAST 225 225 select HAVE_FENTRY if X86_64 || DYNAMIC_FTRACE 226 226 select HAVE_FTRACE_MCOUNT_RECORD 227 227 select HAVE_FUNCTION_GRAPH_RETVAL if HAVE_FUNCTION_GRAPH_TRACER
+4 -4
include/linux/rmap.h
··· 284 284 VM_WARN_ON_FOLIO(!PageAnonExclusive(&folio->page), folio); 285 285 286 286 /* Paired with the memory barrier in try_grab_folio(). */ 287 - if (IS_ENABLED(CONFIG_HAVE_FAST_GUP)) 287 + if (IS_ENABLED(CONFIG_HAVE_GUP_FAST)) 288 288 smp_mb(); 289 289 290 290 if (unlikely(folio_maybe_dma_pinned(folio))) ··· 295 295 * This is conceptually a smp_wmb() paired with the smp_rmb() in 296 296 * gup_must_unshare(). 297 297 */ 298 - if (IS_ENABLED(CONFIG_HAVE_FAST_GUP)) 298 + if (IS_ENABLED(CONFIG_HAVE_GUP_FAST)) 299 299 smp_mb__after_atomic(); 300 300 return 0; 301 301 } ··· 541 541 */ 542 542 543 543 /* Paired with the memory barrier in try_grab_folio(). */ 544 - if (IS_ENABLED(CONFIG_HAVE_FAST_GUP)) 544 + if (IS_ENABLED(CONFIG_HAVE_GUP_FAST)) 545 545 smp_mb(); 546 546 547 547 if (unlikely(folio_maybe_dma_pinned(folio))) ··· 552 552 * This is conceptually a smp_wmb() paired with the smp_rmb() in 553 553 * gup_must_unshare(). 554 554 */ 555 - if (IS_ENABLED(CONFIG_HAVE_FAST_GUP)) 555 + if (IS_ENABLED(CONFIG_HAVE_GUP_FAST)) 556 556 smp_mb__after_atomic(); 557 557 return 0; 558 558 }
+2 -2
kernel/events/core.c
··· 7539 7539 { 7540 7540 u64 size = 0; 7541 7541 7542 - #ifdef CONFIG_HAVE_FAST_GUP 7542 + #ifdef CONFIG_HAVE_GUP_FAST 7543 7543 pgd_t *pgdp, pgd; 7544 7544 p4d_t *p4dp, p4d; 7545 7545 pud_t *pudp, pud; ··· 7587 7587 if (pte_present(pte)) 7588 7588 size = pte_leaf_size(pte); 7589 7589 pte_unmap(ptep); 7590 - #endif /* CONFIG_HAVE_FAST_GUP */ 7590 + #endif /* CONFIG_HAVE_GUP_FAST */ 7591 7591 7592 7592 return size; 7593 7593 }
+1 -1
mm/Kconfig
··· 473 473 config HAVE_MEMBLOCK_PHYS_MAP 474 474 bool 475 475 476 - config HAVE_FAST_GUP 476 + config HAVE_GUP_FAST 477 477 depends on MMU 478 478 bool 479 479
+5 -5
mm/gup.c
··· 501 501 502 502 #ifdef CONFIG_MMU 503 503 504 - #if defined(CONFIG_ARCH_HAS_HUGEPD) || defined(CONFIG_HAVE_FAST_GUP) 504 + #if defined(CONFIG_ARCH_HAS_HUGEPD) || defined(CONFIG_HAVE_GUP_FAST) 505 505 static int record_subpages(struct page *page, unsigned long sz, 506 506 unsigned long addr, unsigned long end, 507 507 struct page **pages) ··· 515 515 516 516 return nr; 517 517 } 518 - #endif /* CONFIG_ARCH_HAS_HUGEPD || CONFIG_HAVE_FAST_GUP */ 518 + #endif /* CONFIG_ARCH_HAS_HUGEPD || CONFIG_HAVE_GUP_FAST */ 519 519 520 520 #ifdef CONFIG_ARCH_HAS_HUGEPD 521 521 static unsigned long hugepte_addr_end(unsigned long addr, unsigned long end, ··· 2782 2782 * 2783 2783 * This code is based heavily on the PowerPC implementation by Nick Piggin. 2784 2784 */ 2785 - #ifdef CONFIG_HAVE_FAST_GUP 2785 + #ifdef CONFIG_HAVE_GUP_FAST 2786 2786 2787 2787 /* 2788 2788 * Used in the GUP-fast path to determine whether GUP is permitted to work on ··· 3361 3361 unsigned int flags, struct page **pages, int *nr) 3362 3362 { 3363 3363 } 3364 - #endif /* CONFIG_HAVE_FAST_GUP */ 3364 + #endif /* CONFIG_HAVE_GUP_FAST */ 3365 3365 3366 3366 #ifndef gup_fast_permitted 3367 3367 /* ··· 3381 3381 int nr_pinned = 0; 3382 3382 unsigned seq; 3383 3383 3384 - if (!IS_ENABLED(CONFIG_HAVE_FAST_GUP) || 3384 + if (!IS_ENABLED(CONFIG_HAVE_GUP_FAST) || 3385 3385 !gup_fast_permitted(start, end)) 3386 3386 return 0; 3387 3387
+1 -1
mm/internal.h
··· 1265 1265 } 1266 1266 1267 1267 /* Paired with a memory barrier in folio_try_share_anon_rmap_*(). */ 1268 - if (IS_ENABLED(CONFIG_HAVE_FAST_GUP)) 1268 + if (IS_ENABLED(CONFIG_HAVE_GUP_FAST)) 1269 1269 smp_rmb(); 1270 1270 1271 1271 /*