Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fcbc38b1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull objtool fixes from Ingo Molnar:
 "A handful of objtool fixes, most of them related to making the UAPI
  header-syncing warnings easier to read and easier to act upon"

* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  tools/headers: Sync objtool UAPI header
  objtool: Fix cross-build
  objtool: Move kernel headers/code sync check to a script
  objtool: Move synced files to their original relative locations
  objtool: Make unreachable annotation inline asms explicitly volatile
  objtool: Add a comment for the unreachable annotation macros
parents 844056fd a356d2ae

include/linux/compiler.h

+13 −8
Original line number Diff line number Diff line
@@ -88,14 +88,19 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val, 


/* Unreachable code */

#ifdef CONFIG_STACK_VALIDATION

/*

 * These macros help objtool understand GCC code flow for unreachable code.

 * The __COUNTER__ based labels are a hack to make each instance of the macros

 * unique, to convince GCC not to merge duplicate inline asm statements.

 */

#define annotate_reachable() ({						\

	asm("%c0:\n\t"							\

	asm volatile("%c0:\n\t"						\

		     ".pushsection .discard.reachable\n\t"		\

		     ".long %c0b - .\n\t"				\

		     ".popsection\n\t" : : "i" (__COUNTER__));		\

})

#define annotate_unreachable() ({					\

	asm("%c0:\n\t"							\

	asm volatile("%c0:\n\t"						\

		     ".pushsection .discard.unreachable\n\t"		\

		     ".long %c0b - .\n\t"				\

		     ".popsection\n\t" : : "i" (__COUNTER__));		\

tools/objtool/.gitignore

+1 −1
Original line number Diff line number Diff line 
arch/x86/insn/inat-tables.c

arch/x86/lib/inat-tables.c

objtool

fixdep

tools/objtool/Makefile

+5 −17
Original line number Diff line number Diff line
@@ -25,7 +25,9 @@ OBJTOOL_IN := $(OBJTOOL)-in.o 


all: $(OBJTOOL)



INCLUDES := -I$(srctree)/tools/include -I$(srctree)/tools/arch/$(HOSTARCH)/include/uapi

INCLUDES := -I$(srctree)/tools/include \

	    -I$(srctree)/tools/arch/$(HOSTARCH)/include/uapi \

	    -I$(srctree)/tools/objtool/arch/$(ARCH)/include

WARNINGS := $(EXTRA_WARNINGS) -Wno-switch-default -Wno-switch-enum -Wno-packed

CFLAGS   += -Wall -Werror $(WARNINGS) -fomit-frame-pointer -O2 -g $(INCLUDES)

LDFLAGS  += -lelf $(LIBSUBCMD)
@@ -41,22 +43,8 @@ include $(srctree)/tools/build/Makefile.include 
$(OBJTOOL_IN): fixdep FORCE

	@$(MAKE) $(build)=objtool



# Busybox's diff doesn't have -I, avoid warning in that case

#

$(OBJTOOL): $(LIBSUBCMD) $(OBJTOOL_IN)

	@(diff -I 2>&1 | grep -q 'option requires an argument' && \

	test -d ../../kernel -a -d ../../tools -a -d ../objtool && (( \

	diff -I'^#include' arch/x86/insn/insn.c ../../arch/x86/lib/insn.c >/dev/null && \

	diff -I'^#include' arch/x86/insn/inat.c ../../arch/x86/lib/inat.c >/dev/null && \

	diff arch/x86/insn/x86-opcode-map.txt ../../arch/x86/lib/x86-opcode-map.txt >/dev/null && \

	diff arch/x86/insn/gen-insn-attr-x86.awk ../../arch/x86/tools/gen-insn-attr-x86.awk >/dev/null && \

	diff -I'^#include' arch/x86/insn/insn.h ../../arch/x86/include/asm/insn.h >/dev/null && \

	diff -I'^#include' arch/x86/insn/inat.h ../../arch/x86/include/asm/inat.h >/dev/null && \

	diff -I'^#include' arch/x86/insn/inat_types.h ../../arch/x86/include/asm/inat_types.h >/dev/null) \

	|| echo "warning: objtool: x86 instruction decoder differs from kernel" >&2 )) || true

	@(test -d ../../kernel -a -d ../../tools -a -d ../objtool && (( \

	diff ../../arch/x86/include/asm/orc_types.h orc_types.h >/dev/null) \

	|| echo "warning: objtool: orc_types.h differs from kernel" >&2 )) || true

	@./sync-check.sh

	$(QUIET_LINK)$(CC) $(OBJTOOL_IN) $(LDFLAGS) -o $@
@@ -66,7 +54,7 @@ $(LIBSUBCMD): fixdep FORCE 
clean:

	$(call QUIET_CLEAN, objtool) $(RM) $(OBJTOOL)

	$(Q)find $(OUTPUT) -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete

	$(Q)$(RM) $(OUTPUT)arch/x86/insn/inat-tables.c $(OUTPUT)fixdep

	$(Q)$(RM) $(OUTPUT)arch/x86/lib/inat-tables.c $(OUTPUT)fixdep



FORCE:

tools/objtool/arch/x86/Build

+5 −5
Original line number Diff line number Diff line 
objtool-y += decode.o



inat_tables_script = arch/x86/insn/gen-insn-attr-x86.awk

inat_tables_maps = arch/x86/insn/x86-opcode-map.txt

inat_tables_script = arch/x86/tools/gen-insn-attr-x86.awk

inat_tables_maps = arch/x86/lib/x86-opcode-map.txt



$(OUTPUT)arch/x86/insn/inat-tables.c: $(inat_tables_script) $(inat_tables_maps)

$(OUTPUT)arch/x86/lib/inat-tables.c: $(inat_tables_script) $(inat_tables_maps)

	$(call rule_mkdir)

	$(Q)$(call echo-cmd,gen)$(AWK) -f $(inat_tables_script) $(inat_tables_maps) > $@



$(OUTPUT)arch/x86/decode.o: $(OUTPUT)arch/x86/insn/inat-tables.c

$(OUTPUT)arch/x86/decode.o: $(OUTPUT)arch/x86/lib/inat-tables.c



CFLAGS_decode.o += -I$(OUTPUT)arch/x86/insn
 
CFLAGS_decode.o += -I$(OUTPUT)arch/x86/lib

tools/objtool/arch/x86/decode.c

+3 −3
Original line number Diff line number Diff line
@@ -19,9 +19,9 @@ 
#include <stdlib.h>



#define unlikely(cond) (cond)

#include "insn/insn.h"

#include "insn/inat.c"

#include "insn/insn.c"

#include <asm/insn.h>

#include "lib/inat.c"

#include "lib/insn.c"



#include "../../elf.h"

#include "../../arch.h"