# git rev-parse -q --verify 8734b41b3efe0fc6082c1937b0e88556c396dc96^{commit} 8734b41b3efe0fc6082c1937b0e88556c396dc96 already have revision, skipping fetch # git checkout -q -f -B kisskb 8734b41b3efe0fc6082c1937b0e88556c396dc96 # git clean -qxdf # < git log -1 # commit 8734b41b3efe0fc6082c1937b0e88556c396dc96 # Author: Russell Currey # Date: Tue Nov 23 18:15:20 2021 +1000 # # powerpc/module_64: Fix livepatching for RO modules # # Livepatching a loaded module involves applying relocations through # apply_relocate_add(), which attempts to write to read-only memory when # CONFIG_STRICT_MODULE_RWX=y. Work around this by performing these # writes through the text poke area by using patch_instruction(). # # R_PPC_REL24 is the only relocation type generated by the kpatch-build # userspace tool or klp-convert kernel tree that I observed applying a # relocation to a post-init module. # # A more comprehensive solution is planned, but using patch_instruction() # for R_PPC_REL24 on should serve as a sufficient fix. # # This does have a performance impact, I observed ~15% overhead in # module_load() on POWER8 bare metal with checksum verification off. # # Fixes: c35717c71e98 ("powerpc: Set ARCH_HAS_STRICT_MODULE_RWX") # Cc: stable@vger.kernel.org # v5.14+ # Reported-by: Joe Lawrence # Signed-off-by: Russell Currey # Tested-by: Joe Lawrence # [mpe: Check return codes from patch_instruction()] # Signed-off-by: Michael Ellerman # Link: https://lore.kernel.org/r/20211214121248.777249-1-mpe@ellerman.id.au # < /opt/cross/kisskb/korg/gcc-9.2.0-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-9.2.0-nolibc/powerpc64-linux/bin/powerpc64-linux-ld --version # < git log --format=%s --max-count=1 8734b41b3efe0fc6082c1937b0e88556c396dc96 # < make -s -j 32 ARCH=powerpc O=/kisskb/build/powerpc-fixes_mpc85xx_defconfig+KVM_powerpc-gcc9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-9.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-fixes_mpc85xx_defconfig+KVM_powerpc-gcc9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-9.2.0-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 32 ARCH=powerpc O=/kisskb/build/powerpc-fixes_mpc85xx_defconfig+KVM_powerpc-gcc9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-9.2.0-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig .config:4297:warning: override: reassigning to symbol PPC_E500MC .config:4298:warning: override: reassigning to symbol VIRTUALIZATION # make -s -j 32 ARCH=powerpc O=/kisskb/build/powerpc-fixes_mpc85xx_defconfig+KVM_powerpc-gcc9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-9.2.0-nolibc/powerpc64-linux/bin/powerpc64-linux- :1559:2: warning: #warning syscall futex_waitv not implemented [-Wcpp] 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:42: 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:6: 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-fixes_mpc85xx_defconfig+KVM_powerpc-gcc9 # Build took: 0:01:44.610217