# git rev-parse -q --verify dcf280e6f80be280ca7dd1b058f038654e4a18dd^{commit} dcf280e6f80be280ca7dd1b058f038654e4a18dd already have revision, skipping fetch # git checkout -q -f -B kisskb dcf280e6f80be280ca7dd1b058f038654e4a18dd # git clean -qxdf # < git log -1 # commit dcf280e6f80be280ca7dd1b058f038654e4a18dd # Author: Michael Ellerman # Date: Fri May 27 21:15:41 2022 +1000 # # powerpc/64: Include cache.h directly in paca.h # # paca.h uses ____cacheline_aligned without directly including cache.h, # where it's defined. # # For Book3S builds that's OK because paca.h includes lppaca.h, and it # does include cache.h. # # But Book3E builds have been getting cache.h indirectly via printk.h, # which is dicey, and in fact that include was recently removed, leading # to build errors such as: # # ld: fs/isofs/dir.o:(.bss+0x0): multiple definition of `____cacheline_aligned'; fs/isofs/namei.o:(.bss+0x0): first defined here # # So include cache.h directly to fix the build error. # # Fixes: 534aa1dc975a ("printk: stop including cache.h from printk.h") # Reported-by: Guenter Roeck # Signed-off-by: Michael Ellerman # < /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/powerpc64-linux/bin/powerpc64-linux-ld --version # < git log --format=%s --max-count=1 dcf280e6f80be280ca7dd1b058f038654e4a18dd # < make -s -j 24 ARCH=powerpc O=/kisskb/build/powerpc-next-rand_powerpc-randconfig+ppc64le_powerpc-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/powerpc64-linux/bin/powerpc64-linux- randconfig # Added to kconfig CONFIG_STANDALONE=y # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_CPU_BIG_ENDIAN=n # Added to kconfig CONFIG_CPU_LITTLE_ENDIAN=y # Added to kconfig CONFIG_PPC64=y # Added to kconfig CONFIG_PPC_BOOK3E_64=n # Added to kconfig CONFIG_PPC_BOOK3S_64=y # Added to kconfig CONFIG_PPC_DISABLE_WERROR=y # Added to kconfig CONFIG_SECTION_MISMATCH_WARN_ONLY=y # Added to kconfig CONFIG_PREVENT_FIRMWARE_BUILD=y # Added to kconfig CONFIG_LD_HEAD_STUB_CATCH=y # Added to kconfig CONFIG_TRIM_UNUSED_KSYMS=n # Added to kconfig CONFIG_UBSAN=n # < make -s -j 24 ARCH=powerpc O=/kisskb/build/powerpc-next-rand_powerpc-randconfig+ppc64le_powerpc-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 24 ARCH=powerpc O=/kisskb/build/powerpc-next-rand_powerpc-randconfig+ppc64le_powerpc-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig .config:3780:warning: override: reassigning to symbol STANDALONE .config:3782:warning: override: reassigning to symbol MODULE_SIG .config:3785:warning: override: reassigning to symbol PPC64 .config:3789:warning: override: reassigning to symbol SECTION_MISMATCH_WARN_ONLY .config:3793:warning: override: reassigning to symbol UBSAN # make -s -j 24 ARCH=powerpc O=/kisskb/build/powerpc-next-rand_powerpc-randconfig+ppc64le_powerpc-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/powerpc64-linux/bin/powerpc64-linux- /kisskb/src/lib/test_kasan.c: In function 'krealloc_less_oob_helper.constprop': /kisskb/src/lib/test_kasan.c:330:59: error: array subscript 201 is outside array bounds of 'char[201]' [-Werror=array-bounds] 330 | KUNIT_EXPECT_KASAN_FAIL(test, ptr2[size2] = 'x'); | ~~~~~~~~~~~~^~~~~ /kisskb/src/lib/test_kasan.c:97:9: note: in definition of macro 'KUNIT_EXPECT_KASAN_FAIL' 97 | expression; \ | ^~~~~~~~~~ /kisskb/src/lib/test_kasan.c:322:16: note: referencing an object of size 201 allocated by 'krealloc' 322 | ptr2 = krealloc(ptr1, size2, GFP_KERNEL); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/lib/test_kasan.c:334:59: error: array subscript 208 is outside array bounds of 'char[201]' [-Werror=array-bounds] 334 | ptr2[round_up(size2, KASAN_GRANULE_SIZE)] = 'x'); | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~ /kisskb/src/lib/test_kasan.c:97:9: note: in definition of macro 'KUNIT_EXPECT_KASAN_FAIL' 97 | expression; \ | ^~~~~~~~~~ /kisskb/src/lib/test_kasan.c:322:16: note: referencing an object of size 201 allocated by 'krealloc' 322 | ptr2 = krealloc(ptr1, size2, GFP_KERNEL); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/lib/test_kasan.c:344:52: error: array subscript 218 is outside array bounds of 'char[201]' [-Werror=array-bounds] 344 | KUNIT_EXPECT_KASAN_FAIL(test, ptr2[middle] = 'x'); | ~~~~~~~~~~~~~^~~~~ /kisskb/src/lib/test_kasan.c:97:9: note: in definition of macro 'KUNIT_EXPECT_KASAN_FAIL' 97 | expression; \ | ^~~~~~~~~~ /kisskb/src/lib/test_kasan.c:322:16: note: referencing an object of size 201 allocated by 'krealloc' 322 | ptr2 = krealloc(ptr1, size2, GFP_KERNEL); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/lib/test_kasan.c:345:55: error: array subscript 234 is outside array bounds of 'char[201]' [-Werror=array-bounds] 345 | KUNIT_EXPECT_KASAN_FAIL(test, ptr2[size1 - 1] = 'x'); | ~~~~~~~~~~~~~~~~^~~~~ /kisskb/src/lib/test_kasan.c:97:9: note: in definition of macro 'KUNIT_EXPECT_KASAN_FAIL' 97 | expression; \ | ^~~~~~~~~~ /kisskb/src/lib/test_kasan.c:322:16: note: referencing an object of size 201 allocated by 'krealloc' 322 | ptr2 = krealloc(ptr1, size2, GFP_KERNEL); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/lib/test_kasan.c:346:51: error: array subscript 235 is outside array bounds of 'char[201]' [-Werror=array-bounds] 346 | KUNIT_EXPECT_KASAN_FAIL(test, ptr2[size1] = 'x'); | ~~~~~~~~~~~~^~~~~ /kisskb/src/lib/test_kasan.c:97:9: note: in definition of macro 'KUNIT_EXPECT_KASAN_FAIL' 97 | expression; \ | ^~~~~~~~~~ /kisskb/src/lib/test_kasan.c:322:16: note: referencing an object of size 201 allocated by 'krealloc' 322 | ptr2 = krealloc(ptr1, size2, GFP_KERNEL); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/lib/test_kasan.c: In function 'krealloc_more_oob_helper.constprop': /kisskb/src/lib/test_kasan.c:301:59: error: array subscript 235 is outside array bounds of 'char[235]' [-Werror=array-bounds] 301 | KUNIT_EXPECT_KASAN_FAIL(test, ptr2[size2] = 'x'); | ~~~~~~~~~~~~^~~~~ /kisskb/src/lib/test_kasan.c:97:9: note: in definition of macro 'KUNIT_EXPECT_KASAN_FAIL' 97 | expression; \ | ^~~~~~~~~~ /kisskb/src/lib/test_kasan.c:290:16: note: referencing an object of size 235 allocated by 'krealloc' 290 | ptr2 = krealloc(ptr1, size2, GFP_KERNEL); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/lib/test_kasan.c:305:59: error: array subscript 240 is outside array bounds of 'char[235]' [-Werror=array-bounds] 305 | ptr2[round_up(size2, KASAN_GRANULE_SIZE)] = 'x'); | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~ /kisskb/src/lib/test_kasan.c:97:9: note: in definition of macro 'KUNIT_EXPECT_KASAN_FAIL' 97 | expression; \ | ^~~~~~~~~~ /kisskb/src/lib/test_kasan.c:290:16: note: referencing an object of size 235 allocated by 'krealloc' 290 | ptr2 = krealloc(ptr1, size2, GFP_KERNEL); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors make[2]: *** [/kisskb/src/scripts/Makefile.build:288: lib/test_kasan.o] Error 1 make[1]: *** [/kisskb/src/Makefile:1834: lib] Error 2 make[1]: *** Waiting for unfinished jobs.... make: *** [Makefile:219: __sub-make] Error 2 Command 'make -s -j 24 ARCH=powerpc O=/kisskb/build/powerpc-next-rand_powerpc-randconfig+ppc64le_powerpc-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/powerpc64-linux/bin/powerpc64-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/powerpc-next-rand_powerpc-randconfig+ppc64le_powerpc-gcc11 # Build took: 0:03:53.998019