lkml.org 
[lkml]   [2019]   [Jun]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 11/16] mm: rename CONFIG_HAVE_GENERIC_GUP to CONFIG_HAVE_FAST_GUP
    Date
    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.

    Signed-off-by: Christoph Hellwig <hch@lst.de>
    ---
    arch/arm/Kconfig | 5 +----
    arch/arm64/Kconfig | 4 +---
    arch/mips/Kconfig | 2 +-
    arch/powerpc/Kconfig | 2 +-
    arch/s390/Kconfig | 2 +-
    arch/sh/Kconfig | 2 +-
    arch/sparc/Kconfig | 2 +-
    arch/x86/Kconfig | 4 +---
    mm/Kconfig | 2 +-
    mm/gup.c | 4 ++--
    10 files changed, 11 insertions(+), 18 deletions(-)

    diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
    index 8869742a85df..3879a3e2c511 100644
    --- a/arch/arm/Kconfig
    +++ b/arch/arm/Kconfig
    @@ -73,6 +73,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_FTRACE_MCOUNT_RECORD if !XIP_KERNEL
    select HAVE_FUNCTION_GRAPH_TRACER if !THUMB2_KERNEL && !CC_IS_CLANG
    select HAVE_FUNCTION_TRACER if !XIP_KERNEL
    @@ -1596,10 +1597,6 @@ config ARCH_SELECT_MEMORY_MODEL
    config HAVE_ARCH_PFN_VALID
    def_bool ARCH_HAS_HOLES_MEMORYMODEL || !SPARSEMEM

    -config HAVE_GENERIC_GUP
    - def_bool y
    - depends on ARM_LPAE
    -
    config HIGHMEM
    bool "High Memory Support"
    depends on MMU
    diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
    index 697ea0510729..4a6ee3e92757 100644
    --- a/arch/arm64/Kconfig
    +++ b/arch/arm64/Kconfig
    @@ -140,6 +140,7 @@ config ARM64
    select HAVE_DMA_CONTIGUOUS
    select HAVE_DYNAMIC_FTRACE
    select HAVE_EFFICIENT_UNALIGNED_ACCESS
    + select HAVE_FAST_GUP
    select HAVE_FTRACE_MCOUNT_RECORD
    select HAVE_FUNCTION_TRACER
    select HAVE_FUNCTION_GRAPH_TRACER
    @@ -262,9 +263,6 @@ config GENERIC_CALIBRATE_DELAY
    config ZONE_DMA32
    def_bool y

    -config HAVE_GENERIC_GUP
    - def_bool y
    -
    config ARCH_ENABLE_MEMORY_HOTPLUG
    def_bool y

    diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
    index 64108a2a16d4..b1e42f0e4ed0 100644
    --- a/arch/mips/Kconfig
    +++ b/arch/mips/Kconfig
    @@ -54,10 +54,10 @@ config MIPS
    select HAVE_DMA_CONTIGUOUS
    select HAVE_DYNAMIC_FTRACE
    select HAVE_EXIT_THREAD
    + select HAVE_FAST_GUP
    select HAVE_FTRACE_MCOUNT_RECORD
    select HAVE_FUNCTION_GRAPH_TRACER
    select HAVE_FUNCTION_TRACER
    - select HAVE_GENERIC_GUP
    select HAVE_IDE
    select HAVE_IOREMAP_PROT
    select HAVE_IRQ_EXIT_ON_IRQ_STACK
    diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
    index 8c1c636308c8..992a04796e56 100644
    --- a/arch/powerpc/Kconfig
    +++ b/arch/powerpc/Kconfig
    @@ -185,12 +185,12 @@ config PPC
    select HAVE_DYNAMIC_FTRACE_WITH_REGS if MPROFILE_KERNEL
    select HAVE_EBPF_JIT if PPC64
    select HAVE_EFFICIENT_UNALIGNED_ACCESS if !(CPU_LITTLE_ENDIAN && POWER7_CPU)
    + select HAVE_FAST_GUP
    select HAVE_FTRACE_MCOUNT_RECORD
    select HAVE_FUNCTION_ERROR_INJECTION
    select HAVE_FUNCTION_GRAPH_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_GENERIC_GUP
    select HAVE_HW_BREAKPOINT if PERF_EVENTS && (PPC_BOOK3S || PPC_8xx)
    select HAVE_IDE
    select HAVE_IOREMAP_PROT
    diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
    index 109243fdb6ec..aaff0376bf53 100644
    --- a/arch/s390/Kconfig
    +++ b/arch/s390/Kconfig
    @@ -137,6 +137,7 @@ config S390
    select HAVE_DMA_CONTIGUOUS
    select HAVE_DYNAMIC_FTRACE
    select HAVE_DYNAMIC_FTRACE_WITH_REGS
    + select HAVE_FAST_GUP
    select HAVE_EFFICIENT_UNALIGNED_ACCESS
    select HAVE_FENTRY
    select HAVE_FTRACE_MCOUNT_RECORD
    @@ -144,7 +145,6 @@ config S390
    select HAVE_FUNCTION_TRACER
    select HAVE_FUTEX_CMPXCHG if FUTEX
    select HAVE_GCC_PLUGINS
    - select HAVE_GENERIC_GUP
    select HAVE_KERNEL_BZIP2
    select HAVE_KERNEL_GZIP
    select HAVE_KERNEL_LZ4
    diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
    index 6fddfc3c9710..56712f3c9838 100644
    --- a/arch/sh/Kconfig
    +++ b/arch/sh/Kconfig
    @@ -14,7 +14,7 @@ config SUPERH
    select HAVE_ARCH_TRACEHOOK
    select HAVE_PERF_EVENTS
    select HAVE_DEBUG_BUGVERBOSE
    - select HAVE_GENERIC_GUP
    + select HAVE_FAST_GUP
    select ARCH_HAVE_CUSTOM_GPIO_H
    select ARCH_HAVE_NMI_SAFE_CMPXCHG if (GUSA_RB || CPU_SH4A)
    select ARCH_HAS_GCOV_PROFILE_ALL
    diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
    index 22435471f942..659232b760e1 100644
    --- a/arch/sparc/Kconfig
    +++ b/arch/sparc/Kconfig
    @@ -28,7 +28,7 @@ config SPARC
    select RTC_DRV_M48T59
    select RTC_SYSTOHC
    select HAVE_ARCH_JUMP_LABEL if SPARC64
    - select HAVE_GENERIC_GUP if SPARC64
    + select HAVE_FAST_GUP if SPARC64
    select GENERIC_IRQ_SHOW
    select ARCH_WANT_IPC_PARSE_VERSION
    select GENERIC_PCI_IOMAP
    diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
    index 7cd53cc59f0f..44500e0ed630 100644
    --- a/arch/x86/Kconfig
    +++ b/arch/x86/Kconfig
    @@ -157,6 +157,7 @@ config X86
    select HAVE_EFFICIENT_UNALIGNED_ACCESS
    select HAVE_EISA
    select HAVE_EXIT_THREAD
    + select HAVE_FAST_GUP
    select HAVE_FENTRY if X86_64 || DYNAMIC_FTRACE
    select HAVE_FTRACE_MCOUNT_RECORD
    select HAVE_FUNCTION_GRAPH_TRACER
    @@ -2874,9 +2875,6 @@ config HAVE_ATOMIC_IOMAP
    config X86_DEV_DMA_OPS
    bool

    -config HAVE_GENERIC_GUP
    - def_bool y
    -
    source "drivers/firmware/Kconfig"

    source "arch/x86/kvm/Kconfig"
    diff --git a/mm/Kconfig b/mm/Kconfig
    index fe51f104a9e0..98dffb0f2447 100644
    --- a/mm/Kconfig
    +++ b/mm/Kconfig
    @@ -132,7 +132,7 @@ config HAVE_MEMBLOCK_NODE_MAP
    config HAVE_MEMBLOCK_PHYS_MAP
    bool

    -config HAVE_GENERIC_GUP
    +config HAVE_FAST_GUP
    bool

    config ARCH_KEEP_MEMBLOCK
    diff --git a/mm/gup.c b/mm/gup.c
    index a86d65cd7051..a24f52292c7f 100644
    --- a/mm/gup.c
    +++ b/mm/gup.c
    @@ -1650,7 +1650,7 @@ struct page *get_dump_page(unsigned long addr)
    #endif /* CONFIG_ELF_CORE */

    /*
    - * Generic Fast GUP
    + * Fast GUP
    *
    * 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
    @@ -1682,7 +1682,7 @@ struct page *get_dump_page(unsigned long addr)
    *
    * 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
    /*
    * WARNING: only to be used in the get_user_pages_fast() implementation.
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-06-01 09:51    [W:3.073 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site