# git rev-parse -q --verify 5d2e5dd5849b4ef5e8ec35e812cdb732c13cd27e^{commit} # git fetch -q -n -f git://gitlab.ozlabs.ibm.com/linuxppc/linux.git fixes-test warning: The last gc run reported the following. Please correct the root cause and remove .git/gc.log. Automatic cleanup will not be performed until the file is removed. warning: There are too many unreachable loose objects; run 'git prune' to remove them. # git rev-parse -q --verify 5d2e5dd5849b4ef5e8ec35e812cdb732c13cd27e^{commit} 5d2e5dd5849b4ef5e8ec35e812cdb732c13cd27e # git checkout -q -f -B kisskb 5d2e5dd5849b4ef5e8ec35e812cdb732c13cd27e # git clean -qxdf # < git log -1 # commit 5d2e5dd5849b4ef5e8ec35e812cdb732c13cd27e # Author: Aneesh Kumar K.V # Date: Wed Jan 8 11:14:22 2020 +0530 # # powerpc/mm/hash: Fix sharing context ids between kernel & userspace # # Commit 0034d395f89d ("powerpc/mm/hash64: Map all the kernel regions in # the same 0xc range") has a bug in the definition of MIN_USER_CONTEXT. # # The result is that the context id used for the vmemmap and the lowest # context id handed out to userspace are the same. The context id is # essentially the process identifier as far as the first stage of the # MMU translation is concerned. # # This can result in multiple SLB entries with the same VSID (Virtual # Segment ID), accessible to the kernel and some random userspace # process that happens to get the overlapping id, which is not expected # eg: # # 07 c00c000008000000 40066bdea7000500 1T ESID= c00c00 VSID= 66bdea7 LLP:100 # 12 0002000008000000 40066bdea7000d80 1T ESID= 200 VSID= 66bdea7 LLP:100 # # Even though the user process and the kernel use the same VSID, the # permissions in the hash page table prevent the user process from # reading or writing to any kernel mappings. # # It can also lead to SLB entries with different base page size # encodings (LLP), eg: # # 05 c00c000008000000 00006bde0053b500 256M ESID=c00c00000 VSID= 6bde0053b LLP:100 # 09 0000000008000000 00006bde0053bc80 256M ESID= 0 VSID= 6bde0053b LLP: 0 # # Such SLB entries can result in machine checks, eg. as seen on a G5: # # Oops: Machine check, sig: 7 [#1] # BE PAGE SIZE=64K MU-Hash SMP NR_CPUS=4 NUMA Power Mac # NIP: c00000000026f248 LR: c000000000295e58 CTR: 0000000000000000 # REGS: c0000000erfd3d70 TRAP: 0200 Tainted: G M (5.5.0-rcl-gcc-8.2.0-00010-g228b667d8ea1) # MSR: 9000000000109032 CR: 24282048 XER: 00000000 # DAR: c00c000000612c80 DSISR: 00000400 IRQMASK: 0 # ... # NIP [c00000000026f248] .kmem_cache_free+0x58/0x140 # LR [c088000008295e58] .putname 8x88/0xa # Call Trace: # .putname+0xB8/0xa # .filename_lookup.part.76+0xbe/0x160 # .do_faccessat+0xe0/0x380 # system_call+0x5c/ex68 # # This happens with 256MB segments and 64K pages, as the duplicate VSID # is hit with the first vmemmap segment and the first user segment, and # older 32-bit userspace maps things in the first user segment. # # On other CPUs a machine check is not seen. Instead the userspace # process can get stuck continuously faulting, with the fault never # properly serviced, due to the kernel not understanding that there is # already a HPTE for the address but with inaccessible permissions. # # On machines with 1T segments we've not seen the bug hit other than by # deliberately exercising it. That seems to be just a matter of luck # though, due to the typical layout of the user virtual address space # and the ranges of vmemmap that are typically populated. # # To fix it we add 2 to MIN_USER_CONTEXT. This ensures the lowest # context given to userspace doesn't overlap with the VMEMMAP context, # or with the context for INVALID_REGION_ID. # # Fixes: 0034d395f89d ("powerpc/mm/hash64: Map all the kernel regions in the same 0xc range") # Cc: stable@vger.kernel.org # v5.2+ # Reported-by: Christian Marillat # Reported-by: Romain Dolbeau # Signed-off-by: Aneesh Kumar K.V # [mpe: Account for INVALID_REGION_ID, mostly rewrite change log] # Signed-off-by: Michael Ellerman # Link: https://lore.kernel.org/r/20200123102547.11623-1-mpe@ellerman.id.au # < /opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux-gcc --version # < /opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux-ld --version # < git log --format=%s --max-count=1 5d2e5dd5849b4ef5e8ec35e812cdb732c13cd27e # < make -s -j 48 ARCH=mips O=/kisskb/build/powerpc-fixes_mips-defconfig_mipsel CROSS_COMPILE=/opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux- defconfig # make -s -j 48 ARCH=mips O=/kisskb/build/powerpc-fixes_mips-defconfig_mipsel CROSS_COMPILE=/opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux- FIT description: Linux 5.5.0-rc3-g5d2e5dd5849b Created: Fri Jan 24 00:07:06 2020 Image 0 (kernel@0) Description: Linux 5.5.0-rc3-g5d2e5dd5849b Created: Fri Jan 24 00:07:06 2020 Type: Kernel Image Compression: gzip compressed Data Size: 4849176 Bytes = 4735.52 KiB = 4.62 MiB Architecture: MIPS OS: Linux Load Address: 0x80100000 Entry Point: 0x808f0f10 Hash algo: sha1 Hash value: 2d22534206cc38f87c8a768c791edd801787eb90 Image 1 (fdt@boston) Description: img,boston Device Tree Created: Fri Jan 24 00:07:06 2020 Type: Flat Device Tree Compression: uncompressed Data Size: 3793 Bytes = 3.70 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 4799f50d688573234da6e9d7701234d394759ef4 Image 2 (fdt@ni169445) Description: NI 169445 device tree Created: Fri Jan 24 00:07:06 2020 Type: Flat Device Tree Compression: uncompressed Data Size: 1871 Bytes = 1.83 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 51b89b31605ee62038c8468c429af091dfc75ec7 Image 3 (fdt@ocelot_pcb123) Description: MSCC Ocelot PCB123 Device Tree Created: Fri Jan 24 00:07:06 2020 Type: Flat Device Tree Compression: uncompressed Data Size: 4639 Bytes = 4.53 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 018897896b42c41c943aca35a20e4300dba250c8 Image 4 (fdt@ocelot_pcb120) Description: MSCC Ocelot PCB120 Device Tree Created: Fri Jan 24 00:07:06 2020 Type: Flat Device Tree Compression: uncompressed Data Size: 5198 Bytes = 5.08 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 36c7bd0bd79cfc2f7dd6acda6c7996294f4967e6 Image 5 (fdt@xilfpga) Description: MIPSfpga (xilfpga) Device Tree Created: Fri Jan 24 00:07:06 2020 Type: Flat Device Tree Compression: uncompressed Data Size: 2708 Bytes = 2.64 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 63d058b780f65e22da30f0a183433765f1807f1d Default Configuration: 'conf@default' Configuration 0 (conf@default) Description: Generic Linux kernel Kernel: kernel@0 Configuration 1 (conf@boston) Description: Boston Linux kernel Kernel: kernel@0 FDT: fdt@boston Configuration 2 (conf@ni169445) Description: NI 169445 Linux Kernel Kernel: kernel@0 FDT: fdt@ni169445 Configuration 3 (conf@ocelot_pcb123) Description: Ocelot Linux kernel Kernel: kernel@0 FDT: fdt@ocelot_pcb123 Configuration 4 (conf@ocelot_pcb120) Description: Ocelot Linux kernel Kernel: kernel@0 FDT: fdt@ocelot_pcb120 Configuration 5 (conf@xilfpga) Description: MIPSfpga Linux kernel Kernel: kernel@0 FDT: fdt@xilfpga Completed OK # rm -rf /kisskb/build/powerpc-fixes_mips-defconfig_mipsel # Build took: 0:02:09.077562