# git rev-parse -q --verify 590ce02bd148cd35721560c140e3759e39a6e56a^{commit} 590ce02bd148cd35721560c140e3759e39a6e56a already have revision, skipping fetch # git checkout -q -f -B kisskb 590ce02bd148cd35721560c140e3759e39a6e56a # git clean -qxdf # < git log -1 # commit 590ce02bd148cd35721560c140e3759e39a6e56a # Author: Nicholas Piggin # Date: Wed Jul 22 17:34:37 2020 +1000 # # powerpc/64s: Fix irq tracing corruption in interrupt/syscall return caused by perf interrupts # # Alexey reports lockdep_assert_irqs_enabled() warnings when stress # testing perf, e.g., # # WARNING: CPU: 0 PID: 1556 at kernel/softirq.c:169 __local_bh_enable_ip+0x258/0x270 # CPU: 0 PID: 1556 Comm: syz-executor # NIP: c0000000001ec888 LR: c0000000001ec884 CTR: c000000000ef0610 # REGS: c000000022d4f8a0 TRAP: 0700 Not tainted (5.8.0-rc3-x) # MSR: 8000000000029033 CR: 28008844 XER: 20040000 # CFAR: c0000000001dc1d0 IRQMASK: 0 # # The interesting thing is MSR[EE] and IRQMASK shows interrupts are # enabled, suggesting the current->hardirqs_enabled irq tracing state is # going out of sync with the actual interrupt enable state. # # The cause is a window in interrupt/syscall return where irq tracing # state is being adjusted for an irqs-enabled return while MSR[EE] is # still enabled. A perf interrupt hits and ends up calling # trace_hardirqs_off() when restoring interrupt flags to a disable # state. # # Fix this by disabling perf interrupts as well while adjusting irq # tracing state. # # Add a debug check that catches the condition sooner. # # Fixes: 68b34588e202 ("powerpc/64/sycall: Implement syscall entry/exit logic in C") # Cc: stable@vger.kernel.org # v5.7+ # Reported-by: Alexey Kardashevskiy # Signed-off-by: Nicholas Piggin # Signed-off-by: Michael Ellerman # Link: https://lore.kernel.org/r/20200722073437.930521-1-npiggin@gmail.com # < /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 590ce02bd148cd35721560c140e3759e39a6e56a # < make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-fixes_mpc86xx_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- mpc86xx_defconfig # < make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-fixes_mpc86xx_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/powerpc-fixes_mpc86xx_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/powerpc-fixes_mpc86xx_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/fsl/mvme7100.dts:135.22-137.4: Warning (pci_bridge): /pcie@f1008000: missing ranges for PCI bridge (or not a bridge) also defined at /kisskb/src/arch/powerpc/boot/dts/fsl/mpc8641si-post.dtsi:92.7-117.3 /kisskb/src/arch/powerpc/boot/dts/fsl/mpc8641si-post.dtsi:102.9-116.4: Warning (pci_bridge): /pcie@f1008000/pcie@0: missing ranges for PCI bridge (or not a bridge) /kisskb/src/arch/powerpc/boot/dts/fsl/mvme7100.dts:139.22-141.4: Warning (pci_bridge): /pcie@f1009000: missing ranges for PCI bridge (or not a bridge) also defined at /kisskb/src/arch/powerpc/boot/dts/fsl/mpc8641si-post.dtsi:119.7-144.3 /kisskb/src/arch/powerpc/boot/dts/fsl/mpc8641si-post.dtsi:129.9-143.4: Warning (pci_bridge): /pcie@f1009000/pcie@0: missing ranges for PCI bridge (or not a bridge) arch/powerpc/boot/dts/fsl/mvme7100.dtb: Warning (pci_device_bus_num): Failed prerequisite 'pci_bridge' /kisskb/src/arch/powerpc/boot/dts/fsl/mvme7100.dts:30.11-32.6: Warning (i2c_bus_reg): /soc@f1000000/i2c@3000/rtc@68: missing or empty reg property INFO: Uncompressed kernel (size 0xb41ce8) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) Image Name: Linux-5.8.0-rc2-g590ce02bd148 Created: Fri Jul 24 02:08:57 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5558364 Bytes = 5428.09 KiB = 5.30 MiB Load Address: 00000000 Entry Point: 00000000 Completed OK # rm -rf /kisskb/build/powerpc-fixes_mpc86xx_defconfig_powerpc-gcc4.9 # Build took: 0:01:59.382103