diff mbox series

[21/46] btf, lto: pass scope as strings

Message ID	20221114114344.18650-22-jirislaby@kernel.org
State	New
Headers	Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; From: "Jiri Slaby (SUSE)" <jirislaby@kernel.org> To: linux-kernel@vger.kernel.org Cc: Jiri Slaby <jslaby@suse.cz>, Alexei Starovoitov <ast@kernel.org>, Daniel Borkmann <daniel@iogearbox.net>, Andrii Nakryiko <andrii@kernel.org>, Martin KaFai Lau <martin.lau@linux.dev>, Song Liu <song@kernel.org>, Yonghong Song <yhs@fb.com>, John Fastabend <john.fastabend@gmail.com>, KP Singh <kpsingh@kernel.org>, Stanislav Fomichev <sdf@google.com>, Hao Luo <haoluo@google.com>, Jiri Olsa <jolsa@kernel.org>, bpf@vger.kernel.org, Martin Liska <mliska@suse.cz> Subject: [PATCH 21/46] btf, lto: pass scope as strings Date: Mon, 14 Nov 2022 12:43:19 +0100 Message-Id: <20221114114344.18650-22-jirislaby@kernel.org> In-Reply-To: <20221114114344.18650-1-jirislaby@kernel.org> References: <20221114114344.18650-1-jirislaby@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	gcc-LTO support for the kernel \| [00/46] gcc-LTO support for the kernel [01/46] x86/boot: robustify calling startup_{32,64}() from the decompressor code [02/46] kbuild: pass jobserver to cmd_ld_vmlinux.o [03/46] kbuild: lto: preserve MAKEFLAGS for module linking [04/46] compiler.h: introduce __visible_on_lto [05/46] compiler.h: introduce __global_on_lto [06/46] Compiler Attributes, lto: introduce __noreorder [07/46] tracepoint, lto: Mark static call functions as __visible [08/46] static_call, lto: Mark static keys as __visible [09/46] static_call, lto: Mark static_call_return0() as __visible [10/46] static_call, lto: Mark func_a() as __visible_on_lto [11/46] x86/alternative, lto: Mark int3_() as global and __visible [12/46] x86/paravirt, lto: Mark native_steal_clock() as __visible_on_lto [13/46] x86/preempt, lto: Mark preempt_schedule_thunk() as __visible [14/46] x86/sev, lto: Mark cpuid_table_copy as __visible_on_lto [15/46] x86/xen, lto: Mark xen_vcpu_stolen() as __visible [16/46] x86, lto: Mark gdt_page and native_sched_clock() as __visible [17/46] amd, lto: Mark amd pmu and pstate functions as __visible_on_lto [18/46] entry, lto: Mark raw_irqentry_exit_cond_resched() as __visible [19/46] export, lto: Mark __kstrtab* in EXPORT_SYMBOL() as global and __visible [20/46] softirq, lto: Mark irq_enter/exit_rcu() as __visible [21/46] btf, lto: pass scope as strings [22/46] btf, lto: Make all BTF IDs global on LTO [23/46] init.h, lto: mark initcalls as __noreorder [24/46] bpf, lto: mark interpreter jump table as __noreorder [25/46] sched, lto: mark sched classes as __noreorder [26/46] x86/apic, lto: Mark apic_driver*() as __noreorder [27/46] linkage, lto: use C version for SYSCALL_ALIAS() / cond_syscall() [28/46] scripts, lto: re-add gcc-ld [29/46] scripts, lto: use CONFIG_LTO for many LTO specific actions [30/46] Kbuild, lto: Add Link Time Optimization support [31/46] x86/purgatory, lto: Disable gcc LTO for purgatory [32/46] x86/realmode, lto: Disable gcc LTO for real mode code [33/46] x86/vdso, lto: Disable gcc LTO for the vdso [34/46] scripts, lto: disable gcc LTO for some mod sources [35/46] Kbuild, lto: disable gcc LTO for bounds+asm-offsets [36/46] lib/string, lto: disable gcc LTO for string.o [37/46] Compiler attributes, lto: disable __flatten with LTO [38/46] Kbuild, lto: don't include weak source file symbols in System.map [39/46] x86, lto: Disable relative init pointers with gcc LTO [40/46] x86/livepatch, lto: Disable live patching with gcc LTO [41/46] x86/lib, lto: Mark 32bit mem{cpy,move,set} as __used [42/46] mm/kasan, lto: Mark kasan mem{cpy,move,set} as __used [43/46] scripts, lto: check C symbols for modversions [44/46] scripts/bloat-o-meter, lto: handle gcc LTO [45/46] kasan, lto: remove extra BUILD_BUG() in memory_is_poisoned [46/46] x86, lto: Finally enable gcc LTO for x86

