# 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-8.1.0-nolibc/hppa-linux/bin/hppa-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/hppa-linux/bin/hppa-linux-ld --version # < git log --format=%s --max-count=1 cc0356d6a02e064387c16a83cb96fe43ef33181e # < make -s -j 24 ARCH=parisc O=/kisskb/build/linus_generic-32bit_defconfig_parisc-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/hppa-linux/bin/hppa-linux- generic-32bit_defconfig # < make -s -j 24 ARCH=parisc O=/kisskb/build/linus_generic-32bit_defconfig_parisc-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/hppa-linux/bin/hppa-linux- help # make -s -j 24 ARCH=parisc O=/kisskb/build/linus_generic-32bit_defconfig_parisc-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/hppa-linux/bin/hppa-linux- olddefconfig # make -s -j 24 ARCH=parisc O=/kisskb/build/linus_generic-32bit_defconfig_parisc-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/hppa-linux/bin/hppa-linux- In file included from : /kisskb/src/include/linux/sched.h: In function 'task_cpu': /kisskb/src/include/linux/sched.h:2129:38: error: 'const struct thread_info' has no member named 'cpu' return READ_ONCE(task_thread_info(p)->cpu); ^~ /kisskb/src/include/linux/compiler_types.h:297:9: note: in definition of macro '__compiletime_assert' if (!(condition)) \ ^~~~~~~~~ /kisskb/src/include/linux/compiler_types.h:317:2: note: in expansion of macro '_compiletime_assert' _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) ^~~~~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/rwonce.h:36:2: note: in expansion of macro 'compiletime_assert' compiletime_assert(__native_word(t) || sizeof(t) == sizeof(long long), \ ^~~~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/rwonce.h:36:21: note: in expansion of macro '__native_word' compiletime_assert(__native_word(t) || sizeof(t) == sizeof(long long), \ ^~~~~~~~~~~~~ /kisskb/src/include/asm-generic/rwonce.h:49:2: note: in expansion of macro 'compiletime_assert_rwonce_type' compiletime_assert_rwonce_type(x); \ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/sched.h:2129:9: note: in expansion of macro 'READ_ONCE' return READ_ONCE(task_thread_info(p)->cpu); ^~~~~~~~~ /kisskb/src/include/linux/sched.h:2129:38: error: 'const struct thread_info' has no member named 'cpu' return READ_ONCE(task_thread_info(p)->cpu); ^~ /kisskb/src/include/linux/compiler_types.h:297:9: note: in definition of macro '__compiletime_assert' if (!(condition)) \ ^~~~~~~~~ /kisskb/src/include/linux/compiler_types.h:317:2: note: in expansion of macro '_compiletime_assert' _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) ^~~~~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/rwonce.h:36:2: note: in expansion of macro 'compiletime_assert' compiletime_assert(__native_word(t) || sizeof(t) == sizeof(long long), \ ^~~~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/rwonce.h:36:21: note: in expansion of macro '__native_word' compiletime_assert(__native_word(t) || sizeof(t) == sizeof(long long), \ ^~~~~~~~~~~~~ /kisskb/src/include/asm-generic/rwonce.h:49:2: note: in expansion of macro 'compiletime_assert_rwonce_type' compiletime_assert_rwonce_type(x); \ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/sched.h:2129:9: note: in expansion of macro 'READ_ONCE' return READ_ONCE(task_thread_info(p)->cpu); ^~~~~~~~~ /kisskb/src/include/linux/sched.h:2129:38: error: 'const struct thread_info' has no member named 'cpu' return READ_ONCE(task_thread_info(p)->cpu); ^~ /kisskb/src/include/linux/compiler_types.h:297:9: note: in definition of macro '__compiletime_assert' if (!(condition)) \ ^~~~~~~~~ /kisskb/src/include/linux/compiler_types.h:317:2: note: in expansion of macro '_compiletime_assert' _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) ^~~~~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/rwonce.h:36:2: note: in expansion of macro 'compiletime_assert' compiletime_assert(__native_word(t) || sizeof(t) == sizeof(long long), \ ^~~~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/rwonce.h:36:21: note: in expansion of macro '__native_word' compiletime_assert(__native_word(t) || sizeof(t) == sizeof(long long), \ ^~~~~~~~~~~~~ /kisskb/src/include/asm-generic/rwonce.h:49:2: note: in expansion of macro 'compiletime_assert_rwonce_type' compiletime_assert_rwonce_type(x); \ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/sched.h:2129:9: note: in expansion of macro 'READ_ONCE' return READ_ONCE(task_thread_info(p)->cpu); ^~~~~~~~~ /kisskb/src/include/linux/sched.h:2129:38: error: 'const struct thread_info' has no member named 'cpu' return READ_ONCE(task_thread_info(p)->cpu); ^~ /kisskb/src/include/linux/compiler_types.h:297:9: note: in definition of macro '__compiletime_assert' if (!(condition)) \ ^~~~~~~~~ /kisskb/src/include/linux/compiler_types.h:317:2: note: in expansion of macro '_compiletime_assert' _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) ^~~~~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/rwonce.h:36:2: note: in expansion of macro 'compiletime_assert' compiletime_assert(__native_word(t) || sizeof(t) == sizeof(long long), \ ^~~~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/rwonce.h:36:21: note: in expansion of macro '__native_word' compiletime_assert(__native_word(t) || sizeof(t) == sizeof(long long), \ ^~~~~~~~~~~~~ /kisskb/src/include/asm-generic/rwonce.h:49:2: note: in expansion of macro 'compiletime_assert_rwonce_type' compiletime_assert_rwonce_type(x); \ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/sched.h:2129:9: note: in expansion of macro 'READ_ONCE' return READ_ONCE(task_thread_info(p)->cpu); ^~~~~~~~~ /kisskb/src/include/linux/sched.h:2129:38: error: 'const struct thread_info' has no member named 'cpu' return READ_ONCE(task_thread_info(p)->cpu); ^~ /kisskb/src/include/linux/compiler_types.h:297:9: note: in definition of macro '__compiletime_assert' if (!(condition)) \ ^~~~~~~~~ /kisskb/src/include/linux/compiler_types.h:317:2: note: in expansion of macro '_compiletime_assert' _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) ^~~~~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/rwonce.h:36:2: note: in expansion of macro 'compiletime_assert' compiletime_assert(__native_word(t) || sizeof(t) == sizeof(long long), \ ^~~~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/rwonce.h:49:2: note: in expansion of macro 'compiletime_assert_rwonce_type' compiletime_assert_rwonce_type(x); \ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/sched.h:2129:9: note: in expansion of macro 'READ_ONCE' return READ_ONCE(task_thread_info(p)->cpu); ^~~~~~~~~ /kisskb/src/include/linux/sched.h:2129:38: error: 'const struct thread_info' has no member named 'cpu' return READ_ONCE(task_thread_info(p)->cpu); ^~ /kisskb/src/include/linux/compiler_types.h:279:13: note: in definition of macro '__unqual_scalar_typeof' _Generic((x), \ ^ /kisskb/src/include/asm-generic/rwonce.h:50:2: note: in expansion of macro '__READ_ONCE' __READ_ONCE(x); \ ^~~~~~~~~~~ /kisskb/src/include/linux/sched.h:2129:9: note: in expansion of macro 'READ_ONCE' return READ_ONCE(task_thread_info(p)->cpu); ^~~~~~~~~ In file included from ./arch/parisc/include/generated/asm/rwonce.h:1, from /kisskb/src/include/linux/compiler.h:266, from /kisskb/src/include/linux/kernel.h:11, from /kisskb/src/include/linux/list.h:9, from /kisskb/src/include/linux/rculist.h:10, from /kisskb/src/include/linux/pid.h:5, from /kisskb/src/include/linux/sched.h:14, from /kisskb/src/arch/parisc/kernel/asm-offsets.c:20: /kisskb/src/include/linux/sched.h:2129:38: error: 'const struct thread_info' has no member named 'cpu' return READ_ONCE(task_thread_info(p)->cpu); ^~ /kisskb/src/include/asm-generic/rwonce.h:44:72: note: in definition of macro '__READ_ONCE' #define __READ_ONCE(x) (*(const volatile __unqual_scalar_typeof(x) *)&(x)) ^ /kisskb/src/include/linux/sched.h:2129:9: note: in expansion of macro 'READ_ONCE' return READ_ONCE(task_thread_info(p)->cpu); ^~~~~~~~~ In file included from /kisskb/src/arch/parisc/kernel/asm-offsets.c:24: /kisskb/src/arch/parisc/kernel/asm-offsets.c: In function 'main': /kisskb/src/include/linux/compiler_types.h:140:35: error: 'struct task_struct' has no member named 'cpu' #define __compiler_offsetof(a, b) __builtin_offsetof(a, b) ^~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/kbuild.h:6:62: note: in definition of macro 'DEFINE' asm volatile("\n.ascii \"->" #sym " %0 " #val "\"" : : "i" (val)) ^~~ /kisskb/src/include/linux/stddef.h:17:32: note: in expansion of macro '__compiler_offsetof' #define offsetof(TYPE, MEMBER) __compiler_offsetof(TYPE, MEMBER) ^~~~~~~~~~~~~~~~~~~ /kisskb/src/arch/parisc/kernel/asm-offsets.c:43:19: note: in expansion of macro 'offsetof' DEFINE(TASK_CPU, offsetof(struct task_struct, cpu)); ^~~~~~~~ make[2]: *** [/kisskb/src/scripts/Makefile.build:121: arch/parisc/kernel/asm-offsets.s] Error 1 make[1]: *** [/kisskb/src/Makefile:1223: prepare0] Error 2 make: *** [Makefile:219: __sub-make] Error 2 Command 'make -s -j 24 ARCH=parisc O=/kisskb/build/linus_generic-32bit_defconfig_parisc-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/hppa-linux/bin/hppa-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_generic-32bit_defconfig_parisc-gcc8 # Build took: 0:00:06.002246