# git rev-parse -q --verify 79ef0c00142519bc34e1341447f3797436cc48bf^{commit} 79ef0c00142519bc34e1341447f3797436cc48bf already have revision, skipping fetch # git checkout -q -f -B kisskb 79ef0c00142519bc34e1341447f3797436cc48bf # git clean -qxdf # < git log -1 # commit 79ef0c00142519bc34e1341447f3797436cc48bf # Merge: d54f486035fd feea69ec121f # Author: Linus Torvalds # Date: Mon Nov 1 20:05:19 2021 -0700 # # Merge tag 'trace-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace # # Pull tracing updates from Steven Rostedt: # # - kprobes: Restructured stack unwinder to show properly on x86 when a # stack dump happens from a kretprobe callback. # # - Fix to bootconfig parsing # # - Have tracefs allow owner and group permissions by default (only # denying others). There's been pressure to allow non root to tracefs # in a controlled fashion, and using groups is probably the safest. # # - Bootconfig memory managament updates. # # - Bootconfig clean up to have the tools directory be less dependent on # changes in the kernel tree. # # - Allow perf to be traced by function tracer. # # - Rewrite of function graph tracer to be a callback from the function # tracer instead of having its own trampoline (this change will happen # on an arch by arch basis, and currently only x86_64 implements it). # # - Allow multiple direct trampolines (bpf hooks to functions) be batched # together in one synchronization. # # - Allow histogram triggers to add variables that can perform # calculations against the event's fields. # # - Use the linker to determine architecture callbacks from the ftrace # trampoline to allow for proper parameter prototypes and prevent # warnings from the compiler. # # - Extend histogram triggers to key off of variables. # # - Have trace recursion use bit magic to determine preempt context over # if branches. # # - Have trace recursion disable preemption as all use cases do anyway. # # - Added testing for verification of tracing utilities. # # - Various small clean ups and fixes. # # * tag 'trace-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: (101 commits) # tracing/histogram: Fix semicolon.cocci warnings # tracing/histogram: Fix documentation inline emphasis warning # tracing: Increase PERF_MAX_TRACE_SIZE to handle Sentinel1 and docker together # tracing: Show size of requested perf buffer # bootconfig: Initialize ret in xbc_parse_tree() # ftrace: do CPU checking after preemption disabled # ftrace: disable preemption when recursion locked # tracing/histogram: Document expression arithmetic and constants # tracing/histogram: Optimize division by a power of 2 # tracing/histogram: Covert expr to const if both operands are constants # tracing/histogram: Simplify handling of .sym-offset in expressions # tracing: Fix operator precedence for hist triggers expression # tracing: Add division and multiplication support for hist triggers # tracing: Add support for creating hist trigger variables from literal # selftests/ftrace: Stop tracing while reading the trace file by default # MAINTAINERS: Update KPROBES and TRACING entries # test_kprobes: Move it from kernel/ to lib/ # docs, kprobes: Remove invalid URL and add new reference # samples/kretprobes: Fix return value if register_kretprobe() failed # lib/bootconfig: Fix the xbc_get_info kerneldoc # ... # < /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 79ef0c00142519bc34e1341447f3797436cc48bf # < 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:1220: 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:05.877663