# git rev-parse -q --verify 12f363511d47f86c49b7766c349989cb33fd61a8^{commit} 12f363511d47f86c49b7766c349989cb33fd61a8 already have revision, skipping fetch # git checkout -q -f -B kisskb 12f363511d47f86c49b7766c349989cb33fd61a8 # git clean -qxdf # < git log -1 # commit 12f363511d47f86c49b7766c349989cb33fd61a8 # Author: Christophe Leroy # Date: Tue Apr 30 16:11:59 2019 +0000 # # powerpc/32s: Fix BATs setting with CONFIG_STRICT_KERNEL_RWX # # Serge reported some crashes with CONFIG_STRICT_KERNEL_RWX enabled # on a book3s32 machine. # # Analysis shows two issues: # - BATs addresses and sizes are not properly aligned. # - There is a gap between the last address covered by BATs and the # first address covered by pages. # # Memory mapped with DBATs: # 0: 0xc0000000-0xc07fffff 0x00000000 Kernel RO coherent # 1: 0xc0800000-0xc0bfffff 0x00800000 Kernel RO coherent # 2: 0xc0c00000-0xc13fffff 0x00c00000 Kernel RW coherent # 3: 0xc1400000-0xc23fffff 0x01400000 Kernel RW coherent # 4: 0xc2400000-0xc43fffff 0x02400000 Kernel RW coherent # 5: 0xc4400000-0xc83fffff 0x04400000 Kernel RW coherent # 6: 0xc8400000-0xd03fffff 0x08400000 Kernel RW coherent # 7: 0xd0400000-0xe03fffff 0x10400000 Kernel RW coherent # # Memory mapped with pages: # 0xe1000000-0xefffffff 0x21000000 240M rw present dirty accessed # # This patch fixes both issues. With the patch, we get the following # which is as expected: # # Memory mapped with DBATs: # 0: 0xc0000000-0xc07fffff 0x00000000 Kernel RO coherent # 1: 0xc0800000-0xc0bfffff 0x00800000 Kernel RO coherent # 2: 0xc0c00000-0xc0ffffff 0x00c00000 Kernel RW coherent # 3: 0xc1000000-0xc1ffffff 0x01000000 Kernel RW coherent # 4: 0xc2000000-0xc3ffffff 0x02000000 Kernel RW coherent # 5: 0xc4000000-0xc7ffffff 0x04000000 Kernel RW coherent # 6: 0xc8000000-0xcfffffff 0x08000000 Kernel RW coherent # 7: 0xd0000000-0xdfffffff 0x10000000 Kernel RW coherent # # Memory mapped with pages: # 0xe0000000-0xefffffff 0x20000000 256M rw present dirty accessed # # Fixes: 63b2bc619565 ("powerpc/mm/32s: Use BATs for STRICT_KERNEL_RWX") # Reported-by: Serge Belyshev # Acked-by: Segher Boessenkool # Signed-off-by: Christophe Leroy # Signed-off-by: Michael Ellerman # < /opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux-ld --version # < git log --format=%s --max-count=1 12f363511d47f86c49b7766c349989cb33fd61a8 # < make -s -j 10 ARCH=powerpc O=/kisskb/build/powerpc-fixes_pseries_defconfig+FA_DUMP_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- pseries_defconfig # Added to kconfig CONFIG_CRASH_DUMP=y # Added to kconfig CONFIG_FA_DUMP=y # yes \n | make -s -j 10 ARCH=powerpc O=/kisskb/build/powerpc-fixes_pseries_defconfig+FA_DUMP_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- oldconfig yes: standard output: Broken pipe # make -s -j 10 ARCH=powerpc O=/kisskb/build/powerpc-fixes_pseries_defconfig+FA_DUMP_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- :1478:2: warning: #warning syscall pidfd_send_signal not implemented [-Wcpp] :1481:2: warning: #warning syscall io_uring_setup not implemented [-Wcpp] :1484:2: warning: #warning syscall io_uring_enter not implemented [-Wcpp] :1487:2: warning: #warning syscall io_uring_register not implemented [-Wcpp] /kisskb/src/net/netfilter/nf_nat_masquerade.c:15:21: warning: 'masq_refcnt6' defined but not used [-Wunused-variable] static unsigned int masq_refcnt6 __read_mostly; ^ /kisskb/src/net/sunrpc/xprtsock.c: In function 'xs_stream_data_receive': /kisskb/src/net/sunrpc/xprtsock.c:529:9: warning: 'ret' may be used uninitialized in this function [-Wmaybe-uninitialized] return ret < 0 ? ret : read; ^ /kisskb/src/net/sunrpc/xprtsock.c:499:10: note: 'ret' was declared here ssize_t ret; ^ /kisskb/src/net/sunrpc/xprtsock.c:498:15: warning: 'read' may be used uninitialized in this function [-Wmaybe-uninitialized] size_t want, read; ^ Completed OK # rm -rf /kisskb/build/powerpc-fixes_pseries_defconfig+FA_DUMP_powerpc-gcc5 # Build took: 0:05:55.964698