Messages in this thread Patch in this message | | | From | Hans de Goede <> | Subject | [PATCH v6 1/2] x86/purgatory: Disable various profiling and sanitizing options | Date | Tue, 17 Mar 2020 14:08:40 +0100 |
| |
Since the purgatory is a special stand-alone binary, various profiling and sanitizing options must be disabled. Having these options enabled typically will cause dependencies on various special symbols exported by special libs / stubs used by these frameworks. Since the purgatory is special, it is not linked against these stubs causing missing symbols in the purgatory if these options are not disabled.
Sync the set of disabled profiling and sanitizing options with that from drivers/firmware/efi/libstub/Makefile, adding -DDISABLE_BRANCH_PROFILING to the CFLAGS and setting:
GCOV_PROFILE := n UBSAN_SANITIZE := n
This fixes broken references to ftrace_likely_update when CONFIG_TRACE_BRANCH_PROFILING is enabled and to __gcov_init and __gcov_exit when CONFIG_GCOV_KERNEL is enabled.
Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- Changes in v6: - Improve commit message wording - Rebase on top of tip/master
Changes in v5: - Not only add -DDISABLE_BRANCH_PROFILING to the CFLAGS but also set: GCOV_PROFILE := n UBSAN_SANITIZE := n
Changes in v4: - This is a new patch in v4 of this series --- arch/x86/purgatory/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/x86/purgatory/Makefile b/arch/x86/purgatory/Makefile index 69379bce9574..5313dd7314fe 100644 --- a/arch/x86/purgatory/Makefile +++ b/arch/x86/purgatory/Makefile @@ -17,9 +17,11 @@ CFLAGS_sha256.o := -D__DISABLE_EXPORTS LDFLAGS_purgatory.ro := -e purgatory_start -r --no-undefined -nostdlib -z nodefaultlib targets += purgatory.ro -# Sanitizer runtimes are unavailable and cannot be linked here. +# Sanitizer, etc. runtimes are unavailable and cannot be linked here. +GCOV_PROFILE := n KASAN_SANITIZE := n KCSAN_SANITIZE := n +UBSAN_SANITIZE := n KCOV_INSTRUMENT := n # These are adjustments to the compiler flags used for objects that @@ -27,7 +29,7 @@ KCOV_INSTRUMENT := n PURGATORY_CFLAGS_REMOVE := -mcmodel=kernel PURGATORY_CFLAGS := -mcmodel=large -ffreestanding -fno-zero-initialized-in-bss -PURGATORY_CFLAGS += $(DISABLE_STACKLEAK_PLUGIN) +PURGATORY_CFLAGS += $(DISABLE_STACKLEAK_PLUGIN) -DDISABLE_BRANCH_PROFILING # Default KBUILD_CFLAGS can have -pg option set when FTRACE is enabled. That # in turn leaves some undefined symbols like __fentry__ in purgatory and not -- 2.24.1
| |