Commit 5a658afd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'objtool-core-2025-03-22' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull objtool updates from Ingo Molnar:

 - The biggest change is the new option to automatically fail the build
   on objtool warnings: CONFIG_OBJTOOL_WERROR.

   While there are no currently known unfixed false positives left, such
   an expansion in the severity of objtool warnings inevitably creates a
   risk of build failures, so it's disabled by default and depends on
   !COMPILE_TEST, so it shouldn't be enabled on
   allyesconfig/allmodconfig builds and won't be forced on people who
   just accept build-time defaults in 'make oldconfig'.

   While the option is strongly recommended, only people who enable it
   explicitly should see it.

   (Josh Poimboeuf)

 - Disable branch profiling in noinstr code with a broad brush that
   includes all of arch/x86/ and kernel/sched/. (Josh Poimboeuf)

 - Create backup object files on objtool errors and print exact objtool
   arguments to make failure analysis easier (Josh Poimboeuf)

 - Improve noreturn handling (Josh Poimboeuf)

 - Improve rodata handling (Tiezhu Yang)

 - Support jump tables, switch tables and goto tables on LoongArch
   (Tiezhu Yang)

 - Misc cleanups and fixes (Josh Poimboeuf, David Engraf, Ingo Molnar)

* tag 'objtool-core-2025-03-22' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (22 commits)
  tracing: Disable branch profiling in noinstr code
  objtool: Use O_CREAT with explicit mode mask
  objtool: Add CONFIG_OBJTOOL_WERROR
  objtool: Create backup on error and print args
  objtool: Change "warning:" to "error:" for --Werror
  objtool: Add --Werror option
  objtool: Add --output option
  objtool: Upgrade "Linked object detected" warning to error
  objtool: Consolidate option validation
  objtool: Remove --unret dependency on --rethunk
  objtool: Increase per-function WARN_FUNC() rate limit
  objtool: Update documentation
  objtool: Improve __noreturn annotation warning
  objtool: Fix error handling inconsistencies in check()
  x86/traps: Make exc_double_fault() consistently noreturn
  LoongArch: Enable jump table for objtool
  objtool/LoongArch: Add support for goto table
  objtool/LoongArch: Add support for switch table
  objtool: Handle PC relative relocation type
  objtool: Handle different entry size of rodata
  ...
parents 23608993 2cbb20b0

arch/loongarch/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -291,6 +291,9 @@ config AS_HAS_LBT_EXTENSION 
config AS_HAS_LVZ_EXTENSION

	def_bool $(as-instr,hvcl 0)



config CC_HAS_ANNOTATE_TABLEJUMP

	def_bool $(cc-option,-mannotate-tablejump)



menu "Kernel type and options"



source "kernel/Kconfig.hz"

arch/loongarch/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -101,7 +101,11 @@ KBUILD_AFLAGS += $(call cc-option,-mthin-add-sub) $(call cc-option,-Wa$(comma) 
KBUILD_CFLAGS			+= $(call cc-option,-mthin-add-sub) $(call cc-option,-Wa$(comma)-mthin-add-sub)



ifdef CONFIG_OBJTOOL

KBUILD_CFLAGS			+= -fno-jump-tables

ifdef CONFIG_CC_HAS_ANNOTATE_TABLEJUMP

KBUILD_CFLAGS			+= -mannotate-tablejump

else

KBUILD_CFLAGS			+= -fno-jump-tables # keep compatibility with older compilers

endif

endif



KBUILD_RUSTFLAGS		+= --target=loongarch64-unknown-none-softfloat -Ccode-model=small

arch/x86/Kbuild

+4 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0



# Branch profiling isn't noinstr-safe.  Disable it for arch/x86/*

subdir-ccflags-$(CONFIG_TRACE_BRANCH_PROFILING) += -DDISABLE_BRANCH_PROFILING



obj-$(CONFIG_ARCH_HAS_CC_PLATFORM) += coco/



obj-y += entry/

arch/x86/coco/sev/core.c

+0 −2
Original line number Diff line number Diff line
@@ -9,8 +9,6 @@ 


#define pr_fmt(fmt)	"SEV: " fmt



#define DISABLE_BRANCH_PROFILING



#include <linux/sched/debug.h>	/* For show_regs() */

#include <linux/percpu-defs.h>

#include <linux/cc_platform.h>

arch/x86/kernel/head64.c

+0 −2
Original line number Diff line number Diff line
@@ -5,8 +5,6 @@ 
 *  Copyright (C) 2000 Andrea Arcangeli <andrea@suse.de> SuSE

 */



#define DISABLE_BRANCH_PROFILING



/* cpu_feature_enabled() cannot be used this early */

#define USE_EARLY_PGTABLE_L5