Commit Message

Jiri Slaby Nov. 14, 2022, 11:43 a.m. UTC

  From: Jiri Slaby <jslaby@suse.cz>

gcc LTO can put assembler top level statements into other assembler
files. The BTF IDs assumed that they are in the same file. We need to
make all BTF IDs global to work around this.

This is a preparation for that, as we will pass __global_on_lto as
scope. That is macro that expands either to "globl" or "local" depending
whether LTO is enabled.

That wouldn't work without this patch as we stringify scope at the
moment.

Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: Andrii Nakryiko <andrii@kernel.org>
Cc: Martin KaFai Lau <martin.lau@linux.dev>
Cc: Song Liu <song@kernel.org>
Cc: Yonghong Song <yhs@fb.com>
Cc: John Fastabend <john.fastabend@gmail.com>
Cc: KP Singh <kpsingh@kernel.org>
Cc: Stanislav Fomichev <sdf@google.com>
Cc: Hao Luo <haoluo@google.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: bpf@vger.kernel.org
Cc: Martin Liska <mliska@suse.cz>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
 include/linux/btf_ids.h | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff mbox series

Patch

diff --git a/include/linux/btf_ids.h b/include/linux/btf_ids.h
index 2aea877d644f..3011757a48ef 100644
--- a/include/linux/btf_ids.h
+++ b/include/linux/btf_ids.h
@@ -83,16 +83,16 @@  word							\
 #define __BTF_ID_LIST(name, scope)			\
 asm(							\
 ".pushsection " BTF_IDS_SECTION ",\"a\";       \n"	\
-"." #scope " " #name ";                        \n"	\
+"." scope " " #name ";                         \n"	\
 #name ":;                                      \n"	\
 ".popsection;                                  \n");
 
 #define BTF_ID_LIST(name)				\
-__BTF_ID_LIST(name, local)				\
+__BTF_ID_LIST(name, "local")				\
 extern u32 name[];
 
 #define BTF_ID_LIST_GLOBAL(name, n)			\
-__BTF_ID_LIST(name, globl)
+__BTF_ID_LIST(name, "globl")
 
 /* The BTF_ID_LIST_SINGLE macro defines a BTF_ID_LIST with
  * a single entry.
@@ -142,18 +142,18 @@  asm(							\
 #define __BTF_SET_START(name, scope)			\
 asm(							\
 ".pushsection " BTF_IDS_SECTION ",\"a\";       \n"	\
-"." #scope " __BTF_ID__set__" #name ";         \n"	\
+"." scope " __BTF_ID__set__" #name ";          \n"	\
 "__BTF_ID__set__" #name ":;                    \n"	\
 ".zero 4                                       \n"	\
 ".popsection;                                  \n");
 
 #define BTF_SET_START(name)				\
-__BTF_ID_LIST(name, local)				\
-__BTF_SET_START(name, local)
+__BTF_ID_LIST(name, "local")				\
+__BTF_SET_START(name, "local")
 
 #define BTF_SET_START_GLOBAL(name)			\
-__BTF_ID_LIST(name, globl)				\
-__BTF_SET_START(name, globl)
+__BTF_ID_LIST(name, "globl")				\
+__BTF_SET_START(name, "globl")
 
 #define BTF_SET_END(name)				\
 asm(							\
@@ -186,14 +186,14 @@  extern struct btf_id_set name;
 #define __BTF_SET8_START(name, scope)			\
 asm(							\
 ".pushsection " BTF_IDS_SECTION ",\"a\";       \n"	\
-"." #scope " __BTF_ID__set8__" #name ";        \n"	\
+"." scope " __BTF_ID__set8__" #name ";         \n"	\
 "__BTF_ID__set8__" #name ":;                   \n"	\
 ".zero 8                                       \n"	\
 ".popsection;                                  \n");
 
 #define BTF_SET8_START(name)				\
-__BTF_ID_LIST(name, local)				\
-__BTF_SET8_START(name, local)
+__BTF_ID_LIST(name, "local")				\
+__BTF_SET8_START(name, "local")
 
 #define BTF_SET8_END(name)				\
 asm(							\