diff options
| author | Miguel Ojeda <ojeda@kernel.org> | 2026-08-16 15:32:33 +0200 |
|---|---|---|
| committer | Miguel Ojeda <ojeda@kernel.org> | 2026-08-23 21:27:17 +0200 |
| commit | 5febf432df1cfa5b25d99b54c32103fafbdd0eb9 (patch) | |
| tree | 93a1ed1d337bc53adf1e572c2586d347703b286e /tools/perf/ui/util.c | |
| download | linux-stable-5febf432df1cfa5b25d99b54c32103fafbdd0eb9.tar.gz linux-stable-5febf432df1cfa5b25d99b54c32103fafbdd0eb9.zip | |
kbuild: rust: keep Rust objects out of Clang LTO with inline helpersgrafted
Under `CONFIG_LTO_CLANG` + `CONFIG_RUST_INLINE_HELPERS`, one may hit
`objtool` errors such as:
vmlinux.o: error: objtool: _R..._3Gsp4boot+0xd6a:
can't find jump dest instruction at .text._R..._3Gsp4boot+0x1dfd
The reason is that in such builds, the Clang invocation that compiles
the combined Rust plus helpers bitcode emits LLVM bitcode (again) --
the final code generation happens in the linker's LTO step, which the
`-mllvm` trap options passed to Clang do not reach.
This, in turn, means that unreachable traps are missing, and the
impossible paths do not merely fallthrough to the next symbol, but past
the end of their own section, since LTO builds place each function in
its own section.
Thus filter `CC_FLAGS_LTO` out of the Clang invocation, so that it always
emits machine code directly, with the traps in place.
Assisted-by: LLM
Cc: Gary Guo <gary@garyguo.net>
Cc: Boqun Feng <boqun@kernel.org>
Cc: Alice Ryhl <aliceryhl@google.com>
Cc: Matthew Maurer <mmaurer@google.com>
Cc: Josh Poimboeuf <jpoimboe@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: stable@vger.kernel.org
Fixes: 3a2486cc1da5 ("kbuild: rust: provide an option to inline C helpers into Rust")
Acked-by: Gary Guo <gary@garyguo.net>
Link: https://patch.msgid.link/20260816133233.197500-2-ojeda@kernel.org
Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
Diffstat (limited to 'tools/perf/ui/util.c')
| -rw-r--r-- | tools/perf/ui/util.c | 90 |
1 files changed, 90 insertions, 0 deletions
diff --git a/tools/perf/ui/util.c b/tools/perf/ui/util.c new file mode 100644 index 000000000..1d38ddf01 --- /dev/null +++ b/tools/perf/ui/util.c @@ -0,0 +1,90 @@ +// SPDX-License-Identifier: GPL-2.0 +#include "util.h" +#include "../util/debug.h" +#include <stdio.h> + +/* + * Default error logging functions + */ +static int perf_stdio__error(const char *format, va_list args) +{ + fprintf(stderr, "Error:\n"); + vfprintf(stderr, format, args); + return 0; +} + +static int perf_stdio__warning(const char *format, va_list args) +{ + if (quiet) + return 0; + + fprintf(stderr, "Warning:\n"); + vfprintf(stderr, format, args); + return 0; +} + +static struct perf_error_ops default_eops = +{ + .error = perf_stdio__error, + .warning = perf_stdio__warning, +}; + +static struct perf_error_ops *perf_eops = &default_eops; + + +int ui__error(const char *format, ...) +{ + int ret; + va_list args; + + va_start(args, format); + ret = perf_eops->error(format, args); + va_end(args); + + return ret; +} + +int ui__warning(const char *format, ...) +{ + int ret; + va_list args; + if (quiet) + return 0; + + va_start(args, format); + ret = perf_eops->warning(format, args); + va_end(args); + + return ret; +} + +/** + * perf_error__register - Register error logging functions + * @eops: The pointer to error logging function struct + * + * Register UI-specific error logging functions. Before calling this, + * other logging functions should be unregistered, if any. + */ +int perf_error__register(struct perf_error_ops *eops) +{ + if (perf_eops != &default_eops) + return -1; + + perf_eops = eops; + return 0; +} + +/** + * perf_error__unregister - Unregister error logging functions + * @eops: The pointer to error logging function struct + * + * Unregister already registered error logging functions. + */ +int perf_error__unregister(struct perf_error_ops *eops) +{ + if (perf_eops != eops) + return -1; + + perf_eops = &default_eops; + return 0; +} |
