# git rev-parse -q --verify 1562551aec8bb15974c69ee79b8da8cc688e7340^{commit} 1562551aec8bb15974c69ee79b8da8cc688e7340 already have revision, skipping fetch # git checkout -q -f -B kisskb 1562551aec8bb15974c69ee79b8da8cc688e7340 # git clean -qxdf # < git log -1 # commit 1562551aec8bb15974c69ee79b8da8cc688e7340 # Author: Michael Ellerman # Date: Fri Dec 16 12:43:12 2022 +1100 # # powerpc/code-patching: Fix oops with DEBUG_VM enabled # # Nathan reported that the new per-cpu mm patching oopses if DEBUG_VM is # enabled: # # ------------[ cut here ]------------ # kernel BUG at arch/powerpc/mm/pgtable.c:333! # Oops: Exception in kernel mode, sig: 5 [#1] # LE PAGE_SIZE=64K MMU=Radix SMP NR_CPUS=2048 NUMA PowerNV # Modules linked in: # CPU: 0 PID: 1 Comm: swapper/0 Not tainted 6.1.0-rc2+ #1 # Hardware name: IBM PowerNV (emulated by qemu) POWER9 0x4e1200 opal:v7.0 PowerNV # ... # NIP assert_pte_locked+0x180/0x1a0 # LR assert_pte_locked+0x170/0x1a0 # Call Trace: # 0x60000000 (unreliable) # patch_instruction+0x618/0x6d0 # arch_prepare_kprobe+0xfc/0x2d0 # register_kprobe+0x520/0x7c0 # arch_init_kprobes+0x28/0x3c # init_kprobes+0x108/0x184 # do_one_initcall+0x60/0x2e0 # kernel_init_freeable+0x1f0/0x3e0 # kernel_init+0x34/0x1d0 # ret_from_kernel_thread+0x5c/0x64 # # Caused by the assert_spin_locked() failing in assert_pte_locked(). The # assert fails because we have unlocked the PTE in text_area_cpu_up_mm(). # # Instead leave the PTE locked and only unlock it when we tear down the # patching_mm for the CPU. That avoids the assert failing, and nothing # else should be using the PTE so leaving it locked is arguably more # correct. # # Fixes: c28c15b6d28a ("powerpc/code-patching: Use temporary mm for Radix MMU") # Reported-by: Nathan Chancellor # Signed-off-by: Michael Ellerman # < /opt/cross/kisskb/korg/gcc-12.2.0-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-12.2.0-nolibc/powerpc64-linux/bin/powerpc64-linux-ld --version # < git log --format=%s --max-count=1 1562551aec8bb15974c69ee79b8da8cc688e7340 # < make -s -j 32 ARCH=powerpc O=/kisskb/build/powerpc-next_mpc85xx_defconfig+KVM_powerpc-gcc12 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-12.2.0-nolibc/powerpc64-linux/bin/powerpc64-linux- mpc85xx_defconfig # Added to kconfig CONFIG_PPC_E500MC=y # Added to kconfig CONFIG_VIRTUALIZATION=y # Added to kconfig CONFIG_KVM_E500MC=y # Added to kconfig # < make -s -j 32 ARCH=powerpc O=/kisskb/build/powerpc-next_mpc85xx_defconfig+KVM_powerpc-gcc12 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-12.2.0-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 32 ARCH=powerpc O=/kisskb/build/powerpc-next_mpc85xx_defconfig+KVM_powerpc-gcc12 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-12.2.0-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig .config:4453:warning: override: reassigning to symbol PPC_E500MC .config:4454:warning: override: reassigning to symbol VIRTUALIZATION # make -s -j 32 ARCH=powerpc O=/kisskb/build/powerpc-next_mpc85xx_defconfig+KVM_powerpc-gcc12 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-12.2.0-nolibc/powerpc64-linux/bin/powerpc64-linux- In file included from /kisskb/src/include/linux/build_bug.h:5, from /kisskb/src/include/linux/container_of.h:5, from /kisskb/src/include/linux/list.h:5, from /kisskb/src/include/linux/module.h:12, 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] 22 | #define IS_ERR_VALUE(x) unlikely((unsigned long)(void *)(x) >= (unsigned long)-MAX_ERRNO) | ^ /kisskb/src/include/linux/compiler.h:78:45: note: in definition of macro 'unlikely' 78 | # define unlikely(x) __builtin_expect(!!(x), 0) | ^ /kisskb/src/drivers/net/ethernet/freescale/fs_enet/mac-scc.c:139:13: note: in expansion of macro 'IS_ERR_VALUE' 139 | if (IS_ERR_VALUE(fep->ring_mem_addr)) | ^~~~~~~~~~~~ /kisskb/src/arch/powerpc/boot/dts/fsl/mpc8541cds.dts:341.15-350.5: Warning (pci_device_reg): /pci@e0008000/i8259@19000: PCI unit address format error, expected "12,0" /kisskb/src/arch/powerpc/boot/dts/fsl/mpc8541cds.dts:330.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:341.15-350.5: Warning (pci_device_reg): /pci@e0008000/i8259@19000: PCI unit address format error, expected "12,0" /kisskb/src/arch/powerpc/boot/dts/fsl/mpc8555cds.dts:330.3-21: Warning (pci_device_bus_num): /pci@e0008000/i8259@19000:bus-range: PCI bus number 1 out of range, expected (0 - 0) Completed OK # rm -rf /kisskb/build/powerpc-next_mpc85xx_defconfig+KVM_powerpc-gcc12 # Build took: 0:02:11.074505