# 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/gcc-4.6.3-nolibc/powerpc-linux/bin/powerpc-linux-gcc --version # < /opt/cross/kisskb/gcc-4.6.3-nolibc/powerpc-linux/bin/powerpc-linux-ld --version # < git log --format=%s --max-count=1 f41c880e164dc3c9fc3eff6ed27e97583af41986 # < make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-fixes_85xx_sbc8548_defconfig_powerpc-gcc4.6 CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/powerpc-linux/bin/powerpc-linux- 85xx/sbc8548_defconfig # make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-fixes_85xx_sbc8548_defconfig_powerpc-gcc4.6 CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/powerpc-linux/bin/powerpc-linux- /kisskb/src/kernel/printk/printk.c: In function 'devkmsg_sysctl_set_loglvl': /kisskb/src/kernel/printk/printk.c:193:16: warning: 'old' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/tty/serial/8250/8250_core.c: In function 'univ8250_release_irq': /kisskb/src/drivers/tty/serial/8250/8250_core.c:247:18: warning: 'i' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/tty/serial/8250/8250_core.c:227:19: note: 'i' was declared here /kisskb/src/fs/proc/inode.c: In function 'proc_reg_open': /kisskb/src/include/linux/list.h:65:12: warning: 'pdeo' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/fs/proc/inode.c:331:21: note: 'pdeo' was declared here INFO: Uncompressed kernel (size 0x47c038) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x500000) INFO: Uncompressed kernel (size 0x46b9b0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x500000) Image Name: Linux-5.2.0-rc1-gf41c880e164d Created: Tue Jun 4 00:56:38 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2247965 Bytes = 2195.28 KiB = 2.14 MiB Load Address: 00000000 Entry Point: 00000000 Image Name: Linux-5.2.0-rc1-gf41c880e164d Created: Tue Jun 4 00:56:38 2019 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2278466 Bytes = 2225.06 KiB = 2.17 MiB Load Address: 00500000 Entry Point: 005002a8 Completed OK # rm -rf /kisskb/build/powerpc-fixes_85xx_sbc8548_defconfig_powerpc-gcc4.6 # Build took: 0:00:30.352569