# git rev-parse -q --verify d37823c3528e5e0705fc7746bcbc2afffb619259^{commit} d37823c3528e5e0705fc7746bcbc2afffb619259 already have revision, skipping fetch # git checkout -q -f -B kisskb d37823c3528e5e0705fc7746bcbc2afffb619259 # git clean -qxdf # < git log -1 # commit d37823c3528e5e0705fc7746bcbc2afffb619259 # Author: Christophe Leroy # Date: Mon Jan 10 15:29:25 2022 +0000 # # powerpc/32s: Fix kasan_init_region() for KASAN # # It has been reported some configuration where the kernel doesn't # boot with KASAN enabled. # # This is due to wrong BAT allocation for the KASAN area: # # ---[ Data Block Address Translation ]--- # 0: 0xc0000000-0xcfffffff 0x00000000 256M Kernel rw m # 1: 0xd0000000-0xdfffffff 0x10000000 256M Kernel rw m # 2: 0xe0000000-0xefffffff 0x20000000 256M Kernel rw m # 3: 0xf8000000-0xf9ffffff 0x2a000000 32M Kernel rw m # 4: 0xfa000000-0xfdffffff 0x2c000000 64M Kernel rw m # # A BAT must have both virtual and physical addresses alignment matching # the size of the BAT. This is not the case for BAT 4 above. # # Fix kasan_init_region() by using block_size() function that is in # book3s32/mmu.c. To be able to reuse it here, make it non static and # change its name to bat_block_size() in order to avoid name conflict # with block_size() defined in # # Also reuse find_free_bat() to avoid an error message from setbat() # when no BAT is available. # # And allocate memory outside of linear memory mapping to avoid # wasting that precious space. # # With this change we get correct alignment for BATs and KASAN shadow # memory is allocated outside the linear memory space. # # ---[ Data Block Address Translation ]--- # 0: 0xc0000000-0xcfffffff 0x00000000 256M Kernel rw # 1: 0xd0000000-0xdfffffff 0x10000000 256M Kernel rw # 2: 0xe0000000-0xefffffff 0x20000000 256M Kernel rw # 3: 0xf8000000-0xfbffffff 0x7c000000 64M Kernel rw # 4: 0xfc000000-0xfdffffff 0x7a000000 32M Kernel rw # # Fixes: 7974c4732642 ("powerpc/32s: Implement dedicated kasan_init_region()") # Cc: stable@vger.kernel.org # Reported-by: Maxime Bizon # Signed-off-by: Christophe Leroy # Tested-by: Maxime Bizon # Signed-off-by: Michael Ellerman # Link: https://lore.kernel.org/r/7a50ef902494d1325227d47d33dada01e52e5518.1641818726.git.christophe.leroy@csgroup.eu # < /opt/cross/kisskb/korg/gcc-9.2.0-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-9.2.0-nolibc/powerpc64-linux/bin/powerpc64-linux-ld --version # < git log --format=%s --max-count=1 d37823c3528e5e0705fc7746bcbc2afffb619259 # < make -s -j 32 ARCH=powerpc O=/kisskb/build/powerpc-fixes_ppc64_defconfig+NO_TM_powerpc-gcc9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-9.2.0-nolibc/powerpc64-linux/bin/powerpc64-linux- ppc64_defconfig # Added to kconfig CONFIG_PPC_TRANSACTIONAL_MEM=n # < make -s -j 32 ARCH=powerpc O=/kisskb/build/powerpc-fixes_ppc64_defconfig+NO_TM_powerpc-gcc9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-9.2.0-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 32 ARCH=powerpc O=/kisskb/build/powerpc-fixes_ppc64_defconfig+NO_TM_powerpc-gcc9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-9.2.0-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig # make -s -j 32 ARCH=powerpc O=/kisskb/build/powerpc-fixes_ppc64_defconfig+NO_TM_powerpc-gcc9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-9.2.0-nolibc/powerpc64-linux/bin/powerpc64-linux- Completed OK # rm -rf /kisskb/build/powerpc-fixes_ppc64_defconfig+NO_TM_powerpc-gcc9 # Build took: 0:02:38.546462