From: Ard Biesheuvel <ardb+git@google.com>
To: linux-kernel@vger.kernel.org
Cc: Ard Biesheuvel <ardb@kernel.org>,
x86@kernel.org, "H. Peter Anvin" <hpa@zytor.com>,
Andy Lutomirski <luto@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
Uros Bizjak <ubizjak@gmail.com>, Dennis Zhou <dennis@kernel.org>,
Tejun Heo <tj@kernel.org>, Christoph Lameter <cl@linux.com>,
Mathieu Desnoyers <mathieu.desnoyers@efficios.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Vitaly Kuznetsov <vkuznets@redhat.com>,
Juergen Gross <jgross@suse.com>,
Boris Ostrovsky <boris.ostrovsky@oracle.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Arnd Bergmann <arnd@arndb.de>,
Masahiro Yamada <masahiroy@kernel.org>,
Kees Cook <kees@kernel.org>,
Nathan Chancellor <nathan@kernel.org>,
Keith Packard <keithp@keithp.com>,
Justin Stitt <justinstitt@google.com>,
Josh Poimboeuf <jpoimboe@kernel.org>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Namhyung Kim <namhyung@kernel.org>, Jiri Olsa <jolsa@kernel.org>,
Ian Rogers <irogers@google.com>,
Adrian Hunter <adrian.hunter@intel.com>,
Kan Liang <kan.liang@linux.intel.com>,
linux-doc@vger.kernel.org, linux-pm@vger.kernel.org,
kvm@vger.kernel.org, xen-devel@lists.xenproject.org,
linux-efi@vger.kernel.org, linux-arch@vger.kernel.org,
linux-sparse@vger.kernel.org, linux-kbuild@vger.kernel.org,
linux-perf-users@vger.kernel.org,
rust-for-linux@vger.kernel.org, llvm@lists.linux.dev
Subject: [RFC PATCH 24/28] tools/objtool: Treat indirect ftrace calls as direct calls
Date: Wed, 25 Sep 2024 17:01:24 +0200 [thread overview]
Message-ID: <20240925150059.3955569-54-ardb+git@google.com> (raw)
In-Reply-To: <20240925150059.3955569-30-ardb+git@google.com>
From: Ard Biesheuvel <ardb@kernel.org>
In some cases, the compiler may rely on indirect calls using GOT slots
as memory operands to emit function calls. This leaves it up to the
linker to relax the call to a direct call if possible, i.e., if the
destination address is known at link time and in range, which may not be
the case when building shared libraries for user space.
On x86, this may happen when building in PIC mode with ftrace enabled,
and given that vmlinux is a fully linked binary, this relaxation is
always possible, and therefore mandatory per the x86_64 psABI.
This means that the indirect calls to __fentry__ that are observeable in
vmlinux.o will have been converted to direct calls in vmlinux, and can
be treated as such by objtool.
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
---
tools/objtool/check.c | 32 ++++++++++++++++++--
1 file changed, 30 insertions(+), 2 deletions(-)
diff --git a/tools/objtool/check.c b/tools/objtool/check.c
index 04725bd83232..94a56099e22d 100644
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@ -1696,11 +1696,39 @@ static int add_call_destinations(struct objtool_file *file)
struct reloc *reloc;
for_each_insn(file, insn) {
- if (insn->type != INSN_CALL)
+ if (insn->type != INSN_CALL &&
+ insn->type != INSN_CALL_DYNAMIC)
continue;
reloc = insn_reloc(file, insn);
- if (!reloc) {
+ if (insn->type == INSN_CALL_DYNAMIC) {
+ if (!reloc)
+ continue;
+
+ /*
+ * GCC 13 and older on x86 will always emit the call to
+ * __fentry__ using a relaxable GOT-based symbol
+ * reference when operating in PIC mode, i.e.,
+ *
+ * call *0x0(%rip)
+ * R_X86_64_GOTPCRELX __fentry__-0x4
+ *
+ * where it is left up to the linker to relax this into
+ *
+ * call __fentry__
+ * nop
+ *
+ * if __fentry__ turns out to be DSO local, which is
+ * always the case for vmlinux. Given that this
+ * relaxation is mandatory per the x86_64 psABI, these
+ * calls can simply be treated as direct calls.
+ */
+ if (arch_ftrace_match(reloc->sym->name)) {
+ insn->type = INSN_CALL;
+ add_call_dest(file, insn, reloc->sym, false);
+ }
+
+ } else if (!reloc) {
dest_off = arch_jump_destination(insn);
dest = find_call_destination(insn->sec, dest_off);
--
2.46.0.792.g87dc391469-goog
next prev parent reply other threads:[~2024-09-25 15:02 UTC|newest]
Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-25 15:01 [RFC PATCH 00/28] x86: Rely on toolchain for relocatable code Ard Biesheuvel
2024-09-25 15:01 ` [RFC PATCH 01/28] x86/pvh: Call C code via the kernel virtual mapping Ard Biesheuvel
2024-09-25 21:12 ` Jason Andryuk
2024-09-25 15:01 ` [RFC PATCH 02/28] Documentation: Bump minimum GCC version to 8.1 Ard Biesheuvel
2024-09-25 15:58 ` Arnd Bergmann
2024-12-19 11:53 ` Mark Rutland
2024-12-19 12:02 ` Arnd Bergmann
2024-09-26 21:35 ` Miguel Ojeda
2024-09-27 16:22 ` Mark Rutland
2024-09-25 15:01 ` [RFC PATCH 03/28] x86/tools: Use mmap() to simplify relocs host tool Ard Biesheuvel
2024-09-25 15:01 ` [RFC PATCH 04/28] x86/boot: Permit GOTPCREL relocations for x86_64 builds Ard Biesheuvel
2024-10-01 5:33 ` Josh Poimboeuf
2024-10-01 6:56 ` Ard Biesheuvel
2024-09-25 15:01 ` [RFC PATCH 05/28] x86: Define the stack protector guard symbol explicitly Ard Biesheuvel
2024-09-25 15:53 ` Ian Rogers
2024-09-25 17:43 ` Ard Biesheuvel
2024-09-25 17:48 ` Ian Rogers
2024-09-25 18:32 ` Uros Bizjak
2024-09-28 13:41 ` Brian Gerst
2024-10-04 13:15 ` Ard Biesheuvel
2024-10-08 14:36 ` Brian Gerst
2024-10-04 10:01 ` Uros Bizjak
2024-09-25 15:01 ` [RFC PATCH 06/28] x86/percpu: Get rid of absolute per-CPU variable placement Ard Biesheuvel
2024-09-25 17:56 ` Christoph Lameter (Ampere)
2024-09-25 15:01 ` [RFC PATCH 07/28] scripts/kallsyms: Avoid 0x0 as the relative base Ard Biesheuvel
2024-09-25 15:01 ` [RFC PATCH 08/28] scripts/kallsyms: Remove support for absolute per-CPU variables Ard Biesheuvel
2024-09-25 15:01 ` [RFC PATCH 09/28] x86/tools: Remove special relocation handling for " Ard Biesheuvel
2024-09-25 15:01 ` [RFC PATCH 10/28] x86/xen: Avoid relocatable quantities in Xen ELF notes Ard Biesheuvel
2024-09-25 15:01 ` [RFC PATCH 11/28] x86/pvh: Avoid absolute symbol references in .head.text Ard Biesheuvel
2024-09-25 21:10 ` Jason Andryuk
2024-09-25 21:50 ` Ard Biesheuvel
2024-09-25 22:40 ` Jason Andryuk
2024-09-25 15:01 ` [RFC PATCH 12/28] x86/pm-trace: Use RIP-relative accesses for .tracedata Ard Biesheuvel
2024-09-25 15:01 ` [RFC PATCH 13/28] x86/kvm: Use RIP-relative addressing Ard Biesheuvel
2024-09-25 15:01 ` [RFC PATCH 14/28] x86/rethook: Use RIP-relative reference for return address Ard Biesheuvel
2024-09-25 16:39 ` Linus Torvalds
2024-09-25 16:45 ` Ard Biesheuvel
2024-09-25 15:01 ` [RFC PATCH 15/28] x86/sync_core: Use RIP-relative addressing Ard Biesheuvel
2024-09-25 15:01 ` [RFC PATCH 16/28] x86/entry_64: " Ard Biesheuvel
2024-09-25 15:01 ` [RFC PATCH 17/28] x86/hibernate: Prefer RIP-relative accesses Ard Biesheuvel
2024-09-25 15:01 ` [RFC PATCH 18/28] x86/boot/64: Determine VA/PA offset before entering C code Ard Biesheuvel
2024-09-25 15:01 ` [RFC PATCH 19/28] x86/boot/64: Avoid intentional absolute symbol references in .head.text Ard Biesheuvel
2024-09-25 15:01 ` [RFC PATCH 20/28] x64/acpi: Use PIC-compatible references in wakeup_64.S Ard Biesheuvel
2024-09-25 15:01 ` [RFC PATCH 21/28] x86/head: Use PIC-compatible symbol references in startup code Ard Biesheuvel
2024-09-25 15:01 ` [RFC PATCH 22/28] asm-generic: Treat PIC .data.rel.ro sections as .rodata Ard Biesheuvel
2024-09-25 15:01 ` [RFC PATCH 23/28] tools/objtool: Mark generated sections as writable Ard Biesheuvel
2024-09-25 15:01 ` Ard Biesheuvel [this message]
2024-10-01 7:18 ` [RFC PATCH 24/28] tools/objtool: Treat indirect ftrace calls as direct calls Josh Poimboeuf
2024-10-01 7:39 ` Ard Biesheuvel
2024-09-25 15:01 ` [RFC PATCH 25/28] x86: Use PIE codegen for the core kernel Ard Biesheuvel
2024-10-01 21:13 ` H. Peter Anvin
2024-10-02 15:25 ` Ard Biesheuvel
2024-10-02 20:01 ` Linus Torvalds
2024-10-03 11:13 ` Ard Biesheuvel
2024-10-04 21:06 ` H. Peter Anvin
2024-10-05 8:31 ` Uros Bizjak
2024-10-05 23:36 ` H. Peter Anvin
2024-10-06 0:00 ` Linus Torvalds
2024-10-06 8:06 ` Uros Bizjak
2024-10-06 7:59 ` Uros Bizjak
2024-10-06 18:00 ` David Laight
2024-10-06 19:17 ` Uros Bizjak
2024-10-06 19:38 ` H. Peter Anvin
2024-09-25 15:01 ` [RFC PATCH 26/28] x86/boot: Implement support for ELF RELA/RELR relocations Ard Biesheuvel
2024-09-25 15:01 ` [RFC PATCH 27/28] x86/kernel: Switch to PIE linking for the core kernel Ard Biesheuvel
2024-09-25 18:54 ` Uros Bizjak
2024-09-25 19:14 ` Ard Biesheuvel
2024-09-25 19:39 ` Uros Bizjak
2024-09-25 20:01 ` Ard Biesheuvel
2024-09-25 20:22 ` Uros Bizjak
2024-09-25 20:24 ` Vegard Nossum
2024-09-26 13:38 ` Ard Biesheuvel
2024-09-25 15:01 ` [RFC PATCH 28/28] x86/tools: Drop x86_64 support from 'relocs' tool Ard Biesheuvel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240925150059.3955569-54-ardb+git@google.com \
--to=ardb+git@google.com \
--cc=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=ardb@kernel.org \
--cc=arnd@arndb.de \
--cc=boris.ostrovsky@oracle.com \
--cc=cl@linux.com \
--cc=dennis@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=hpa@zytor.com \
--cc=irogers@google.com \
--cc=jgross@suse.com \
--cc=jolsa@kernel.org \
--cc=jpoimboe@kernel.org \
--cc=justinstitt@google.com \
--cc=kan.liang@linux.intel.com \
--cc=kees@kernel.org \
--cc=keithp@keithp.com \
--cc=kvm@vger.kernel.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-efi@vger.kernel.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-sparse@vger.kernel.org \
--cc=llvm@lists.linux.dev \
--cc=luto@kernel.org \
--cc=masahiroy@kernel.org \
--cc=mathieu.desnoyers@efficios.com \
--cc=namhyung@kernel.org \
--cc=nathan@kernel.org \
--cc=pbonzini@redhat.com \
--cc=peterz@infradead.org \
--cc=rust-for-linux@vger.kernel.org \
--cc=tj@kernel.org \
--cc=ubizjak@gmail.com \
--cc=vkuznets@redhat.com \
--cc=x86@kernel.org \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).