From: Brian Gerst <brgerst@gmail.com>
To: linux-kernel@vger.kernel.org, x86@kernel.org
Cc: Ingo Molnar <mingo@kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
Borislav Petkov <bp@alien8.de>, "H . Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
Uros Bizjak <ubizjak@gmail.com>,
David.Laight@aculab.com, Brian Gerst <brgerst@gmail.com>
Subject: [PATCH v3 05/14] x86/relocs: Handle R_X86_64_REX_GOTPCRELX relocations
Date: Wed, 15 Nov 2023 12:36:59 -0500 [thread overview]
Message-ID: <20231115173708.108316-6-brgerst@gmail.com> (raw)
In-Reply-To: <20231115173708.108316-1-brgerst@gmail.com>
Clang may produce R_X86_64_REX_GOTPCRELX relocations when redefining the
stack protector location. Treat them as another type of PC-relative
relocation.
Signed-off-by: Brian Gerst <brgerst@gmail.com>
---
arch/x86/tools/relocs.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c
index d30949e25ebd..24ad10c62840 100644
--- a/arch/x86/tools/relocs.c
+++ b/arch/x86/tools/relocs.c
@@ -31,6 +31,11 @@ static struct relocs relocs32;
static struct relocs relocs32neg;
static struct relocs relocs64;
#define FMT PRIu64
+
+#ifndef R_X86_64_REX_GOTPCRELX
+#define R_X86_64_REX_GOTPCRELX 42
+#endif
+
#else
#define FMT PRIu32
#endif
@@ -224,6 +229,7 @@ static const char *rel_type(unsigned type)
REL_TYPE(R_X86_64_PC16),
REL_TYPE(R_X86_64_8),
REL_TYPE(R_X86_64_PC8),
+ REL_TYPE(R_X86_64_REX_GOTPCRELX),
#else
REL_TYPE(R_386_NONE),
REL_TYPE(R_386_32),
@@ -848,6 +854,7 @@ static int do_reloc64(struct section *sec, Elf_Rel *rel, ElfW(Sym) *sym,
case R_X86_64_PC32:
case R_X86_64_PLT32:
+ case R_X86_64_REX_GOTPCRELX:
/*
* PC relative relocations don't need to be adjusted unless
* referencing a percpu symbol.
--
2.41.0
next prev parent reply other threads:[~2023-11-15 17:37 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-15 17:36 [PATCH v3 00/14] x86-64: Stack protector and percpu improvements Brian Gerst
2023-11-15 17:36 ` [PATCH v3 01/14] x86/stackprotector/32: Remove stack protector test script Brian Gerst
2023-11-15 17:36 ` [PATCH v3 02/14] x86/stackprotector/64: " Brian Gerst
2023-11-15 17:36 ` [PATCH v3 03/14] x86/boot: Disable stack protector for early boot code Brian Gerst
2023-11-15 17:36 ` [PATCH v3 04/14] x86/pvh: Use fixed_percpu_data for early boot GSBASE Brian Gerst
2023-11-15 17:36 ` Brian Gerst [this message]
2023-11-15 17:37 ` [PATCH v3 06/14] objtool: Allow adding relocations to an existing section Brian Gerst
2023-11-15 17:37 ` [PATCH v3 07/14] objtool: Convert fixed location stack protector accesses Brian Gerst
2023-11-15 17:37 ` [PATCH v3 08/14] x86/stackprotector/64: Convert to normal percpu variable Brian Gerst
2023-11-15 17:37 ` [PATCH v3 09/14] x86/percpu/64: Use relative percpu offsets Brian Gerst
2023-11-15 17:37 ` [PATCH v3 10/14] x86/percpu/64: Remove fixed_percpu_data Brian Gerst
2023-11-15 17:37 ` [PATCH v3 11/14] x86/boot/64: Remove inverse relocations Brian Gerst
2023-11-15 17:37 ` [PATCH v3 12/14] x86/percpu/64: Remove INIT_PER_CPU macros Brian Gerst
2023-11-15 17:37 ` [PATCH v3 13/14] percpu: Remove PER_CPU_FIRST_SECTION Brian Gerst
2023-11-15 17:37 ` [PATCH v3 14/14] kallsyms: Remove KALLSYMS_ABSOLUTE_PERCPU Brian Gerst
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=20231115173708.108316-6-brgerst@gmail.com \
--to=brgerst@gmail.com \
--cc=David.Laight@aculab.com \
--cc=bp@alien8.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=ubizjak@gmail.com \
--cc=x86@kernel.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