# git rev-parse -q --verify 53f1d31708f6240e4615b0927df31f182e389e2f^{commit} 53f1d31708f6240e4615b0927df31f182e389e2f already have revision, skipping fetch # git checkout -q -f -B kisskb 53f1d31708f6240e4615b0927df31f182e389e2f # git clean -qxdf # < git log -1 # commit 53f1d31708f6240e4615b0927df31f182e389e2f # Author: Aneesh Kumar K.V # Date: Fri Mar 26 12:37:55 2021 +0530 # # powerpc/mm/book3s64: Use the correct storage key value when calling H_PROTECT # # H_PROTECT expects the flag value to include flags: # AVPN, pp0, pp1, pp2, key0-key4, Noexec, CMO Option flags # # This patch updates hpte_updatepp() to fetch the storage key value from # the linux page table and use the same in H_PROTECT hcall. # # native_hpte_updatepp() is not updated because the kernel doesn't clear # the existing storage key value there. The kernel also doesn't use # hpte_updatepp() callback for updating storage keys. # # This fixes the below kernel crash observed with KUAP enabled. # # BUG: Unable to handle kernel data access on write at 0xc009fffffc440000 # Faulting instruction address: 0xc0000000000b7030 # Key fault AMR: 0xfcffffffffffffff IAMR: 0xc0000077bc498100 # Found HPTE: v = 0x40070adbb6fffc05 r = 0x1ffffffffff1194 # Oops: Kernel access of bad area, sig: 11 [#1] # LE PAGE_SIZE=64K MMU=Hash SMP NR_CPUS=2048 NUMA pSeries # ... # CFAR: c000000000010100 DAR: c009fffffc440000 DSISR: 02200000 IRQMASK: 0 # ... # NIP memset+0x68/0x104 # LR pcpu_alloc+0x54c/0xb50 # Call Trace: # pcpu_alloc+0x55c/0xb50 (unreliable) # blk_stat_alloc_callback+0x94/0x150 # blk_mq_init_allocated_queue+0x64/0x560 # blk_mq_init_queue+0x54/0xb0 # scsi_mq_alloc_queue+0x30/0xa0 # scsi_alloc_sdev+0x1cc/0x300 # scsi_probe_and_add_lun+0xb50/0x1020 # __scsi_scan_target+0x17c/0x790 # scsi_scan_channel+0x90/0xe0 # scsi_scan_host_selected+0x148/0x1f0 # do_scan_async+0x2c/0x2a0 # async_run_entry_fn+0x78/0x220 # process_one_work+0x264/0x540 # worker_thread+0xa8/0x600 # kthread+0x190/0x1a0 # ret_from_kernel_thread+0x5c/0x6c # # With KUAP enabled the kernel uses storage key 3 for all its # translations. But as shown by the debug print, in this specific case we # have the hash page table entry created with key value 0. # # Found HPTE: v = 0x40070adbb6fffc05 r = 0x1ffffffffff1194 # # and DSISR indicates a key fault. # # This can happen due to parallel fault on the same EA by different CPUs: # # CPU 0 CPU 1 # fault on X # # H_PAGE_BUSY set # fault on X # # finish fault handling and # clear H_PAGE_BUSY # check for H_PAGE_BUSY # continue with fault handling. # # This implies CPU1 will end up calling hpte_updatepp for address X and # the kernel updated the hash pte entry with key 0 # # Fixes: d94b827e89dc ("powerpc/book3s64/kuap: Use Key 3 for kernel mapping with hash translation") # Reported-by: Murilo Opsfelder Araujo # Signed-off-by: Aneesh Kumar K.V # Debugged-by: Michael Ellerman # Signed-off-by: Michael Ellerman # Link: https://lore.kernel.org/r/20210326070755.304625-1-aneesh.kumar@linux.ibm.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 53f1d31708f6240e4615b0927df31f182e389e2f # < make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-fixes_mpc85xx_smp_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- mpc85xx_smp_defconfig # < make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-fixes_mpc85xx_smp_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_mpc85xx_smp_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_mpc85xx_smp_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- In file included from /kisskb/src/include/linux/kernel.h:10:0, from /kisskb/src/include/linux/list.h:9, 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] #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: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:330.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 0xe07e5c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xf00000) INFO: Uncompressed kernel (size 0xe07e5c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xf00000) INFO: Uncompressed kernel (size 0xe07e5c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xf00000) INFO: Uncompressed kernel (size 0xe07e5c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xf00000) INFO: Uncompressed kernel (size 0xe07e5c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xf00000) INFO: Uncompressed kernel (size 0xe07e5c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xf00000) INFO: Uncompressed kernel (size 0xe07e5c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xf00000) INFO: Uncompressed kernel (size 0xe07e5c) overlaps the address of the wrapper(0x400000) INFO: Uncompressed kernel (size 0xe07e5c) overlaps the address of the wrapper(0x400000) INFO: Uncompressed kernel (size 0xe07e5c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xf00000) INFO: Fixing the link_address of wrapper to (0xf00000) INFO: Fixing the link_address of wrapper to (0xf00000) INFO: Uncompressed kernel (size 0xe07e5c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xf00000) INFO: Uncompressed kernel (size 0xe07e5c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xf00000) INFO: Uncompressed kernel (size 0xe07e5c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xf00000) INFO: Uncompressed kernel (size 0xe07e5c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xf00000) INFO: Uncompressed kernel (size 0xe07e5c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xf00000) INFO: Uncompressed kernel (size 0xdf7730) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) Image Name: Linux-5.12.0-rc2-g53f1d31708f6 Created: Sun Mar 28 00:59:27 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6809465 Bytes = 6649.87 KiB = 6.49 MiB Load Address: 00000000 Entry Point: 00000000 Image Name: Linux-5.12.0-rc2-g53f1d31708f6 Created: Sun Mar 28 00:59:30 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6840038 Bytes = 6679.72 KiB = 6.52 MiB Load Address: 00f00000 Entry Point: 00f002a4 Image Name: Linux-5.12.0-rc2-g53f1d31708f6 Created: Sun Mar 28 00:59:30 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6840054 Bytes = 6679.74 KiB = 6.52 MiB Load Address: 00f00000 Entry Point: 00f00314 Image Name: Linux-5.12.0-rc2-g53f1d31708f6 Created: Sun Mar 28 00:59:30 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6839922 Bytes = 6679.61 KiB = 6.52 MiB Load Address: 00f00000 Entry Point: 00f00314 Image Name: Linux-5.12.0-rc2-g53f1d31708f6 Created: Sun Mar 28 00:59:31 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6839991 Bytes = 6679.68 KiB = 6.52 MiB Load Address: 00f00000 Entry Point: 00f002a4 Image Name: Linux-5.12.0-rc2-g53f1d31708f6 Created: Sun Mar 28 00:59:31 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6841456 Bytes = 6681.11 KiB = 6.52 MiB Load Address: 00f00000 Entry Point: 00f002a4 Image Name: Linux-5.12.0-rc2-g53f1d31708f6 Created: Sun Mar 28 00:59:31 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6840241 Bytes = 6679.92 KiB = 6.52 MiB Load Address: 00f00000 Entry Point: 00f002a4 Image Name: Linux-5.12.0-rc2-g53f1d31708f6 Created: Sun Mar 28 00:59:31 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6839920 Bytes = 6679.61 KiB = 6.52 MiB Load Address: 00f00000 Entry Point: 00f00314 Image Name: Linux-5.12.0-rc2-g53f1d31708f6 Created: Sun Mar 28 00:59:31 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6842133 Bytes = 6681.77 KiB = 6.53 MiB Load Address: 00f00000 Entry Point: 00f002a4 Image Name: Linux-5.12.0-rc2-g53f1d31708f6 Created: Sun Mar 28 00:59:32 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6841965 Bytes = 6681.61 KiB = 6.53 MiB Load Address: 00f00000 Entry Point: 00f002a4 Image Name: Linux-5.12.0-rc2-g53f1d31708f6 Created: Sun Mar 28 00:59:32 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6839956 Bytes = 6679.64 KiB = 6.52 MiB Load Address: 00f00000 Entry Point: 00f002a4 Image Name: Linux-5.12.0-rc2-g53f1d31708f6 Created: Sun Mar 28 00:59:32 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6840406 Bytes = 6680.08 KiB = 6.52 MiB Load Address: 00f00000 Entry Point: 00f00314 Image Name: Linux-5.12.0-rc2-g53f1d31708f6 Created: Sun Mar 28 00:59:32 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6839920 Bytes = 6679.61 KiB = 6.52 MiB Load Address: 00f00000 Entry Point: 00f002a4 Image Name: Linux-5.12.0-rc2-g53f1d31708f6 Created: Sun Mar 28 00:59:32 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6841219 Bytes = 6680.88 KiB = 6.52 MiB Load Address: 00f00000 Entry Point: 00f002a4 Image Name: Linux-5.12.0-rc2-g53f1d31708f6 Created: Sun Mar 28 00:59:32 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6839962 Bytes = 6679.65 KiB = 6.52 MiB Load Address: 00f00000 Entry Point: 00f002a4 Image Name: Linux-5.12.0-rc2-g53f1d31708f6 Created: Sun Mar 28 00:59:32 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6839968 Bytes = 6679.66 KiB = 6.52 MiB Load Address: 00f00000 Entry Point: 00f00314 Completed OK # rm -rf /kisskb/build/powerpc-fixes_mpc85xx_smp_defconfig_powerpc-gcc4.9 # Build took: 0:02:13.512452