From 2439f8931750cb2d248803aea0a6802afc29df49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Wed, 29 Mar 2017 11:42:17 +0200 Subject: [PATCH] enable THP on Power (#1434007) [labbott: Build the kernel configs, add rpm changelog) --- baseconfig/powerpc/CONFIG_DEV_DAX | 1 + baseconfig/powerpc/CONFIG_DEV_DAX_PMEM | 1 + baseconfig/powerpc/CONFIG_NR_DEV_DAX | 1 + baseconfig/powerpc/CONFIG_TRANSPARENT_HUGEPAGE | 2 +- baseconfig/powerpc/CONFIG_TRANSPARENT_HUGEPAGE_MADVISE | 1 + kernel-ppc64-debug.config | 6 +++++- kernel-ppc64.config | 6 +++++- kernel-ppc64le-debug.config | 6 +++++- kernel-ppc64le.config | 6 +++++- kernel-ppc64p7-debug.config | 6 +++++- kernel-ppc64p7.config | 6 +++++- kernel.spec | 3 +++ 12 files changed, 38 insertions(+), 7 deletions(-) create mode 100644 baseconfig/powerpc/CONFIG_DEV_DAX create mode 100644 baseconfig/powerpc/CONFIG_DEV_DAX_PMEM create mode 100644 baseconfig/powerpc/CONFIG_NR_DEV_DAX create mode 100644 baseconfig/powerpc/CONFIG_TRANSPARENT_HUGEPAGE_MADVISE diff --git a/baseconfig/powerpc/CONFIG_DEV_DAX b/baseconfig/powerpc/CONFIG_DEV_DAX new file mode 100644 index 000000000..77478a213 --- /dev/null +++ b/baseconfig/powerpc/CONFIG_DEV_DAX @@ -0,0 +1 @@ +CONFIG_DEV_DAX=m diff --git a/baseconfig/powerpc/CONFIG_DEV_DAX_PMEM b/baseconfig/powerpc/CONFIG_DEV_DAX_PMEM new file mode 100644 index 000000000..8c7fd6732 --- /dev/null +++ b/baseconfig/powerpc/CONFIG_DEV_DAX_PMEM @@ -0,0 +1 @@ +CONFIG_DEV_DAX_PMEM=m diff --git a/baseconfig/powerpc/CONFIG_NR_DEV_DAX b/baseconfig/powerpc/CONFIG_NR_DEV_DAX new file mode 100644 index 000000000..3fd0f86b1 --- /dev/null +++ b/baseconfig/powerpc/CONFIG_NR_DEV_DAX @@ -0,0 +1 @@ +CONFIG_NR_DEV_DAX=32768 diff --git a/baseconfig/powerpc/CONFIG_TRANSPARENT_HUGEPAGE b/baseconfig/powerpc/CONFIG_TRANSPARENT_HUGEPAGE index 4874a851b..75d999c66 100644 --- a/baseconfig/powerpc/CONFIG_TRANSPARENT_HUGEPAGE +++ b/baseconfig/powerpc/CONFIG_TRANSPARENT_HUGEPAGE @@ -1 +1 @@ -# CONFIG_TRANSPARENT_HUGEPAGE is not set +CONFIG_TRANSPARENT_HUGEPAGE=y diff --git a/baseconfig/powerpc/CONFIG_TRANSPARENT_HUGEPAGE_MADVISE b/baseconfig/powerpc/CONFIG_TRANSPARENT_HUGEPAGE_MADVISE new file mode 100644 index 000000000..f9a942f2c --- /dev/null +++ b/baseconfig/powerpc/CONFIG_TRANSPARENT_HUGEPAGE_MADVISE @@ -0,0 +1 @@ +CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config index 9d7ecaab3..3ba077273 100644 --- a/kernel-ppc64-debug.config +++ b/kernel-ppc64-debug.config @@ -993,6 +993,8 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 # CONFIG_DEFXX is not set CONFIG_DETECT_HUNG_TASK=y CONFIG_DEV_APPLETALK=m +CONFIG_DEV_DAX=m +CONFIG_DEV_DAX_PMEM=m # CONFIG_DEVFREQ_GOV_PASSIVE is not set # CONFIG_DEVFREQ_GOV_PERFORMANCE is not set # CONFIG_DEVFREQ_GOV_POWERSAVE is not set @@ -3461,6 +3463,7 @@ CONFIG_NOUVEAU_DEBUG=5 CONFIG_NOUVEAU_DEBUG_DEFAULT=3 CONFIG_NOZOMI=m CONFIG_NR_CPUS=1024 +CONFIG_NR_DEV_DAX=32768 CONFIG_NR_IRQS=512 CONFIG_NS83820=m CONFIG_NSC_FIR=m @@ -5086,7 +5089,8 @@ CONFIG_TOUCHSCREEN_ZFORCE=m CONFIG_TRACER_SNAPSHOT=y # CONFIG_TRACE_SINK is not set # CONFIG_TRACING_EVENTS_GPIO is not set -# CONFIG_TRANSPARENT_HUGEPAGE is not set +CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y +CONFIG_TRANSPARENT_HUGEPAGE=y # CONFIG_TR is not set CONFIG_TRUSTED_KEYS=m # CONFIG_TS4800_IRQ is not set diff --git a/kernel-ppc64.config b/kernel-ppc64.config index d9e915837..dfb86ac9d 100644 --- a/kernel-ppc64.config +++ b/kernel-ppc64.config @@ -983,6 +983,8 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 # CONFIG_DEFXX is not set # CONFIG_DETECT_HUNG_TASK is not set CONFIG_DEV_APPLETALK=m +CONFIG_DEV_DAX=m +CONFIG_DEV_DAX_PMEM=m # CONFIG_DEVFREQ_GOV_PASSIVE is not set # CONFIG_DEVFREQ_GOV_PERFORMANCE is not set # CONFIG_DEVFREQ_GOV_POWERSAVE is not set @@ -3439,6 +3441,7 @@ CONFIG_NOUVEAU_DEBUG=5 CONFIG_NOUVEAU_DEBUG_DEFAULT=3 CONFIG_NOZOMI=m CONFIG_NR_CPUS=1024 +CONFIG_NR_DEV_DAX=32768 CONFIG_NR_IRQS=512 CONFIG_NS83820=m CONFIG_NSC_FIR=m @@ -5062,7 +5065,8 @@ CONFIG_TOUCHSCREEN_ZFORCE=m CONFIG_TRACER_SNAPSHOT=y # CONFIG_TRACE_SINK is not set # CONFIG_TRACING_EVENTS_GPIO is not set -# CONFIG_TRANSPARENT_HUGEPAGE is not set +CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y +CONFIG_TRANSPARENT_HUGEPAGE=y # CONFIG_TR is not set CONFIG_TRUSTED_KEYS=m # CONFIG_TS4800_IRQ is not set diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index 235eb52d4..783c7824d 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -948,6 +948,8 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 # CONFIG_DEFXX is not set CONFIG_DETECT_HUNG_TASK=y CONFIG_DEV_APPLETALK=m +CONFIG_DEV_DAX=m +CONFIG_DEV_DAX_PMEM=m # CONFIG_DEVFREQ_GOV_PASSIVE is not set # CONFIG_DEVFREQ_GOV_PERFORMANCE is not set # CONFIG_DEVFREQ_GOV_POWERSAVE is not set @@ -3406,6 +3408,7 @@ CONFIG_NOUVEAU_DEBUG=5 CONFIG_NOUVEAU_DEBUG_DEFAULT=3 CONFIG_NOZOMI=m CONFIG_NR_CPUS=1024 +CONFIG_NR_DEV_DAX=32768 CONFIG_NR_IRQS=512 CONFIG_NS83820=m CONFIG_NSC_FIR=m @@ -5015,7 +5018,8 @@ CONFIG_TOUCHSCREEN_ZFORCE=m CONFIG_TRACER_SNAPSHOT=y # CONFIG_TRACE_SINK is not set # CONFIG_TRACING_EVENTS_GPIO is not set -# CONFIG_TRANSPARENT_HUGEPAGE is not set +CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y +CONFIG_TRANSPARENT_HUGEPAGE=y # CONFIG_TR is not set CONFIG_TRUSTED_KEYS=m # CONFIG_TS4800_IRQ is not set diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index aa3d835b5..2d23fab1a 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -938,6 +938,8 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 # CONFIG_DEFXX is not set # CONFIG_DETECT_HUNG_TASK is not set CONFIG_DEV_APPLETALK=m +CONFIG_DEV_DAX=m +CONFIG_DEV_DAX_PMEM=m # CONFIG_DEVFREQ_GOV_PASSIVE is not set # CONFIG_DEVFREQ_GOV_PERFORMANCE is not set # CONFIG_DEVFREQ_GOV_POWERSAVE is not set @@ -3384,6 +3386,7 @@ CONFIG_NOUVEAU_DEBUG=5 CONFIG_NOUVEAU_DEBUG_DEFAULT=3 CONFIG_NOZOMI=m CONFIG_NR_CPUS=1024 +CONFIG_NR_DEV_DAX=32768 CONFIG_NR_IRQS=512 CONFIG_NS83820=m CONFIG_NSC_FIR=m @@ -4991,7 +4994,8 @@ CONFIG_TOUCHSCREEN_ZFORCE=m CONFIG_TRACER_SNAPSHOT=y # CONFIG_TRACE_SINK is not set # CONFIG_TRACING_EVENTS_GPIO is not set -# CONFIG_TRANSPARENT_HUGEPAGE is not set +CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y +CONFIG_TRANSPARENT_HUGEPAGE=y # CONFIG_TR is not set CONFIG_TRUSTED_KEYS=m # CONFIG_TS4800_IRQ is not set diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config index 14153e3c5..03a216c2c 100644 --- a/kernel-ppc64p7-debug.config +++ b/kernel-ppc64p7-debug.config @@ -948,6 +948,8 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 # CONFIG_DEFXX is not set CONFIG_DETECT_HUNG_TASK=y CONFIG_DEV_APPLETALK=m +CONFIG_DEV_DAX=m +CONFIG_DEV_DAX_PMEM=m # CONFIG_DEVFREQ_GOV_PASSIVE is not set # CONFIG_DEVFREQ_GOV_PERFORMANCE is not set # CONFIG_DEVFREQ_GOV_POWERSAVE is not set @@ -3405,6 +3407,7 @@ CONFIG_NOUVEAU_DEBUG=5 CONFIG_NOUVEAU_DEBUG_DEFAULT=3 CONFIG_NOZOMI=m CONFIG_NR_CPUS=1024 +CONFIG_NR_DEV_DAX=32768 CONFIG_NR_IRQS=512 CONFIG_NS83820=m CONFIG_NSC_FIR=m @@ -5014,7 +5017,8 @@ CONFIG_TOUCHSCREEN_ZFORCE=m CONFIG_TRACER_SNAPSHOT=y # CONFIG_TRACE_SINK is not set # CONFIG_TRACING_EVENTS_GPIO is not set -# CONFIG_TRANSPARENT_HUGEPAGE is not set +CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y +CONFIG_TRANSPARENT_HUGEPAGE=y # CONFIG_TR is not set CONFIG_TRUSTED_KEYS=m # CONFIG_TS4800_IRQ is not set diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config index 2baf5ea37..2821682a3 100644 --- a/kernel-ppc64p7.config +++ b/kernel-ppc64p7.config @@ -938,6 +938,8 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 # CONFIG_DEFXX is not set # CONFIG_DETECT_HUNG_TASK is not set CONFIG_DEV_APPLETALK=m +CONFIG_DEV_DAX=m +CONFIG_DEV_DAX_PMEM=m # CONFIG_DEVFREQ_GOV_PASSIVE is not set # CONFIG_DEVFREQ_GOV_PERFORMANCE is not set # CONFIG_DEVFREQ_GOV_POWERSAVE is not set @@ -3383,6 +3385,7 @@ CONFIG_NOUVEAU_DEBUG=5 CONFIG_NOUVEAU_DEBUG_DEFAULT=3 CONFIG_NOZOMI=m CONFIG_NR_CPUS=1024 +CONFIG_NR_DEV_DAX=32768 CONFIG_NR_IRQS=512 CONFIG_NS83820=m CONFIG_NSC_FIR=m @@ -4990,7 +4993,8 @@ CONFIG_TOUCHSCREEN_ZFORCE=m CONFIG_TRACER_SNAPSHOT=y # CONFIG_TRACE_SINK is not set # CONFIG_TRACING_EVENTS_GPIO is not set -# CONFIG_TRANSPARENT_HUGEPAGE is not set +CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y +CONFIG_TRANSPARENT_HUGEPAGE=y # CONFIG_TR is not set CONFIG_TRUSTED_KEYS=m # CONFIG_TS4800_IRQ is not set diff --git a/kernel.spec b/kernel.spec index 8b0ef5aae..2284f0f38 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2169,6 +2169,9 @@ fi # # %changelog +* Wed Mar 29 2017 Dan Horák +- Enable THP on Power (rhbz 1434007) + * Wed Mar 29 2017 Laura Abbott - 4.11.0-0.rc4.git2.1 - Linux v4.11-rc4-40-gfe82203