# git rev-parse -q --verify f41c880e164dc3c9fc3eff6ed27e97583af41986^{commit} f41c880e164dc3c9fc3eff6ed27e97583af41986 already have revision, skipping fetch # git checkout -q -f -B kisskb f41c880e164dc3c9fc3eff6ed27e97583af41986 # git clean -qxdf # < git log -1 # commit f41c880e164dc3c9fc3eff6ed27e97583af41986 # Author: Nicholas Piggin # Date: Mon Jun 3 16:05:31 2019 +1000 # # powerpc/64s: Fix THP PMD collapse serialisation # # Commit 1b2443a547f9 ("powerpc/book3s64: Avoid multiple endian # conversion in pte helpers") changed the actual bitwise tests in # pte_access_permitted by using pte_write() and pte_present() helpers # rather than raw bitwise testing _PAGE_WRITE and _PAGE_PRESENT bits. # # The pte_present change now returns true for ptes which are # !_PAGE_PRESENT and _PAGE_INVALID, which is the combination used by # pmdp_invalidate to synchronize access from lock-free lookups. # pte_access_permitted is used by pmd_access_permitted, so allowing GUP # lock free access to proceed with such PTEs breaks this # synchronisation. # # This bug has been observed on HPT host, with random crashes and # corruption in guests, usually together with bad PMD messages in the # host. # # Fix this by adding an explicit check in pmd_access_permitted, and # documenting the condition explicitly. # # The pte_write() change should be okay, and would prevent GUP from # falling back to the slow path when encountering savedwrite ptes, which # matches what x86 (that does not implement savedwrite) does. # # Fixes: 1b2443a547f9 ("powerpc/book3s64: Avoid multiple endian conversion in pte helpers") # Cc: stable@vger.kernel.org # v4.20+ # Signed-off-by: Nicholas Piggin # Signed-off-by: Michael Ellerman # < /opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux-ld --version # < git log --format=%s --max-count=1 f41c880e164dc3c9fc3eff6ed27e97583af41986 # < make -s -j 120 ARCH=powerpc O=/kisskb/build/powerpc-fixes_mpc85xx_smp_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- mpc85xx_smp_defconfig # make -s -j 120 ARCH=powerpc O=/kisskb/build/powerpc-fixes_mpc85xx_smp_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- In file included from /kisskb/src/include/linux/kernel.h:11:0, from /kisskb/src/include/linux/list.h:9, from /kisskb/src/include/linux/module.h:9, 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:334.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:334.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 0xc695d4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc695d4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc695d4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc695d4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc695d4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc695d4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc695d4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc695d4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc695d4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc695d4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc695d4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc695d4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc695d4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc695d4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc695d4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc58da0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) Image Name: Linux-5.2.0-rc1-gf41c880e164d Created: Tue Jun 4 01:28:45 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6090111 Bytes = 5947.37 KiB = 5.81 MiB Load Address: 00000000 Entry Point: 00000000 Image Name: Linux-5.2.0-rc1-gf41c880e164d Created: Tue Jun 4 01:28:45 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6121254 Bytes = 5977.79 KiB = 5.84 MiB Load Address: 00d00000 Entry Point: 00d002a4 Image Name: Linux-5.2.0-rc1-gf41c880e164d Created: Tue Jun 4 01:28:45 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6120405 Bytes = 5976.96 KiB = 5.84 MiB Load Address: 00d00000 Entry Point: 00d002a4 Image Name: Linux-5.2.0-rc1-gf41c880e164d Created: Tue Jun 4 01:28:45 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6120449 Bytes = 5977.00 KiB = 5.84 MiB Load Address: 00d00000 Entry Point: 00d002a4 Image Name: Linux-5.2.0-rc1-gf41c880e164d Created: Tue Jun 4 01:28:45 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6120339 Bytes = 5976.89 KiB = 5.84 MiB Load Address: 00d00000 Entry Point: 00d002a4 Image Name: Linux-5.2.0-rc1-gf41c880e164d Created: Tue Jun 4 01:28:45 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6122183 Bytes = 5978.69 KiB = 5.84 MiB Load Address: 00d00000 Entry Point: 00d002a4 Image Name: Linux-5.2.0-rc1-gf41c880e164d Created: Tue Jun 4 01:28:45 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6120431 Bytes = 5976.98 KiB = 5.84 MiB Load Address: 00d00000 Entry Point: 00d00314 Image Name: Linux-5.2.0-rc1-gf41c880e164d Created: Tue Jun 4 01:28:45 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6120522 Bytes = 5977.07 KiB = 5.84 MiB Load Address: 00d00000 Entry Point: 00d00314 Image Name: Linux-5.2.0-rc1-gf41c880e164d Created: Tue Jun 4 01:28:45 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6121648 Bytes = 5978.17 KiB = 5.84 MiB Load Address: 00d00000 Entry Point: 00d002a4 Image Name: Linux-5.2.0-rc1-gf41c880e164d Created: Tue Jun 4 01:28:45 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6120490 Bytes = 5977.04 KiB = 5.84 MiB Load Address: 00d00000 Entry Point: 00d002a4 Image Name: Linux-5.2.0-rc1-gf41c880e164d Created: Tue Jun 4 01:28:45 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6120492 Bytes = 5977.04 KiB = 5.84 MiB Load Address: 00d00000 Entry Point: 00d002a4 Image Name: Linux-5.2.0-rc1-gf41c880e164d Created: Tue Jun 4 01:28:45 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6120802 Bytes = 5977.35 KiB = 5.84 MiB Load Address: 00d00000 Entry Point: 00d002a4 Image Name: Linux-5.2.0-rc1-gf41c880e164d Created: Tue Jun 4 01:28:45 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6120452 Bytes = 5977.00 KiB = 5.84 MiB Load Address: 00d00000 Entry Point: 00d00314 Image Name: Linux-5.2.0-rc1-gf41c880e164d Created: Tue Jun 4 01:28:45 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6120479 Bytes = 5977.03 KiB = 5.84 MiB Load Address: 00d00000 Entry Point: 00d00314 Image Name: Linux-5.2.0-rc1-gf41c880e164d Created: Tue Jun 4 01:28:45 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6120519 Bytes = 5977.07 KiB = 5.84 MiB Load Address: 00d00000 Entry Point: 00d002a4 Image Name: Linux-5.2.0-rc1-gf41c880e164d Created: Tue Jun 4 01:28:45 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6120432 Bytes = 5976.98 KiB = 5.84 MiB Load Address: 00d00000 Entry Point: 00d00314 Completed OK # rm -rf /kisskb/build/powerpc-fixes_mpc85xx_smp_defconfig_powerpc-gcc5 # Build took: 0:00:51.947314