github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-07 14:04:54 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Revert "ANDROID: kbuild: fix dynamic ftrace with clang LTO"

Browse Source 
This reverts commit c4fa71e251 as the LTO
feature causes merge issues with 5.8-rc1.  So remove it for now and
allow the developer to add the latest version of the patches later on.

Cc: Sami Tolvanen <samitolvanen@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Id688d5e1e8b69b13aeb49da2716bfe45415e7c39
This commit is contained in:
Greg Kroah-Hartman 2020-06-24 08:54:38 +02:00
parent 4f60494720
commit 16fe007e61
9 changed files with 5 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/Kconfig
View File

@ -594,7 +594,7 @@ config LTO_CLANG
bool "Use Clang's Link Time Optimization (LTO) (EXPERIMENTAL)"
depends on ARCH_SUPPORTS_LTO_CLANG
depends on !KASAN
depends on !FTRACE_MCOUNT_RECORD || HAVE_C_RECORDMCOUNT
depends on !FTRACE_MCOUNT_RECORD
depends on CC_IS_CLANG && CLANG_VERSION >= 100000 && LD_IS_LLD
select LTO
help

1
include/asm-generic/vmlinux.lds.h
View File

@ -568,7 +568,6 @@
NOINSTR_TEXT \
*(TEXT_CFI_MAIN) \
*(.text..refcount) \
*(.text..ftrace) \
*(.ref.text) \
MEM_KEEP(init.text*) \
MEM_KEEP(exit.text*) \

8
include/linux/compiler-clang.h
View File

@ -47,12 +47,4 @@
# define __noscs __attribute__((__no_sanitize__("shadow-call-stack")))
#endif
#ifdef CONFIG_LTO_CLANG
#ifdef CONFIG_FTRACE_MCOUNT_RECORD
#define __norecordmcount \
__attribute__((__section__(".text..ftrace")))
#endif
#define __nocfi __attribute__((__no_sanitize__("cfi")))
#endif

4
include/linux/compiler_types.h
View File

@ -197,10 +197,6 @@ struct ftrace_likely_data {
# define randomized_struct_fields_end
#endif
#ifndef __norecordmcount
# define __norecordmcount
#endif
#ifndef __nocfi
# define __nocfi
#endif

6
kernel/trace/ftrace.c
View File

@ -6062,9 +6062,9 @@ static int ftrace_cmp_ips(const void *a, const void *b)
return 0;
}
static int __norecordmcount ftrace_process_locs(struct module *mod,
unsigned long *start,
unsigned long *end)
static int ftrace_process_locs(struct module *mod,
unsigned long *start,
unsigned long *end)
{
struct ftrace_page *start_pg;
struct ftrace_page *pg;

11
scripts/Makefile.build
View File

@ -178,12 +178,6 @@ ifdef BUILD_C_RECORDMCOUNT
ifeq ("$(origin RECORDMCOUNT_WARN)", "command line")
RECORDMCOUNT_FLAGS = -w
endif
ifdef CONFIG_LTO_CLANG
# With LTO, we postpone running recordmcount until after the LTO link step, so
# let's export the parameters for the link script.
export RECORDMCOUNT_FLAGS
else
# Due to recursion, we must skip empty.o.
# The empty.o file is created in the make process in order to determine
# the target endianness and word size. It is made before all other C
@ -192,8 +186,6 @@ sub_cmd_record_mcount = \
if [ $(@) != "scripts/mod/empty.o" ]; then \
$(objtree)/scripts/recordmcount $(RECORDMCOUNT_FLAGS) "$(@)"; \
fi;
endif
recordmcount_source := $(srctree)/scripts/recordmcount.c \
$(srctree)/scripts/recordmcount.h
else
@ -203,13 +195,10 @@ sub_cmd_record_mcount = perl $(srctree)/scripts/recordmcount.pl "$(ARCH)" \
"$(OBJDUMP)" "$(OBJCOPY)" "$(CC) $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS)" \
"$(LD) $(KBUILD_LDFLAGS)" "$(NM)" "$(RM)" "$(MV)" \
"$(if $(part-of-module),1,0)" "$(@)";
recordmcount_source := $(srctree)/scripts/recordmcount.pl
endif # BUILD_C_RECORDMCOUNT
ifndef CONFIG_LTO_CLANG
cmd_record_mcount = $(if $(findstring $(strip $(CC_FLAGS_FTRACE)),$(_c_flags)), \
$(sub_cmd_record_mcount))
endif # CONFIG_LTO_CLANG
endif # CC_USING_RECORD_MCOUNT
endif # CONFIG_FTRACE_MCOUNT_RECORD

4
scripts/Makefile.modfinal
View File

@ -41,10 +41,6 @@ ifdef CONFIG_LTO_CLANG
-o $@ --whole-archive \
$(filter-out FORCE,$(^:$(modpost-ext).o=.o)); \
$(if $(ARCH_POSTLINK), $(MAKE) -f $(ARCH_POSTLINK) $@, true)
ifdef CONFIG_FTRACE_MCOUNT_RECORD
cmd_ld_ko_o += ; $(objtree)/scripts/recordmcount $(RECORDMCOUNT_FLAGS) $@
endif
else
cmd_ld_ko_o = \
$(LD) -r $(KBUILD_LDFLAGS) \

18
scripts/link-vmlinux.sh
View File

@ -87,19 +87,6 @@ modpost_link()
${LD} ${KBUILD_LDFLAGS} -r -o ${1} $(modversions) ${objects}
}
# If CONFIG_LTO_CLANG is selected, we postpone running recordmcount until
# we have compiled LLVM IR to an object file.
recordmcount()
{
if [ -z "${CONFIG_LTO_CLANG}" ]; then
return
fi
if [ -n "${CONFIG_FTRACE_MCOUNT_RECORD}" ]; then
scripts/recordmcount ${RECORDMCOUNT_FLAGS} $*
fi
}
objtool_link()
{
local objtoolopt;
@ -334,11 +321,6 @@ objtool_link vmlinux.o
# modpost vmlinux.o to check for section mismatches
${MAKE} -f "${srctree}/scripts/Makefile.modpost" MODPOST_VMLINUX=1
if [ -n "${CONFIG_LTO_CLANG}" ]; then
# Call recordmcount if needed
recordmcount vmlinux.o
fi
info MODINFO modules.builtin.modinfo
${OBJCOPY} -j .modinfo -O binary vmlinux.o modules.builtin.modinfo
info GEN modules.builtin

4
scripts/recordmcount.c
View File

@ -412,9 +412,7 @@ static int is_mcounted_section_name(char const *const txtname)
strcmp(".irqentry.text", txtname) == 0 ||
strcmp(".softirqentry.text", txtname) == 0 ||
strcmp(".kprobes.text", txtname) == 0 ||
strcmp(".cpuidle.text", txtname) == 0 ||
(strncmp(".text.", txtname, 6) == 0 &&
strcmp(".text..ftrace", txtname) != 0);
strcmp(".cpuidle.text", txtname) == 0;
}
static char const *already_has_rel_mcount = "success"; /* our work here is done! */