mm: rename CONFIG_HAVE_GENERIC_GUP to CONFIG_HAVE_FAST_GUP
We only support the generic GUP now, so rename the config option to be more clear, and always use the mm/Kconfig definition of the symbol and select it from the arch Kconfigs. Link: http://lkml.kernel.org/r/20190625143715.1689-11-hch@lst.de Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Khalid Aziz <khalid.aziz@oracle.com> Reviewed-by: Jason Gunthorpe <jgg@mellanox.com> Cc: Andrey Konovalov <andreyknvl@google.com> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: David Miller <davem@davemloft.net> Cc: James Hogan <jhogan@kernel.org> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Nicholas Piggin <npiggin@gmail.com> Cc: Paul Burton <paul.burton@mips.com> Cc: Paul Mackerras <paulus@samba.org> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: Rich Felker <dalias@libc.org> Cc: Yoshinori Sato <ysato@users.sourceforge.jp> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
7b9afb86b6
commit
67a929e097
@ -75,6 +75,7 @@ config ARM
|
|||||||
select HAVE_DYNAMIC_FTRACE_WITH_REGS if HAVE_DYNAMIC_FTRACE
|
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_EFFICIENT_UNALIGNED_ACCESS if (CPU_V6 || CPU_V6K || CPU_V7) && MMU
|
||||||
select HAVE_EXIT_THREAD
|
select HAVE_EXIT_THREAD
|
||||||
|
select HAVE_FAST_GUP if ARM_LPAE
|
||||||
select HAVE_FTRACE_MCOUNT_RECORD if !XIP_KERNEL
|
select HAVE_FTRACE_MCOUNT_RECORD if !XIP_KERNEL
|
||||||
select HAVE_FUNCTION_GRAPH_TRACER if !THUMB2_KERNEL && !CC_IS_CLANG
|
select HAVE_FUNCTION_GRAPH_TRACER if !THUMB2_KERNEL && !CC_IS_CLANG
|
||||||
select HAVE_FUNCTION_TRACER if !XIP_KERNEL
|
select HAVE_FUNCTION_TRACER if !XIP_KERNEL
|
||||||
@ -1625,10 +1626,6 @@ config ARCH_SPARSEMEM_DEFAULT
|
|||||||
config HAVE_ARCH_PFN_VALID
|
config HAVE_ARCH_PFN_VALID
|
||||||
def_bool ARCH_HAS_HOLES_MEMORYMODEL || !SPARSEMEM
|
def_bool ARCH_HAS_HOLES_MEMORYMODEL || !SPARSEMEM
|
||||||
|
|
||||||
config HAVE_GENERIC_GUP
|
|
||||||
def_bool y
|
|
||||||
depends on ARM_LPAE
|
|
||||||
|
|
||||||
config HIGHMEM
|
config HIGHMEM
|
||||||
bool "High Memory Support"
|
bool "High Memory Support"
|
||||||
depends on MMU
|
depends on MMU
|
||||||
|
@ -143,6 +143,7 @@ config ARM64
|
|||||||
select HAVE_DMA_CONTIGUOUS
|
select HAVE_DMA_CONTIGUOUS
|
||||||
select HAVE_DYNAMIC_FTRACE
|
select HAVE_DYNAMIC_FTRACE
|
||||||
select HAVE_EFFICIENT_UNALIGNED_ACCESS
|
select HAVE_EFFICIENT_UNALIGNED_ACCESS
|
||||||
|
select HAVE_FAST_GUP
|
||||||
select HAVE_FTRACE_MCOUNT_RECORD
|
select HAVE_FTRACE_MCOUNT_RECORD
|
||||||
select HAVE_FUNCTION_TRACER
|
select HAVE_FUNCTION_TRACER
|
||||||
select HAVE_FUNCTION_GRAPH_TRACER
|
select HAVE_FUNCTION_GRAPH_TRACER
|
||||||
@ -267,9 +268,6 @@ config ZONE_DMA32
|
|||||||
bool "Support DMA32 zone" if EXPERT
|
bool "Support DMA32 zone" if EXPERT
|
||||||
default y
|
default y
|
||||||
|
|
||||||
config HAVE_GENERIC_GUP
|
|
||||||
def_bool y
|
|
||||||
|
|
||||||
config ARCH_ENABLE_MEMORY_HOTPLUG
|
config ARCH_ENABLE_MEMORY_HOTPLUG
|
||||||
def_bool y
|
def_bool y
|
||||||
|
|
||||||
|
@ -53,10 +53,10 @@ config MIPS
|
|||||||
select HAVE_DMA_CONTIGUOUS
|
select HAVE_DMA_CONTIGUOUS
|
||||||
select HAVE_DYNAMIC_FTRACE
|
select HAVE_DYNAMIC_FTRACE
|
||||||
select HAVE_EXIT_THREAD
|
select HAVE_EXIT_THREAD
|
||||||
|
select HAVE_FAST_GUP
|
||||||
select HAVE_FTRACE_MCOUNT_RECORD
|
select HAVE_FTRACE_MCOUNT_RECORD
|
||||||
select HAVE_FUNCTION_GRAPH_TRACER
|
select HAVE_FUNCTION_GRAPH_TRACER
|
||||||
select HAVE_FUNCTION_TRACER
|
select HAVE_FUNCTION_TRACER
|
||||||
select HAVE_GENERIC_GUP
|
|
||||||
select HAVE_IDE
|
select HAVE_IDE
|
||||||
select HAVE_IOREMAP_PROT
|
select HAVE_IOREMAP_PROT
|
||||||
select HAVE_IRQ_EXIT_ON_IRQ_STACK
|
select HAVE_IRQ_EXIT_ON_IRQ_STACK
|
||||||
|
@ -185,12 +185,12 @@ config PPC
|
|||||||
select HAVE_DYNAMIC_FTRACE_WITH_REGS if MPROFILE_KERNEL
|
select HAVE_DYNAMIC_FTRACE_WITH_REGS if MPROFILE_KERNEL
|
||||||
select HAVE_EBPF_JIT if PPC64
|
select HAVE_EBPF_JIT if PPC64
|
||||||
select HAVE_EFFICIENT_UNALIGNED_ACCESS if !(CPU_LITTLE_ENDIAN && POWER7_CPU)
|
select HAVE_EFFICIENT_UNALIGNED_ACCESS if !(CPU_LITTLE_ENDIAN && POWER7_CPU)
|
||||||
|
select HAVE_FAST_GUP
|
||||||
select HAVE_FTRACE_MCOUNT_RECORD
|
select HAVE_FTRACE_MCOUNT_RECORD
|
||||||
select HAVE_FUNCTION_ERROR_INJECTION
|
select HAVE_FUNCTION_ERROR_INJECTION
|
||||||
select HAVE_FUNCTION_GRAPH_TRACER
|
select HAVE_FUNCTION_GRAPH_TRACER
|
||||||
select HAVE_FUNCTION_TRACER
|
select HAVE_FUNCTION_TRACER
|
||||||
select HAVE_GCC_PLUGINS if GCC_VERSION >= 50200 # plugin support on gcc <= 5.1 is buggy on PPC
|
select HAVE_GCC_PLUGINS if GCC_VERSION >= 50200 # plugin support on gcc <= 5.1 is buggy on PPC
|
||||||
select HAVE_GENERIC_GUP
|
|
||||||
select HAVE_HW_BREAKPOINT if PERF_EVENTS && (PPC_BOOK3S || PPC_8xx)
|
select HAVE_HW_BREAKPOINT if PERF_EVENTS && (PPC_BOOK3S || PPC_8xx)
|
||||||
select HAVE_IDE
|
select HAVE_IDE
|
||||||
select HAVE_IOREMAP_PROT
|
select HAVE_IOREMAP_PROT
|
||||||
|
@ -139,6 +139,7 @@ config S390
|
|||||||
select HAVE_DMA_CONTIGUOUS
|
select HAVE_DMA_CONTIGUOUS
|
||||||
select HAVE_DYNAMIC_FTRACE
|
select HAVE_DYNAMIC_FTRACE
|
||||||
select HAVE_DYNAMIC_FTRACE_WITH_REGS
|
select HAVE_DYNAMIC_FTRACE_WITH_REGS
|
||||||
|
select HAVE_FAST_GUP
|
||||||
select HAVE_EFFICIENT_UNALIGNED_ACCESS
|
select HAVE_EFFICIENT_UNALIGNED_ACCESS
|
||||||
select HAVE_FENTRY
|
select HAVE_FENTRY
|
||||||
select HAVE_FTRACE_MCOUNT_RECORD
|
select HAVE_FTRACE_MCOUNT_RECORD
|
||||||
@ -146,7 +147,6 @@ config S390
|
|||||||
select HAVE_FUNCTION_TRACER
|
select HAVE_FUNCTION_TRACER
|
||||||
select HAVE_FUTEX_CMPXCHG if FUTEX
|
select HAVE_FUTEX_CMPXCHG if FUTEX
|
||||||
select HAVE_GCC_PLUGINS
|
select HAVE_GCC_PLUGINS
|
||||||
select HAVE_GENERIC_GUP
|
|
||||||
select HAVE_KERNEL_BZIP2
|
select HAVE_KERNEL_BZIP2
|
||||||
select HAVE_KERNEL_GZIP
|
select HAVE_KERNEL_GZIP
|
||||||
select HAVE_KERNEL_LZ4
|
select HAVE_KERNEL_LZ4
|
||||||
|
@ -15,7 +15,7 @@ config SUPERH
|
|||||||
select HAVE_ARCH_TRACEHOOK
|
select HAVE_ARCH_TRACEHOOK
|
||||||
select HAVE_PERF_EVENTS
|
select HAVE_PERF_EVENTS
|
||||||
select HAVE_DEBUG_BUGVERBOSE
|
select HAVE_DEBUG_BUGVERBOSE
|
||||||
select HAVE_GENERIC_GUP
|
select HAVE_FAST_GUP if MMU
|
||||||
select ARCH_HAVE_CUSTOM_GPIO_H
|
select ARCH_HAVE_CUSTOM_GPIO_H
|
||||||
select ARCH_HAVE_NMI_SAFE_CMPXCHG if (GUSA_RB || CPU_SH4A)
|
select ARCH_HAVE_NMI_SAFE_CMPXCHG if (GUSA_RB || CPU_SH4A)
|
||||||
select ARCH_HAS_GCOV_PROFILE_ALL
|
select ARCH_HAS_GCOV_PROFILE_ALL
|
||||||
|
@ -28,7 +28,7 @@ config SPARC
|
|||||||
select RTC_DRV_M48T59
|
select RTC_DRV_M48T59
|
||||||
select RTC_SYSTOHC
|
select RTC_SYSTOHC
|
||||||
select HAVE_ARCH_JUMP_LABEL if SPARC64
|
select HAVE_ARCH_JUMP_LABEL if SPARC64
|
||||||
select HAVE_GENERIC_GUP if SPARC64
|
select HAVE_FAST_GUP if SPARC64
|
||||||
select GENERIC_IRQ_SHOW
|
select GENERIC_IRQ_SHOW
|
||||||
select ARCH_WANT_IPC_PARSE_VERSION
|
select ARCH_WANT_IPC_PARSE_VERSION
|
||||||
select GENERIC_PCI_IOMAP
|
select GENERIC_PCI_IOMAP
|
||||||
|
@ -159,6 +159,7 @@ config X86
|
|||||||
select HAVE_EFFICIENT_UNALIGNED_ACCESS
|
select HAVE_EFFICIENT_UNALIGNED_ACCESS
|
||||||
select HAVE_EISA
|
select HAVE_EISA
|
||||||
select HAVE_EXIT_THREAD
|
select HAVE_EXIT_THREAD
|
||||||
|
select HAVE_FAST_GUP
|
||||||
select HAVE_FENTRY if X86_64 || DYNAMIC_FTRACE
|
select HAVE_FENTRY if X86_64 || DYNAMIC_FTRACE
|
||||||
select HAVE_FTRACE_MCOUNT_RECORD
|
select HAVE_FTRACE_MCOUNT_RECORD
|
||||||
select HAVE_FUNCTION_GRAPH_TRACER
|
select HAVE_FUNCTION_GRAPH_TRACER
|
||||||
@ -2907,9 +2908,6 @@ config HAVE_ATOMIC_IOMAP
|
|||||||
config X86_DEV_DMA_OPS
|
config X86_DEV_DMA_OPS
|
||||||
bool
|
bool
|
||||||
|
|
||||||
config HAVE_GENERIC_GUP
|
|
||||||
def_bool y
|
|
||||||
|
|
||||||
source "drivers/firmware/Kconfig"
|
source "drivers/firmware/Kconfig"
|
||||||
|
|
||||||
source "arch/x86/kvm/Kconfig"
|
source "arch/x86/kvm/Kconfig"
|
||||||
|
@ -132,7 +132,7 @@ config HAVE_MEMBLOCK_NODE_MAP
|
|||||||
config HAVE_MEMBLOCK_PHYS_MAP
|
config HAVE_MEMBLOCK_PHYS_MAP
|
||||||
bool
|
bool
|
||||||
|
|
||||||
config HAVE_GENERIC_GUP
|
config HAVE_FAST_GUP
|
||||||
bool
|
bool
|
||||||
|
|
||||||
config ARCH_KEEP_MEMBLOCK
|
config ARCH_KEEP_MEMBLOCK
|
||||||
|
4
mm/gup.c
4
mm/gup.c
@ -1651,7 +1651,7 @@ struct page *get_dump_page(unsigned long addr)
|
|||||||
#endif /* CONFIG_ELF_CORE */
|
#endif /* CONFIG_ELF_CORE */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Generic Fast GUP
|
* Fast GUP
|
||||||
*
|
*
|
||||||
* get_user_pages_fast attempts to pin user pages by walking the page
|
* get_user_pages_fast attempts to pin user pages by walking the page
|
||||||
* tables directly and avoids taking locks. Thus the walker needs to be
|
* tables directly and avoids taking locks. Thus the walker needs to be
|
||||||
@ -1683,7 +1683,7 @@ struct page *get_dump_page(unsigned long addr)
|
|||||||
*
|
*
|
||||||
* This code is based heavily on the PowerPC implementation by Nick Piggin.
|
* This code is based heavily on the PowerPC implementation by Nick Piggin.
|
||||||
*/
|
*/
|
||||||
#ifdef CONFIG_HAVE_GENERIC_GUP
|
#ifdef CONFIG_HAVE_FAST_GUP
|
||||||
#ifdef CONFIG_GUP_GET_PTE_LOW_HIGH
|
#ifdef CONFIG_GUP_GET_PTE_LOW_HIGH
|
||||||
/*
|
/*
|
||||||
* WARNING: only to be used in the get_user_pages_fast() implementation.
|
* WARNING: only to be used in the get_user_pages_fast() implementation.
|
||||||
|
Loading…
Reference in New Issue
Block a user