# git rev-parse -q --verify c14cbef0319d21339a76247c3061230ae2950a7c^{commit} c14cbef0319d21339a76247c3061230ae2950a7c already have revision, skipping fetch # git checkout -q -f -B kisskb c14cbef0319d21339a76247c3061230ae2950a7c # git clean -qxdf # < git log -1 # commit c14cbef0319d21339a76247c3061230ae2950a7c # Author: Christophe Leroy # Date: Mon Jun 3 08:20:28 2019 +0000 # # powerpc: fix kexec failure on book3s/32 # # In the old days, _PAGE_EXEC didn't exist on 6xx aka book3s/32. # Therefore, allthough __mapin_ram_chunk() was already mapping kernel # text with PAGE_KERNEL_TEXT and the rest with PAGE_KERNEL, the entire # memory was executable. Part of the memory (first 512kbytes) was # mapped with BATs instead of page table, but it was also entirely # mapped as executable. # # In commit 385e89d5b20f ("powerpc/mm: add exec protection on # powerpc 603"), we started adding exec protection to some 6xx, namely # the 603, for pages mapped via pagetables. # # Then, in commit 63b2bc619565 ("powerpc/mm/32s: Use BATs for # STRICT_KERNEL_RWX"), the exec protection was extended to BAT mapped # memory, so that really only the kernel text could be executed. # # The problem here is that kexec is based on copying some code into # upper part of memory then executing it from there in order to install # a fresh new kernel at its definitive location. # # However, the code is position independant and first part of it is # just there to deactivate the MMU and jump to the second part. So it # is possible to run this first part inplace instead of running the # copy. Once the MMU is off, there is no protection anymore and the # second part of the code will just run as before. # # Reported-by: Aaro Koskinen # Fixes: 63b2bc619565 ("powerpc/mm/32s: Use BATs for STRICT_KERNEL_RWX") # Cc: stable@vger.kernel.org # Signed-off-by: Christophe Leroy # Tested-by: Aaro Koskinen # 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 c14cbef0319d21339a76247c3061230ae2950a7c # < make -s -j 24 ARCH=powerpc O=/kisskb/build/powerpc-fixes_mpc85xx_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- mpc85xx_defconfig # make -s -j 24 ARCH=powerpc O=/kisskb/build/powerpc-fixes_mpc85xx_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- In file included from /kisskb/src/include/linux/kernel.h:11:0, from /kisskb/src/include/linux/list.h:9, from /kisskb/src/include/linux/module.h:9, from /kisskb/src/drivers/net/ethernet/freescale/fs_enet/mac-scc.c:15: /kisskb/src/drivers/net/ethernet/freescale/fs_enet/mac-scc.c: In function 'allocate_bd': /kisskb/src/include/linux/err.h:22:49: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define IS_ERR_VALUE(x) unlikely((unsigned long)(void *)(x) >= (unsigned long)-MAX_ERRNO) ^ /kisskb/src/include/linux/compiler.h:78:42: note: in definition of macro 'unlikely' # define unlikely(x) __builtin_expect(!!(x), 0) ^ /kisskb/src/drivers/net/ethernet/freescale/fs_enet/mac-scc.c:139:6: note: in expansion of macro 'IS_ERR_VALUE' if (IS_ERR_VALUE(fep->ring_mem_addr)) ^ /kisskb/src/arch/powerpc/boot/dts/fsl/mpc8541cds.dts:334.3-21: Warning (pci_device_bus_num): /pci@e0008000/i8259@19000:bus-range: PCI bus number 1 out of range, expected (0 - 0) /kisskb/src/arch/powerpc/boot/dts/fsl/mpc8555cds.dts:334.3-21: Warning (pci_device_bus_num): /pci@e0008000/i8259@19000:bus-range: PCI bus number 1 out of range, expected (0 - 0) INFO: Uncompressed kernel (size 0xbd5518) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbd5518) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbd5518) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbd5518) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbd5518) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbd5518) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbd5518) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbd5518) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbd5518) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbd5518) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbd5518) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbd5518) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbd5518) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbd5518) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbd5518) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbc4ce4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) Image Name: Linux-5.2.0-rc2-gc14cbef0319d Created: Fri Jun 7 01:52:24 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5827618 Bytes = 5691.03 KiB = 5.56 MiB Load Address: 00c00000 Entry Point: 00c002a4 Image Name: Linux-5.2.0-rc2-gc14cbef0319d Created: Fri Jun 7 01:52:25 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5826788 Bytes = 5690.22 KiB = 5.56 MiB Load Address: 00c00000 Entry Point: 00c00314 Image Name: Linux-5.2.0-rc2-gc14cbef0319d Created: Fri Jun 7 01:52:25 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5826717 Bytes = 5690.15 KiB = 5.56 MiB Load Address: 00c00000 Entry Point: 00c002a4 Image Name: Linux-5.2.0-rc2-gc14cbef0319d Created: Fri Jun 7 01:52:25 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5829422 Bytes = 5692.79 KiB = 5.56 MiB Load Address: 00c00000 Entry Point: 00c002a4 Image Name: Linux-5.2.0-rc2-gc14cbef0319d Created: Fri Jun 7 01:52:25 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5826534 Bytes = 5689.97 KiB = 5.56 MiB Load Address: 00c00000 Entry Point: 00c00314 Image Name: Linux-5.2.0-rc2-gc14cbef0319d Created: Fri Jun 7 01:52:25 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5826569 Bytes = 5690.01 KiB = 5.56 MiB Load Address: 00c00000 Entry Point: 00c00314 Image Name: Linux-5.2.0-rc2-gc14cbef0319d Created: Fri Jun 7 01:52:25 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5797166 Bytes = 5661.29 KiB = 5.53 MiB Load Address: 00000000 Entry Point: 00000000 Image Name: Linux-5.2.0-rc2-gc14cbef0319d Created: Fri Jun 7 01:52:25 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5828921 Bytes = 5692.31 KiB = 5.56 MiB Load Address: 00c00000 Entry Point: 00c002a4 Image Name: Linux-5.2.0-rc2-gc14cbef0319d Created: Fri Jun 7 01:52:25 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5827092 Bytes = 5690.52 KiB = 5.56 MiB Load Address: 00c00000 Entry Point: 00c00314 Image Name: Linux-5.2.0-rc2-gc14cbef0319d Created: Fri Jun 7 01:52:25 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5826981 Bytes = 5690.41 KiB = 5.56 MiB Load Address: 00c00000 Entry Point: 00c002a4 Image Name: Linux-5.2.0-rc2-gc14cbef0319d Created: Fri Jun 7 01:52:25 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5826717 Bytes = 5690.15 KiB = 5.56 MiB Load Address: 00c00000 Entry Point: 00c002a4 Image Name: Linux-5.2.0-rc2-gc14cbef0319d Created: Fri Jun 7 01:52:25 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5826536 Bytes = 5689.98 KiB = 5.56 MiB Load Address: 00c00000 Entry Point: 00c00314 Image Name: Linux-5.2.0-rc2-gc14cbef0319d Created: Fri Jun 7 01:52:25 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5829293 Bytes = 5692.67 KiB = 5.56 MiB Load Address: 00c00000 Entry Point: 00c002a4 Image Name: Linux-5.2.0-rc2-gc14cbef0319d Created: Fri Jun 7 01:52:26 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5826398 Bytes = 5689.84 KiB = 5.56 MiB Load Address: 00c00000 Entry Point: 00c002a4 Image Name: Linux-5.2.0-rc2-gc14cbef0319d Created: Fri Jun 7 01:52:26 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5826445 Bytes = 5689.89 KiB = 5.56 MiB Load Address: 00c00000 Entry Point: 00c002a4 Image Name: Linux-5.2.0-rc2-gc14cbef0319d Created: Fri Jun 7 01:52:26 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5828237 Bytes = 5691.64 KiB = 5.56 MiB Load Address: 00c00000 Entry Point: 00c002a4 Completed OK # rm -rf /kisskb/build/powerpc-fixes_mpc85xx_defconfig_powerpc-gcc5 # Build took: 0:02:18.292512