# git rev-parse -q --verify cc0356d6a02e064387c16a83cb96fe43ef33181e^{commit} cc0356d6a02e064387c16a83cb96fe43ef33181e already have revision, skipping fetch # git checkout -q -f -B kisskb cc0356d6a02e064387c16a83cb96fe43ef33181e # git clean -qxdf # < git log -1 # commit cc0356d6a02e064387c16a83cb96fe43ef33181e # Merge: fc02cb2b37fe a72fdfd21e01 # Author: Linus Torvalds # Date: Tue Nov 2 07:56:47 2021 -0700 # # Merge tag 'x86_core_for_v5.16_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip # # Pull x86 core updates from Borislav Petkov: # # - Do not #GP on userspace use of CLI/STI but pretend it was a NOP to # keep old userspace from breaking. Adjust the corresponding iopl # selftest to that. # # - Improve stack overflow warnings to say which stack got overflowed and # raise the exception stack sizes to 2 pages since overflowing the # single page of exception stack is very easy to do nowadays with all # the tracing machinery enabled. With that, rip out the custom mapping # of AMD SEV's too. # # - A bunch of changes in preparation for FGKASLR like supporting more # than 64K section headers in the relocs tool, correct ORC lookup table # size to cover the whole kernel .text and other adjustments. # # * tag 'x86_core_for_v5.16_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: # selftests/x86/iopl: Adjust to the faked iopl CLI/STI usage # vmlinux.lds.h: Have ORC lookup cover entire _etext - _stext # x86/boot/compressed: Avoid duplicate malloc() implementations # x86/boot: Allow a "silent" kaslr random byte fetch # x86/tools/relocs: Support >64K section headers # x86/sev: Make the #VC exception stacks part of the default stacks storage # x86: Increase exception stack sizes # x86/mm/64: Improve stack overflow warnings # x86/iopl: Fake iopl(3) CLI/STI usage # < /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux-ld --version # < git log --format=%s --max-count=1 cc0356d6a02e064387c16a83cb96fe43ef33181e # < make -s -j 32 ARCH=m68k O=/kisskb/build/linus_m68k-allmodconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_SAMPLES=n # < make -s -j 32 ARCH=m68k O=/kisskb/build/linus_m68k-allmodconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux- help # make -s -j 32 ARCH=m68k O=/kisskb/build/linus_m68k-allmodconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux- olddefconfig # make -s -j 32 ARCH=m68k O=/kisskb/build/linus_m68k-allmodconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux- :1559:2: warning: #warning syscall futex_waitv not implemented [-Wcpp] In file included from : In function 'prestera_hw_build_tests', inlined from 'prestera_hw_switch_init' at /kisskb/src/drivers/net/ethernet/marvell/prestera/prestera_hw.c:788:2: /kisskb/src/include/linux/compiler_types.h:317:45: error: call to '__compiletime_assert_351' declared with attribute error: BUILD_BUG_ON failed: sizeof(struct prestera_msg_switch_attr_req) != 16 317 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^ /kisskb/src/include/linux/compiler_types.h:298:25: note: in definition of macro '__compiletime_assert' 298 | prefix ## suffix(); \ | ^~~~~~ /kisskb/src/include/linux/compiler_types.h:317:9: note: in expansion of macro '_compiletime_assert' 317 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:39:37: note: in expansion of macro 'compiletime_assert' 39 | #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) | ^~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:50:9: note: in expansion of macro 'BUILD_BUG_ON_MSG' 50 | BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition) | ^~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/marvell/prestera/prestera_hw.c:501:9: note: in expansion of macro 'BUILD_BUG_ON' 501 | BUILD_BUG_ON(sizeof(struct prestera_msg_switch_attr_req) != 16); | ^~~~~~~~~~~~ /kisskb/src/include/linux/compiler_types.h:317:45: error: call to '__compiletime_assert_356' declared with attribute error: BUILD_BUG_ON failed: sizeof(struct prestera_msg_bridge_req) != 16 317 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^ /kisskb/src/include/linux/compiler_types.h:298:25: note: in definition of macro '__compiletime_assert' 298 | prefix ## suffix(); \ | ^~~~~~ /kisskb/src/include/linux/compiler_types.h:317:9: note: in expansion of macro '_compiletime_assert' 317 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:39:37: note: in expansion of macro 'compiletime_assert' 39 | #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) | ^~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:50:9: note: in expansion of macro 'BUILD_BUG_ON_MSG' 50 | BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition) | ^~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/marvell/prestera/prestera_hw.c:506:9: note: in expansion of macro 'BUILD_BUG_ON' 506 | BUILD_BUG_ON(sizeof(struct prestera_msg_bridge_req) != 16); | ^~~~~~~~~~~~ /kisskb/src/include/linux/compiler_types.h:317:45: error: call to '__compiletime_assert_358' declared with attribute error: BUILD_BUG_ON failed: sizeof(struct prestera_msg_acl_ruleset_bind_req) != 16 317 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^ /kisskb/src/include/linux/compiler_types.h:298:25: note: in definition of macro '__compiletime_assert' 298 | prefix ## suffix(); \ | ^~~~~~ /kisskb/src/include/linux/compiler_types.h:317:9: note: in expansion of macro '_compiletime_assert' 317 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:39:37: note: in expansion of macro 'compiletime_assert' 39 | #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) | ^~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:50:9: note: in expansion of macro 'BUILD_BUG_ON_MSG' 50 | BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition) | ^~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/marvell/prestera/prestera_hw.c:508:9: note: in expansion of macro 'BUILD_BUG_ON' 508 | BUILD_BUG_ON(sizeof(struct prestera_msg_acl_ruleset_bind_req) != 16); | ^~~~~~~~~~~~ /kisskb/src/include/linux/compiler_types.h:317:45: error: call to '__compiletime_assert_359' declared with attribute error: BUILD_BUG_ON failed: sizeof(struct prestera_msg_acl_ruleset_req) != 8 317 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^ /kisskb/src/include/linux/compiler_types.h:298:25: note: in definition of macro '__compiletime_assert' 298 | prefix ## suffix(); \ | ^~~~~~ /kisskb/src/include/linux/compiler_types.h:317:9: note: in expansion of macro '_compiletime_assert' 317 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:39:37: note: in expansion of macro 'compiletime_assert' 39 | #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) | ^~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:50:9: note: in expansion of macro 'BUILD_BUG_ON_MSG' 50 | BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition) | ^~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/marvell/prestera/prestera_hw.c:509:9: note: in expansion of macro 'BUILD_BUG_ON' 509 | BUILD_BUG_ON(sizeof(struct prestera_msg_acl_ruleset_req) != 8); | ^~~~~~~~~~~~ /kisskb/src/include/linux/compiler_types.h:317:45: error: call to '__compiletime_assert_360' declared with attribute error: BUILD_BUG_ON failed: sizeof(struct prestera_msg_span_req) != 16 317 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^ /kisskb/src/include/linux/compiler_types.h:298:25: note: in definition of macro '__compiletime_assert' 298 | prefix ## suffix(); \ | ^~~~~~ /kisskb/src/include/linux/compiler_types.h:317:9: note: in expansion of macro '_compiletime_assert' 317 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:39:37: note: in expansion of macro 'compiletime_assert' 39 | #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) | ^~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:50:9: note: in expansion of macro 'BUILD_BUG_ON_MSG' 50 | BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition) | ^~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/marvell/prestera/prestera_hw.c:510:9: note: in expansion of macro 'BUILD_BUG_ON' 510 | BUILD_BUG_ON(sizeof(struct prestera_msg_span_req) != 16); | ^~~~~~~~~~~~ /kisskb/src/include/linux/compiler_types.h:317:45: error: call to '__compiletime_assert_362' declared with attribute error: BUILD_BUG_ON failed: sizeof(struct prestera_msg_rxtx_req) != 8 317 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^ /kisskb/src/include/linux/compiler_types.h:298:25: note: in definition of macro '__compiletime_assert' 298 | prefix ## suffix(); \ | ^~~~~~ /kisskb/src/include/linux/compiler_types.h:317:9: note: in expansion of macro '_compiletime_assert' 317 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:39:37: note: in expansion of macro 'compiletime_assert' 39 | #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) | ^~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:50:9: note: in expansion of macro 'BUILD_BUG_ON_MSG' 50 | BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition) | ^~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/marvell/prestera/prestera_hw.c:512:9: note: in expansion of macro 'BUILD_BUG_ON' 512 | BUILD_BUG_ON(sizeof(struct prestera_msg_rxtx_req) != 8); | ^~~~~~~~~~~~ /kisskb/src/include/linux/compiler_types.h:317:45: error: call to '__compiletime_assert_363' declared with attribute error: BUILD_BUG_ON failed: sizeof(struct prestera_msg_lag_req) != 16 317 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^ /kisskb/src/include/linux/compiler_types.h:298:25: note: in definition of macro '__compiletime_assert' 298 | prefix ## suffix(); \ | ^~~~~~ /kisskb/src/include/linux/compiler_types.h:317:9: note: in expansion of macro '_compiletime_assert' 317 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:39:37: note: in expansion of macro 'compiletime_assert' 39 | #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) | ^~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:50:9: note: in expansion of macro 'BUILD_BUG_ON_MSG' 50 | BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition) | ^~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/marvell/prestera/prestera_hw.c:513:9: note: in expansion of macro 'BUILD_BUG_ON' 513 | BUILD_BUG_ON(sizeof(struct prestera_msg_lag_req) != 16); | ^~~~~~~~~~~~ /kisskb/src/include/linux/compiler_types.h:317:45: error: call to '__compiletime_assert_364' declared with attribute error: BUILD_BUG_ON failed: sizeof(struct prestera_msg_cpu_code_counter_req) != 8 317 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^ /kisskb/src/include/linux/compiler_types.h:298:25: note: in definition of macro '__compiletime_assert' 298 | prefix ## suffix(); \ | ^~~~~~ /kisskb/src/include/linux/compiler_types.h:317:9: note: in expansion of macro '_compiletime_assert' 317 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:39:37: note: in expansion of macro 'compiletime_assert' 39 | #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) | ^~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:50:9: note: in expansion of macro 'BUILD_BUG_ON_MSG' 50 | BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition) | ^~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/marvell/prestera/prestera_hw.c:514:9: note: in expansion of macro 'BUILD_BUG_ON' 514 | BUILD_BUG_ON(sizeof(struct prestera_msg_cpu_code_counter_req) != 8); | ^~~~~~~~~~~~ /kisskb/src/include/linux/compiler_types.h:317:45: error: call to '__compiletime_assert_369' declared with attribute error: BUILD_BUG_ON failed: sizeof(struct prestera_msg_port_info_resp) != 20 317 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^ /kisskb/src/include/linux/compiler_types.h:298:25: note: in definition of macro '__compiletime_assert' 298 | prefix ## suffix(); \ | ^~~~~~ /kisskb/src/include/linux/compiler_types.h:317:9: note: in expansion of macro '_compiletime_assert' 317 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:39:37: note: in expansion of macro 'compiletime_assert' 39 | #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) | ^~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:50:9: note: in expansion of macro 'BUILD_BUG_ON_MSG' 50 | BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition) | ^~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/marvell/prestera/prestera_hw.c:521:9: note: in expansion of macro 'BUILD_BUG_ON' 521 | BUILD_BUG_ON(sizeof(struct prestera_msg_port_info_resp) != 20); | ^~~~~~~~~~~~ /kisskb/src/include/linux/compiler_types.h:317:45: error: call to '__compiletime_assert_370' declared with attribute error: BUILD_BUG_ON failed: sizeof(struct prestera_msg_bridge_resp) != 12 317 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^ /kisskb/src/include/linux/compiler_types.h:298:25: note: in definition of macro '__compiletime_assert' 298 | prefix ## suffix(); \ | ^~~~~~ /kisskb/src/include/linux/compiler_types.h:317:9: note: in expansion of macro '_compiletime_assert' 317 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:39:37: note: in expansion of macro 'compiletime_assert' 39 | #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) | ^~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:50:9: note: in expansion of macro 'BUILD_BUG_ON_MSG' 50 | BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition) | ^~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/marvell/prestera/prestera_hw.c:522:9: note: in expansion of macro 'BUILD_BUG_ON' 522 | BUILD_BUG_ON(sizeof(struct prestera_msg_bridge_resp) != 12); | ^~~~~~~~~~~~ /kisskb/src/include/linux/compiler_types.h:317:45: error: call to '__compiletime_assert_373' declared with attribute error: BUILD_BUG_ON failed: sizeof(struct prestera_msg_acl_ruleset_resp) != 12 317 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^ /kisskb/src/include/linux/compiler_types.h:298:25: note: in definition of macro '__compiletime_assert' 298 | prefix ## suffix(); \ | ^~~~~~ /kisskb/src/include/linux/compiler_types.h:317:9: note: in expansion of macro '_compiletime_assert' 317 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:39:37: note: in expansion of macro 'compiletime_assert' 39 | #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) | ^~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:50:9: note: in expansion of macro 'BUILD_BUG_ON_MSG' 50 | BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition) | ^~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/marvell/prestera/prestera_hw.c:525:9: note: in expansion of macro 'BUILD_BUG_ON' 525 | BUILD_BUG_ON(sizeof(struct prestera_msg_acl_ruleset_resp) != 12); | ^~~~~~~~~~~~ /kisskb/src/include/linux/compiler_types.h:317:45: error: call to '__compiletime_assert_374' declared with attribute error: BUILD_BUG_ON failed: sizeof(struct prestera_msg_span_resp) != 12 317 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^ /kisskb/src/include/linux/compiler_types.h:298:25: note: in definition of macro '__compiletime_assert' 298 | prefix ## suffix(); \ | ^~~~~~ /kisskb/src/include/linux/compiler_types.h:317:9: note: in expansion of macro '_compiletime_assert' 317 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:39:37: note: in expansion of macro 'compiletime_assert' 39 | #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) | ^~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:50:9: note: in expansion of macro 'BUILD_BUG_ON_MSG' 50 | BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition) | ^~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/marvell/prestera/prestera_hw.c:526:9: note: in expansion of macro 'BUILD_BUG_ON' 526 | BUILD_BUG_ON(sizeof(struct prestera_msg_span_resp) != 12); | ^~~~~~~~~~~~ make[6]: *** [/kisskb/src/scripts/Makefile.build:277: drivers/net/ethernet/marvell/prestera/prestera_hw.o] Error 1 make[5]: *** [/kisskb/src/scripts/Makefile.build:540: drivers/net/ethernet/marvell/prestera] Error 2 make[4]: *** [/kisskb/src/scripts/Makefile.build:540: drivers/net/ethernet/marvell] Error 2 make[3]: *** [/kisskb/src/scripts/Makefile.build:540: drivers/net/ethernet] Error 2 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:540: drivers/net] Error 2 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1872: drivers] Error 2 make[1]: *** Waiting for unfinished jobs.... make: *** [Makefile:219: __sub-make] Error 2 Command 'make -s -j 32 ARCH=m68k O=/kisskb/build/linus_m68k-allmodconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_m68k-allmodconfig_m68k-gcc11 # Build took: 0:07:06.279096