# git rev-parse -q --verify 1c9df907da83812e4f33b59d3d142c864d9da57f^{commit} 1c9df907da83812e4f33b59d3d142c864d9da57f already have revision, skipping fetch # git checkout -q -f -B kisskb 1c9df907da83812e4f33b59d3d142c864d9da57f # git clean -qxdf # < git log -1 # commit 1c9df907da83812e4f33b59d3d142c864d9da57f # Author: Willy Tarreau # Date: Thu Jul 30 07:59:24 2020 +0200 # # random: fix circular include dependency on arm64 after addition of percpu.h # # Daniel Díaz and Kees Cook independently reported that commit # f227e3ec3b5c ("random32: update the net random state on interrupt and # activity") broke arm64 due to a circular dependency on include files # since the addition of percpu.h in random.h. # # The correct fix would definitely be to move all the prandom32 stuff out # of random.h but for backporting, a smaller solution is preferred. # # This one replaces linux/percpu.h with asm/percpu.h, and this fixes the # problem on x86_64, arm64, arm, and mips. Note that moving percpu.h # around didn't change anything and that removing it entirely broke # differently. When backporting, such options might still be considered # if this patch fails to help. # # [ It turns out that an alternate fix seems to be to just remove the # troublesome remove from the arm64 # that causes the circular dependency. # # But we might as well do the whole belt-and-suspenders thing, and # minimize inclusion in too. Either will fix the # problem, and both are good changes. - Linus ] # # Reported-by: Daniel Díaz # Reported-by: Kees Cook # Tested-by: Marc Zyngier # Fixes: f227e3ec3b5c # Cc: Stephen Rothwell # Signed-off-by: Willy Tarreau # Signed-off-by: Linus Torvalds # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux-ld --version # < git log --format=%s --max-count=1 1c9df907da83812e4f33b59d3d142c864d9da57f # < make -s -j 48 ARCH=powerpc O=/kisskb/build/linus_ppc44x_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- ppc44x_defconfig # < make -s -j 48 ARCH=powerpc O=/kisskb/build/linus_ppc44x_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 48 ARCH=powerpc O=/kisskb/build/linus_ppc44x_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig # make -s -j 48 ARCH=powerpc O=/kisskb/build/linus_ppc44x_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- /kisskb/src/block/genhd.c: In function 'diskstats_show': /kisskb/src/block/genhd.c:1623:1: warning: the frame size of 1160 bytes is larger than 1024 bytes [-Wframe-larger-than=] } ^ /kisskb/src/lib/zstd/compress.c: In function 'ZSTD_compressBlock_doubleFast': /kisskb/src/lib/zstd/compress.c:1393:1: warning: the frame size of 1384 bytes is larger than 1024 bytes [-Wframe-larger-than=] } ^ /kisskb/src/arch/powerpc/boot/dts/katmai.dts:322.26-361.5: Warning (pci_bridge): /plb/pciex@d00000000: node name is not "pci" or "pcie" /kisskb/src/arch/powerpc/boot/dts/katmai.dts:363.26-402.5: Warning (pci_bridge): /plb/pciex@d20000000: node name is not "pci" or "pcie" /kisskb/src/arch/powerpc/boot/dts/katmai.dts:404.26-443.5: Warning (pci_bridge): /plb/pciex@d40000000: node name is not "pci" or "pcie" arch/powerpc/boot/dts/katmai.dtb: Warning (pci_device_bus_num): Failed prerequisite 'pci_bridge' INFO: Uncompressed kernel (size 0x5c1670) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5c1670) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5c1670) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5c1670) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5c1670) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5c1670) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5c1670) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5c1670) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5c1670) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5c1670) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5c1670) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) Image Name: Linux-5.8.0-rc7-33840-g1c9df907d Created: Fri Jul 31 03:24:52 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2972491 Bytes = 2902.82 KiB = 2.83 MiB Load Address: 00600000 Entry Point: 006014a8 Image Name: Linux-5.8.0-rc7-33840-g1c9df907d Created: Fri Jul 31 03:24:52 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2972352 Bytes = 2902.69 KiB = 2.83 MiB Load Address: 00600000 Entry Point: 006014a0 Image Name: Linux-5.8.0-rc7-33840-g1c9df907d Created: Fri Jul 31 03:24:52 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2972081 Bytes = 2902.42 KiB = 2.83 MiB Load Address: 00600000 Entry Point: 006014a8 Image Name: Linux-5.8.0-rc7-33840-g1c9df907d Created: Fri Jul 31 03:24:52 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2972019 Bytes = 2902.36 KiB = 2.83 MiB Load Address: 00600000 Entry Point: 006014b8 Image Name: Linux-5.8.0-rc7-33840-g1c9df907d Created: Fri Jul 31 03:24:52 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2971993 Bytes = 2902.34 KiB = 2.83 MiB Load Address: 00600000 Entry Point: 00601498 Image Name: Linux-5.8.0-rc7-33840-g1c9df907d Created: Fri Jul 31 03:24:52 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2972566 Bytes = 2902.90 KiB = 2.83 MiB Load Address: 00600000 Entry Point: 006000c4 Image Name: Linux-5.8.0-rc7-33840-g1c9df907d Created: Fri Jul 31 03:24:52 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2971612 Bytes = 2901.96 KiB = 2.83 MiB Load Address: 00600000 Entry Point: 006014a8 Image Name: Linux-5.8.0-rc7-33840-g1c9df907d Created: Fri Jul 31 03:24:52 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2971851 Bytes = 2902.20 KiB = 2.83 MiB Load Address: 00600000 Entry Point: 006001b8 Image Name: Linux-5.8.0-rc7-33840-g1c9df907d Created: Fri Jul 31 03:24:52 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2972519 Bytes = 2902.85 KiB = 2.83 MiB Load Address: 00600000 Entry Point: 00601488 Completed OK # rm -rf /kisskb/build/linus_ppc44x_defconfig_powerpc-gcc4.9 # Build took: 0:00:57.135151