# git rev-parse -q --verify c21f5a9ed85ca3e914ca11f421677ae9ae0d04b0^{commit} c21f5a9ed85ca3e914ca11f421677ae9ae0d04b0 already have revision, skipping fetch # git checkout -q -f -B kisskb c21f5a9ed85ca3e914ca11f421677ae9ae0d04b0 # git clean -qxdf # < git log -1 # commit c21f5a9ed85ca3e914ca11f421677ae9ae0d04b0 # Author: Christophe Leroy # Date: Mon Jun 3 13:00:51 2019 +0000 # # powerpc/32s: fix booting with CONFIG_PPC_EARLY_DEBUG_BOOTX # # When booting through OF, setup_disp_bat() does nothing because # disp_BAT are not set. By change, it used to work because BOOTX # buffer is mapped 1:1 at address 0x81000000 by the bootloader, and # btext_setup_display() sets virt addr same as phys addr. # # But since commit 215b823707ce ("powerpc/32s: set up an early static # hash table for KASAN."), a temporary page table overrides the # bootloader mapping. # # This 0x81000000 is also problematic with the newly implemented # Kernel Userspace Access Protection (KUAP) because it is within user # address space. # # This patch fixes those issues by properly setting disp_BAT through # a call to btext_prepare_BAT(), allowing setup_disp_bat() to # properly setup BAT3 for early bootx screen buffer access. # # Reported-by: Mathieu Malaterre # Fixes: 215b823707ce ("powerpc/32s: set up an early static hash table for KASAN.") # Signed-off-by: Christophe Leroy # Tested-by: Mathieu Malaterre # Signed-off-by: Michael Ellerman # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/s390-linux/bin/s390-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/s390-linux/bin/s390-linux-ld --version # < git log --format=%s --max-count=1 c21f5a9ed85ca3e914ca11f421677ae9ae0d04b0 # < make -s -j 120 ARCH=s390 O=/kisskb/build/powerpc-fixes_s390-defconfig_s390x-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/s390-linux/bin/s390-linux- defconfig # make -s -j 120 ARCH=s390 O=/kisskb/build/powerpc-fixes_s390-defconfig_s390x-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/s390-linux/bin/s390-linux- arch/s390/../../virt/kvm/kvm_main.o: In function `kvm_vcpu_unmap': /kisskb/src/arch/s390/kvm/../../../virt/kvm/kvm_main.c:1799: undefined reference to `memunmap' make[1]: *** [/kisskb/src/Makefile:1052: vmlinux] Error 1 make: *** [Makefile:179: sub-make] Error 2 Command 'make -s -j 120 ARCH=s390 O=/kisskb/build/powerpc-fixes_s390-defconfig_s390x-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/s390-linux/bin/s390-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/powerpc-fixes_s390-defconfig_s390x-gcc8 # Build took: 0:01:01.327687