* [PATCH v5 01/24] elf, uapi: Add a header for relocation constants
2026-09-08 6:33 [PATCH v5 00/24] vdso: Reject absolute relocations during build Thomas Weißschuh
@ 2026-09-08 6:33 ` Thomas Weißschuh
2026-09-08 9:00 ` Christophe Leroy (CS GROUP)
2026-09-10 6:31 ` Mukesh Kumar Chaurasiya
2026-09-08 6:33 ` [PATCH v5 02/24] x86/elf, um/x86/elf: Move relocation constants to UAPI Thomas Weißschuh
` (22 subsequent siblings)
23 siblings, 2 replies; 53+ messages in thread
From: Thomas Weißschuh @ 2026-09-08 6:33 UTC (permalink / raw)
To: Paul Walmsley, Palmer Dabbelt, Albert Ou, Alexandre Ghiti,
Nathan Chancellor, Nick Desaulniers, Bill Wendling, Justin Stitt,
Andy Lutomirski, Vincenzo Frascino, Kees Cook, Ingo Molnar,
Borislav Petkov, Dave Hansen, x86, H. Peter Anvin,
Richard Weinberger, Anton Ivanov, Johannes Berg, Russell King,
Catalin Marinas, Will Deacon, Madhavan Srinivasan,
Michael Ellerman, Nicholas Piggin, Huacai Chen, WANG Xuerui,
Heiko Carstens, Vasily Gorbik, Alexander Gordeev,
Christian Borntraeger, Sven Schnelle, Thomas Bogendoerfer,
Miguel Ojeda, Alex Gaynor, Gary Guo, Björn Roy Baron,
Benno Lossin, Andreas Hindborg, Alice Ryhl, Trevor Gross,
Danilo Krummrich, Thomas Gleixner, Christophe Leroy, Boqun Feng,
Nicolas Schier
Cc: linux-riscv, linux-kernel, llvm, linux-mm, linux-um,
linux-arm-kernel, linuxppc-dev, loongarch, linux-s390, linux-mips,
rust-for-linux, linux-kbuild, Jan Stancek,
Arnaldo Carvalho de Melo, Alexandre Ghiti, Thomas Weißschuh
While the numeric constants for relocations are architecture specific,
it is still useful to get access to them from other architectures.
Also the definitions are useful for userspace in general.
For example tools processing elf files during a kernel cross-compilation
can make use of them.
Introduce a dedicated header for them, similar to the elf-em.h header.
For now the header is empty but it will be filled step by step in
upcomming commits.
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
---
include/uapi/linux/elf-r.h | 5 +++++
include/uapi/linux/elf.h | 1 +
2 files changed, 6 insertions(+)
diff --git a/include/uapi/linux/elf-r.h b/include/uapi/linux/elf-r.h
new file mode 100644
index 000000000000..2c382c8a4807
--- /dev/null
+++ b/include/uapi/linux/elf-r.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
+#ifndef _UAPI_LINUX_ELF_R_H
+#define _UAPI_LINUX_ELF_R_H
+
+#endif /* _UAPI_LINUX_ELF_R_H */
diff --git a/include/uapi/linux/elf.h b/include/uapi/linux/elf.h
index ee30dcd80901..b3e312255552 100644
--- a/include/uapi/linux/elf.h
+++ b/include/uapi/linux/elf.h
@@ -4,6 +4,7 @@
#include <linux/types.h>
#include <linux/elf-em.h>
+#include <linux/elf-r.h>
/* 32-bit ELF base types. */
typedef __u32 Elf32_Addr;
--
2.55.0
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 53+ messages in thread* Re: [PATCH v5 01/24] elf, uapi: Add a header for relocation constants
2026-09-08 6:33 ` [PATCH v5 01/24] elf, uapi: Add a header for relocation constants Thomas Weißschuh
@ 2026-09-08 9:00 ` Christophe Leroy (CS GROUP)
2026-09-10 6:31 ` Mukesh Kumar Chaurasiya
1 sibling, 0 replies; 53+ messages in thread
From: Christophe Leroy (CS GROUP) @ 2026-09-08 9:00 UTC (permalink / raw)
To: Thomas Weißschuh, Paul Walmsley, Palmer Dabbelt, Albert Ou,
Alexandre Ghiti, Nathan Chancellor, Nick Desaulniers,
Bill Wendling, Justin Stitt, Andy Lutomirski, Vincenzo Frascino,
Kees Cook, Ingo Molnar, Borislav Petkov, Dave Hansen, x86,
H. Peter Anvin, Richard Weinberger, Anton Ivanov, Johannes Berg,
Russell King, Catalin Marinas, Will Deacon, Madhavan Srinivasan,
Michael Ellerman, Nicholas Piggin, Huacai Chen, WANG Xuerui,
Heiko Carstens, Vasily Gorbik, Alexander Gordeev,
Christian Borntraeger, Sven Schnelle, Thomas Bogendoerfer,
Miguel Ojeda, Alex Gaynor, Gary Guo, Björn Roy Baron,
Benno Lossin, Andreas Hindborg, Alice Ryhl, Trevor Gross,
Danilo Krummrich, Thomas Gleixner, Boqun Feng, Nicolas Schier
Cc: linux-riscv, linux-kernel, llvm, linux-mm, linux-um,
linux-arm-kernel, linuxppc-dev, loongarch, linux-s390, linux-mips,
rust-for-linux, linux-kbuild, Jan Stancek,
Arnaldo Carvalho de Melo, Alexandre Ghiti
Le 08/09/2026 à 08:33, Thomas Weißschuh a écrit :
> While the numeric constants for relocations are architecture specific,
> it is still useful to get access to them from other architectures.
> Also the definitions are useful for userspace in general.
> For example tools processing elf files during a kernel cross-compilation
> can make use of them.
>
> Introduce a dedicated header for them, similar to the elf-em.h header.
> For now the header is empty but it will be filled step by step in
> upcomming commits.
>
> Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Reviewed-by: Christophe Leroy (CS GROUP) <chleroy@kernel.org>
> ---
> include/uapi/linux/elf-r.h | 5 +++++
> include/uapi/linux/elf.h | 1 +
> 2 files changed, 6 insertions(+)
>
> diff --git a/include/uapi/linux/elf-r.h b/include/uapi/linux/elf-r.h
> new file mode 100644
> index 000000000000..2c382c8a4807
> --- /dev/null
> +++ b/include/uapi/linux/elf-r.h
> @@ -0,0 +1,5 @@
> +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
> +#ifndef _UAPI_LINUX_ELF_R_H
> +#define _UAPI_LINUX_ELF_R_H
> +
> +#endif /* _UAPI_LINUX_ELF_R_H */
> diff --git a/include/uapi/linux/elf.h b/include/uapi/linux/elf.h
> index ee30dcd80901..b3e312255552 100644
> --- a/include/uapi/linux/elf.h
> +++ b/include/uapi/linux/elf.h
> @@ -4,6 +4,7 @@
>
> #include <linux/types.h>
> #include <linux/elf-em.h>
> +#include <linux/elf-r.h>
>
> /* 32-bit ELF base types. */
> typedef __u32 Elf32_Addr;
>
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v5 01/24] elf, uapi: Add a header for relocation constants
2026-09-08 6:33 ` [PATCH v5 01/24] elf, uapi: Add a header for relocation constants Thomas Weißschuh
2026-09-08 9:00 ` Christophe Leroy (CS GROUP)
@ 2026-09-10 6:31 ` Mukesh Kumar Chaurasiya
1 sibling, 0 replies; 53+ messages in thread
From: Mukesh Kumar Chaurasiya @ 2026-09-10 6:31 UTC (permalink / raw)
To: Thomas Weißschuh
Cc: Paul Walmsley, Palmer Dabbelt, Albert Ou, Alexandre Ghiti,
Nathan Chancellor, Nick Desaulniers, Bill Wendling, Justin Stitt,
Andy Lutomirski, Vincenzo Frascino, Kees Cook, Ingo Molnar,
Borislav Petkov, Dave Hansen, x86, H. Peter Anvin,
Richard Weinberger, Anton Ivanov, Johannes Berg, Russell King,
Catalin Marinas, Will Deacon, Madhavan Srinivasan,
Michael Ellerman, Nicholas Piggin, Huacai Chen, WANG Xuerui,
Heiko Carstens, Vasily Gorbik, Alexander Gordeev,
Christian Borntraeger, Sven Schnelle, Thomas Bogendoerfer,
Miguel Ojeda, Alex Gaynor, Gary Guo, Björn Roy Baron,
Benno Lossin, Andreas Hindborg, Alice Ryhl, Trevor Gross,
Danilo Krummrich, Thomas Gleixner, Christophe Leroy, Boqun Feng,
Nicolas Schier, linux-riscv, linux-kernel, llvm, linux-mm,
linux-um, linux-arm-kernel, linuxppc-dev, loongarch, linux-s390,
linux-mips, rust-for-linux, linux-kbuild, Jan Stancek,
Arnaldo Carvalho de Melo, Alexandre Ghiti
On Tue, Sep 08, 2026 at 08:33:35AM +0200, Thomas Weißschuh wrote:
> While the numeric constants for relocations are architecture specific,
> it is still useful to get access to them from other architectures.
> Also the definitions are useful for userspace in general.
> For example tools processing elf files during a kernel cross-compilation
> can make use of them.
>
> Introduce a dedicated header for them, similar to the elf-em.h header.
> For now the header is empty but it will be filled step by step in
> upcomming commits.
>
> Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
> ---
> include/uapi/linux/elf-r.h | 5 +++++
> include/uapi/linux/elf.h | 1 +
> 2 files changed, 6 insertions(+)
>
> diff --git a/include/uapi/linux/elf-r.h b/include/uapi/linux/elf-r.h
> new file mode 100644
> index 000000000000..2c382c8a4807
> --- /dev/null
> +++ b/include/uapi/linux/elf-r.h
> @@ -0,0 +1,5 @@
> +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
> +#ifndef _UAPI_LINUX_ELF_R_H
> +#define _UAPI_LINUX_ELF_R_H
> +
> +#endif /* _UAPI_LINUX_ELF_R_H */
> diff --git a/include/uapi/linux/elf.h b/include/uapi/linux/elf.h
> index ee30dcd80901..b3e312255552 100644
> --- a/include/uapi/linux/elf.h
> +++ b/include/uapi/linux/elf.h
> @@ -4,6 +4,7 @@
>
> #include <linux/types.h>
> #include <linux/elf-em.h>
> +#include <linux/elf-r.h>
>
> /* 32-bit ELF base types. */
> typedef __u32 Elf32_Addr;
>
> --
> 2.55.0
>
Reviewed-by: Mukesh Kumar Chaurasiya (IBM) <mkchauras@gmail.com>
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 53+ messages in thread
* [PATCH v5 02/24] x86/elf, um/x86/elf: Move relocation constants to UAPI
2026-09-08 6:33 [PATCH v5 00/24] vdso: Reject absolute relocations during build Thomas Weißschuh
2026-09-08 6:33 ` [PATCH v5 01/24] elf, uapi: Add a header for relocation constants Thomas Weißschuh
@ 2026-09-08 6:33 ` Thomas Weißschuh
2026-09-08 13:55 ` Borislav Petkov
2026-09-08 6:33 ` [PATCH v5 03/24] ARM: elf: " Thomas Weißschuh
` (21 subsequent siblings)
23 siblings, 1 reply; 53+ messages in thread
From: Thomas Weißschuh @ 2026-09-08 6:33 UTC (permalink / raw)
To: Paul Walmsley, Palmer Dabbelt, Albert Ou, Alexandre Ghiti,
Nathan Chancellor, Nick Desaulniers, Bill Wendling, Justin Stitt,
Andy Lutomirski, Vincenzo Frascino, Kees Cook, Ingo Molnar,
Borislav Petkov, Dave Hansen, x86, H. Peter Anvin,
Richard Weinberger, Anton Ivanov, Johannes Berg, Russell King,
Catalin Marinas, Will Deacon, Madhavan Srinivasan,
Michael Ellerman, Nicholas Piggin, Huacai Chen, WANG Xuerui,
Heiko Carstens, Vasily Gorbik, Alexander Gordeev,
Christian Borntraeger, Sven Schnelle, Thomas Bogendoerfer,
Miguel Ojeda, Alex Gaynor, Gary Guo, Björn Roy Baron,
Benno Lossin, Andreas Hindborg, Alice Ryhl, Trevor Gross,
Danilo Krummrich, Thomas Gleixner, Christophe Leroy, Boqun Feng,
Nicolas Schier
Cc: linux-riscv, linux-kernel, llvm, linux-mm, linux-um,
linux-arm-kernel, linuxppc-dev, loongarch, linux-s390, linux-mips,
rust-for-linux, linux-kbuild, Jan Stancek,
Arnaldo Carvalho de Melo, Alexandre Ghiti, Thomas Weißschuh
These constants are useful for cross-platform userspace, for example to
process ELF files during kernel cross-compilation.
Move them from the kernel-private architecture-specific header to the UAPI.
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
---
arch/x86/include/asm/elf.h | 33 ---------------------------------
arch/x86/um/asm/elf.h | 33 ---------------------------------
include/uapi/linux/elf-r.h | 34 ++++++++++++++++++++++++++++++++++
3 files changed, 34 insertions(+), 66 deletions(-)
diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h
index 4133c790e71a..ad84c0f60459 100644
--- a/arch/x86/include/asm/elf.h
+++ b/arch/x86/include/asm/elf.h
@@ -22,19 +22,6 @@ typedef struct user_i387_struct elf_fpregset_t;
#ifdef __i386__
-#define R_386_NONE 0
-#define R_386_32 1
-#define R_386_PC32 2
-#define R_386_GOT32 3
-#define R_386_PLT32 4
-#define R_386_COPY 5
-#define R_386_GLOB_DAT 6
-#define R_386_JMP_SLOT 7
-#define R_386_RELATIVE 8
-#define R_386_GOTOFF 9
-#define R_386_GOTPC 10
-#define R_386_NUM 11
-
/*
* These are used to set parameters in the core dumps.
*/
@@ -44,26 +31,6 @@ typedef struct user_i387_struct elf_fpregset_t;
#else
-/* x86-64 relocation types */
-#define R_X86_64_NONE 0 /* No reloc */
-#define R_X86_64_64 1 /* Direct 64 bit */
-#define R_X86_64_PC32 2 /* PC relative 32 bit signed */
-#define R_X86_64_GOT32 3 /* 32 bit GOT entry */
-#define R_X86_64_PLT32 4 /* 32 bit PLT address */
-#define R_X86_64_COPY 5 /* Copy symbol at runtime */
-#define R_X86_64_GLOB_DAT 6 /* Create GOT entry */
-#define R_X86_64_JUMP_SLOT 7 /* Create PLT entry */
-#define R_X86_64_RELATIVE 8 /* Adjust by program base */
-#define R_X86_64_GOTPCREL 9 /* 32 bit signed pc relative
- offset to GOT */
-#define R_X86_64_32 10 /* Direct 32 bit zero extended */
-#define R_X86_64_32S 11 /* Direct 32 bit sign extended */
-#define R_X86_64_16 12 /* Direct 16 bit zero extended */
-#define R_X86_64_PC16 13 /* 16 bit sign extended pc relative */
-#define R_X86_64_8 14 /* Direct 8 bit sign extended */
-#define R_X86_64_PC8 15 /* 8 bit sign extended pc relative */
-#define R_X86_64_PC64 24 /* Place relative 64-bit signed */
-
/*
* These are used to set parameters in the core dumps.
*/
diff --git a/arch/x86/um/asm/elf.h b/arch/x86/um/asm/elf.h
index 22d0111b543b..b768497d5ee1 100644
--- a/arch/x86/um/asm/elf.h
+++ b/arch/x86/um/asm/elf.h
@@ -12,19 +12,6 @@
#ifdef CONFIG_X86_32
-#define R_386_NONE 0
-#define R_386_32 1
-#define R_386_PC32 2
-#define R_386_GOT32 3
-#define R_386_PLT32 4
-#define R_386_COPY 5
-#define R_386_GLOB_DAT 6
-#define R_386_JMP_SLOT 7
-#define R_386_RELATIVE 8
-#define R_386_GOTOFF 9
-#define R_386_GOTPC 10
-#define R_386_NUM 11
-
/*
* This is used to ensure we don't load something for the wrong architecture.
*/
@@ -72,26 +59,6 @@
#else
-/* x86-64 relocation types, taken from asm-x86_64/elf.h */
-#define R_X86_64_NONE 0 /* No reloc */
-#define R_X86_64_64 1 /* Direct 64 bit */
-#define R_X86_64_PC32 2 /* PC relative 32 bit signed */
-#define R_X86_64_GOT32 3 /* 32 bit GOT entry */
-#define R_X86_64_PLT32 4 /* 32 bit PLT address */
-#define R_X86_64_COPY 5 /* Copy symbol at runtime */
-#define R_X86_64_GLOB_DAT 6 /* Create GOT entry */
-#define R_X86_64_JUMP_SLOT 7 /* Create PLT entry */
-#define R_X86_64_RELATIVE 8 /* Adjust by program base */
-#define R_X86_64_GOTPCREL 9 /* 32 bit signed pc relative
- offset to GOT */
-#define R_X86_64_32 10 /* Direct 32 bit zero extended */
-#define R_X86_64_32S 11 /* Direct 32 bit sign extended */
-#define R_X86_64_16 12 /* Direct 16 bit zero extended */
-#define R_X86_64_PC16 13 /* 16 bit sign extended pc relative */
-#define R_X86_64_8 14 /* Direct 8 bit sign extended */
-#define R_X86_64_PC8 15 /* 8 bit sign extended pc relative */
-#define R_X86_64_PC64 24 /* Place relative 64-bit signed */
-
/*
* This is used to ensure we don't load something for the wrong architecture.
*/
diff --git a/include/uapi/linux/elf-r.h b/include/uapi/linux/elf-r.h
index 2c382c8a4807..45a160ecf405 100644
--- a/include/uapi/linux/elf-r.h
+++ b/include/uapi/linux/elf-r.h
@@ -2,4 +2,38 @@
#ifndef _UAPI_LINUX_ELF_R_H
#define _UAPI_LINUX_ELF_R_H
+/* i386 relocation types */
+#define R_386_NONE 0
+#define R_386_32 1
+#define R_386_PC32 2
+#define R_386_GOT32 3
+#define R_386_PLT32 4
+#define R_386_COPY 5
+#define R_386_GLOB_DAT 6
+#define R_386_JMP_SLOT 7
+#define R_386_RELATIVE 8
+#define R_386_GOTOFF 9
+#define R_386_GOTPC 10
+#define R_386_NUM 11
+
+/* x86-64 relocation types */
+#define R_X86_64_NONE 0 /* No reloc */
+#define R_X86_64_64 1 /* Direct 64 bit */
+#define R_X86_64_PC32 2 /* PC relative 32 bit signed */
+#define R_X86_64_GOT32 3 /* 32 bit GOT entry */
+#define R_X86_64_PLT32 4 /* 32 bit PLT address */
+#define R_X86_64_COPY 5 /* Copy symbol at runtime */
+#define R_X86_64_GLOB_DAT 6 /* Create GOT entry */
+#define R_X86_64_JUMP_SLOT 7 /* Create PLT entry */
+#define R_X86_64_RELATIVE 8 /* Adjust by program base */
+#define R_X86_64_GOTPCREL 9 /* 32 bit signed pc relative
+ offset to GOT */
+#define R_X86_64_32 10 /* Direct 32 bit zero extended */
+#define R_X86_64_32S 11 /* Direct 32 bit sign extended */
+#define R_X86_64_16 12 /* Direct 16 bit zero extended */
+#define R_X86_64_PC16 13 /* 16 bit sign extended pc relative */
+#define R_X86_64_8 14 /* Direct 8 bit sign extended */
+#define R_X86_64_PC8 15 /* 8 bit sign extended pc relative */
+#define R_X86_64_PC64 24 /* Place relative 64-bit signed */
+
#endif /* _UAPI_LINUX_ELF_R_H */
--
2.55.0
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 53+ messages in thread* Re: [PATCH v5 02/24] x86/elf, um/x86/elf: Move relocation constants to UAPI
2026-09-08 6:33 ` [PATCH v5 02/24] x86/elf, um/x86/elf: Move relocation constants to UAPI Thomas Weißschuh
@ 2026-09-08 13:55 ` Borislav Petkov
2026-09-08 14:26 ` Thomas Weißschuh
2026-09-08 14:32 ` Christophe Leroy (CS GROUP)
0 siblings, 2 replies; 53+ messages in thread
From: Borislav Petkov @ 2026-09-08 13:55 UTC (permalink / raw)
To: Thomas Weißschuh
Cc: Paul Walmsley, Palmer Dabbelt, Albert Ou, Alexandre Ghiti,
Nathan Chancellor, Nick Desaulniers, Bill Wendling, Justin Stitt,
Andy Lutomirski, Vincenzo Frascino, Kees Cook, Ingo Molnar,
Dave Hansen, x86, H. Peter Anvin, Richard Weinberger,
Anton Ivanov, Johannes Berg, Russell King, Catalin Marinas,
Will Deacon, Madhavan Srinivasan, Michael Ellerman,
Nicholas Piggin, Huacai Chen, WANG Xuerui, Heiko Carstens,
Vasily Gorbik, Alexander Gordeev, Christian Borntraeger,
Sven Schnelle, Thomas Bogendoerfer, Miguel Ojeda, Alex Gaynor,
Gary Guo, Björn Roy Baron, Benno Lossin, Andreas Hindborg,
Alice Ryhl, Trevor Gross, Danilo Krummrich, Thomas Gleixner,
Christophe Leroy, Boqun Feng, Nicolas Schier, linux-riscv,
linux-kernel, llvm, linux-mm, linux-um, linux-arm-kernel,
linuxppc-dev, loongarch, linux-s390, linux-mips, rust-for-linux,
linux-kbuild, Jan Stancek, Arnaldo Carvalho de Melo,
Alexandre Ghiti
On Tue, Sep 08, 2026 at 08:33:36AM +0200, Thomas Weißschuh wrote:
> These constants are useful for cross-platform userspace, for example to
> process ELF files during kernel cross-compilation.
>
> Move them from the kernel-private architecture-specific header to the UAPI.
Why UAPI?
Why not include/linux/ ?
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 53+ messages in thread* Re: [PATCH v5 02/24] x86/elf, um/x86/elf: Move relocation constants to UAPI
2026-09-08 13:55 ` Borislav Petkov
@ 2026-09-08 14:26 ` Thomas Weißschuh
2026-09-08 15:12 ` Borislav Petkov
2026-09-08 14:32 ` Christophe Leroy (CS GROUP)
1 sibling, 1 reply; 53+ messages in thread
From: Thomas Weißschuh @ 2026-09-08 14:26 UTC (permalink / raw)
To: Borislav Petkov
Cc: Paul Walmsley, Palmer Dabbelt, Albert Ou, Alexandre Ghiti,
Nathan Chancellor, Nick Desaulniers, Bill Wendling, Justin Stitt,
Andy Lutomirski, Vincenzo Frascino, Kees Cook, Ingo Molnar,
Dave Hansen, x86, H. Peter Anvin, Richard Weinberger,
Anton Ivanov, Johannes Berg, Russell King, Catalin Marinas,
Will Deacon, Madhavan Srinivasan, Michael Ellerman,
Nicholas Piggin, Huacai Chen, WANG Xuerui, Heiko Carstens,
Vasily Gorbik, Alexander Gordeev, Christian Borntraeger,
Sven Schnelle, Thomas Bogendoerfer, Miguel Ojeda, Alex Gaynor,
Gary Guo, Björn Roy Baron, Benno Lossin, Andreas Hindborg,
Alice Ryhl, Trevor Gross, Danilo Krummrich, Thomas Gleixner,
Christophe Leroy, Boqun Feng, Nicolas Schier, linux-riscv,
linux-kernel, llvm, linux-mm, linux-um, linux-arm-kernel,
linuxppc-dev, loongarch, linux-s390, linux-mips, rust-for-linux,
linux-kbuild, Jan Stancek, Arnaldo Carvalho de Melo,
Alexandre Ghiti
On Tue, Sep 08, 2026 at 06:55:13AM -0700, Borislav Petkov wrote:
> On Tue, Sep 08, 2026 at 08:33:36AM +0200, Thomas Weißschuh wrote:
> > These constants are useful for cross-platform userspace, for example to
> > process ELF files during kernel cross-compilation.
> >
> > Move them from the kernel-private architecture-specific header to the UAPI.
>
> Why UAPI?
>
> Why not include/linux/ ?
The existing, generic ELF definitions are there.
The ELF stuff in include/linux/ is highly specific to Linux.
Also later in the patchset I want to expose the definitions to the
tools/ build. Exposing generic UAPI definitions to tools/ is a much
easier sell than include/linux/.
Thomas
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v5 02/24] x86/elf, um/x86/elf: Move relocation constants to UAPI
2026-09-08 14:26 ` Thomas Weißschuh
@ 2026-09-08 15:12 ` Borislav Petkov
2026-09-09 5:59 ` Thomas Weißschuh
0 siblings, 1 reply; 53+ messages in thread
From: Borislav Petkov @ 2026-09-08 15:12 UTC (permalink / raw)
To: Thomas Weißschuh
Cc: Paul Walmsley, Palmer Dabbelt, Albert Ou, Alexandre Ghiti,
Nathan Chancellor, Nick Desaulniers, Bill Wendling, Justin Stitt,
Andy Lutomirski, Vincenzo Frascino, Kees Cook, Ingo Molnar,
Dave Hansen, x86, H. Peter Anvin, Richard Weinberger,
Anton Ivanov, Johannes Berg, Russell King, Catalin Marinas,
Will Deacon, Madhavan Srinivasan, Michael Ellerman,
Nicholas Piggin, Huacai Chen, WANG Xuerui, Heiko Carstens,
Vasily Gorbik, Alexander Gordeev, Christian Borntraeger,
Sven Schnelle, Thomas Bogendoerfer, Miguel Ojeda, Alex Gaynor,
Gary Guo, Björn Roy Baron, Benno Lossin, Andreas Hindborg,
Alice Ryhl, Trevor Gross, Danilo Krummrich, Thomas Gleixner,
Christophe Leroy, Boqun Feng, Nicolas Schier, linux-riscv,
linux-kernel, llvm, linux-mm, linux-um, linux-arm-kernel,
linuxppc-dev, loongarch, linux-s390, linux-mips, rust-for-linux,
linux-kbuild, Jan Stancek, Arnaldo Carvalho de Melo,
Alexandre Ghiti
On Tue, Sep 08, 2026 at 04:26:00PM +0200, Thomas Weißschuh wrote:
> The existing, generic ELF definitions are there.
> The ELF stuff in include/linux/ is highly specific to Linux.
And putting them in UAPI casts them in stone. I wouldn't want to maintain them
forever if not necessary.
> Also later in the patchset I want to expose the definitions to the
> tools/ build. Exposing generic UAPI definitions to tools/ is a much
> easier sell than include/linux/.
tools/ *copies* kernel headers on a "they're needed" basis. No need to put
anything in UAPI for that.
It's even written down: tools/include/uapi/README
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 53+ messages in thread* Re: [PATCH v5 02/24] x86/elf, um/x86/elf: Move relocation constants to UAPI
2026-09-08 15:12 ` Borislav Petkov
@ 2026-09-09 5:59 ` Thomas Weißschuh
2026-09-09 14:49 ` Borislav Petkov
0 siblings, 1 reply; 53+ messages in thread
From: Thomas Weißschuh @ 2026-09-09 5:59 UTC (permalink / raw)
To: Borislav Petkov
Cc: Paul Walmsley, Palmer Dabbelt, Albert Ou, Alexandre Ghiti,
Nathan Chancellor, Nick Desaulniers, Bill Wendling, Justin Stitt,
Andy Lutomirski, Vincenzo Frascino, Kees Cook, Ingo Molnar,
Dave Hansen, x86, H. Peter Anvin, Richard Weinberger,
Anton Ivanov, Johannes Berg, Russell King, Catalin Marinas,
Will Deacon, Madhavan Srinivasan, Michael Ellerman,
Nicholas Piggin, Huacai Chen, WANG Xuerui, Heiko Carstens,
Vasily Gorbik, Alexander Gordeev, Christian Borntraeger,
Sven Schnelle, Thomas Bogendoerfer, Miguel Ojeda, Alex Gaynor,
Gary Guo, Björn Roy Baron, Benno Lossin, Andreas Hindborg,
Alice Ryhl, Trevor Gross, Danilo Krummrich, Thomas Gleixner,
Christophe Leroy, Boqun Feng, Nicolas Schier, linux-riscv,
linux-kernel, llvm, linux-mm, linux-um, linux-arm-kernel,
linuxppc-dev, loongarch, linux-s390, linux-mips, rust-for-linux,
linux-kbuild, Jan Stancek, Arnaldo Carvalho de Melo,
Alexandre Ghiti
On Tue, Sep 08, 2026 at 08:12:38AM -0700, Borislav Petkov wrote:
> On Tue, Sep 08, 2026 at 04:26:00PM +0200, Thomas Weißschuh wrote:
> > The existing, generic ELF definitions are there.
> > The ELF stuff in include/linux/ is highly specific to Linux.
>
> And putting them in UAPI casts them in stone. I wouldn't want to maintain them
> forever if not necessary.
These names and numbers are defined by the architectures' ELF specifications.
They are already cast in stone. For example see Table 4.9 of [0].
Changing them would break compilers, linkers, loaders and more or less every
existing ELF binary.
> > Also later in the patchset I want to expose the definitions to the
> > tools/ build. Exposing generic UAPI definitions to tools/ is a much
> > easier sell than include/linux/.
>
> tools/ *copies* kernel headers on a "they're needed" basis. No need to put
> anything in UAPI for that.
>
> It's even written down: tools/include/uapi/README
That is the documentation for the tools UAPI headers.
Also we already have other, closely related, ELF constants in the UAPI,
see {,tools/}include/uapi/linux/elf{,-em}.h.
[0] https://gitlab.com/x86-psABIs/x86-64-ABI/-/jobs/artifacts/master/raw/x86-64-ABI/abi.pdf?job=build
Thomas
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 53+ messages in thread* Re: [PATCH v5 02/24] x86/elf, um/x86/elf: Move relocation constants to UAPI
2026-09-09 5:59 ` Thomas Weißschuh
@ 2026-09-09 14:49 ` Borislav Petkov
2026-09-09 19:27 ` H. Peter Anvin
2026-09-10 8:33 ` Thomas Weißschuh
0 siblings, 2 replies; 53+ messages in thread
From: Borislav Petkov @ 2026-09-09 14:49 UTC (permalink / raw)
To: Thomas Weißschuh
Cc: Paul Walmsley, Palmer Dabbelt, Albert Ou, Alexandre Ghiti,
Nathan Chancellor, Nick Desaulniers, Bill Wendling, Justin Stitt,
Andy Lutomirski, Vincenzo Frascino, Kees Cook, Ingo Molnar,
Dave Hansen, x86, H. Peter Anvin, Richard Weinberger,
Anton Ivanov, Johannes Berg, Russell King, Catalin Marinas,
Will Deacon, Madhavan Srinivasan, Michael Ellerman,
Nicholas Piggin, Huacai Chen, WANG Xuerui, Heiko Carstens,
Vasily Gorbik, Alexander Gordeev, Christian Borntraeger,
Sven Schnelle, Thomas Bogendoerfer, Miguel Ojeda, Alex Gaynor,
Gary Guo, Björn Roy Baron, Benno Lossin, Andreas Hindborg,
Alice Ryhl, Trevor Gross, Danilo Krummrich, Thomas Gleixner,
Christophe Leroy, Boqun Feng, Nicolas Schier, linux-riscv,
linux-kernel, llvm, linux-mm, linux-um, linux-arm-kernel,
linuxppc-dev, loongarch, linux-s390, linux-mips, rust-for-linux,
linux-kbuild, Jan Stancek, Arnaldo Carvalho de Melo,
Alexandre Ghiti
On Wed, Sep 09, 2026 at 07:59:51AM +0200, Thomas Weißschuh wrote:
> These names and numbers are defined by the architectures' ELF specifications.
> They are already cast in stone. For example see Table 4.9 of [0].
> Changing them would break compilers, linkers, loaders and more or less every
> existing ELF binary.
So?
Your goal is to provide them to tools/. You want to provide them to
*everything*. See the discrepance here?
> That is the documentation for the tools UAPI headers.
Did you even read that file?
"Why we want a copy of kernel headers in tools?
==============================================
There used to be no copies, with tools/ code using kernel headers
directly. From time to time tools/perf/ broke due to legitimate kernel
hacking. At some point Linus complained about such direct usage. Then we
adopted the current model.
The way these headers are used in perf are not restricted to just
including them to compile something.
..."
Just read the damn thing before you reply.
> Also we already have other, closely related, ELF constants in the UAPI,
> see {,tools/}include/uapi/linux/elf{,-em}.h.
Srsly?!?
You moved them there:
commit 626fd35278295fbb21f2da331cd8028e9738d965
Author: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Date: Wed Feb 26 12:44:46 2025 +0100
tools/include: Add uapi/linux/elf.h
It will be used by the vDSO selftests.
Looking at the rest, it looks like some elf bits got exported, you added some
more and that ship has sailed. I still think us providing headers is
completely unnecessary and it will come to cause conflicts eventually but hey,
not my problem.
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 53+ messages in thread* Re: [PATCH v5 02/24] x86/elf, um/x86/elf: Move relocation constants to UAPI
2026-09-09 14:49 ` Borislav Petkov
@ 2026-09-09 19:27 ` H. Peter Anvin
2026-09-09 19:47 ` Borislav Petkov
2026-09-10 8:33 ` Thomas Weißschuh
1 sibling, 1 reply; 53+ messages in thread
From: H. Peter Anvin @ 2026-09-09 19:27 UTC (permalink / raw)
To: Borislav Petkov, Thomas Weißschuh
Cc: Paul Walmsley, Palmer Dabbelt, Albert Ou, Alexandre Ghiti,
Nathan Chancellor, Nick Desaulniers, Bill Wendling, Justin Stitt,
Andy Lutomirski, Vincenzo Frascino, Kees Cook, Ingo Molnar,
Dave Hansen, x86, Richard Weinberger, Anton Ivanov, Johannes Berg,
Russell King, Catalin Marinas, Will Deacon, Madhavan Srinivasan,
Michael Ellerman, Nicholas Piggin, Huacai Chen, WANG Xuerui,
Heiko Carstens, Vasily Gorbik, Alexander Gordeev,
Christian Borntraeger, Sven Schnelle, Thomas Bogendoerfer,
Miguel Ojeda, Alex Gaynor, Gary Guo, Björn Roy Baron,
Benno Lossin, Andreas Hindborg, Alice Ryhl, Trevor Gross,
Danilo Krummrich, Thomas Gleixner, Christophe Leroy, Boqun Feng,
Nicolas Schier, linux-riscv, linux-kernel, llvm, linux-mm,
linux-um, linux-arm-kernel, linuxppc-dev, loongarch, linux-s390,
linux-mips, rust-for-linux, linux-kbuild, Jan Stancek,
Arnaldo Carvalho de Melo, Alexandre Ghiti
On September 9, 2026 7:49:30 AM PDT, Borislav Petkov <bp@alien8.de> wrote:
>On Wed, Sep 09, 2026 at 07:59:51AM +0200, Thomas Weißschuh wrote:
>> These names and numbers are defined by the architectures' ELF specifications.
>> They are already cast in stone. For example see Table 4.9 of [0].
>> Changing them would break compilers, linkers, loaders and more or less every
>> existing ELF binary.
>
>So?
>
>Your goal is to provide them to tools/. You want to provide them to
>*everything*. See the discrepance here?
>
>> That is the documentation for the tools UAPI headers.
>
>Did you even read that file?
>
>"Why we want a copy of kernel headers in tools?
>==============================================
>
>There used to be no copies, with tools/ code using kernel headers
>directly. From time to time tools/perf/ broke due to legitimate kernel
>hacking. At some point Linus complained about such direct usage. Then we
>adopted the current model.
>
>The way these headers are used in perf are not restricted to just
>including them to compile something.
>..."
>
>Just read the damn thing before you reply.
>
>> Also we already have other, closely related, ELF constants in the UAPI,
>> see {,tools/}include/uapi/linux/elf{,-em}.h.
>
>Srsly?!?
>
>You moved them there:
>
>commit 626fd35278295fbb21f2da331cd8028e9738d965
>Author: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
>Date: Wed Feb 26 12:44:46 2025 +0100
>
> tools/include: Add uapi/linux/elf.h
>
> It will be used by the vDSO selftests.
>
>
>Looking at the rest, it looks like some elf bits got exported, you added some
>more and that ship has sailed. I still think us providing headers is
>completely unnecessary and it will come to cause conflicts eventually but hey,
>not my problem.
>
I do believe there are *some* headers that would be reasonably to export to tools/ beyond what it is in uapi; a major reason for that is that the tools are suffering from a crazy level of internal inconsistency right now.
Basically uapi ⊂ treewide ⊂ kernel, but also treewide ⊂ tools common ⊂ tool-specific...
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 53+ messages in thread* Re: [PATCH v5 02/24] x86/elf, um/x86/elf: Move relocation constants to UAPI
2026-09-09 19:27 ` H. Peter Anvin
@ 2026-09-09 19:47 ` Borislav Petkov
0 siblings, 0 replies; 53+ messages in thread
From: Borislav Petkov @ 2026-09-09 19:47 UTC (permalink / raw)
To: H. Peter Anvin
Cc: Thomas Weißschuh, Paul Walmsley, Palmer Dabbelt, Albert Ou,
Alexandre Ghiti, Nathan Chancellor, Nick Desaulniers,
Bill Wendling, Justin Stitt, Andy Lutomirski, Vincenzo Frascino,
Kees Cook, Ingo Molnar, Dave Hansen, x86, Richard Weinberger,
Anton Ivanov, Johannes Berg, Russell King, Catalin Marinas,
Will Deacon, Madhavan Srinivasan, Michael Ellerman,
Nicholas Piggin, Huacai Chen, WANG Xuerui, Heiko Carstens,
Vasily Gorbik, Alexander Gordeev, Christian Borntraeger,
Sven Schnelle, Thomas Bogendoerfer, Miguel Ojeda, Alex Gaynor,
Gary Guo, Björn Roy Baron, Benno Lossin, Andreas Hindborg,
Alice Ryhl, Trevor Gross, Danilo Krummrich, Thomas Gleixner,
Christophe Leroy, Boqun Feng, Nicolas Schier, linux-riscv,
linux-kernel, llvm, linux-mm, linux-um, linux-arm-kernel,
linuxppc-dev, loongarch, linux-s390, linux-mips, rust-for-linux,
linux-kbuild, Jan Stancek, Arnaldo Carvalho de Melo,
Alexandre Ghiti
On Wed, Sep 09, 2026 at 12:27:30PM -0700, H. Peter Anvin wrote:
> I do believe there are *some* headers that would be reasonably to export to
> tools/ beyond what it is in uapi; a major reason for that is that the tools
> are suffering from a crazy level of internal inconsistency right now.
Well, as long as it stays "internal" I don't mind.
What I do mind is this unnecessary and senseless exposure of headers.
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v5 02/24] x86/elf, um/x86/elf: Move relocation constants to UAPI
2026-09-09 14:49 ` Borislav Petkov
2026-09-09 19:27 ` H. Peter Anvin
@ 2026-09-10 8:33 ` Thomas Weißschuh
1 sibling, 0 replies; 53+ messages in thread
From: Thomas Weißschuh @ 2026-09-10 8:33 UTC (permalink / raw)
To: Borislav Petkov
Cc: Paul Walmsley, Palmer Dabbelt, Albert Ou, Alexandre Ghiti,
Nathan Chancellor, Nick Desaulniers, Bill Wendling, Justin Stitt,
Andy Lutomirski, Vincenzo Frascino, Kees Cook, Ingo Molnar,
Dave Hansen, x86, H. Peter Anvin, Richard Weinberger,
Anton Ivanov, Johannes Berg, Russell King, Catalin Marinas,
Will Deacon, Madhavan Srinivasan, Michael Ellerman,
Nicholas Piggin, Huacai Chen, WANG Xuerui, Heiko Carstens,
Vasily Gorbik, Alexander Gordeev, Christian Borntraeger,
Sven Schnelle, Thomas Bogendoerfer, Miguel Ojeda, Alex Gaynor,
Gary Guo, Björn Roy Baron, Benno Lossin, Andreas Hindborg,
Alice Ryhl, Trevor Gross, Danilo Krummrich, Thomas Gleixner,
Christophe Leroy, Boqun Feng, Nicolas Schier, linux-riscv,
linux-kernel, llvm, linux-mm, linux-um, linux-arm-kernel,
linuxppc-dev, loongarch, linux-s390, linux-mips, rust-for-linux,
linux-kbuild, Jan Stancek, Arnaldo Carvalho de Melo,
Alexandre Ghiti
On Wed, Sep 09, 2026 at 07:49:30AM -0700, Borislav Petkov wrote:
> On Wed, Sep 09, 2026 at 07:59:51AM +0200, Thomas Weißschuh wrote:
> > These names and numbers are defined by the architectures' ELF specifications.
> > They are already cast in stone. For example see Table 4.9 of [0].
> > Changing them would break compilers, linkers, loaders and more or less every
> > existing ELF binary.
>
> So?
This was a direct response to your "And putting them in UAPI casts them in
stone". With the idea that we can't possibly cast them more into stone
than they already are.
> Your goal is to provide them to tools/. You want to provide them to
> *everything*. See the discrepance here?
My goal is to make my tool work. For that I can just as well add ad-hoc
relocation constants definitions in my own code. Just as everybody else
has done, in what seems like a well-honed tradition.
Unifying the constant definitions was a preparatory cleanup step I put
in my series.
Some architectures (like x86) define the relocation constants in internal
kernel headers, but others do so in their UAPI headers, so we can't have it
in include/linux/.
As the UAPI is the common superset, and given that we already have quite some
ELF definitions in the UAPI I this is where I put the relocation constants.
We can add a tools/-specific header which is not shared with include/linux/
but then we still have duplication with the regular kernel code.
As a coincidence, these definitions in the UAPI would also be useful
for nolibc static PIE support, but that is more of a weird curiousity
and not something I want to bring up as reason here.
(...)
> > Also we already have other, closely related, ELF constants in the UAPI,
> > see {,tools/}include/uapi/linux/elf{,-em}.h.
>
> Srsly?!?
>
> You moved them there:
>
> commit 626fd35278295fbb21f2da331cd8028e9738d965
> Author: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
> Date: Wed Feb 26 12:44:46 2025 +0100
>
> tools/include: Add uapi/linux/elf.h
>
> It will be used by the vDSO selftests.
I think we are talking past each other. To me the act of "exposing
something to UAPI" is adding it to include/uapi/ (or the arch/ variants).
That is an actual change worthy of discussion, which I am happy to have.
Copying headers (UAPI or not) to tools/include/ is a rote administrative task.
The commit above is the latter.
elf.h has been part of the UAPI for as long as the UAPI exists.
> Looking at the rest, it looks like some elf bits got exported, you added some
> more and that ship has sailed.
"some elf bits got exported" undersells it a bit. There are 14 years of dozens
of people adding constants to include/uapi/linux/elf.h. So far it doesn't seem
to have been a problem.
> I still think us providing headers is completely unnecessary and it will come
> to cause conflicts eventually but hey, not my problem.
As there is pushback, I'll just drop all of the header changes.
Maybe somebody else wants to deal with it at some point. Not my problem either.
Thomas
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v5 02/24] x86/elf, um/x86/elf: Move relocation constants to UAPI
2026-09-08 13:55 ` Borislav Petkov
2026-09-08 14:26 ` Thomas Weißschuh
@ 2026-09-08 14:32 ` Christophe Leroy (CS GROUP)
1 sibling, 0 replies; 53+ messages in thread
From: Christophe Leroy (CS GROUP) @ 2026-09-08 14:32 UTC (permalink / raw)
To: Borislav Petkov, Thomas Weißschuh
Cc: Paul Walmsley, Palmer Dabbelt, Albert Ou, Alexandre Ghiti,
Nathan Chancellor, Nick Desaulniers, Bill Wendling, Justin Stitt,
Andy Lutomirski, Vincenzo Frascino, Kees Cook, Ingo Molnar,
Dave Hansen, x86, H. Peter Anvin, Richard Weinberger,
Anton Ivanov, Johannes Berg, Russell King, Catalin Marinas,
Will Deacon, Madhavan Srinivasan, Michael Ellerman,
Nicholas Piggin, Huacai Chen, WANG Xuerui, Heiko Carstens,
Vasily Gorbik, Alexander Gordeev, Christian Borntraeger,
Sven Schnelle, Thomas Bogendoerfer, Miguel Ojeda, Alex Gaynor,
Gary Guo, Björn Roy Baron, Benno Lossin, Andreas Hindborg,
Alice Ryhl, Trevor Gross, Danilo Krummrich, Thomas Gleixner,
Boqun Feng, Nicolas Schier, linux-riscv, linux-kernel, llvm,
linux-mm, linux-um, linux-arm-kernel, linuxppc-dev, loongarch,
linux-s390, linux-mips, rust-for-linux, linux-kbuild, Jan Stancek,
Arnaldo Carvalho de Melo, Alexandre Ghiti
Le 08/09/2026 à 15:55, Borislav Petkov a écrit :
> On Tue, Sep 08, 2026 at 08:33:36AM +0200, Thomas Weißschuh wrote:
>> These constants are useful for cross-platform userspace, for example to
>> process ELF files during kernel cross-compilation.
>>
>> Move them from the kernel-private architecture-specific header to the UAPI.
>
> Why UAPI?
>
> Why not include/linux/ ?
>
I guess because on some architectures it is already in UAPI, see for
instance powerpc in patch 5 ?
Christophe
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 53+ messages in thread
* [PATCH v5 03/24] ARM: elf: Move relocation constants to UAPI
2026-09-08 6:33 [PATCH v5 00/24] vdso: Reject absolute relocations during build Thomas Weißschuh
2026-09-08 6:33 ` [PATCH v5 01/24] elf, uapi: Add a header for relocation constants Thomas Weißschuh
2026-09-08 6:33 ` [PATCH v5 02/24] x86/elf, um/x86/elf: Move relocation constants to UAPI Thomas Weißschuh
@ 2026-09-08 6:33 ` Thomas Weißschuh
2026-09-08 6:33 ` [PATCH v5 04/24] arm64: " Thomas Weißschuh
` (20 subsequent siblings)
23 siblings, 0 replies; 53+ messages in thread
From: Thomas Weißschuh @ 2026-09-08 6:33 UTC (permalink / raw)
To: Paul Walmsley, Palmer Dabbelt, Albert Ou, Alexandre Ghiti,
Nathan Chancellor, Nick Desaulniers, Bill Wendling, Justin Stitt,
Andy Lutomirski, Vincenzo Frascino, Kees Cook, Ingo Molnar,
Borislav Petkov, Dave Hansen, x86, H. Peter Anvin,
Richard Weinberger, Anton Ivanov, Johannes Berg, Russell King,
Catalin Marinas, Will Deacon, Madhavan Srinivasan,
Michael Ellerman, Nicholas Piggin, Huacai Chen, WANG Xuerui,
Heiko Carstens, Vasily Gorbik, Alexander Gordeev,
Christian Borntraeger, Sven Schnelle, Thomas Bogendoerfer,
Miguel Ojeda, Alex Gaynor, Gary Guo, Björn Roy Baron,
Benno Lossin, Andreas Hindborg, Alice Ryhl, Trevor Gross,
Danilo Krummrich, Thomas Gleixner, Christophe Leroy, Boqun Feng,
Nicolas Schier
Cc: linux-riscv, linux-kernel, llvm, linux-mm, linux-um,
linux-arm-kernel, linuxppc-dev, loongarch, linux-s390, linux-mips,
rust-for-linux, linux-kbuild, Jan Stancek,
Arnaldo Carvalho de Melo, Alexandre Ghiti, Thomas Weißschuh
These constants are useful for cross-platform userspace, for example to
process ELF files during kernel cross-compilation.
Move them from the kernel-private architecture-specific header to the UAPI.
One arm64 header is also changed as it duplicates an arm definition.
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
---
arch/arm/include/asm/elf.h | 24 ------------------------
arch/arm64/include/asm/elf.h | 1 -
include/uapi/linux/elf-r.h | 25 +++++++++++++++++++++++++
3 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h
index 9f21e170320f..ec2d416baa9f 100644
--- a/arch/arm/include/asm/elf.h
+++ b/arch/arm/include/asm/elf.h
@@ -47,30 +47,6 @@ typedef struct user_fp elf_fpregset_t;
#define EF_ARM_HASENTRY 0x00000002 /* All */
#define EF_ARM_RELEXEC 0x00000001 /* All */
-#define R_ARM_NONE 0
-#define R_ARM_PC24 1
-#define R_ARM_ABS32 2
-#define R_ARM_REL32 3
-#define R_ARM_CALL 28
-#define R_ARM_JUMP24 29
-#define R_ARM_TARGET1 38
-#define R_ARM_V4BX 40
-#define R_ARM_PREL31 42
-#define R_ARM_MOVW_ABS_NC 43
-#define R_ARM_MOVT_ABS 44
-#define R_ARM_MOVW_PREL_NC 45
-#define R_ARM_MOVT_PREL 46
-#define R_ARM_ALU_PC_G0_NC 57
-#define R_ARM_ALU_PC_G1_NC 59
-#define R_ARM_LDR_PC_G2 63
-
-#define R_ARM_THM_CALL 10
-#define R_ARM_THM_JUMP24 30
-#define R_ARM_THM_MOVW_ABS_NC 47
-#define R_ARM_THM_MOVT_ABS 48
-#define R_ARM_THM_MOVW_PREL_NC 49
-#define R_ARM_THM_MOVT_PREL 50
-
/*
* These are used to set parameters in the core dumps.
*/
diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h
index d2779d604c7b..cfdf4c5ac08b 100644
--- a/arch/arm64/include/asm/elf.h
+++ b/arch/arm64/include/asm/elf.h
@@ -18,7 +18,6 @@
*/
/* Miscellaneous. */
-#define R_ARM_NONE 0
#define R_AARCH64_NONE 256
/* Data. */
diff --git a/include/uapi/linux/elf-r.h b/include/uapi/linux/elf-r.h
index 45a160ecf405..001884641e77 100644
--- a/include/uapi/linux/elf-r.h
+++ b/include/uapi/linux/elf-r.h
@@ -36,4 +36,29 @@
#define R_X86_64_PC8 15 /* 8 bit sign extended pc relative */
#define R_X86_64_PC64 24 /* Place relative 64-bit signed */
+/* arm relocation types */
+#define R_ARM_NONE 0
+#define R_ARM_PC24 1
+#define R_ARM_ABS32 2
+#define R_ARM_REL32 3
+#define R_ARM_CALL 28
+#define R_ARM_JUMP24 29
+#define R_ARM_TARGET1 38
+#define R_ARM_V4BX 40
+#define R_ARM_PREL31 42
+#define R_ARM_MOVW_ABS_NC 43
+#define R_ARM_MOVT_ABS 44
+#define R_ARM_MOVW_PREL_NC 45
+#define R_ARM_MOVT_PREL 46
+#define R_ARM_ALU_PC_G0_NC 57
+#define R_ARM_ALU_PC_G1_NC 59
+#define R_ARM_LDR_PC_G2 63
+
+#define R_ARM_THM_CALL 10
+#define R_ARM_THM_JUMP24 30
+#define R_ARM_THM_MOVW_ABS_NC 47
+#define R_ARM_THM_MOVT_ABS 48
+#define R_ARM_THM_MOVW_PREL_NC 49
+#define R_ARM_THM_MOVT_PREL 50
+
#endif /* _UAPI_LINUX_ELF_R_H */
--
2.55.0
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH v5 04/24] arm64: elf: Move relocation constants to UAPI
2026-09-08 6:33 [PATCH v5 00/24] vdso: Reject absolute relocations during build Thomas Weißschuh
` (2 preceding siblings ...)
2026-09-08 6:33 ` [PATCH v5 03/24] ARM: elf: " Thomas Weißschuh
@ 2026-09-08 6:33 ` Thomas Weißschuh
2026-09-08 6:33 ` [PATCH v5 05/24] powerpc/elf: " Thomas Weißschuh
` (19 subsequent siblings)
23 siblings, 0 replies; 53+ messages in thread
From: Thomas Weißschuh @ 2026-09-08 6:33 UTC (permalink / raw)
To: Paul Walmsley, Palmer Dabbelt, Albert Ou, Alexandre Ghiti,
Nathan Chancellor, Nick Desaulniers, Bill Wendling, Justin Stitt,
Andy Lutomirski, Vincenzo Frascino, Kees Cook, Ingo Molnar,
Borislav Petkov, Dave Hansen, x86, H. Peter Anvin,
Richard Weinberger, Anton Ivanov, Johannes Berg, Russell King,
Catalin Marinas, Will Deacon, Madhavan Srinivasan,
Michael Ellerman, Nicholas Piggin, Huacai Chen, WANG Xuerui,
Heiko Carstens, Vasily Gorbik, Alexander Gordeev,
Christian Borntraeger, Sven Schnelle, Thomas Bogendoerfer,
Miguel Ojeda, Alex Gaynor, Gary Guo, Björn Roy Baron,
Benno Lossin, Andreas Hindborg, Alice Ryhl, Trevor Gross,
Danilo Krummrich, Thomas Gleixner, Christophe Leroy, Boqun Feng,
Nicolas Schier
Cc: linux-riscv, linux-kernel, llvm, linux-mm, linux-um,
linux-arm-kernel, linuxppc-dev, loongarch, linux-s390, linux-mips,
rust-for-linux, linux-kbuild, Jan Stancek,
Arnaldo Carvalho de Melo, Alexandre Ghiti, Thomas Weißschuh
These constants are useful for cross-platform userspace, for example to
process ELF files during kernel cross-compilation.
Move them from the kernel-private architecture-specific header to the UAPI.
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
---
arch/arm64/include/asm/elf.h | 54 --------------------------------------------
include/uapi/linux/elf-r.h | 52 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 52 insertions(+), 54 deletions(-)
diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h
index cfdf4c5ac08b..43f3763807a2 100644
--- a/arch/arm64/include/asm/elf.h
+++ b/arch/arm64/include/asm/elf.h
@@ -13,60 +13,6 @@
#include <asm/ptrace.h>
#include <asm/user.h>
-/*
- * AArch64 static relocation types.
- */
-
-/* Miscellaneous. */
-#define R_AARCH64_NONE 256
-
-/* Data. */
-#define R_AARCH64_ABS64 257
-#define R_AARCH64_ABS32 258
-#define R_AARCH64_ABS16 259
-#define R_AARCH64_PREL64 260
-#define R_AARCH64_PREL32 261
-#define R_AARCH64_PREL16 262
-
-/* Instructions. */
-#define R_AARCH64_MOVW_UABS_G0 263
-#define R_AARCH64_MOVW_UABS_G0_NC 264
-#define R_AARCH64_MOVW_UABS_G1 265
-#define R_AARCH64_MOVW_UABS_G1_NC 266
-#define R_AARCH64_MOVW_UABS_G2 267
-#define R_AARCH64_MOVW_UABS_G2_NC 268
-#define R_AARCH64_MOVW_UABS_G3 269
-
-#define R_AARCH64_MOVW_SABS_G0 270
-#define R_AARCH64_MOVW_SABS_G1 271
-#define R_AARCH64_MOVW_SABS_G2 272
-
-#define R_AARCH64_LD_PREL_LO19 273
-#define R_AARCH64_ADR_PREL_LO21 274
-#define R_AARCH64_ADR_PREL_PG_HI21 275
-#define R_AARCH64_ADR_PREL_PG_HI21_NC 276
-#define R_AARCH64_ADD_ABS_LO12_NC 277
-#define R_AARCH64_LDST8_ABS_LO12_NC 278
-
-#define R_AARCH64_TSTBR14 279
-#define R_AARCH64_CONDBR19 280
-#define R_AARCH64_JUMP26 282
-#define R_AARCH64_CALL26 283
-#define R_AARCH64_LDST16_ABS_LO12_NC 284
-#define R_AARCH64_LDST32_ABS_LO12_NC 285
-#define R_AARCH64_LDST64_ABS_LO12_NC 286
-#define R_AARCH64_LDST128_ABS_LO12_NC 299
-
-#define R_AARCH64_MOVW_PREL_G0 287
-#define R_AARCH64_MOVW_PREL_G0_NC 288
-#define R_AARCH64_MOVW_PREL_G1 289
-#define R_AARCH64_MOVW_PREL_G1_NC 290
-#define R_AARCH64_MOVW_PREL_G2 291
-#define R_AARCH64_MOVW_PREL_G2_NC 292
-#define R_AARCH64_MOVW_PREL_G3 293
-
-#define R_AARCH64_RELATIVE 1027
-
/*
* These are used to set parameters in the core dumps.
*/
diff --git a/include/uapi/linux/elf-r.h b/include/uapi/linux/elf-r.h
index 001884641e77..cf931fc05afa 100644
--- a/include/uapi/linux/elf-r.h
+++ b/include/uapi/linux/elf-r.h
@@ -61,4 +61,56 @@
#define R_ARM_THM_MOVW_PREL_NC 49
#define R_ARM_THM_MOVT_PREL 50
+/* AArch64 static relocation types */
+
+/* Miscellaneous. */
+#define R_AARCH64_NONE 256
+
+/* Data. */
+#define R_AARCH64_ABS64 257
+#define R_AARCH64_ABS32 258
+#define R_AARCH64_ABS16 259
+#define R_AARCH64_PREL64 260
+#define R_AARCH64_PREL32 261
+#define R_AARCH64_PREL16 262
+
+/* Instructions. */
+#define R_AARCH64_MOVW_UABS_G0 263
+#define R_AARCH64_MOVW_UABS_G0_NC 264
+#define R_AARCH64_MOVW_UABS_G1 265
+#define R_AARCH64_MOVW_UABS_G1_NC 266
+#define R_AARCH64_MOVW_UABS_G2 267
+#define R_AARCH64_MOVW_UABS_G2_NC 268
+#define R_AARCH64_MOVW_UABS_G3 269
+
+#define R_AARCH64_MOVW_SABS_G0 270
+#define R_AARCH64_MOVW_SABS_G1 271
+#define R_AARCH64_MOVW_SABS_G2 272
+
+#define R_AARCH64_LD_PREL_LO19 273
+#define R_AARCH64_ADR_PREL_LO21 274
+#define R_AARCH64_ADR_PREL_PG_HI21 275
+#define R_AARCH64_ADR_PREL_PG_HI21_NC 276
+#define R_AARCH64_ADD_ABS_LO12_NC 277
+#define R_AARCH64_LDST8_ABS_LO12_NC 278
+
+#define R_AARCH64_TSTBR14 279
+#define R_AARCH64_CONDBR19 280
+#define R_AARCH64_JUMP26 282
+#define R_AARCH64_CALL26 283
+#define R_AARCH64_LDST16_ABS_LO12_NC 284
+#define R_AARCH64_LDST32_ABS_LO12_NC 285
+#define R_AARCH64_LDST64_ABS_LO12_NC 286
+#define R_AARCH64_LDST128_ABS_LO12_NC 299
+
+#define R_AARCH64_MOVW_PREL_G0 287
+#define R_AARCH64_MOVW_PREL_G0_NC 288
+#define R_AARCH64_MOVW_PREL_G1 289
+#define R_AARCH64_MOVW_PREL_G1_NC 290
+#define R_AARCH64_MOVW_PREL_G2 291
+#define R_AARCH64_MOVW_PREL_G2_NC 292
+#define R_AARCH64_MOVW_PREL_G3 293
+
+#define R_AARCH64_RELATIVE 1027
+
#endif /* _UAPI_LINUX_ELF_R_H */
--
2.55.0
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH v5 05/24] powerpc/elf: Move relocation constants to UAPI
2026-09-08 6:33 [PATCH v5 00/24] vdso: Reject absolute relocations during build Thomas Weißschuh
` (3 preceding siblings ...)
2026-09-08 6:33 ` [PATCH v5 04/24] arm64: " Thomas Weißschuh
@ 2026-09-08 6:33 ` Thomas Weißschuh
2026-09-08 9:02 ` Christophe Leroy (CS GROUP)
` (2 more replies)
2026-09-08 6:33 ` [PATCH v5 06/24] riscv: elf: " Thomas Weißschuh
` (18 subsequent siblings)
23 siblings, 3 replies; 53+ messages in thread
From: Thomas Weißschuh @ 2026-09-08 6:33 UTC (permalink / raw)
To: Paul Walmsley, Palmer Dabbelt, Albert Ou, Alexandre Ghiti,
Nathan Chancellor, Nick Desaulniers, Bill Wendling, Justin Stitt,
Andy Lutomirski, Vincenzo Frascino, Kees Cook, Ingo Molnar,
Borislav Petkov, Dave Hansen, x86, H. Peter Anvin,
Richard Weinberger, Anton Ivanov, Johannes Berg, Russell King,
Catalin Marinas, Will Deacon, Madhavan Srinivasan,
Michael Ellerman, Nicholas Piggin, Huacai Chen, WANG Xuerui,
Heiko Carstens, Vasily Gorbik, Alexander Gordeev,
Christian Borntraeger, Sven Schnelle, Thomas Bogendoerfer,
Miguel Ojeda, Alex Gaynor, Gary Guo, Björn Roy Baron,
Benno Lossin, Andreas Hindborg, Alice Ryhl, Trevor Gross,
Danilo Krummrich, Thomas Gleixner, Christophe Leroy, Boqun Feng,
Nicolas Schier
Cc: linux-riscv, linux-kernel, llvm, linux-mm, linux-um,
linux-arm-kernel, linuxppc-dev, loongarch, linux-s390, linux-mips,
rust-for-linux, linux-kbuild, Jan Stancek,
Arnaldo Carvalho de Melo, Alexandre Ghiti, Thomas Weißschuh
These constants are useful for cross-platform userspace, for example to
process ELF files during kernel cross-compilation.
Move them from the kernel-private architecture-specific header to the UAPI.
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
---
arch/powerpc/include/uapi/asm/elf.h | 201 ------------------------------------
include/uapi/linux/elf-r.h | 201 ++++++++++++++++++++++++++++++++++++
2 files changed, 201 insertions(+), 201 deletions(-)
diff --git a/arch/powerpc/include/uapi/asm/elf.h b/arch/powerpc/include/uapi/asm/elf.h
index a5377f494fa3..aba921b8249a 100644
--- a/arch/powerpc/include/uapi/asm/elf.h
+++ b/arch/powerpc/include/uapi/asm/elf.h
@@ -17,78 +17,6 @@
#include <asm/cputable.h>
#include <asm/auxvec.h>
-/* PowerPC relocations defined by the ABIs */
-#define R_PPC_NONE 0
-#define R_PPC_ADDR32 1 /* 32bit absolute address */
-#define R_PPC_ADDR24 2 /* 26bit address, 2 bits ignored. */
-#define R_PPC_ADDR16 3 /* 16bit absolute address */
-#define R_PPC_ADDR16_LO 4 /* lower 16bit of absolute address */
-#define R_PPC_ADDR16_HI 5 /* high 16bit of absolute address */
-#define R_PPC_ADDR16_HA 6 /* adjusted high 16bit */
-#define R_PPC_ADDR14 7 /* 16bit address, 2 bits ignored */
-#define R_PPC_ADDR14_BRTAKEN 8
-#define R_PPC_ADDR14_BRNTAKEN 9
-#define R_PPC_REL24 10 /* PC relative 26 bit */
-#define R_PPC_REL14 11 /* PC relative 16 bit */
-#define R_PPC_REL14_BRTAKEN 12
-#define R_PPC_REL14_BRNTAKEN 13
-#define R_PPC_GOT16 14
-#define R_PPC_GOT16_LO 15
-#define R_PPC_GOT16_HI 16
-#define R_PPC_GOT16_HA 17
-#define R_PPC_PLTREL24 18
-#define R_PPC_COPY 19
-#define R_PPC_GLOB_DAT 20
-#define R_PPC_JMP_SLOT 21
-#define R_PPC_RELATIVE 22
-#define R_PPC_LOCAL24PC 23
-#define R_PPC_UADDR32 24
-#define R_PPC_UADDR16 25
-#define R_PPC_REL32 26
-#define R_PPC_PLT32 27
-#define R_PPC_PLTREL32 28
-#define R_PPC_PLT16_LO 29
-#define R_PPC_PLT16_HI 30
-#define R_PPC_PLT16_HA 31
-#define R_PPC_SDAREL16 32
-#define R_PPC_SECTOFF 33
-#define R_PPC_SECTOFF_LO 34
-#define R_PPC_SECTOFF_HI 35
-#define R_PPC_SECTOFF_HA 36
-
-/* PowerPC relocations defined for the TLS access ABI. */
-#define R_PPC_TLS 67 /* none (sym+add)@tls */
-#define R_PPC_DTPMOD32 68 /* word32 (sym+add)@dtpmod */
-#define R_PPC_TPREL16 69 /* half16* (sym+add)@tprel */
-#define R_PPC_TPREL16_LO 70 /* half16 (sym+add)@tprel@l */
-#define R_PPC_TPREL16_HI 71 /* half16 (sym+add)@tprel@h */
-#define R_PPC_TPREL16_HA 72 /* half16 (sym+add)@tprel@ha */
-#define R_PPC_TPREL32 73 /* word32 (sym+add)@tprel */
-#define R_PPC_DTPREL16 74 /* half16* (sym+add)@dtprel */
-#define R_PPC_DTPREL16_LO 75 /* half16 (sym+add)@dtprel@l */
-#define R_PPC_DTPREL16_HI 76 /* half16 (sym+add)@dtprel@h */
-#define R_PPC_DTPREL16_HA 77 /* half16 (sym+add)@dtprel@ha */
-#define R_PPC_DTPREL32 78 /* word32 (sym+add)@dtprel */
-#define R_PPC_GOT_TLSGD16 79 /* half16* (sym+add)@got@tlsgd */
-#define R_PPC_GOT_TLSGD16_LO 80 /* half16 (sym+add)@got@tlsgd@l */
-#define R_PPC_GOT_TLSGD16_HI 81 /* half16 (sym+add)@got@tlsgd@h */
-#define R_PPC_GOT_TLSGD16_HA 82 /* half16 (sym+add)@got@tlsgd@ha */
-#define R_PPC_GOT_TLSLD16 83 /* half16* (sym+add)@got@tlsld */
-#define R_PPC_GOT_TLSLD16_LO 84 /* half16 (sym+add)@got@tlsld@l */
-#define R_PPC_GOT_TLSLD16_HI 85 /* half16 (sym+add)@got@tlsld@h */
-#define R_PPC_GOT_TLSLD16_HA 86 /* half16 (sym+add)@got@tlsld@ha */
-#define R_PPC_GOT_TPREL16 87 /* half16* (sym+add)@got@tprel */
-#define R_PPC_GOT_TPREL16_LO 88 /* half16 (sym+add)@got@tprel@l */
-#define R_PPC_GOT_TPREL16_HI 89 /* half16 (sym+add)@got@tprel@h */
-#define R_PPC_GOT_TPREL16_HA 90 /* half16 (sym+add)@got@tprel@ha */
-#define R_PPC_GOT_DTPREL16 91 /* half16* (sym+add)@got@dtprel */
-#define R_PPC_GOT_DTPREL16_LO 92 /* half16* (sym+add)@got@dtprel@l */
-#define R_PPC_GOT_DTPREL16_HI 93 /* half16* (sym+add)@got@dtprel@h */
-#define R_PPC_GOT_DTPREL16_HA 94 /* half16* (sym+add)@got@dtprel@ha */
-
-/* keep this the last entry. */
-#define R_PPC_NUM 95
-
#define ELF_NGREG 48 /* includes nip, msr, lr, etc. */
#define ELF_NFPREG 33 /* includes fpscr */
@@ -166,133 +94,4 @@ typedef elf_vrreg_t elf_vrregset_t32[ELF_NVRREG32];
typedef elf_fpreg_t elf_vsrreghalf_t32[ELF_NVSRHALFREG];
#endif
-/* PowerPC64 relocations defined by the ABIs */
-#define R_PPC64_NONE R_PPC_NONE
-#define R_PPC64_ADDR32 R_PPC_ADDR32 /* 32bit absolute address. */
-#define R_PPC64_ADDR24 R_PPC_ADDR24 /* 26bit address, word aligned. */
-#define R_PPC64_ADDR16 R_PPC_ADDR16 /* 16bit absolute address. */
-#define R_PPC64_ADDR16_LO R_PPC_ADDR16_LO /* lower 16bits of abs. address. */
-#define R_PPC64_ADDR16_HI R_PPC_ADDR16_HI /* high 16bits of abs. address. */
-#define R_PPC64_ADDR16_HA R_PPC_ADDR16_HA /* adjusted high 16bits. */
-#define R_PPC64_ADDR14 R_PPC_ADDR14 /* 16bit address, word aligned. */
-#define R_PPC64_ADDR14_BRTAKEN R_PPC_ADDR14_BRTAKEN
-#define R_PPC64_ADDR14_BRNTAKEN R_PPC_ADDR14_BRNTAKEN
-#define R_PPC64_REL24 R_PPC_REL24 /* PC relative 26 bit, word aligned. */
-#define R_PPC64_REL14 R_PPC_REL14 /* PC relative 16 bit. */
-#define R_PPC64_REL14_BRTAKEN R_PPC_REL14_BRTAKEN
-#define R_PPC64_REL14_BRNTAKEN R_PPC_REL14_BRNTAKEN
-#define R_PPC64_GOT16 R_PPC_GOT16
-#define R_PPC64_GOT16_LO R_PPC_GOT16_LO
-#define R_PPC64_GOT16_HI R_PPC_GOT16_HI
-#define R_PPC64_GOT16_HA R_PPC_GOT16_HA
-
-#define R_PPC64_COPY R_PPC_COPY
-#define R_PPC64_GLOB_DAT R_PPC_GLOB_DAT
-#define R_PPC64_JMP_SLOT R_PPC_JMP_SLOT
-#define R_PPC64_RELATIVE R_PPC_RELATIVE
-
-#define R_PPC64_UADDR32 R_PPC_UADDR32
-#define R_PPC64_UADDR16 R_PPC_UADDR16
-#define R_PPC64_REL32 R_PPC_REL32
-#define R_PPC64_PLT32 R_PPC_PLT32
-#define R_PPC64_PLTREL32 R_PPC_PLTREL32
-#define R_PPC64_PLT16_LO R_PPC_PLT16_LO
-#define R_PPC64_PLT16_HI R_PPC_PLT16_HI
-#define R_PPC64_PLT16_HA R_PPC_PLT16_HA
-
-#define R_PPC64_SECTOFF R_PPC_SECTOFF
-#define R_PPC64_SECTOFF_LO R_PPC_SECTOFF_LO
-#define R_PPC64_SECTOFF_HI R_PPC_SECTOFF_HI
-#define R_PPC64_SECTOFF_HA R_PPC_SECTOFF_HA
-#define R_PPC64_ADDR30 37 /* word30 (S + A - P) >> 2. */
-#define R_PPC64_ADDR64 38 /* doubleword64 S + A. */
-#define R_PPC64_ADDR16_HIGHER 39 /* half16 #higher(S + A). */
-#define R_PPC64_ADDR16_HIGHERA 40 /* half16 #highera(S + A). */
-#define R_PPC64_ADDR16_HIGHEST 41 /* half16 #highest(S + A). */
-#define R_PPC64_ADDR16_HIGHESTA 42 /* half16 #highesta(S + A). */
-#define R_PPC64_UADDR64 43 /* doubleword64 S + A. */
-#define R_PPC64_REL64 44 /* doubleword64 S + A - P. */
-#define R_PPC64_PLT64 45 /* doubleword64 L + A. */
-#define R_PPC64_PLTREL64 46 /* doubleword64 L + A - P. */
-#define R_PPC64_TOC16 47 /* half16* S + A - .TOC. */
-#define R_PPC64_TOC16_LO 48 /* half16 #lo(S + A - .TOC.). */
-#define R_PPC64_TOC16_HI 49 /* half16 #hi(S + A - .TOC.). */
-#define R_PPC64_TOC16_HA 50 /* half16 #ha(S + A - .TOC.). */
-#define R_PPC64_TOC 51 /* doubleword64 .TOC. */
-#define R_PPC64_PLTGOT16 52 /* half16* M + A. */
-#define R_PPC64_PLTGOT16_LO 53 /* half16 #lo(M + A). */
-#define R_PPC64_PLTGOT16_HI 54 /* half16 #hi(M + A). */
-#define R_PPC64_PLTGOT16_HA 55 /* half16 #ha(M + A). */
-
-#define R_PPC64_ADDR16_DS 56 /* half16ds* (S + A) >> 2. */
-#define R_PPC64_ADDR16_LO_DS 57 /* half16ds #lo(S + A) >> 2. */
-#define R_PPC64_GOT16_DS 58 /* half16ds* (G + A) >> 2. */
-#define R_PPC64_GOT16_LO_DS 59 /* half16ds #lo(G + A) >> 2. */
-#define R_PPC64_PLT16_LO_DS 60 /* half16ds #lo(L + A) >> 2. */
-#define R_PPC64_SECTOFF_DS 61 /* half16ds* (R + A) >> 2. */
-#define R_PPC64_SECTOFF_LO_DS 62 /* half16ds #lo(R + A) >> 2. */
-#define R_PPC64_TOC16_DS 63 /* half16ds* (S + A - .TOC.) >> 2. */
-#define R_PPC64_TOC16_LO_DS 64 /* half16ds #lo(S + A - .TOC.) >> 2. */
-#define R_PPC64_PLTGOT16_DS 65 /* half16ds* (M + A) >> 2. */
-#define R_PPC64_PLTGOT16_LO_DS 66 /* half16ds #lo(M + A) >> 2. */
-
-/* PowerPC64 relocations defined for the TLS access ABI. */
-#define R_PPC64_TLS 67 /* none (sym+add)@tls */
-#define R_PPC64_DTPMOD64 68 /* doubleword64 (sym+add)@dtpmod */
-#define R_PPC64_TPREL16 69 /* half16* (sym+add)@tprel */
-#define R_PPC64_TPREL16_LO 70 /* half16 (sym+add)@tprel@l */
-#define R_PPC64_TPREL16_HI 71 /* half16 (sym+add)@tprel@h */
-#define R_PPC64_TPREL16_HA 72 /* half16 (sym+add)@tprel@ha */
-#define R_PPC64_TPREL64 73 /* doubleword64 (sym+add)@tprel */
-#define R_PPC64_DTPREL16 74 /* half16* (sym+add)@dtprel */
-#define R_PPC64_DTPREL16_LO 75 /* half16 (sym+add)@dtprel@l */
-#define R_PPC64_DTPREL16_HI 76 /* half16 (sym+add)@dtprel@h */
-#define R_PPC64_DTPREL16_HA 77 /* half16 (sym+add)@dtprel@ha */
-#define R_PPC64_DTPREL64 78 /* doubleword64 (sym+add)@dtprel */
-#define R_PPC64_GOT_TLSGD16 79 /* half16* (sym+add)@got@tlsgd */
-#define R_PPC64_GOT_TLSGD16_LO 80 /* half16 (sym+add)@got@tlsgd@l */
-#define R_PPC64_GOT_TLSGD16_HI 81 /* half16 (sym+add)@got@tlsgd@h */
-#define R_PPC64_GOT_TLSGD16_HA 82 /* half16 (sym+add)@got@tlsgd@ha */
-#define R_PPC64_GOT_TLSLD16 83 /* half16* (sym+add)@got@tlsld */
-#define R_PPC64_GOT_TLSLD16_LO 84 /* half16 (sym+add)@got@tlsld@l */
-#define R_PPC64_GOT_TLSLD16_HI 85 /* half16 (sym+add)@got@tlsld@h */
-#define R_PPC64_GOT_TLSLD16_HA 86 /* half16 (sym+add)@got@tlsld@ha */
-#define R_PPC64_GOT_TPREL16_DS 87 /* half16ds* (sym+add)@got@tprel */
-#define R_PPC64_GOT_TPREL16_LO_DS 88 /* half16ds (sym+add)@got@tprel@l */
-#define R_PPC64_GOT_TPREL16_HI 89 /* half16 (sym+add)@got@tprel@h */
-#define R_PPC64_GOT_TPREL16_HA 90 /* half16 (sym+add)@got@tprel@ha */
-#define R_PPC64_GOT_DTPREL16_DS 91 /* half16ds* (sym+add)@got@dtprel */
-#define R_PPC64_GOT_DTPREL16_LO_DS 92 /* half16ds (sym+add)@got@dtprel@l */
-#define R_PPC64_GOT_DTPREL16_HI 93 /* half16 (sym+add)@got@dtprel@h */
-#define R_PPC64_GOT_DTPREL16_HA 94 /* half16 (sym+add)@got@dtprel@ha */
-#define R_PPC64_TPREL16_DS 95 /* half16ds* (sym+add)@tprel */
-#define R_PPC64_TPREL16_LO_DS 96 /* half16ds (sym+add)@tprel@l */
-#define R_PPC64_TPREL16_HIGHER 97 /* half16 (sym+add)@tprel@higher */
-#define R_PPC64_TPREL16_HIGHERA 98 /* half16 (sym+add)@tprel@highera */
-#define R_PPC64_TPREL16_HIGHEST 99 /* half16 (sym+add)@tprel@highest */
-#define R_PPC64_TPREL16_HIGHESTA 100 /* half16 (sym+add)@tprel@highesta */
-#define R_PPC64_DTPREL16_DS 101 /* half16ds* (sym+add)@dtprel */
-#define R_PPC64_DTPREL16_LO_DS 102 /* half16ds (sym+add)@dtprel@l */
-#define R_PPC64_DTPREL16_HIGHER 103 /* half16 (sym+add)@dtprel@higher */
-#define R_PPC64_DTPREL16_HIGHERA 104 /* half16 (sym+add)@dtprel@highera */
-#define R_PPC64_DTPREL16_HIGHEST 105 /* half16 (sym+add)@dtprel@highest */
-#define R_PPC64_DTPREL16_HIGHESTA 106 /* half16 (sym+add)@dtprel@highesta */
-#define R_PPC64_TLSGD 107
-#define R_PPC64_TLSLD 108
-#define R_PPC64_TOCSAVE 109
-
-#define R_PPC64_REL24_NOTOC 116
-#define R_PPC64_ENTRY 118
-
-#define R_PPC64_PCREL34 132
-#define R_PPC64_GOT_PCREL34 133
-
-#define R_PPC64_REL16 249
-#define R_PPC64_REL16_LO 250
-#define R_PPC64_REL16_HI 251
-#define R_PPC64_REL16_HA 252
-
-/* Keep this the last entry. */
-#define R_PPC64_NUM 253
-
#endif /* _UAPI_ASM_POWERPC_ELF_H */
diff --git a/include/uapi/linux/elf-r.h b/include/uapi/linux/elf-r.h
index cf931fc05afa..0d0dfaa7c724 100644
--- a/include/uapi/linux/elf-r.h
+++ b/include/uapi/linux/elf-r.h
@@ -113,4 +113,205 @@
#define R_AARCH64_RELATIVE 1027
+/* PowerPC relocations defined by the ABIs */
+#define R_PPC_NONE 0
+#define R_PPC_ADDR32 1 /* 32bit absolute address */
+#define R_PPC_ADDR24 2 /* 26bit address, 2 bits ignored. */
+#define R_PPC_ADDR16 3 /* 16bit absolute address */
+#define R_PPC_ADDR16_LO 4 /* lower 16bit of absolute address */
+#define R_PPC_ADDR16_HI 5 /* high 16bit of absolute address */
+#define R_PPC_ADDR16_HA 6 /* adjusted high 16bit */
+#define R_PPC_ADDR14 7 /* 16bit address, 2 bits ignored */
+#define R_PPC_ADDR14_BRTAKEN 8
+#define R_PPC_ADDR14_BRNTAKEN 9
+#define R_PPC_REL24 10 /* PC relative 26 bit */
+#define R_PPC_REL14 11 /* PC relative 16 bit */
+#define R_PPC_REL14_BRTAKEN 12
+#define R_PPC_REL14_BRNTAKEN 13
+#define R_PPC_GOT16 14
+#define R_PPC_GOT16_LO 15
+#define R_PPC_GOT16_HI 16
+#define R_PPC_GOT16_HA 17
+#define R_PPC_PLTREL24 18
+#define R_PPC_COPY 19
+#define R_PPC_GLOB_DAT 20
+#define R_PPC_JMP_SLOT 21
+#define R_PPC_RELATIVE 22
+#define R_PPC_LOCAL24PC 23
+#define R_PPC_UADDR32 24
+#define R_PPC_UADDR16 25
+#define R_PPC_REL32 26
+#define R_PPC_PLT32 27
+#define R_PPC_PLTREL32 28
+#define R_PPC_PLT16_LO 29
+#define R_PPC_PLT16_HI 30
+#define R_PPC_PLT16_HA 31
+#define R_PPC_SDAREL16 32
+#define R_PPC_SECTOFF 33
+#define R_PPC_SECTOFF_LO 34
+#define R_PPC_SECTOFF_HI 35
+#define R_PPC_SECTOFF_HA 36
+
+/* PowerPC relocations defined for the TLS access ABI. */
+#define R_PPC_TLS 67 /* none (sym+add)@tls */
+#define R_PPC_DTPMOD32 68 /* word32 (sym+add)@dtpmod */
+#define R_PPC_TPREL16 69 /* half16* (sym+add)@tprel */
+#define R_PPC_TPREL16_LO 70 /* half16 (sym+add)@tprel@l */
+#define R_PPC_TPREL16_HI 71 /* half16 (sym+add)@tprel@h */
+#define R_PPC_TPREL16_HA 72 /* half16 (sym+add)@tprel@ha */
+#define R_PPC_TPREL32 73 /* word32 (sym+add)@tprel */
+#define R_PPC_DTPREL16 74 /* half16* (sym+add)@dtprel */
+#define R_PPC_DTPREL16_LO 75 /* half16 (sym+add)@dtprel@l */
+#define R_PPC_DTPREL16_HI 76 /* half16 (sym+add)@dtprel@h */
+#define R_PPC_DTPREL16_HA 77 /* half16 (sym+add)@dtprel@ha */
+#define R_PPC_DTPREL32 78 /* word32 (sym+add)@dtprel */
+#define R_PPC_GOT_TLSGD16 79 /* half16* (sym+add)@got@tlsgd */
+#define R_PPC_GOT_TLSGD16_LO 80 /* half16 (sym+add)@got@tlsgd@l */
+#define R_PPC_GOT_TLSGD16_HI 81 /* half16 (sym+add)@got@tlsgd@h */
+#define R_PPC_GOT_TLSGD16_HA 82 /* half16 (sym+add)@got@tlsgd@ha */
+#define R_PPC_GOT_TLSLD16 83 /* half16* (sym+add)@got@tlsld */
+#define R_PPC_GOT_TLSLD16_LO 84 /* half16 (sym+add)@got@tlsld@l */
+#define R_PPC_GOT_TLSLD16_HI 85 /* half16 (sym+add)@got@tlsld@h */
+#define R_PPC_GOT_TLSLD16_HA 86 /* half16 (sym+add)@got@tlsld@ha */
+#define R_PPC_GOT_TPREL16 87 /* half16* (sym+add)@got@tprel */
+#define R_PPC_GOT_TPREL16_LO 88 /* half16 (sym+add)@got@tprel@l */
+#define R_PPC_GOT_TPREL16_HI 89 /* half16 (sym+add)@got@tprel@h */
+#define R_PPC_GOT_TPREL16_HA 90 /* half16 (sym+add)@got@tprel@ha */
+#define R_PPC_GOT_DTPREL16 91 /* half16* (sym+add)@got@dtprel */
+#define R_PPC_GOT_DTPREL16_LO 92 /* half16* (sym+add)@got@dtprel@l */
+#define R_PPC_GOT_DTPREL16_HI 93 /* half16* (sym+add)@got@dtprel@h */
+#define R_PPC_GOT_DTPREL16_HA 94 /* half16* (sym+add)@got@dtprel@ha */
+
+/* keep this the last entry. */
+#define R_PPC_NUM 95
+
+/* PowerPC64 relocations defined by the ABIs */
+#define R_PPC64_NONE R_PPC_NONE
+#define R_PPC64_ADDR32 R_PPC_ADDR32 /* 32bit absolute address. */
+#define R_PPC64_ADDR24 R_PPC_ADDR24 /* 26bit address, word aligned. */
+#define R_PPC64_ADDR16 R_PPC_ADDR16 /* 16bit absolute address. */
+#define R_PPC64_ADDR16_LO R_PPC_ADDR16_LO /* lower 16bits of abs. address. */
+#define R_PPC64_ADDR16_HI R_PPC_ADDR16_HI /* high 16bits of abs. address. */
+#define R_PPC64_ADDR16_HA R_PPC_ADDR16_HA /* adjusted high 16bits. */
+#define R_PPC64_ADDR14 R_PPC_ADDR14 /* 16bit address, word aligned. */
+#define R_PPC64_ADDR14_BRTAKEN R_PPC_ADDR14_BRTAKEN
+#define R_PPC64_ADDR14_BRNTAKEN R_PPC_ADDR14_BRNTAKEN
+#define R_PPC64_REL24 R_PPC_REL24 /* PC relative 26 bit, word aligned. */
+#define R_PPC64_REL14 R_PPC_REL14 /* PC relative 16 bit. */
+#define R_PPC64_REL14_BRTAKEN R_PPC_REL14_BRTAKEN
+#define R_PPC64_REL14_BRNTAKEN R_PPC_REL14_BRNTAKEN
+#define R_PPC64_GOT16 R_PPC_GOT16
+#define R_PPC64_GOT16_LO R_PPC_GOT16_LO
+#define R_PPC64_GOT16_HI R_PPC_GOT16_HI
+#define R_PPC64_GOT16_HA R_PPC_GOT16_HA
+
+#define R_PPC64_COPY R_PPC_COPY
+#define R_PPC64_GLOB_DAT R_PPC_GLOB_DAT
+#define R_PPC64_JMP_SLOT R_PPC_JMP_SLOT
+#define R_PPC64_RELATIVE R_PPC_RELATIVE
+
+#define R_PPC64_UADDR32 R_PPC_UADDR32
+#define R_PPC64_UADDR16 R_PPC_UADDR16
+#define R_PPC64_REL32 R_PPC_REL32
+#define R_PPC64_PLT32 R_PPC_PLT32
+#define R_PPC64_PLTREL32 R_PPC_PLTREL32
+#define R_PPC64_PLT16_LO R_PPC_PLT16_LO
+#define R_PPC64_PLT16_HI R_PPC_PLT16_HI
+#define R_PPC64_PLT16_HA R_PPC_PLT16_HA
+
+#define R_PPC64_SECTOFF R_PPC_SECTOFF
+#define R_PPC64_SECTOFF_LO R_PPC_SECTOFF_LO
+#define R_PPC64_SECTOFF_HI R_PPC_SECTOFF_HI
+#define R_PPC64_SECTOFF_HA R_PPC_SECTOFF_HA
+#define R_PPC64_ADDR30 37 /* word30 (S + A - P) >> 2. */
+#define R_PPC64_ADDR64 38 /* doubleword64 S + A. */
+#define R_PPC64_ADDR16_HIGHER 39 /* half16 #higher(S + A). */
+#define R_PPC64_ADDR16_HIGHERA 40 /* half16 #highera(S + A). */
+#define R_PPC64_ADDR16_HIGHEST 41 /* half16 #highest(S + A). */
+#define R_PPC64_ADDR16_HIGHESTA 42 /* half16 #highesta(S + A). */
+#define R_PPC64_UADDR64 43 /* doubleword64 S + A. */
+#define R_PPC64_REL64 44 /* doubleword64 S + A - P. */
+#define R_PPC64_PLT64 45 /* doubleword64 L + A. */
+#define R_PPC64_PLTREL64 46 /* doubleword64 L + A - P. */
+#define R_PPC64_TOC16 47 /* half16* S + A - .TOC. */
+#define R_PPC64_TOC16_LO 48 /* half16 #lo(S + A - .TOC.). */
+#define R_PPC64_TOC16_HI 49 /* half16 #hi(S + A - .TOC.). */
+#define R_PPC64_TOC16_HA 50 /* half16 #ha(S + A - .TOC.). */
+#define R_PPC64_TOC 51 /* doubleword64 .TOC. */
+#define R_PPC64_PLTGOT16 52 /* half16* M + A. */
+#define R_PPC64_PLTGOT16_LO 53 /* half16 #lo(M + A). */
+#define R_PPC64_PLTGOT16_HI 54 /* half16 #hi(M + A). */
+#define R_PPC64_PLTGOT16_HA 55 /* half16 #ha(M + A). */
+
+#define R_PPC64_ADDR16_DS 56 /* half16ds* (S + A) >> 2. */
+#define R_PPC64_ADDR16_LO_DS 57 /* half16ds #lo(S + A) >> 2. */
+#define R_PPC64_GOT16_DS 58 /* half16ds* (G + A) >> 2. */
+#define R_PPC64_GOT16_LO_DS 59 /* half16ds #lo(G + A) >> 2. */
+#define R_PPC64_PLT16_LO_DS 60 /* half16ds #lo(L + A) >> 2. */
+#define R_PPC64_SECTOFF_DS 61 /* half16ds* (R + A) >> 2. */
+#define R_PPC64_SECTOFF_LO_DS 62 /* half16ds #lo(R + A) >> 2. */
+#define R_PPC64_TOC16_DS 63 /* half16ds* (S + A - .TOC.) >> 2. */
+#define R_PPC64_TOC16_LO_DS 64 /* half16ds #lo(S + A - .TOC.) >> 2. */
+#define R_PPC64_PLTGOT16_DS 65 /* half16ds* (M + A) >> 2. */
+#define R_PPC64_PLTGOT16_LO_DS 66 /* half16ds #lo(M + A) >> 2. */
+
+/* PowerPC64 relocations defined for the TLS access ABI. */
+#define R_PPC64_TLS 67 /* none (sym+add)@tls */
+#define R_PPC64_DTPMOD64 68 /* doubleword64 (sym+add)@dtpmod */
+#define R_PPC64_TPREL16 69 /* half16* (sym+add)@tprel */
+#define R_PPC64_TPREL16_LO 70 /* half16 (sym+add)@tprel@l */
+#define R_PPC64_TPREL16_HI 71 /* half16 (sym+add)@tprel@h */
+#define R_PPC64_TPREL16_HA 72 /* half16 (sym+add)@tprel@ha */
+#define R_PPC64_TPREL64 73 /* doubleword64 (sym+add)@tprel */
+#define R_PPC64_DTPREL16 74 /* half16* (sym+add)@dtprel */
+#define R_PPC64_DTPREL16_LO 75 /* half16 (sym+add)@dtprel@l */
+#define R_PPC64_DTPREL16_HI 76 /* half16 (sym+add)@dtprel@h */
+#define R_PPC64_DTPREL16_HA 77 /* half16 (sym+add)@dtprel@ha */
+#define R_PPC64_DTPREL64 78 /* doubleword64 (sym+add)@dtprel */
+#define R_PPC64_GOT_TLSGD16 79 /* half16* (sym+add)@got@tlsgd */
+#define R_PPC64_GOT_TLSGD16_LO 80 /* half16 (sym+add)@got@tlsgd@l */
+#define R_PPC64_GOT_TLSGD16_HI 81 /* half16 (sym+add)@got@tlsgd@h */
+#define R_PPC64_GOT_TLSGD16_HA 82 /* half16 (sym+add)@got@tlsgd@ha */
+#define R_PPC64_GOT_TLSLD16 83 /* half16* (sym+add)@got@tlsld */
+#define R_PPC64_GOT_TLSLD16_LO 84 /* half16 (sym+add)@got@tlsld@l */
+#define R_PPC64_GOT_TLSLD16_HI 85 /* half16 (sym+add)@got@tlsld@h */
+#define R_PPC64_GOT_TLSLD16_HA 86 /* half16 (sym+add)@got@tlsld@ha */
+#define R_PPC64_GOT_TPREL16_DS 87 /* half16ds* (sym+add)@got@tprel */
+#define R_PPC64_GOT_TPREL16_LO_DS 88 /* half16ds (sym+add)@got@tprel@l */
+#define R_PPC64_GOT_TPREL16_HI 89 /* half16 (sym+add)@got@tprel@h */
+#define R_PPC64_GOT_TPREL16_HA 90 /* half16 (sym+add)@got@tprel@ha */
+#define R_PPC64_GOT_DTPREL16_DS 91 /* half16ds* (sym+add)@got@dtprel */
+#define R_PPC64_GOT_DTPREL16_LO_DS 92 /* half16ds (sym+add)@got@dtprel@l */
+#define R_PPC64_GOT_DTPREL16_HI 93 /* half16 (sym+add)@got@dtprel@h */
+#define R_PPC64_GOT_DTPREL16_HA 94 /* half16 (sym+add)@got@dtprel@ha */
+#define R_PPC64_TPREL16_DS 95 /* half16ds* (sym+add)@tprel */
+#define R_PPC64_TPREL16_LO_DS 96 /* half16ds (sym+add)@tprel@l */
+#define R_PPC64_TPREL16_HIGHER 97 /* half16 (sym+add)@tprel@higher */
+#define R_PPC64_TPREL16_HIGHERA 98 /* half16 (sym+add)@tprel@highera */
+#define R_PPC64_TPREL16_HIGHEST 99 /* half16 (sym+add)@tprel@highest */
+#define R_PPC64_TPREL16_HIGHESTA 100 /* half16 (sym+add)@tprel@highesta */
+#define R_PPC64_DTPREL16_DS 101 /* half16ds* (sym+add)@dtprel */
+#define R_PPC64_DTPREL16_LO_DS 102 /* half16ds (sym+add)@dtprel@l */
+#define R_PPC64_DTPREL16_HIGHER 103 /* half16 (sym+add)@dtprel@higher */
+#define R_PPC64_DTPREL16_HIGHERA 104 /* half16 (sym+add)@dtprel@highera */
+#define R_PPC64_DTPREL16_HIGHEST 105 /* half16 (sym+add)@dtprel@highest */
+#define R_PPC64_DTPREL16_HIGHESTA 106 /* half16 (sym+add)@dtprel@highesta */
+#define R_PPC64_TLSGD 107
+#define R_PPC64_TLSLD 108
+#define R_PPC64_TOCSAVE 109
+
+#define R_PPC64_REL24_NOTOC 116
+#define R_PPC64_ENTRY 118
+
+#define R_PPC64_PCREL34 132
+#define R_PPC64_GOT_PCREL34 133
+
+#define R_PPC64_REL16 249
+#define R_PPC64_REL16_LO 250
+#define R_PPC64_REL16_HI 251
+#define R_PPC64_REL16_HA 252
+
+/* Keep this the last entry. */
+#define R_PPC64_NUM 253
+
#endif /* _UAPI_LINUX_ELF_R_H */
--
2.55.0
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 53+ messages in thread* Re: [PATCH v5 05/24] powerpc/elf: Move relocation constants to UAPI
2026-09-08 6:33 ` [PATCH v5 05/24] powerpc/elf: " Thomas Weißschuh
@ 2026-09-08 9:02 ` Christophe Leroy (CS GROUP)
2026-09-08 14:01 ` R Nageswara Sastry
2026-09-10 6:30 ` Mukesh Kumar Chaurasiya
2 siblings, 0 replies; 53+ messages in thread
From: Christophe Leroy (CS GROUP) @ 2026-09-08 9:02 UTC (permalink / raw)
To: Thomas Weißschuh, Paul Walmsley, Palmer Dabbelt, Albert Ou,
Alexandre Ghiti, Nathan Chancellor, Nick Desaulniers,
Bill Wendling, Justin Stitt, Andy Lutomirski, Vincenzo Frascino,
Kees Cook, Ingo Molnar, Borislav Petkov, Dave Hansen, x86,
H. Peter Anvin, Richard Weinberger, Anton Ivanov, Johannes Berg,
Russell King, Catalin Marinas, Will Deacon, Madhavan Srinivasan,
Michael Ellerman, Nicholas Piggin, Huacai Chen, WANG Xuerui,
Heiko Carstens, Vasily Gorbik, Alexander Gordeev,
Christian Borntraeger, Sven Schnelle, Thomas Bogendoerfer,
Miguel Ojeda, Alex Gaynor, Gary Guo, Björn Roy Baron,
Benno Lossin, Andreas Hindborg, Alice Ryhl, Trevor Gross,
Danilo Krummrich, Thomas Gleixner, Boqun Feng, Nicolas Schier
Cc: linux-riscv, linux-kernel, llvm, linux-mm, linux-um,
linux-arm-kernel, linuxppc-dev, loongarch, linux-s390, linux-mips,
rust-for-linux, linux-kbuild, Jan Stancek,
Arnaldo Carvalho de Melo, Alexandre Ghiti
Le 08/09/2026 à 08:33, Thomas Weißschuh a écrit :
> These constants are useful for cross-platform userspace, for example to
> process ELF files during kernel cross-compilation.
>
> Move them from the kernel-private architecture-specific header to the UAPI.
>
> Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Reviewed-by: Christophe Leroy (CS GROUP) <chleroy@kernel.org>
> ---
> arch/powerpc/include/uapi/asm/elf.h | 201 ------------------------------------
> include/uapi/linux/elf-r.h | 201 ++++++++++++++++++++++++++++++++++++
> 2 files changed, 201 insertions(+), 201 deletions(-)
>
> diff --git a/arch/powerpc/include/uapi/asm/elf.h b/arch/powerpc/include/uapi/asm/elf.h
> index a5377f494fa3..aba921b8249a 100644
> --- a/arch/powerpc/include/uapi/asm/elf.h
> +++ b/arch/powerpc/include/uapi/asm/elf.h
> @@ -17,78 +17,6 @@
> #include <asm/cputable.h>
> #include <asm/auxvec.h>
>
> -/* PowerPC relocations defined by the ABIs */
> -#define R_PPC_NONE 0
> -#define R_PPC_ADDR32 1 /* 32bit absolute address */
> -#define R_PPC_ADDR24 2 /* 26bit address, 2 bits ignored. */
> -#define R_PPC_ADDR16 3 /* 16bit absolute address */
> -#define R_PPC_ADDR16_LO 4 /* lower 16bit of absolute address */
> -#define R_PPC_ADDR16_HI 5 /* high 16bit of absolute address */
> -#define R_PPC_ADDR16_HA 6 /* adjusted high 16bit */
> -#define R_PPC_ADDR14 7 /* 16bit address, 2 bits ignored */
> -#define R_PPC_ADDR14_BRTAKEN 8
> -#define R_PPC_ADDR14_BRNTAKEN 9
> -#define R_PPC_REL24 10 /* PC relative 26 bit */
> -#define R_PPC_REL14 11 /* PC relative 16 bit */
> -#define R_PPC_REL14_BRTAKEN 12
> -#define R_PPC_REL14_BRNTAKEN 13
> -#define R_PPC_GOT16 14
> -#define R_PPC_GOT16_LO 15
> -#define R_PPC_GOT16_HI 16
> -#define R_PPC_GOT16_HA 17
> -#define R_PPC_PLTREL24 18
> -#define R_PPC_COPY 19
> -#define R_PPC_GLOB_DAT 20
> -#define R_PPC_JMP_SLOT 21
> -#define R_PPC_RELATIVE 22
> -#define R_PPC_LOCAL24PC 23
> -#define R_PPC_UADDR32 24
> -#define R_PPC_UADDR16 25
> -#define R_PPC_REL32 26
> -#define R_PPC_PLT32 27
> -#define R_PPC_PLTREL32 28
> -#define R_PPC_PLT16_LO 29
> -#define R_PPC_PLT16_HI 30
> -#define R_PPC_PLT16_HA 31
> -#define R_PPC_SDAREL16 32
> -#define R_PPC_SECTOFF 33
> -#define R_PPC_SECTOFF_LO 34
> -#define R_PPC_SECTOFF_HI 35
> -#define R_PPC_SECTOFF_HA 36
> -
> -/* PowerPC relocations defined for the TLS access ABI. */
> -#define R_PPC_TLS 67 /* none (sym+add)@tls */
> -#define R_PPC_DTPMOD32 68 /* word32 (sym+add)@dtpmod */
> -#define R_PPC_TPREL16 69 /* half16* (sym+add)@tprel */
> -#define R_PPC_TPREL16_LO 70 /* half16 (sym+add)@tprel@l */
> -#define R_PPC_TPREL16_HI 71 /* half16 (sym+add)@tprel@h */
> -#define R_PPC_TPREL16_HA 72 /* half16 (sym+add)@tprel@ha */
> -#define R_PPC_TPREL32 73 /* word32 (sym+add)@tprel */
> -#define R_PPC_DTPREL16 74 /* half16* (sym+add)@dtprel */
> -#define R_PPC_DTPREL16_LO 75 /* half16 (sym+add)@dtprel@l */
> -#define R_PPC_DTPREL16_HI 76 /* half16 (sym+add)@dtprel@h */
> -#define R_PPC_DTPREL16_HA 77 /* half16 (sym+add)@dtprel@ha */
> -#define R_PPC_DTPREL32 78 /* word32 (sym+add)@dtprel */
> -#define R_PPC_GOT_TLSGD16 79 /* half16* (sym+add)@got@tlsgd */
> -#define R_PPC_GOT_TLSGD16_LO 80 /* half16 (sym+add)@got@tlsgd@l */
> -#define R_PPC_GOT_TLSGD16_HI 81 /* half16 (sym+add)@got@tlsgd@h */
> -#define R_PPC_GOT_TLSGD16_HA 82 /* half16 (sym+add)@got@tlsgd@ha */
> -#define R_PPC_GOT_TLSLD16 83 /* half16* (sym+add)@got@tlsld */
> -#define R_PPC_GOT_TLSLD16_LO 84 /* half16 (sym+add)@got@tlsld@l */
> -#define R_PPC_GOT_TLSLD16_HI 85 /* half16 (sym+add)@got@tlsld@h */
> -#define R_PPC_GOT_TLSLD16_HA 86 /* half16 (sym+add)@got@tlsld@ha */
> -#define R_PPC_GOT_TPREL16 87 /* half16* (sym+add)@got@tprel */
> -#define R_PPC_GOT_TPREL16_LO 88 /* half16 (sym+add)@got@tprel@l */
> -#define R_PPC_GOT_TPREL16_HI 89 /* half16 (sym+add)@got@tprel@h */
> -#define R_PPC_GOT_TPREL16_HA 90 /* half16 (sym+add)@got@tprel@ha */
> -#define R_PPC_GOT_DTPREL16 91 /* half16* (sym+add)@got@dtprel */
> -#define R_PPC_GOT_DTPREL16_LO 92 /* half16* (sym+add)@got@dtprel@l */
> -#define R_PPC_GOT_DTPREL16_HI 93 /* half16* (sym+add)@got@dtprel@h */
> -#define R_PPC_GOT_DTPREL16_HA 94 /* half16* (sym+add)@got@dtprel@ha */
> -
> -/* keep this the last entry. */
> -#define R_PPC_NUM 95
> -
>
> #define ELF_NGREG 48 /* includes nip, msr, lr, etc. */
> #define ELF_NFPREG 33 /* includes fpscr */
> @@ -166,133 +94,4 @@ typedef elf_vrreg_t elf_vrregset_t32[ELF_NVRREG32];
> typedef elf_fpreg_t elf_vsrreghalf_t32[ELF_NVSRHALFREG];
> #endif
>
> -/* PowerPC64 relocations defined by the ABIs */
> -#define R_PPC64_NONE R_PPC_NONE
> -#define R_PPC64_ADDR32 R_PPC_ADDR32 /* 32bit absolute address. */
> -#define R_PPC64_ADDR24 R_PPC_ADDR24 /* 26bit address, word aligned. */
> -#define R_PPC64_ADDR16 R_PPC_ADDR16 /* 16bit absolute address. */
> -#define R_PPC64_ADDR16_LO R_PPC_ADDR16_LO /* lower 16bits of abs. address. */
> -#define R_PPC64_ADDR16_HI R_PPC_ADDR16_HI /* high 16bits of abs. address. */
> -#define R_PPC64_ADDR16_HA R_PPC_ADDR16_HA /* adjusted high 16bits. */
> -#define R_PPC64_ADDR14 R_PPC_ADDR14 /* 16bit address, word aligned. */
> -#define R_PPC64_ADDR14_BRTAKEN R_PPC_ADDR14_BRTAKEN
> -#define R_PPC64_ADDR14_BRNTAKEN R_PPC_ADDR14_BRNTAKEN
> -#define R_PPC64_REL24 R_PPC_REL24 /* PC relative 26 bit, word aligned. */
> -#define R_PPC64_REL14 R_PPC_REL14 /* PC relative 16 bit. */
> -#define R_PPC64_REL14_BRTAKEN R_PPC_REL14_BRTAKEN
> -#define R_PPC64_REL14_BRNTAKEN R_PPC_REL14_BRNTAKEN
> -#define R_PPC64_GOT16 R_PPC_GOT16
> -#define R_PPC64_GOT16_LO R_PPC_GOT16_LO
> -#define R_PPC64_GOT16_HI R_PPC_GOT16_HI
> -#define R_PPC64_GOT16_HA R_PPC_GOT16_HA
> -
> -#define R_PPC64_COPY R_PPC_COPY
> -#define R_PPC64_GLOB_DAT R_PPC_GLOB_DAT
> -#define R_PPC64_JMP_SLOT R_PPC_JMP_SLOT
> -#define R_PPC64_RELATIVE R_PPC_RELATIVE
> -
> -#define R_PPC64_UADDR32 R_PPC_UADDR32
> -#define R_PPC64_UADDR16 R_PPC_UADDR16
> -#define R_PPC64_REL32 R_PPC_REL32
> -#define R_PPC64_PLT32 R_PPC_PLT32
> -#define R_PPC64_PLTREL32 R_PPC_PLTREL32
> -#define R_PPC64_PLT16_LO R_PPC_PLT16_LO
> -#define R_PPC64_PLT16_HI R_PPC_PLT16_HI
> -#define R_PPC64_PLT16_HA R_PPC_PLT16_HA
> -
> -#define R_PPC64_SECTOFF R_PPC_SECTOFF
> -#define R_PPC64_SECTOFF_LO R_PPC_SECTOFF_LO
> -#define R_PPC64_SECTOFF_HI R_PPC_SECTOFF_HI
> -#define R_PPC64_SECTOFF_HA R_PPC_SECTOFF_HA
> -#define R_PPC64_ADDR30 37 /* word30 (S + A - P) >> 2. */
> -#define R_PPC64_ADDR64 38 /* doubleword64 S + A. */
> -#define R_PPC64_ADDR16_HIGHER 39 /* half16 #higher(S + A). */
> -#define R_PPC64_ADDR16_HIGHERA 40 /* half16 #highera(S + A). */
> -#define R_PPC64_ADDR16_HIGHEST 41 /* half16 #highest(S + A). */
> -#define R_PPC64_ADDR16_HIGHESTA 42 /* half16 #highesta(S + A). */
> -#define R_PPC64_UADDR64 43 /* doubleword64 S + A. */
> -#define R_PPC64_REL64 44 /* doubleword64 S + A - P. */
> -#define R_PPC64_PLT64 45 /* doubleword64 L + A. */
> -#define R_PPC64_PLTREL64 46 /* doubleword64 L + A - P. */
> -#define R_PPC64_TOC16 47 /* half16* S + A - .TOC. */
> -#define R_PPC64_TOC16_LO 48 /* half16 #lo(S + A - .TOC.). */
> -#define R_PPC64_TOC16_HI 49 /* half16 #hi(S + A - .TOC.). */
> -#define R_PPC64_TOC16_HA 50 /* half16 #ha(S + A - .TOC.). */
> -#define R_PPC64_TOC 51 /* doubleword64 .TOC. */
> -#define R_PPC64_PLTGOT16 52 /* half16* M + A. */
> -#define R_PPC64_PLTGOT16_LO 53 /* half16 #lo(M + A). */
> -#define R_PPC64_PLTGOT16_HI 54 /* half16 #hi(M + A). */
> -#define R_PPC64_PLTGOT16_HA 55 /* half16 #ha(M + A). */
> -
> -#define R_PPC64_ADDR16_DS 56 /* half16ds* (S + A) >> 2. */
> -#define R_PPC64_ADDR16_LO_DS 57 /* half16ds #lo(S + A) >> 2. */
> -#define R_PPC64_GOT16_DS 58 /* half16ds* (G + A) >> 2. */
> -#define R_PPC64_GOT16_LO_DS 59 /* half16ds #lo(G + A) >> 2. */
> -#define R_PPC64_PLT16_LO_DS 60 /* half16ds #lo(L + A) >> 2. */
> -#define R_PPC64_SECTOFF_DS 61 /* half16ds* (R + A) >> 2. */
> -#define R_PPC64_SECTOFF_LO_DS 62 /* half16ds #lo(R + A) >> 2. */
> -#define R_PPC64_TOC16_DS 63 /* half16ds* (S + A - .TOC.) >> 2. */
> -#define R_PPC64_TOC16_LO_DS 64 /* half16ds #lo(S + A - .TOC.) >> 2. */
> -#define R_PPC64_PLTGOT16_DS 65 /* half16ds* (M + A) >> 2. */
> -#define R_PPC64_PLTGOT16_LO_DS 66 /* half16ds #lo(M + A) >> 2. */
> -
> -/* PowerPC64 relocations defined for the TLS access ABI. */
> -#define R_PPC64_TLS 67 /* none (sym+add)@tls */
> -#define R_PPC64_DTPMOD64 68 /* doubleword64 (sym+add)@dtpmod */
> -#define R_PPC64_TPREL16 69 /* half16* (sym+add)@tprel */
> -#define R_PPC64_TPREL16_LO 70 /* half16 (sym+add)@tprel@l */
> -#define R_PPC64_TPREL16_HI 71 /* half16 (sym+add)@tprel@h */
> -#define R_PPC64_TPREL16_HA 72 /* half16 (sym+add)@tprel@ha */
> -#define R_PPC64_TPREL64 73 /* doubleword64 (sym+add)@tprel */
> -#define R_PPC64_DTPREL16 74 /* half16* (sym+add)@dtprel */
> -#define R_PPC64_DTPREL16_LO 75 /* half16 (sym+add)@dtprel@l */
> -#define R_PPC64_DTPREL16_HI 76 /* half16 (sym+add)@dtprel@h */
> -#define R_PPC64_DTPREL16_HA 77 /* half16 (sym+add)@dtprel@ha */
> -#define R_PPC64_DTPREL64 78 /* doubleword64 (sym+add)@dtprel */
> -#define R_PPC64_GOT_TLSGD16 79 /* half16* (sym+add)@got@tlsgd */
> -#define R_PPC64_GOT_TLSGD16_LO 80 /* half16 (sym+add)@got@tlsgd@l */
> -#define R_PPC64_GOT_TLSGD16_HI 81 /* half16 (sym+add)@got@tlsgd@h */
> -#define R_PPC64_GOT_TLSGD16_HA 82 /* half16 (sym+add)@got@tlsgd@ha */
> -#define R_PPC64_GOT_TLSLD16 83 /* half16* (sym+add)@got@tlsld */
> -#define R_PPC64_GOT_TLSLD16_LO 84 /* half16 (sym+add)@got@tlsld@l */
> -#define R_PPC64_GOT_TLSLD16_HI 85 /* half16 (sym+add)@got@tlsld@h */
> -#define R_PPC64_GOT_TLSLD16_HA 86 /* half16 (sym+add)@got@tlsld@ha */
> -#define R_PPC64_GOT_TPREL16_DS 87 /* half16ds* (sym+add)@got@tprel */
> -#define R_PPC64_GOT_TPREL16_LO_DS 88 /* half16ds (sym+add)@got@tprel@l */
> -#define R_PPC64_GOT_TPREL16_HI 89 /* half16 (sym+add)@got@tprel@h */
> -#define R_PPC64_GOT_TPREL16_HA 90 /* half16 (sym+add)@got@tprel@ha */
> -#define R_PPC64_GOT_DTPREL16_DS 91 /* half16ds* (sym+add)@got@dtprel */
> -#define R_PPC64_GOT_DTPREL16_LO_DS 92 /* half16ds (sym+add)@got@dtprel@l */
> -#define R_PPC64_GOT_DTPREL16_HI 93 /* half16 (sym+add)@got@dtprel@h */
> -#define R_PPC64_GOT_DTPREL16_HA 94 /* half16 (sym+add)@got@dtprel@ha */
> -#define R_PPC64_TPREL16_DS 95 /* half16ds* (sym+add)@tprel */
> -#define R_PPC64_TPREL16_LO_DS 96 /* half16ds (sym+add)@tprel@l */
> -#define R_PPC64_TPREL16_HIGHER 97 /* half16 (sym+add)@tprel@higher */
> -#define R_PPC64_TPREL16_HIGHERA 98 /* half16 (sym+add)@tprel@highera */
> -#define R_PPC64_TPREL16_HIGHEST 99 /* half16 (sym+add)@tprel@highest */
> -#define R_PPC64_TPREL16_HIGHESTA 100 /* half16 (sym+add)@tprel@highesta */
> -#define R_PPC64_DTPREL16_DS 101 /* half16ds* (sym+add)@dtprel */
> -#define R_PPC64_DTPREL16_LO_DS 102 /* half16ds (sym+add)@dtprel@l */
> -#define R_PPC64_DTPREL16_HIGHER 103 /* half16 (sym+add)@dtprel@higher */
> -#define R_PPC64_DTPREL16_HIGHERA 104 /* half16 (sym+add)@dtprel@highera */
> -#define R_PPC64_DTPREL16_HIGHEST 105 /* half16 (sym+add)@dtprel@highest */
> -#define R_PPC64_DTPREL16_HIGHESTA 106 /* half16 (sym+add)@dtprel@highesta */
> -#define R_PPC64_TLSGD 107
> -#define R_PPC64_TLSLD 108
> -#define R_PPC64_TOCSAVE 109
> -
> -#define R_PPC64_REL24_NOTOC 116
> -#define R_PPC64_ENTRY 118
> -
> -#define R_PPC64_PCREL34 132
> -#define R_PPC64_GOT_PCREL34 133
> -
> -#define R_PPC64_REL16 249
> -#define R_PPC64_REL16_LO 250
> -#define R_PPC64_REL16_HI 251
> -#define R_PPC64_REL16_HA 252
> -
> -/* Keep this the last entry. */
> -#define R_PPC64_NUM 253
> -
> #endif /* _UAPI_ASM_POWERPC_ELF_H */
> diff --git a/include/uapi/linux/elf-r.h b/include/uapi/linux/elf-r.h
> index cf931fc05afa..0d0dfaa7c724 100644
> --- a/include/uapi/linux/elf-r.h
> +++ b/include/uapi/linux/elf-r.h
> @@ -113,4 +113,205 @@
>
> #define R_AARCH64_RELATIVE 1027
>
> +/* PowerPC relocations defined by the ABIs */
> +#define R_PPC_NONE 0
> +#define R_PPC_ADDR32 1 /* 32bit absolute address */
> +#define R_PPC_ADDR24 2 /* 26bit address, 2 bits ignored. */
> +#define R_PPC_ADDR16 3 /* 16bit absolute address */
> +#define R_PPC_ADDR16_LO 4 /* lower 16bit of absolute address */
> +#define R_PPC_ADDR16_HI 5 /* high 16bit of absolute address */
> +#define R_PPC_ADDR16_HA 6 /* adjusted high 16bit */
> +#define R_PPC_ADDR14 7 /* 16bit address, 2 bits ignored */
> +#define R_PPC_ADDR14_BRTAKEN 8
> +#define R_PPC_ADDR14_BRNTAKEN 9
> +#define R_PPC_REL24 10 /* PC relative 26 bit */
> +#define R_PPC_REL14 11 /* PC relative 16 bit */
> +#define R_PPC_REL14_BRTAKEN 12
> +#define R_PPC_REL14_BRNTAKEN 13
> +#define R_PPC_GOT16 14
> +#define R_PPC_GOT16_LO 15
> +#define R_PPC_GOT16_HI 16
> +#define R_PPC_GOT16_HA 17
> +#define R_PPC_PLTREL24 18
> +#define R_PPC_COPY 19
> +#define R_PPC_GLOB_DAT 20
> +#define R_PPC_JMP_SLOT 21
> +#define R_PPC_RELATIVE 22
> +#define R_PPC_LOCAL24PC 23
> +#define R_PPC_UADDR32 24
> +#define R_PPC_UADDR16 25
> +#define R_PPC_REL32 26
> +#define R_PPC_PLT32 27
> +#define R_PPC_PLTREL32 28
> +#define R_PPC_PLT16_LO 29
> +#define R_PPC_PLT16_HI 30
> +#define R_PPC_PLT16_HA 31
> +#define R_PPC_SDAREL16 32
> +#define R_PPC_SECTOFF 33
> +#define R_PPC_SECTOFF_LO 34
> +#define R_PPC_SECTOFF_HI 35
> +#define R_PPC_SECTOFF_HA 36
> +
> +/* PowerPC relocations defined for the TLS access ABI. */
> +#define R_PPC_TLS 67 /* none (sym+add)@tls */
> +#define R_PPC_DTPMOD32 68 /* word32 (sym+add)@dtpmod */
> +#define R_PPC_TPREL16 69 /* half16* (sym+add)@tprel */
> +#define R_PPC_TPREL16_LO 70 /* half16 (sym+add)@tprel@l */
> +#define R_PPC_TPREL16_HI 71 /* half16 (sym+add)@tprel@h */
> +#define R_PPC_TPREL16_HA 72 /* half16 (sym+add)@tprel@ha */
> +#define R_PPC_TPREL32 73 /* word32 (sym+add)@tprel */
> +#define R_PPC_DTPREL16 74 /* half16* (sym+add)@dtprel */
> +#define R_PPC_DTPREL16_LO 75 /* half16 (sym+add)@dtprel@l */
> +#define R_PPC_DTPREL16_HI 76 /* half16 (sym+add)@dtprel@h */
> +#define R_PPC_DTPREL16_HA 77 /* half16 (sym+add)@dtprel@ha */
> +#define R_PPC_DTPREL32 78 /* word32 (sym+add)@dtprel */
> +#define R_PPC_GOT_TLSGD16 79 /* half16* (sym+add)@got@tlsgd */
> +#define R_PPC_GOT_TLSGD16_LO 80 /* half16 (sym+add)@got@tlsgd@l */
> +#define R_PPC_GOT_TLSGD16_HI 81 /* half16 (sym+add)@got@tlsgd@h */
> +#define R_PPC_GOT_TLSGD16_HA 82 /* half16 (sym+add)@got@tlsgd@ha */
> +#define R_PPC_GOT_TLSLD16 83 /* half16* (sym+add)@got@tlsld */
> +#define R_PPC_GOT_TLSLD16_LO 84 /* half16 (sym+add)@got@tlsld@l */
> +#define R_PPC_GOT_TLSLD16_HI 85 /* half16 (sym+add)@got@tlsld@h */
> +#define R_PPC_GOT_TLSLD16_HA 86 /* half16 (sym+add)@got@tlsld@ha */
> +#define R_PPC_GOT_TPREL16 87 /* half16* (sym+add)@got@tprel */
> +#define R_PPC_GOT_TPREL16_LO 88 /* half16 (sym+add)@got@tprel@l */
> +#define R_PPC_GOT_TPREL16_HI 89 /* half16 (sym+add)@got@tprel@h */
> +#define R_PPC_GOT_TPREL16_HA 90 /* half16 (sym+add)@got@tprel@ha */
> +#define R_PPC_GOT_DTPREL16 91 /* half16* (sym+add)@got@dtprel */
> +#define R_PPC_GOT_DTPREL16_LO 92 /* half16* (sym+add)@got@dtprel@l */
> +#define R_PPC_GOT_DTPREL16_HI 93 /* half16* (sym+add)@got@dtprel@h */
> +#define R_PPC_GOT_DTPREL16_HA 94 /* half16* (sym+add)@got@dtprel@ha */
> +
> +/* keep this the last entry. */
> +#define R_PPC_NUM 95
> +
> +/* PowerPC64 relocations defined by the ABIs */
> +#define R_PPC64_NONE R_PPC_NONE
> +#define R_PPC64_ADDR32 R_PPC_ADDR32 /* 32bit absolute address. */
> +#define R_PPC64_ADDR24 R_PPC_ADDR24 /* 26bit address, word aligned. */
> +#define R_PPC64_ADDR16 R_PPC_ADDR16 /* 16bit absolute address. */
> +#define R_PPC64_ADDR16_LO R_PPC_ADDR16_LO /* lower 16bits of abs. address. */
> +#define R_PPC64_ADDR16_HI R_PPC_ADDR16_HI /* high 16bits of abs. address. */
> +#define R_PPC64_ADDR16_HA R_PPC_ADDR16_HA /* adjusted high 16bits. */
> +#define R_PPC64_ADDR14 R_PPC_ADDR14 /* 16bit address, word aligned. */
> +#define R_PPC64_ADDR14_BRTAKEN R_PPC_ADDR14_BRTAKEN
> +#define R_PPC64_ADDR14_BRNTAKEN R_PPC_ADDR14_BRNTAKEN
> +#define R_PPC64_REL24 R_PPC_REL24 /* PC relative 26 bit, word aligned. */
> +#define R_PPC64_REL14 R_PPC_REL14 /* PC relative 16 bit. */
> +#define R_PPC64_REL14_BRTAKEN R_PPC_REL14_BRTAKEN
> +#define R_PPC64_REL14_BRNTAKEN R_PPC_REL14_BRNTAKEN
> +#define R_PPC64_GOT16 R_PPC_GOT16
> +#define R_PPC64_GOT16_LO R_PPC_GOT16_LO
> +#define R_PPC64_GOT16_HI R_PPC_GOT16_HI
> +#define R_PPC64_GOT16_HA R_PPC_GOT16_HA
> +
> +#define R_PPC64_COPY R_PPC_COPY
> +#define R_PPC64_GLOB_DAT R_PPC_GLOB_DAT
> +#define R_PPC64_JMP_SLOT R_PPC_JMP_SLOT
> +#define R_PPC64_RELATIVE R_PPC_RELATIVE
> +
> +#define R_PPC64_UADDR32 R_PPC_UADDR32
> +#define R_PPC64_UADDR16 R_PPC_UADDR16
> +#define R_PPC64_REL32 R_PPC_REL32
> +#define R_PPC64_PLT32 R_PPC_PLT32
> +#define R_PPC64_PLTREL32 R_PPC_PLTREL32
> +#define R_PPC64_PLT16_LO R_PPC_PLT16_LO
> +#define R_PPC64_PLT16_HI R_PPC_PLT16_HI
> +#define R_PPC64_PLT16_HA R_PPC_PLT16_HA
> +
> +#define R_PPC64_SECTOFF R_PPC_SECTOFF
> +#define R_PPC64_SECTOFF_LO R_PPC_SECTOFF_LO
> +#define R_PPC64_SECTOFF_HI R_PPC_SECTOFF_HI
> +#define R_PPC64_SECTOFF_HA R_PPC_SECTOFF_HA
> +#define R_PPC64_ADDR30 37 /* word30 (S + A - P) >> 2. */
> +#define R_PPC64_ADDR64 38 /* doubleword64 S + A. */
> +#define R_PPC64_ADDR16_HIGHER 39 /* half16 #higher(S + A). */
> +#define R_PPC64_ADDR16_HIGHERA 40 /* half16 #highera(S + A). */
> +#define R_PPC64_ADDR16_HIGHEST 41 /* half16 #highest(S + A). */
> +#define R_PPC64_ADDR16_HIGHESTA 42 /* half16 #highesta(S + A). */
> +#define R_PPC64_UADDR64 43 /* doubleword64 S + A. */
> +#define R_PPC64_REL64 44 /* doubleword64 S + A - P. */
> +#define R_PPC64_PLT64 45 /* doubleword64 L + A. */
> +#define R_PPC64_PLTREL64 46 /* doubleword64 L + A - P. */
> +#define R_PPC64_TOC16 47 /* half16* S + A - .TOC. */
> +#define R_PPC64_TOC16_LO 48 /* half16 #lo(S + A - .TOC.). */
> +#define R_PPC64_TOC16_HI 49 /* half16 #hi(S + A - .TOC.). */
> +#define R_PPC64_TOC16_HA 50 /* half16 #ha(S + A - .TOC.). */
> +#define R_PPC64_TOC 51 /* doubleword64 .TOC. */
> +#define R_PPC64_PLTGOT16 52 /* half16* M + A. */
> +#define R_PPC64_PLTGOT16_LO 53 /* half16 #lo(M + A). */
> +#define R_PPC64_PLTGOT16_HI 54 /* half16 #hi(M + A). */
> +#define R_PPC64_PLTGOT16_HA 55 /* half16 #ha(M + A). */
> +
> +#define R_PPC64_ADDR16_DS 56 /* half16ds* (S + A) >> 2. */
> +#define R_PPC64_ADDR16_LO_DS 57 /* half16ds #lo(S + A) >> 2. */
> +#define R_PPC64_GOT16_DS 58 /* half16ds* (G + A) >> 2. */
> +#define R_PPC64_GOT16_LO_DS 59 /* half16ds #lo(G + A) >> 2. */
> +#define R_PPC64_PLT16_LO_DS 60 /* half16ds #lo(L + A) >> 2. */
> +#define R_PPC64_SECTOFF_DS 61 /* half16ds* (R + A) >> 2. */
> +#define R_PPC64_SECTOFF_LO_DS 62 /* half16ds #lo(R + A) >> 2. */
> +#define R_PPC64_TOC16_DS 63 /* half16ds* (S + A - .TOC.) >> 2. */
> +#define R_PPC64_TOC16_LO_DS 64 /* half16ds #lo(S + A - .TOC.) >> 2. */
> +#define R_PPC64_PLTGOT16_DS 65 /* half16ds* (M + A) >> 2. */
> +#define R_PPC64_PLTGOT16_LO_DS 66 /* half16ds #lo(M + A) >> 2. */
> +
> +/* PowerPC64 relocations defined for the TLS access ABI. */
> +#define R_PPC64_TLS 67 /* none (sym+add)@tls */
> +#define R_PPC64_DTPMOD64 68 /* doubleword64 (sym+add)@dtpmod */
> +#define R_PPC64_TPREL16 69 /* half16* (sym+add)@tprel */
> +#define R_PPC64_TPREL16_LO 70 /* half16 (sym+add)@tprel@l */
> +#define R_PPC64_TPREL16_HI 71 /* half16 (sym+add)@tprel@h */
> +#define R_PPC64_TPREL16_HA 72 /* half16 (sym+add)@tprel@ha */
> +#define R_PPC64_TPREL64 73 /* doubleword64 (sym+add)@tprel */
> +#define R_PPC64_DTPREL16 74 /* half16* (sym+add)@dtprel */
> +#define R_PPC64_DTPREL16_LO 75 /* half16 (sym+add)@dtprel@l */
> +#define R_PPC64_DTPREL16_HI 76 /* half16 (sym+add)@dtprel@h */
> +#define R_PPC64_DTPREL16_HA 77 /* half16 (sym+add)@dtprel@ha */
> +#define R_PPC64_DTPREL64 78 /* doubleword64 (sym+add)@dtprel */
> +#define R_PPC64_GOT_TLSGD16 79 /* half16* (sym+add)@got@tlsgd */
> +#define R_PPC64_GOT_TLSGD16_LO 80 /* half16 (sym+add)@got@tlsgd@l */
> +#define R_PPC64_GOT_TLSGD16_HI 81 /* half16 (sym+add)@got@tlsgd@h */
> +#define R_PPC64_GOT_TLSGD16_HA 82 /* half16 (sym+add)@got@tlsgd@ha */
> +#define R_PPC64_GOT_TLSLD16 83 /* half16* (sym+add)@got@tlsld */
> +#define R_PPC64_GOT_TLSLD16_LO 84 /* half16 (sym+add)@got@tlsld@l */
> +#define R_PPC64_GOT_TLSLD16_HI 85 /* half16 (sym+add)@got@tlsld@h */
> +#define R_PPC64_GOT_TLSLD16_HA 86 /* half16 (sym+add)@got@tlsld@ha */
> +#define R_PPC64_GOT_TPREL16_DS 87 /* half16ds* (sym+add)@got@tprel */
> +#define R_PPC64_GOT_TPREL16_LO_DS 88 /* half16ds (sym+add)@got@tprel@l */
> +#define R_PPC64_GOT_TPREL16_HI 89 /* half16 (sym+add)@got@tprel@h */
> +#define R_PPC64_GOT_TPREL16_HA 90 /* half16 (sym+add)@got@tprel@ha */
> +#define R_PPC64_GOT_DTPREL16_DS 91 /* half16ds* (sym+add)@got@dtprel */
> +#define R_PPC64_GOT_DTPREL16_LO_DS 92 /* half16ds (sym+add)@got@dtprel@l */
> +#define R_PPC64_GOT_DTPREL16_HI 93 /* half16 (sym+add)@got@dtprel@h */
> +#define R_PPC64_GOT_DTPREL16_HA 94 /* half16 (sym+add)@got@dtprel@ha */
> +#define R_PPC64_TPREL16_DS 95 /* half16ds* (sym+add)@tprel */
> +#define R_PPC64_TPREL16_LO_DS 96 /* half16ds (sym+add)@tprel@l */
> +#define R_PPC64_TPREL16_HIGHER 97 /* half16 (sym+add)@tprel@higher */
> +#define R_PPC64_TPREL16_HIGHERA 98 /* half16 (sym+add)@tprel@highera */
> +#define R_PPC64_TPREL16_HIGHEST 99 /* half16 (sym+add)@tprel@highest */
> +#define R_PPC64_TPREL16_HIGHESTA 100 /* half16 (sym+add)@tprel@highesta */
> +#define R_PPC64_DTPREL16_DS 101 /* half16ds* (sym+add)@dtprel */
> +#define R_PPC64_DTPREL16_LO_DS 102 /* half16ds (sym+add)@dtprel@l */
> +#define R_PPC64_DTPREL16_HIGHER 103 /* half16 (sym+add)@dtprel@higher */
> +#define R_PPC64_DTPREL16_HIGHERA 104 /* half16 (sym+add)@dtprel@highera */
> +#define R_PPC64_DTPREL16_HIGHEST 105 /* half16 (sym+add)@dtprel@highest */
> +#define R_PPC64_DTPREL16_HIGHESTA 106 /* half16 (sym+add)@dtprel@highesta */
> +#define R_PPC64_TLSGD 107
> +#define R_PPC64_TLSLD 108
> +#define R_PPC64_TOCSAVE 109
> +
> +#define R_PPC64_REL24_NOTOC 116
> +#define R_PPC64_ENTRY 118
> +
> +#define R_PPC64_PCREL34 132
> +#define R_PPC64_GOT_PCREL34 133
> +
> +#define R_PPC64_REL16 249
> +#define R_PPC64_REL16_LO 250
> +#define R_PPC64_REL16_HI 251
> +#define R_PPC64_REL16_HA 252
> +
> +/* Keep this the last entry. */
> +#define R_PPC64_NUM 253
> +
> #endif /* _UAPI_LINUX_ELF_R_H */
>
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v5 05/24] powerpc/elf: Move relocation constants to UAPI
2026-09-08 6:33 ` [PATCH v5 05/24] powerpc/elf: " Thomas Weißschuh
2026-09-08 9:02 ` Christophe Leroy (CS GROUP)
@ 2026-09-08 14:01 ` R Nageswara Sastry
2026-09-10 6:30 ` Mukesh Kumar Chaurasiya
2 siblings, 0 replies; 53+ messages in thread
From: R Nageswara Sastry @ 2026-09-08 14:01 UTC (permalink / raw)
To: Thomas Weißschuh, Paul Walmsley, Palmer Dabbelt, Albert Ou,
Alexandre Ghiti, Nathan Chancellor, Nick Desaulniers,
Bill Wendling, Justin Stitt, Andy Lutomirski, Vincenzo Frascino,
Kees Cook, Ingo Molnar, Borislav Petkov, Dave Hansen, x86,
H. Peter Anvin, Richard Weinberger, Anton Ivanov, Johannes Berg,
Russell King, Catalin Marinas, Will Deacon, Madhavan Srinivasan,
Michael Ellerman, Nicholas Piggin, Huacai Chen, WANG Xuerui,
Heiko Carstens, Vasily Gorbik, Alexander Gordeev,
Christian Borntraeger, Sven Schnelle, Thomas Bogendoerfer,
Miguel Ojeda, Alex Gaynor, Gary Guo, Björn Roy Baron,
Benno Lossin, Andreas Hindborg, Alice Ryhl, Trevor Gross,
Danilo Krummrich, Thomas Gleixner, Christophe Leroy, Boqun Feng,
Nicolas Schier
Cc: linux-riscv, linux-kernel, llvm, linux-mm, linux-um,
linux-arm-kernel, linuxppc-dev, loongarch, linux-s390, linux-mips,
rust-for-linux, linux-kbuild, Jan Stancek,
Arnaldo Carvalho de Melo, Alexandre Ghiti
On 08.09.2026 12:03 PM, Thomas Weißschuh wrote:
> These constants are useful for cross-platform userspace, for example to
> process ELF files during kernel cross-compilation.
>
> Move them from the kernel-private architecture-specific header to the UAPI.
>
> Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Tested-by: R Nageswara Sastry <rnsastry@linux.ibm.com>
System: ppc64le LPAR (IBM POWER), Linux 7.3-rc2
> ---
> arch/powerpc/include/uapi/asm/elf.h | 201 ------------------------------------
> include/uapi/linux/elf-r.h | 201 ++++++++++++++++++++++++++++++++++++
> 2 files changed, 201 insertions(+), 201 deletions(-)
>
> diff --git a/arch/powerpc/include/uapi/asm/elf.h b/arch/powerpc/include/uapi/asm/elf.h
> index a5377f494fa3..aba921b8249a 100644
> --- a/arch/powerpc/include/uapi/asm/elf.h
> +++ b/arch/powerpc/include/uapi/asm/elf.h
> @@ -17,78 +17,6 @@
> #include <asm/cputable.h>
> #include <asm/auxvec.h>
>
> -/* PowerPC relocations defined by the ABIs */
> -#define R_PPC_NONE 0
> -#define R_PPC_ADDR32 1 /* 32bit absolute address */
> -#define R_PPC_ADDR24 2 /* 26bit address, 2 bits ignored. */
> -#define R_PPC_ADDR16 3 /* 16bit absolute address */
> -#define R_PPC_ADDR16_LO 4 /* lower 16bit of absolute address */
> -#define R_PPC_ADDR16_HI 5 /* high 16bit of absolute address */
> -#define R_PPC_ADDR16_HA 6 /* adjusted high 16bit */
> -#define R_PPC_ADDR14 7 /* 16bit address, 2 bits ignored */
> -#define R_PPC_ADDR14_BRTAKEN 8
> -#define R_PPC_ADDR14_BRNTAKEN 9
> -#define R_PPC_REL24 10 /* PC relative 26 bit */
> -#define R_PPC_REL14 11 /* PC relative 16 bit */
> -#define R_PPC_REL14_BRTAKEN 12
> -#define R_PPC_REL14_BRNTAKEN 13
> -#define R_PPC_GOT16 14
> -#define R_PPC_GOT16_LO 15
> -#define R_PPC_GOT16_HI 16
> -#define R_PPC_GOT16_HA 17
> -#define R_PPC_PLTREL24 18
> -#define R_PPC_COPY 19
> -#define R_PPC_GLOB_DAT 20
> -#define R_PPC_JMP_SLOT 21
> -#define R_PPC_RELATIVE 22
> -#define R_PPC_LOCAL24PC 23
> -#define R_PPC_UADDR32 24
> -#define R_PPC_UADDR16 25
> -#define R_PPC_REL32 26
> -#define R_PPC_PLT32 27
> -#define R_PPC_PLTREL32 28
> -#define R_PPC_PLT16_LO 29
> -#define R_PPC_PLT16_HI 30
> -#define R_PPC_PLT16_HA 31
> -#define R_PPC_SDAREL16 32
> -#define R_PPC_SECTOFF 33
> -#define R_PPC_SECTOFF_LO 34
> -#define R_PPC_SECTOFF_HI 35
> -#define R_PPC_SECTOFF_HA 36
> -
> -/* PowerPC relocations defined for the TLS access ABI. */
> -#define R_PPC_TLS 67 /* none (sym+add)@tls */
> -#define R_PPC_DTPMOD32 68 /* word32 (sym+add)@dtpmod */
> -#define R_PPC_TPREL16 69 /* half16* (sym+add)@tprel */
> -#define R_PPC_TPREL16_LO 70 /* half16 (sym+add)@tprel@l */
> -#define R_PPC_TPREL16_HI 71 /* half16 (sym+add)@tprel@h */
> -#define R_PPC_TPREL16_HA 72 /* half16 (sym+add)@tprel@ha */
> -#define R_PPC_TPREL32 73 /* word32 (sym+add)@tprel */
> -#define R_PPC_DTPREL16 74 /* half16* (sym+add)@dtprel */
> -#define R_PPC_DTPREL16_LO 75 /* half16 (sym+add)@dtprel@l */
> -#define R_PPC_DTPREL16_HI 76 /* half16 (sym+add)@dtprel@h */
> -#define R_PPC_DTPREL16_HA 77 /* half16 (sym+add)@dtprel@ha */
> -#define R_PPC_DTPREL32 78 /* word32 (sym+add)@dtprel */
> -#define R_PPC_GOT_TLSGD16 79 /* half16* (sym+add)@got@tlsgd */
> -#define R_PPC_GOT_TLSGD16_LO 80 /* half16 (sym+add)@got@tlsgd@l */
> -#define R_PPC_GOT_TLSGD16_HI 81 /* half16 (sym+add)@got@tlsgd@h */
> -#define R_PPC_GOT_TLSGD16_HA 82 /* half16 (sym+add)@got@tlsgd@ha */
> -#define R_PPC_GOT_TLSLD16 83 /* half16* (sym+add)@got@tlsld */
> -#define R_PPC_GOT_TLSLD16_LO 84 /* half16 (sym+add)@got@tlsld@l */
> -#define R_PPC_GOT_TLSLD16_HI 85 /* half16 (sym+add)@got@tlsld@h */
> -#define R_PPC_GOT_TLSLD16_HA 86 /* half16 (sym+add)@got@tlsld@ha */
> -#define R_PPC_GOT_TPREL16 87 /* half16* (sym+add)@got@tprel */
> -#define R_PPC_GOT_TPREL16_LO 88 /* half16 (sym+add)@got@tprel@l */
> -#define R_PPC_GOT_TPREL16_HI 89 /* half16 (sym+add)@got@tprel@h */
> -#define R_PPC_GOT_TPREL16_HA 90 /* half16 (sym+add)@got@tprel@ha */
> -#define R_PPC_GOT_DTPREL16 91 /* half16* (sym+add)@got@dtprel */
> -#define R_PPC_GOT_DTPREL16_LO 92 /* half16* (sym+add)@got@dtprel@l */
> -#define R_PPC_GOT_DTPREL16_HI 93 /* half16* (sym+add)@got@dtprel@h */
> -#define R_PPC_GOT_DTPREL16_HA 94 /* half16* (sym+add)@got@dtprel@ha */
> -
> -/* keep this the last entry. */
> -#define R_PPC_NUM 95
> -
>
> #define ELF_NGREG 48 /* includes nip, msr, lr, etc. */
> #define ELF_NFPREG 33 /* includes fpscr */
> @@ -166,133 +94,4 @@ typedef elf_vrreg_t elf_vrregset_t32[ELF_NVRREG32];
> typedef elf_fpreg_t elf_vsrreghalf_t32[ELF_NVSRHALFREG];
> #endif
>
> -/* PowerPC64 relocations defined by the ABIs */
> -#define R_PPC64_NONE R_PPC_NONE
> -#define R_PPC64_ADDR32 R_PPC_ADDR32 /* 32bit absolute address. */
> -#define R_PPC64_ADDR24 R_PPC_ADDR24 /* 26bit address, word aligned. */
> -#define R_PPC64_ADDR16 R_PPC_ADDR16 /* 16bit absolute address. */
> -#define R_PPC64_ADDR16_LO R_PPC_ADDR16_LO /* lower 16bits of abs. address. */
> -#define R_PPC64_ADDR16_HI R_PPC_ADDR16_HI /* high 16bits of abs. address. */
> -#define R_PPC64_ADDR16_HA R_PPC_ADDR16_HA /* adjusted high 16bits. */
> -#define R_PPC64_ADDR14 R_PPC_ADDR14 /* 16bit address, word aligned. */
> -#define R_PPC64_ADDR14_BRTAKEN R_PPC_ADDR14_BRTAKEN
> -#define R_PPC64_ADDR14_BRNTAKEN R_PPC_ADDR14_BRNTAKEN
> -#define R_PPC64_REL24 R_PPC_REL24 /* PC relative 26 bit, word aligned. */
> -#define R_PPC64_REL14 R_PPC_REL14 /* PC relative 16 bit. */
> -#define R_PPC64_REL14_BRTAKEN R_PPC_REL14_BRTAKEN
> -#define R_PPC64_REL14_BRNTAKEN R_PPC_REL14_BRNTAKEN
> -#define R_PPC64_GOT16 R_PPC_GOT16
> -#define R_PPC64_GOT16_LO R_PPC_GOT16_LO
> -#define R_PPC64_GOT16_HI R_PPC_GOT16_HI
> -#define R_PPC64_GOT16_HA R_PPC_GOT16_HA
> -
> -#define R_PPC64_COPY R_PPC_COPY
> -#define R_PPC64_GLOB_DAT R_PPC_GLOB_DAT
> -#define R_PPC64_JMP_SLOT R_PPC_JMP_SLOT
> -#define R_PPC64_RELATIVE R_PPC_RELATIVE
> -
> -#define R_PPC64_UADDR32 R_PPC_UADDR32
> -#define R_PPC64_UADDR16 R_PPC_UADDR16
> -#define R_PPC64_REL32 R_PPC_REL32
> -#define R_PPC64_PLT32 R_PPC_PLT32
> -#define R_PPC64_PLTREL32 R_PPC_PLTREL32
> -#define R_PPC64_PLT16_LO R_PPC_PLT16_LO
> -#define R_PPC64_PLT16_HI R_PPC_PLT16_HI
> -#define R_PPC64_PLT16_HA R_PPC_PLT16_HA
> -
> -#define R_PPC64_SECTOFF R_PPC_SECTOFF
> -#define R_PPC64_SECTOFF_LO R_PPC_SECTOFF_LO
> -#define R_PPC64_SECTOFF_HI R_PPC_SECTOFF_HI
> -#define R_PPC64_SECTOFF_HA R_PPC_SECTOFF_HA
> -#define R_PPC64_ADDR30 37 /* word30 (S + A - P) >> 2. */
> -#define R_PPC64_ADDR64 38 /* doubleword64 S + A. */
> -#define R_PPC64_ADDR16_HIGHER 39 /* half16 #higher(S + A). */
> -#define R_PPC64_ADDR16_HIGHERA 40 /* half16 #highera(S + A). */
> -#define R_PPC64_ADDR16_HIGHEST 41 /* half16 #highest(S + A). */
> -#define R_PPC64_ADDR16_HIGHESTA 42 /* half16 #highesta(S + A). */
> -#define R_PPC64_UADDR64 43 /* doubleword64 S + A. */
> -#define R_PPC64_REL64 44 /* doubleword64 S + A - P. */
> -#define R_PPC64_PLT64 45 /* doubleword64 L + A. */
> -#define R_PPC64_PLTREL64 46 /* doubleword64 L + A - P. */
> -#define R_PPC64_TOC16 47 /* half16* S + A - .TOC. */
> -#define R_PPC64_TOC16_LO 48 /* half16 #lo(S + A - .TOC.). */
> -#define R_PPC64_TOC16_HI 49 /* half16 #hi(S + A - .TOC.). */
> -#define R_PPC64_TOC16_HA 50 /* half16 #ha(S + A - .TOC.). */
> -#define R_PPC64_TOC 51 /* doubleword64 .TOC. */
> -#define R_PPC64_PLTGOT16 52 /* half16* M + A. */
> -#define R_PPC64_PLTGOT16_LO 53 /* half16 #lo(M + A). */
> -#define R_PPC64_PLTGOT16_HI 54 /* half16 #hi(M + A). */
> -#define R_PPC64_PLTGOT16_HA 55 /* half16 #ha(M + A). */
> -
> -#define R_PPC64_ADDR16_DS 56 /* half16ds* (S + A) >> 2. */
> -#define R_PPC64_ADDR16_LO_DS 57 /* half16ds #lo(S + A) >> 2. */
> -#define R_PPC64_GOT16_DS 58 /* half16ds* (G + A) >> 2. */
> -#define R_PPC64_GOT16_LO_DS 59 /* half16ds #lo(G + A) >> 2. */
> -#define R_PPC64_PLT16_LO_DS 60 /* half16ds #lo(L + A) >> 2. */
> -#define R_PPC64_SECTOFF_DS 61 /* half16ds* (R + A) >> 2. */
> -#define R_PPC64_SECTOFF_LO_DS 62 /* half16ds #lo(R + A) >> 2. */
> -#define R_PPC64_TOC16_DS 63 /* half16ds* (S + A - .TOC.) >> 2. */
> -#define R_PPC64_TOC16_LO_DS 64 /* half16ds #lo(S + A - .TOC.) >> 2. */
> -#define R_PPC64_PLTGOT16_DS 65 /* half16ds* (M + A) >> 2. */
> -#define R_PPC64_PLTGOT16_LO_DS 66 /* half16ds #lo(M + A) >> 2. */
> -
> -/* PowerPC64 relocations defined for the TLS access ABI. */
> -#define R_PPC64_TLS 67 /* none (sym+add)@tls */
> -#define R_PPC64_DTPMOD64 68 /* doubleword64 (sym+add)@dtpmod */
> -#define R_PPC64_TPREL16 69 /* half16* (sym+add)@tprel */
> -#define R_PPC64_TPREL16_LO 70 /* half16 (sym+add)@tprel@l */
> -#define R_PPC64_TPREL16_HI 71 /* half16 (sym+add)@tprel@h */
> -#define R_PPC64_TPREL16_HA 72 /* half16 (sym+add)@tprel@ha */
> -#define R_PPC64_TPREL64 73 /* doubleword64 (sym+add)@tprel */
> -#define R_PPC64_DTPREL16 74 /* half16* (sym+add)@dtprel */
> -#define R_PPC64_DTPREL16_LO 75 /* half16 (sym+add)@dtprel@l */
> -#define R_PPC64_DTPREL16_HI 76 /* half16 (sym+add)@dtprel@h */
> -#define R_PPC64_DTPREL16_HA 77 /* half16 (sym+add)@dtprel@ha */
> -#define R_PPC64_DTPREL64 78 /* doubleword64 (sym+add)@dtprel */
> -#define R_PPC64_GOT_TLSGD16 79 /* half16* (sym+add)@got@tlsgd */
> -#define R_PPC64_GOT_TLSGD16_LO 80 /* half16 (sym+add)@got@tlsgd@l */
> -#define R_PPC64_GOT_TLSGD16_HI 81 /* half16 (sym+add)@got@tlsgd@h */
> -#define R_PPC64_GOT_TLSGD16_HA 82 /* half16 (sym+add)@got@tlsgd@ha */
> -#define R_PPC64_GOT_TLSLD16 83 /* half16* (sym+add)@got@tlsld */
> -#define R_PPC64_GOT_TLSLD16_LO 84 /* half16 (sym+add)@got@tlsld@l */
> -#define R_PPC64_GOT_TLSLD16_HI 85 /* half16 (sym+add)@got@tlsld@h */
> -#define R_PPC64_GOT_TLSLD16_HA 86 /* half16 (sym+add)@got@tlsld@ha */
> -#define R_PPC64_GOT_TPREL16_DS 87 /* half16ds* (sym+add)@got@tprel */
> -#define R_PPC64_GOT_TPREL16_LO_DS 88 /* half16ds (sym+add)@got@tprel@l */
> -#define R_PPC64_GOT_TPREL16_HI 89 /* half16 (sym+add)@got@tprel@h */
> -#define R_PPC64_GOT_TPREL16_HA 90 /* half16 (sym+add)@got@tprel@ha */
> -#define R_PPC64_GOT_DTPREL16_DS 91 /* half16ds* (sym+add)@got@dtprel */
> -#define R_PPC64_GOT_DTPREL16_LO_DS 92 /* half16ds (sym+add)@got@dtprel@l */
> -#define R_PPC64_GOT_DTPREL16_HI 93 /* half16 (sym+add)@got@dtprel@h */
> -#define R_PPC64_GOT_DTPREL16_HA 94 /* half16 (sym+add)@got@dtprel@ha */
> -#define R_PPC64_TPREL16_DS 95 /* half16ds* (sym+add)@tprel */
> -#define R_PPC64_TPREL16_LO_DS 96 /* half16ds (sym+add)@tprel@l */
> -#define R_PPC64_TPREL16_HIGHER 97 /* half16 (sym+add)@tprel@higher */
> -#define R_PPC64_TPREL16_HIGHERA 98 /* half16 (sym+add)@tprel@highera */
> -#define R_PPC64_TPREL16_HIGHEST 99 /* half16 (sym+add)@tprel@highest */
> -#define R_PPC64_TPREL16_HIGHESTA 100 /* half16 (sym+add)@tprel@highesta */
> -#define R_PPC64_DTPREL16_DS 101 /* half16ds* (sym+add)@dtprel */
> -#define R_PPC64_DTPREL16_LO_DS 102 /* half16ds (sym+add)@dtprel@l */
> -#define R_PPC64_DTPREL16_HIGHER 103 /* half16 (sym+add)@dtprel@higher */
> -#define R_PPC64_DTPREL16_HIGHERA 104 /* half16 (sym+add)@dtprel@highera */
> -#define R_PPC64_DTPREL16_HIGHEST 105 /* half16 (sym+add)@dtprel@highest */
> -#define R_PPC64_DTPREL16_HIGHESTA 106 /* half16 (sym+add)@dtprel@highesta */
> -#define R_PPC64_TLSGD 107
> -#define R_PPC64_TLSLD 108
> -#define R_PPC64_TOCSAVE 109
> -
> -#define R_PPC64_REL24_NOTOC 116
> -#define R_PPC64_ENTRY 118
> -
> -#define R_PPC64_PCREL34 132
> -#define R_PPC64_GOT_PCREL34 133
> -
> -#define R_PPC64_REL16 249
> -#define R_PPC64_REL16_LO 250
> -#define R_PPC64_REL16_HI 251
> -#define R_PPC64_REL16_HA 252
> -
> -/* Keep this the last entry. */
> -#define R_PPC64_NUM 253
> -
> #endif /* _UAPI_ASM_POWERPC_ELF_H */
> diff --git a/include/uapi/linux/elf-r.h b/include/uapi/linux/elf-r.h
> index cf931fc05afa..0d0dfaa7c724 100644
> --- a/include/uapi/linux/elf-r.h
> +++ b/include/uapi/linux/elf-r.h
> @@ -113,4 +113,205 @@
>
> #define R_AARCH64_RELATIVE 1027
>
> +/* PowerPC relocations defined by the ABIs */
> +#define R_PPC_NONE 0
> +#define R_PPC_ADDR32 1 /* 32bit absolute address */
> +#define R_PPC_ADDR24 2 /* 26bit address, 2 bits ignored. */
> +#define R_PPC_ADDR16 3 /* 16bit absolute address */
> +#define R_PPC_ADDR16_LO 4 /* lower 16bit of absolute address */
> +#define R_PPC_ADDR16_HI 5 /* high 16bit of absolute address */
> +#define R_PPC_ADDR16_HA 6 /* adjusted high 16bit */
> +#define R_PPC_ADDR14 7 /* 16bit address, 2 bits ignored */
> +#define R_PPC_ADDR14_BRTAKEN 8
> +#define R_PPC_ADDR14_BRNTAKEN 9
> +#define R_PPC_REL24 10 /* PC relative 26 bit */
> +#define R_PPC_REL14 11 /* PC relative 16 bit */
> +#define R_PPC_REL14_BRTAKEN 12
> +#define R_PPC_REL14_BRNTAKEN 13
> +#define R_PPC_GOT16 14
> +#define R_PPC_GOT16_LO 15
> +#define R_PPC_GOT16_HI 16
> +#define R_PPC_GOT16_HA 17
> +#define R_PPC_PLTREL24 18
> +#define R_PPC_COPY 19
> +#define R_PPC_GLOB_DAT 20
> +#define R_PPC_JMP_SLOT 21
> +#define R_PPC_RELATIVE 22
> +#define R_PPC_LOCAL24PC 23
> +#define R_PPC_UADDR32 24
> +#define R_PPC_UADDR16 25
> +#define R_PPC_REL32 26
> +#define R_PPC_PLT32 27
> +#define R_PPC_PLTREL32 28
> +#define R_PPC_PLT16_LO 29
> +#define R_PPC_PLT16_HI 30
> +#define R_PPC_PLT16_HA 31
> +#define R_PPC_SDAREL16 32
> +#define R_PPC_SECTOFF 33
> +#define R_PPC_SECTOFF_LO 34
> +#define R_PPC_SECTOFF_HI 35
> +#define R_PPC_SECTOFF_HA 36
> +
> +/* PowerPC relocations defined for the TLS access ABI. */
> +#define R_PPC_TLS 67 /* none (sym+add)@tls */
> +#define R_PPC_DTPMOD32 68 /* word32 (sym+add)@dtpmod */
> +#define R_PPC_TPREL16 69 /* half16* (sym+add)@tprel */
> +#define R_PPC_TPREL16_LO 70 /* half16 (sym+add)@tprel@l */
> +#define R_PPC_TPREL16_HI 71 /* half16 (sym+add)@tprel@h */
> +#define R_PPC_TPREL16_HA 72 /* half16 (sym+add)@tprel@ha */
> +#define R_PPC_TPREL32 73 /* word32 (sym+add)@tprel */
> +#define R_PPC_DTPREL16 74 /* half16* (sym+add)@dtprel */
> +#define R_PPC_DTPREL16_LO 75 /* half16 (sym+add)@dtprel@l */
> +#define R_PPC_DTPREL16_HI 76 /* half16 (sym+add)@dtprel@h */
> +#define R_PPC_DTPREL16_HA 77 /* half16 (sym+add)@dtprel@ha */
> +#define R_PPC_DTPREL32 78 /* word32 (sym+add)@dtprel */
> +#define R_PPC_GOT_TLSGD16 79 /* half16* (sym+add)@got@tlsgd */
> +#define R_PPC_GOT_TLSGD16_LO 80 /* half16 (sym+add)@got@tlsgd@l */
> +#define R_PPC_GOT_TLSGD16_HI 81 /* half16 (sym+add)@got@tlsgd@h */
> +#define R_PPC_GOT_TLSGD16_HA 82 /* half16 (sym+add)@got@tlsgd@ha */
> +#define R_PPC_GOT_TLSLD16 83 /* half16* (sym+add)@got@tlsld */
> +#define R_PPC_GOT_TLSLD16_LO 84 /* half16 (sym+add)@got@tlsld@l */
> +#define R_PPC_GOT_TLSLD16_HI 85 /* half16 (sym+add)@got@tlsld@h */
> +#define R_PPC_GOT_TLSLD16_HA 86 /* half16 (sym+add)@got@tlsld@ha */
> +#define R_PPC_GOT_TPREL16 87 /* half16* (sym+add)@got@tprel */
> +#define R_PPC_GOT_TPREL16_LO 88 /* half16 (sym+add)@got@tprel@l */
> +#define R_PPC_GOT_TPREL16_HI 89 /* half16 (sym+add)@got@tprel@h */
> +#define R_PPC_GOT_TPREL16_HA 90 /* half16 (sym+add)@got@tprel@ha */
> +#define R_PPC_GOT_DTPREL16 91 /* half16* (sym+add)@got@dtprel */
> +#define R_PPC_GOT_DTPREL16_LO 92 /* half16* (sym+add)@got@dtprel@l */
> +#define R_PPC_GOT_DTPREL16_HI 93 /* half16* (sym+add)@got@dtprel@h */
> +#define R_PPC_GOT_DTPREL16_HA 94 /* half16* (sym+add)@got@dtprel@ha */
> +
> +/* keep this the last entry. */
> +#define R_PPC_NUM 95
> +
> +/* PowerPC64 relocations defined by the ABIs */
> +#define R_PPC64_NONE R_PPC_NONE
> +#define R_PPC64_ADDR32 R_PPC_ADDR32 /* 32bit absolute address. */
> +#define R_PPC64_ADDR24 R_PPC_ADDR24 /* 26bit address, word aligned. */
> +#define R_PPC64_ADDR16 R_PPC_ADDR16 /* 16bit absolute address. */
> +#define R_PPC64_ADDR16_LO R_PPC_ADDR16_LO /* lower 16bits of abs. address. */
> +#define R_PPC64_ADDR16_HI R_PPC_ADDR16_HI /* high 16bits of abs. address. */
> +#define R_PPC64_ADDR16_HA R_PPC_ADDR16_HA /* adjusted high 16bits. */
> +#define R_PPC64_ADDR14 R_PPC_ADDR14 /* 16bit address, word aligned. */
> +#define R_PPC64_ADDR14_BRTAKEN R_PPC_ADDR14_BRTAKEN
> +#define R_PPC64_ADDR14_BRNTAKEN R_PPC_ADDR14_BRNTAKEN
> +#define R_PPC64_REL24 R_PPC_REL24 /* PC relative 26 bit, word aligned. */
> +#define R_PPC64_REL14 R_PPC_REL14 /* PC relative 16 bit. */
> +#define R_PPC64_REL14_BRTAKEN R_PPC_REL14_BRTAKEN
> +#define R_PPC64_REL14_BRNTAKEN R_PPC_REL14_BRNTAKEN
> +#define R_PPC64_GOT16 R_PPC_GOT16
> +#define R_PPC64_GOT16_LO R_PPC_GOT16_LO
> +#define R_PPC64_GOT16_HI R_PPC_GOT16_HI
> +#define R_PPC64_GOT16_HA R_PPC_GOT16_HA
> +
> +#define R_PPC64_COPY R_PPC_COPY
> +#define R_PPC64_GLOB_DAT R_PPC_GLOB_DAT
> +#define R_PPC64_JMP_SLOT R_PPC_JMP_SLOT
> +#define R_PPC64_RELATIVE R_PPC_RELATIVE
> +
> +#define R_PPC64_UADDR32 R_PPC_UADDR32
> +#define R_PPC64_UADDR16 R_PPC_UADDR16
> +#define R_PPC64_REL32 R_PPC_REL32
> +#define R_PPC64_PLT32 R_PPC_PLT32
> +#define R_PPC64_PLTREL32 R_PPC_PLTREL32
> +#define R_PPC64_PLT16_LO R_PPC_PLT16_LO
> +#define R_PPC64_PLT16_HI R_PPC_PLT16_HI
> +#define R_PPC64_PLT16_HA R_PPC_PLT16_HA
> +
> +#define R_PPC64_SECTOFF R_PPC_SECTOFF
> +#define R_PPC64_SECTOFF_LO R_PPC_SECTOFF_LO
> +#define R_PPC64_SECTOFF_HI R_PPC_SECTOFF_HI
> +#define R_PPC64_SECTOFF_HA R_PPC_SECTOFF_HA
> +#define R_PPC64_ADDR30 37 /* word30 (S + A - P) >> 2. */
> +#define R_PPC64_ADDR64 38 /* doubleword64 S + A. */
> +#define R_PPC64_ADDR16_HIGHER 39 /* half16 #higher(S + A). */
> +#define R_PPC64_ADDR16_HIGHERA 40 /* half16 #highera(S + A). */
> +#define R_PPC64_ADDR16_HIGHEST 41 /* half16 #highest(S + A). */
> +#define R_PPC64_ADDR16_HIGHESTA 42 /* half16 #highesta(S + A). */
> +#define R_PPC64_UADDR64 43 /* doubleword64 S + A. */
> +#define R_PPC64_REL64 44 /* doubleword64 S + A - P. */
> +#define R_PPC64_PLT64 45 /* doubleword64 L + A. */
> +#define R_PPC64_PLTREL64 46 /* doubleword64 L + A - P. */
> +#define R_PPC64_TOC16 47 /* half16* S + A - .TOC. */
> +#define R_PPC64_TOC16_LO 48 /* half16 #lo(S + A - .TOC.). */
> +#define R_PPC64_TOC16_HI 49 /* half16 #hi(S + A - .TOC.). */
> +#define R_PPC64_TOC16_HA 50 /* half16 #ha(S + A - .TOC.). */
> +#define R_PPC64_TOC 51 /* doubleword64 .TOC. */
> +#define R_PPC64_PLTGOT16 52 /* half16* M + A. */
> +#define R_PPC64_PLTGOT16_LO 53 /* half16 #lo(M + A). */
> +#define R_PPC64_PLTGOT16_HI 54 /* half16 #hi(M + A). */
> +#define R_PPC64_PLTGOT16_HA 55 /* half16 #ha(M + A). */
> +
> +#define R_PPC64_ADDR16_DS 56 /* half16ds* (S + A) >> 2. */
> +#define R_PPC64_ADDR16_LO_DS 57 /* half16ds #lo(S + A) >> 2. */
> +#define R_PPC64_GOT16_DS 58 /* half16ds* (G + A) >> 2. */
> +#define R_PPC64_GOT16_LO_DS 59 /* half16ds #lo(G + A) >> 2. */
> +#define R_PPC64_PLT16_LO_DS 60 /* half16ds #lo(L + A) >> 2. */
> +#define R_PPC64_SECTOFF_DS 61 /* half16ds* (R + A) >> 2. */
> +#define R_PPC64_SECTOFF_LO_DS 62 /* half16ds #lo(R + A) >> 2. */
> +#define R_PPC64_TOC16_DS 63 /* half16ds* (S + A - .TOC.) >> 2. */
> +#define R_PPC64_TOC16_LO_DS 64 /* half16ds #lo(S + A - .TOC.) >> 2. */
> +#define R_PPC64_PLTGOT16_DS 65 /* half16ds* (M + A) >> 2. */
> +#define R_PPC64_PLTGOT16_LO_DS 66 /* half16ds #lo(M + A) >> 2. */
> +
> +/* PowerPC64 relocations defined for the TLS access ABI. */
> +#define R_PPC64_TLS 67 /* none (sym+add)@tls */
> +#define R_PPC64_DTPMOD64 68 /* doubleword64 (sym+add)@dtpmod */
> +#define R_PPC64_TPREL16 69 /* half16* (sym+add)@tprel */
> +#define R_PPC64_TPREL16_LO 70 /* half16 (sym+add)@tprel@l */
> +#define R_PPC64_TPREL16_HI 71 /* half16 (sym+add)@tprel@h */
> +#define R_PPC64_TPREL16_HA 72 /* half16 (sym+add)@tprel@ha */
> +#define R_PPC64_TPREL64 73 /* doubleword64 (sym+add)@tprel */
> +#define R_PPC64_DTPREL16 74 /* half16* (sym+add)@dtprel */
> +#define R_PPC64_DTPREL16_LO 75 /* half16 (sym+add)@dtprel@l */
> +#define R_PPC64_DTPREL16_HI 76 /* half16 (sym+add)@dtprel@h */
> +#define R_PPC64_DTPREL16_HA 77 /* half16 (sym+add)@dtprel@ha */
> +#define R_PPC64_DTPREL64 78 /* doubleword64 (sym+add)@dtprel */
> +#define R_PPC64_GOT_TLSGD16 79 /* half16* (sym+add)@got@tlsgd */
> +#define R_PPC64_GOT_TLSGD16_LO 80 /* half16 (sym+add)@got@tlsgd@l */
> +#define R_PPC64_GOT_TLSGD16_HI 81 /* half16 (sym+add)@got@tlsgd@h */
> +#define R_PPC64_GOT_TLSGD16_HA 82 /* half16 (sym+add)@got@tlsgd@ha */
> +#define R_PPC64_GOT_TLSLD16 83 /* half16* (sym+add)@got@tlsld */
> +#define R_PPC64_GOT_TLSLD16_LO 84 /* half16 (sym+add)@got@tlsld@l */
> +#define R_PPC64_GOT_TLSLD16_HI 85 /* half16 (sym+add)@got@tlsld@h */
> +#define R_PPC64_GOT_TLSLD16_HA 86 /* half16 (sym+add)@got@tlsld@ha */
> +#define R_PPC64_GOT_TPREL16_DS 87 /* half16ds* (sym+add)@got@tprel */
> +#define R_PPC64_GOT_TPREL16_LO_DS 88 /* half16ds (sym+add)@got@tprel@l */
> +#define R_PPC64_GOT_TPREL16_HI 89 /* half16 (sym+add)@got@tprel@h */
> +#define R_PPC64_GOT_TPREL16_HA 90 /* half16 (sym+add)@got@tprel@ha */
> +#define R_PPC64_GOT_DTPREL16_DS 91 /* half16ds* (sym+add)@got@dtprel */
> +#define R_PPC64_GOT_DTPREL16_LO_DS 92 /* half16ds (sym+add)@got@dtprel@l */
> +#define R_PPC64_GOT_DTPREL16_HI 93 /* half16 (sym+add)@got@dtprel@h */
> +#define R_PPC64_GOT_DTPREL16_HA 94 /* half16 (sym+add)@got@dtprel@ha */
> +#define R_PPC64_TPREL16_DS 95 /* half16ds* (sym+add)@tprel */
> +#define R_PPC64_TPREL16_LO_DS 96 /* half16ds (sym+add)@tprel@l */
> +#define R_PPC64_TPREL16_HIGHER 97 /* half16 (sym+add)@tprel@higher */
> +#define R_PPC64_TPREL16_HIGHERA 98 /* half16 (sym+add)@tprel@highera */
> +#define R_PPC64_TPREL16_HIGHEST 99 /* half16 (sym+add)@tprel@highest */
> +#define R_PPC64_TPREL16_HIGHESTA 100 /* half16 (sym+add)@tprel@highesta */
> +#define R_PPC64_DTPREL16_DS 101 /* half16ds* (sym+add)@dtprel */
> +#define R_PPC64_DTPREL16_LO_DS 102 /* half16ds (sym+add)@dtprel@l */
> +#define R_PPC64_DTPREL16_HIGHER 103 /* half16 (sym+add)@dtprel@higher */
> +#define R_PPC64_DTPREL16_HIGHERA 104 /* half16 (sym+add)@dtprel@highera */
> +#define R_PPC64_DTPREL16_HIGHEST 105 /* half16 (sym+add)@dtprel@highest */
> +#define R_PPC64_DTPREL16_HIGHESTA 106 /* half16 (sym+add)@dtprel@highesta */
> +#define R_PPC64_TLSGD 107
> +#define R_PPC64_TLSLD 108
> +#define R_PPC64_TOCSAVE 109
> +
> +#define R_PPC64_REL24_NOTOC 116
> +#define R_PPC64_ENTRY 118
> +
> +#define R_PPC64_PCREL34 132
> +#define R_PPC64_GOT_PCREL34 133
> +
> +#define R_PPC64_REL16 249
> +#define R_PPC64_REL16_LO 250
> +#define R_PPC64_REL16_HI 251
> +#define R_PPC64_REL16_HA 252
> +
> +/* Keep this the last entry. */
> +#define R_PPC64_NUM 253
> +
> #endif /* _UAPI_LINUX_ELF_R_H */
>
--
Thanks and Regards
R.Nageswara Sastry
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v5 05/24] powerpc/elf: Move relocation constants to UAPI
2026-09-08 6:33 ` [PATCH v5 05/24] powerpc/elf: " Thomas Weißschuh
2026-09-08 9:02 ` Christophe Leroy (CS GROUP)
2026-09-08 14:01 ` R Nageswara Sastry
@ 2026-09-10 6:30 ` Mukesh Kumar Chaurasiya
2 siblings, 0 replies; 53+ messages in thread
From: Mukesh Kumar Chaurasiya @ 2026-09-10 6:30 UTC (permalink / raw)
To: Thomas Weißschuh
Cc: Paul Walmsley, Palmer Dabbelt, Albert Ou, Alexandre Ghiti,
Nathan Chancellor, Nick Desaulniers, Bill Wendling, Justin Stitt,
Andy Lutomirski, Vincenzo Frascino, Kees Cook, Ingo Molnar,
Borislav Petkov, Dave Hansen, x86, H. Peter Anvin,
Richard Weinberger, Anton Ivanov, Johannes Berg, Russell King,
Catalin Marinas, Will Deacon, Madhavan Srinivasan,
Michael Ellerman, Nicholas Piggin, Huacai Chen, WANG Xuerui,
Heiko Carstens, Vasily Gorbik, Alexander Gordeev,
Christian Borntraeger, Sven Schnelle, Thomas Bogendoerfer,
Miguel Ojeda, Alex Gaynor, Gary Guo, Björn Roy Baron,
Benno Lossin, Andreas Hindborg, Alice Ryhl, Trevor Gross,
Danilo Krummrich, Thomas Gleixner, Christophe Leroy, Boqun Feng,
Nicolas Schier, linux-riscv, linux-kernel, llvm, linux-mm,
linux-um, linux-arm-kernel, linuxppc-dev, loongarch, linux-s390,
linux-mips, rust-for-linux, linux-kbuild, Jan Stancek,
Arnaldo Carvalho de Melo, Alexandre Ghiti
On Tue, Sep 08, 2026 at 08:33:39AM +0200, Thomas Weißschuh wrote:
> These constants are useful for cross-platform userspace, for example to
> process ELF files during kernel cross-compilation.
>
> Move them from the kernel-private architecture-specific header to the UAPI.
>
> Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
> ---
> arch/powerpc/include/uapi/asm/elf.h | 201 ------------------------------------
> include/uapi/linux/elf-r.h | 201 ++++++++++++++++++++++++++++++++++++
> 2 files changed, 201 insertions(+), 201 deletions(-)
>
> diff --git a/arch/powerpc/include/uapi/asm/elf.h b/arch/powerpc/include/uapi/asm/elf.h
> index a5377f494fa3..aba921b8249a 100644
> --- a/arch/powerpc/include/uapi/asm/elf.h
> +++ b/arch/powerpc/include/uapi/asm/elf.h
> @@ -17,78 +17,6 @@
> #include <asm/cputable.h>
> #include <asm/auxvec.h>
>
> -/* PowerPC relocations defined by the ABIs */
> -#define R_PPC_NONE 0
> -#define R_PPC_ADDR32 1 /* 32bit absolute address */
> -#define R_PPC_ADDR24 2 /* 26bit address, 2 bits ignored. */
> -#define R_PPC_ADDR16 3 /* 16bit absolute address */
> -#define R_PPC_ADDR16_LO 4 /* lower 16bit of absolute address */
> -#define R_PPC_ADDR16_HI 5 /* high 16bit of absolute address */
> -#define R_PPC_ADDR16_HA 6 /* adjusted high 16bit */
> -#define R_PPC_ADDR14 7 /* 16bit address, 2 bits ignored */
> -#define R_PPC_ADDR14_BRTAKEN 8
> -#define R_PPC_ADDR14_BRNTAKEN 9
> -#define R_PPC_REL24 10 /* PC relative 26 bit */
> -#define R_PPC_REL14 11 /* PC relative 16 bit */
> -#define R_PPC_REL14_BRTAKEN 12
> -#define R_PPC_REL14_BRNTAKEN 13
> -#define R_PPC_GOT16 14
> -#define R_PPC_GOT16_LO 15
> -#define R_PPC_GOT16_HI 16
> -#define R_PPC_GOT16_HA 17
> -#define R_PPC_PLTREL24 18
> -#define R_PPC_COPY 19
> -#define R_PPC_GLOB_DAT 20
> -#define R_PPC_JMP_SLOT 21
> -#define R_PPC_RELATIVE 22
> -#define R_PPC_LOCAL24PC 23
> -#define R_PPC_UADDR32 24
> -#define R_PPC_UADDR16 25
> -#define R_PPC_REL32 26
> -#define R_PPC_PLT32 27
> -#define R_PPC_PLTREL32 28
> -#define R_PPC_PLT16_LO 29
> -#define R_PPC_PLT16_HI 30
> -#define R_PPC_PLT16_HA 31
> -#define R_PPC_SDAREL16 32
> -#define R_PPC_SECTOFF 33
> -#define R_PPC_SECTOFF_LO 34
> -#define R_PPC_SECTOFF_HI 35
> -#define R_PPC_SECTOFF_HA 36
> -
> -/* PowerPC relocations defined for the TLS access ABI. */
> -#define R_PPC_TLS 67 /* none (sym+add)@tls */
> -#define R_PPC_DTPMOD32 68 /* word32 (sym+add)@dtpmod */
> -#define R_PPC_TPREL16 69 /* half16* (sym+add)@tprel */
> -#define R_PPC_TPREL16_LO 70 /* half16 (sym+add)@tprel@l */
> -#define R_PPC_TPREL16_HI 71 /* half16 (sym+add)@tprel@h */
> -#define R_PPC_TPREL16_HA 72 /* half16 (sym+add)@tprel@ha */
> -#define R_PPC_TPREL32 73 /* word32 (sym+add)@tprel */
> -#define R_PPC_DTPREL16 74 /* half16* (sym+add)@dtprel */
> -#define R_PPC_DTPREL16_LO 75 /* half16 (sym+add)@dtprel@l */
> -#define R_PPC_DTPREL16_HI 76 /* half16 (sym+add)@dtprel@h */
> -#define R_PPC_DTPREL16_HA 77 /* half16 (sym+add)@dtprel@ha */
> -#define R_PPC_DTPREL32 78 /* word32 (sym+add)@dtprel */
> -#define R_PPC_GOT_TLSGD16 79 /* half16* (sym+add)@got@tlsgd */
> -#define R_PPC_GOT_TLSGD16_LO 80 /* half16 (sym+add)@got@tlsgd@l */
> -#define R_PPC_GOT_TLSGD16_HI 81 /* half16 (sym+add)@got@tlsgd@h */
> -#define R_PPC_GOT_TLSGD16_HA 82 /* half16 (sym+add)@got@tlsgd@ha */
> -#define R_PPC_GOT_TLSLD16 83 /* half16* (sym+add)@got@tlsld */
> -#define R_PPC_GOT_TLSLD16_LO 84 /* half16 (sym+add)@got@tlsld@l */
> -#define R_PPC_GOT_TLSLD16_HI 85 /* half16 (sym+add)@got@tlsld@h */
> -#define R_PPC_GOT_TLSLD16_HA 86 /* half16 (sym+add)@got@tlsld@ha */
> -#define R_PPC_GOT_TPREL16 87 /* half16* (sym+add)@got@tprel */
> -#define R_PPC_GOT_TPREL16_LO 88 /* half16 (sym+add)@got@tprel@l */
> -#define R_PPC_GOT_TPREL16_HI 89 /* half16 (sym+add)@got@tprel@h */
> -#define R_PPC_GOT_TPREL16_HA 90 /* half16 (sym+add)@got@tprel@ha */
> -#define R_PPC_GOT_DTPREL16 91 /* half16* (sym+add)@got@dtprel */
> -#define R_PPC_GOT_DTPREL16_LO 92 /* half16* (sym+add)@got@dtprel@l */
> -#define R_PPC_GOT_DTPREL16_HI 93 /* half16* (sym+add)@got@dtprel@h */
> -#define R_PPC_GOT_DTPREL16_HA 94 /* half16* (sym+add)@got@dtprel@ha */
> -
> -/* keep this the last entry. */
> -#define R_PPC_NUM 95
> -
>
> #define ELF_NGREG 48 /* includes nip, msr, lr, etc. */
> #define ELF_NFPREG 33 /* includes fpscr */
> @@ -166,133 +94,4 @@ typedef elf_vrreg_t elf_vrregset_t32[ELF_NVRREG32];
> typedef elf_fpreg_t elf_vsrreghalf_t32[ELF_NVSRHALFREG];
> #endif
>
> -/* PowerPC64 relocations defined by the ABIs */
> -#define R_PPC64_NONE R_PPC_NONE
> -#define R_PPC64_ADDR32 R_PPC_ADDR32 /* 32bit absolute address. */
> -#define R_PPC64_ADDR24 R_PPC_ADDR24 /* 26bit address, word aligned. */
> -#define R_PPC64_ADDR16 R_PPC_ADDR16 /* 16bit absolute address. */
> -#define R_PPC64_ADDR16_LO R_PPC_ADDR16_LO /* lower 16bits of abs. address. */
> -#define R_PPC64_ADDR16_HI R_PPC_ADDR16_HI /* high 16bits of abs. address. */
> -#define R_PPC64_ADDR16_HA R_PPC_ADDR16_HA /* adjusted high 16bits. */
> -#define R_PPC64_ADDR14 R_PPC_ADDR14 /* 16bit address, word aligned. */
> -#define R_PPC64_ADDR14_BRTAKEN R_PPC_ADDR14_BRTAKEN
> -#define R_PPC64_ADDR14_BRNTAKEN R_PPC_ADDR14_BRNTAKEN
> -#define R_PPC64_REL24 R_PPC_REL24 /* PC relative 26 bit, word aligned. */
> -#define R_PPC64_REL14 R_PPC_REL14 /* PC relative 16 bit. */
> -#define R_PPC64_REL14_BRTAKEN R_PPC_REL14_BRTAKEN
> -#define R_PPC64_REL14_BRNTAKEN R_PPC_REL14_BRNTAKEN
> -#define R_PPC64_GOT16 R_PPC_GOT16
> -#define R_PPC64_GOT16_LO R_PPC_GOT16_LO
> -#define R_PPC64_GOT16_HI R_PPC_GOT16_HI
> -#define R_PPC64_GOT16_HA R_PPC_GOT16_HA
> -
> -#define R_PPC64_COPY R_PPC_COPY
> -#define R_PPC64_GLOB_DAT R_PPC_GLOB_DAT
> -#define R_PPC64_JMP_SLOT R_PPC_JMP_SLOT
> -#define R_PPC64_RELATIVE R_PPC_RELATIVE
> -
> -#define R_PPC64_UADDR32 R_PPC_UADDR32
> -#define R_PPC64_UADDR16 R_PPC_UADDR16
> -#define R_PPC64_REL32 R_PPC_REL32
> -#define R_PPC64_PLT32 R_PPC_PLT32
> -#define R_PPC64_PLTREL32 R_PPC_PLTREL32
> -#define R_PPC64_PLT16_LO R_PPC_PLT16_LO
> -#define R_PPC64_PLT16_HI R_PPC_PLT16_HI
> -#define R_PPC64_PLT16_HA R_PPC_PLT16_HA
> -
> -#define R_PPC64_SECTOFF R_PPC_SECTOFF
> -#define R_PPC64_SECTOFF_LO R_PPC_SECTOFF_LO
> -#define R_PPC64_SECTOFF_HI R_PPC_SECTOFF_HI
> -#define R_PPC64_SECTOFF_HA R_PPC_SECTOFF_HA
> -#define R_PPC64_ADDR30 37 /* word30 (S + A - P) >> 2. */
> -#define R_PPC64_ADDR64 38 /* doubleword64 S + A. */
> -#define R_PPC64_ADDR16_HIGHER 39 /* half16 #higher(S + A). */
> -#define R_PPC64_ADDR16_HIGHERA 40 /* half16 #highera(S + A). */
> -#define R_PPC64_ADDR16_HIGHEST 41 /* half16 #highest(S + A). */
> -#define R_PPC64_ADDR16_HIGHESTA 42 /* half16 #highesta(S + A). */
> -#define R_PPC64_UADDR64 43 /* doubleword64 S + A. */
> -#define R_PPC64_REL64 44 /* doubleword64 S + A - P. */
> -#define R_PPC64_PLT64 45 /* doubleword64 L + A. */
> -#define R_PPC64_PLTREL64 46 /* doubleword64 L + A - P. */
> -#define R_PPC64_TOC16 47 /* half16* S + A - .TOC. */
> -#define R_PPC64_TOC16_LO 48 /* half16 #lo(S + A - .TOC.). */
> -#define R_PPC64_TOC16_HI 49 /* half16 #hi(S + A - .TOC.). */
> -#define R_PPC64_TOC16_HA 50 /* half16 #ha(S + A - .TOC.). */
> -#define R_PPC64_TOC 51 /* doubleword64 .TOC. */
> -#define R_PPC64_PLTGOT16 52 /* half16* M + A. */
> -#define R_PPC64_PLTGOT16_LO 53 /* half16 #lo(M + A). */
> -#define R_PPC64_PLTGOT16_HI 54 /* half16 #hi(M + A). */
> -#define R_PPC64_PLTGOT16_HA 55 /* half16 #ha(M + A). */
> -
> -#define R_PPC64_ADDR16_DS 56 /* half16ds* (S + A) >> 2. */
> -#define R_PPC64_ADDR16_LO_DS 57 /* half16ds #lo(S + A) >> 2. */
> -#define R_PPC64_GOT16_DS 58 /* half16ds* (G + A) >> 2. */
> -#define R_PPC64_GOT16_LO_DS 59 /* half16ds #lo(G + A) >> 2. */
> -#define R_PPC64_PLT16_LO_DS 60 /* half16ds #lo(L + A) >> 2. */
> -#define R_PPC64_SECTOFF_DS 61 /* half16ds* (R + A) >> 2. */
> -#define R_PPC64_SECTOFF_LO_DS 62 /* half16ds #lo(R + A) >> 2. */
> -#define R_PPC64_TOC16_DS 63 /* half16ds* (S + A - .TOC.) >> 2. */
> -#define R_PPC64_TOC16_LO_DS 64 /* half16ds #lo(S + A - .TOC.) >> 2. */
> -#define R_PPC64_PLTGOT16_DS 65 /* half16ds* (M + A) >> 2. */
> -#define R_PPC64_PLTGOT16_LO_DS 66 /* half16ds #lo(M + A) >> 2. */
> -
> -/* PowerPC64 relocations defined for the TLS access ABI. */
> -#define R_PPC64_TLS 67 /* none (sym+add)@tls */
> -#define R_PPC64_DTPMOD64 68 /* doubleword64 (sym+add)@dtpmod */
> -#define R_PPC64_TPREL16 69 /* half16* (sym+add)@tprel */
> -#define R_PPC64_TPREL16_LO 70 /* half16 (sym+add)@tprel@l */
> -#define R_PPC64_TPREL16_HI 71 /* half16 (sym+add)@tprel@h */
> -#define R_PPC64_TPREL16_HA 72 /* half16 (sym+add)@tprel@ha */
> -#define R_PPC64_TPREL64 73 /* doubleword64 (sym+add)@tprel */
> -#define R_PPC64_DTPREL16 74 /* half16* (sym+add)@dtprel */
> -#define R_PPC64_DTPREL16_LO 75 /* half16 (sym+add)@dtprel@l */
> -#define R_PPC64_DTPREL16_HI 76 /* half16 (sym+add)@dtprel@h */
> -#define R_PPC64_DTPREL16_HA 77 /* half16 (sym+add)@dtprel@ha */
> -#define R_PPC64_DTPREL64 78 /* doubleword64 (sym+add)@dtprel */
> -#define R_PPC64_GOT_TLSGD16 79 /* half16* (sym+add)@got@tlsgd */
> -#define R_PPC64_GOT_TLSGD16_LO 80 /* half16 (sym+add)@got@tlsgd@l */
> -#define R_PPC64_GOT_TLSGD16_HI 81 /* half16 (sym+add)@got@tlsgd@h */
> -#define R_PPC64_GOT_TLSGD16_HA 82 /* half16 (sym+add)@got@tlsgd@ha */
> -#define R_PPC64_GOT_TLSLD16 83 /* half16* (sym+add)@got@tlsld */
> -#define R_PPC64_GOT_TLSLD16_LO 84 /* half16 (sym+add)@got@tlsld@l */
> -#define R_PPC64_GOT_TLSLD16_HI 85 /* half16 (sym+add)@got@tlsld@h */
> -#define R_PPC64_GOT_TLSLD16_HA 86 /* half16 (sym+add)@got@tlsld@ha */
> -#define R_PPC64_GOT_TPREL16_DS 87 /* half16ds* (sym+add)@got@tprel */
> -#define R_PPC64_GOT_TPREL16_LO_DS 88 /* half16ds (sym+add)@got@tprel@l */
> -#define R_PPC64_GOT_TPREL16_HI 89 /* half16 (sym+add)@got@tprel@h */
> -#define R_PPC64_GOT_TPREL16_HA 90 /* half16 (sym+add)@got@tprel@ha */
> -#define R_PPC64_GOT_DTPREL16_DS 91 /* half16ds* (sym+add)@got@dtprel */
> -#define R_PPC64_GOT_DTPREL16_LO_DS 92 /* half16ds (sym+add)@got@dtprel@l */
> -#define R_PPC64_GOT_DTPREL16_HI 93 /* half16 (sym+add)@got@dtprel@h */
> -#define R_PPC64_GOT_DTPREL16_HA 94 /* half16 (sym+add)@got@dtprel@ha */
> -#define R_PPC64_TPREL16_DS 95 /* half16ds* (sym+add)@tprel */
> -#define R_PPC64_TPREL16_LO_DS 96 /* half16ds (sym+add)@tprel@l */
> -#define R_PPC64_TPREL16_HIGHER 97 /* half16 (sym+add)@tprel@higher */
> -#define R_PPC64_TPREL16_HIGHERA 98 /* half16 (sym+add)@tprel@highera */
> -#define R_PPC64_TPREL16_HIGHEST 99 /* half16 (sym+add)@tprel@highest */
> -#define R_PPC64_TPREL16_HIGHESTA 100 /* half16 (sym+add)@tprel@highesta */
> -#define R_PPC64_DTPREL16_DS 101 /* half16ds* (sym+add)@dtprel */
> -#define R_PPC64_DTPREL16_LO_DS 102 /* half16ds (sym+add)@dtprel@l */
> -#define R_PPC64_DTPREL16_HIGHER 103 /* half16 (sym+add)@dtprel@higher */
> -#define R_PPC64_DTPREL16_HIGHERA 104 /* half16 (sym+add)@dtprel@highera */
> -#define R_PPC64_DTPREL16_HIGHEST 105 /* half16 (sym+add)@dtprel@highest */
> -#define R_PPC64_DTPREL16_HIGHESTA 106 /* half16 (sym+add)@dtprel@highesta */
> -#define R_PPC64_TLSGD 107
> -#define R_PPC64_TLSLD 108
> -#define R_PPC64_TOCSAVE 109
> -
> -#define R_PPC64_REL24_NOTOC 116
> -#define R_PPC64_ENTRY 118
> -
> -#define R_PPC64_PCREL34 132
> -#define R_PPC64_GOT_PCREL34 133
> -
> -#define R_PPC64_REL16 249
> -#define R_PPC64_REL16_LO 250
> -#define R_PPC64_REL16_HI 251
> -#define R_PPC64_REL16_HA 252
> -
> -/* Keep this the last entry. */
> -#define R_PPC64_NUM 253
> -
> #endif /* _UAPI_ASM_POWERPC_ELF_H */
> diff --git a/include/uapi/linux/elf-r.h b/include/uapi/linux/elf-r.h
> index cf931fc05afa..0d0dfaa7c724 100644
> --- a/include/uapi/linux/elf-r.h
> +++ b/include/uapi/linux/elf-r.h
> @@ -113,4 +113,205 @@
>
> #define R_AARCH64_RELATIVE 1027
>
> +/* PowerPC relocations defined by the ABIs */
> +#define R_PPC_NONE 0
> +#define R_PPC_ADDR32 1 /* 32bit absolute address */
> +#define R_PPC_ADDR24 2 /* 26bit address, 2 bits ignored. */
> +#define R_PPC_ADDR16 3 /* 16bit absolute address */
> +#define R_PPC_ADDR16_LO 4 /* lower 16bit of absolute address */
> +#define R_PPC_ADDR16_HI 5 /* high 16bit of absolute address */
> +#define R_PPC_ADDR16_HA 6 /* adjusted high 16bit */
> +#define R_PPC_ADDR14 7 /* 16bit address, 2 bits ignored */
> +#define R_PPC_ADDR14_BRTAKEN 8
> +#define R_PPC_ADDR14_BRNTAKEN 9
> +#define R_PPC_REL24 10 /* PC relative 26 bit */
> +#define R_PPC_REL14 11 /* PC relative 16 bit */
> +#define R_PPC_REL14_BRTAKEN 12
> +#define R_PPC_REL14_BRNTAKEN 13
> +#define R_PPC_GOT16 14
> +#define R_PPC_GOT16_LO 15
> +#define R_PPC_GOT16_HI 16
> +#define R_PPC_GOT16_HA 17
> +#define R_PPC_PLTREL24 18
> +#define R_PPC_COPY 19
> +#define R_PPC_GLOB_DAT 20
> +#define R_PPC_JMP_SLOT 21
> +#define R_PPC_RELATIVE 22
> +#define R_PPC_LOCAL24PC 23
> +#define R_PPC_UADDR32 24
> +#define R_PPC_UADDR16 25
> +#define R_PPC_REL32 26
> +#define R_PPC_PLT32 27
> +#define R_PPC_PLTREL32 28
> +#define R_PPC_PLT16_LO 29
> +#define R_PPC_PLT16_HI 30
> +#define R_PPC_PLT16_HA 31
> +#define R_PPC_SDAREL16 32
> +#define R_PPC_SECTOFF 33
> +#define R_PPC_SECTOFF_LO 34
> +#define R_PPC_SECTOFF_HI 35
> +#define R_PPC_SECTOFF_HA 36
> +
> +/* PowerPC relocations defined for the TLS access ABI. */
> +#define R_PPC_TLS 67 /* none (sym+add)@tls */
> +#define R_PPC_DTPMOD32 68 /* word32 (sym+add)@dtpmod */
> +#define R_PPC_TPREL16 69 /* half16* (sym+add)@tprel */
> +#define R_PPC_TPREL16_LO 70 /* half16 (sym+add)@tprel@l */
> +#define R_PPC_TPREL16_HI 71 /* half16 (sym+add)@tprel@h */
> +#define R_PPC_TPREL16_HA 72 /* half16 (sym+add)@tprel@ha */
> +#define R_PPC_TPREL32 73 /* word32 (sym+add)@tprel */
> +#define R_PPC_DTPREL16 74 /* half16* (sym+add)@dtprel */
> +#define R_PPC_DTPREL16_LO 75 /* half16 (sym+add)@dtprel@l */
> +#define R_PPC_DTPREL16_HI 76 /* half16 (sym+add)@dtprel@h */
> +#define R_PPC_DTPREL16_HA 77 /* half16 (sym+add)@dtprel@ha */
> +#define R_PPC_DTPREL32 78 /* word32 (sym+add)@dtprel */
> +#define R_PPC_GOT_TLSGD16 79 /* half16* (sym+add)@got@tlsgd */
> +#define R_PPC_GOT_TLSGD16_LO 80 /* half16 (sym+add)@got@tlsgd@l */
> +#define R_PPC_GOT_TLSGD16_HI 81 /* half16 (sym+add)@got@tlsgd@h */
> +#define R_PPC_GOT_TLSGD16_HA 82 /* half16 (sym+add)@got@tlsgd@ha */
> +#define R_PPC_GOT_TLSLD16 83 /* half16* (sym+add)@got@tlsld */
> +#define R_PPC_GOT_TLSLD16_LO 84 /* half16 (sym+add)@got@tlsld@l */
> +#define R_PPC_GOT_TLSLD16_HI 85 /* half16 (sym+add)@got@tlsld@h */
> +#define R_PPC_GOT_TLSLD16_HA 86 /* half16 (sym+add)@got@tlsld@ha */
> +#define R_PPC_GOT_TPREL16 87 /* half16* (sym+add)@got@tprel */
> +#define R_PPC_GOT_TPREL16_LO 88 /* half16 (sym+add)@got@tprel@l */
> +#define R_PPC_GOT_TPREL16_HI 89 /* half16 (sym+add)@got@tprel@h */
> +#define R_PPC_GOT_TPREL16_HA 90 /* half16 (sym+add)@got@tprel@ha */
> +#define R_PPC_GOT_DTPREL16 91 /* half16* (sym+add)@got@dtprel */
> +#define R_PPC_GOT_DTPREL16_LO 92 /* half16* (sym+add)@got@dtprel@l */
> +#define R_PPC_GOT_DTPREL16_HI 93 /* half16* (sym+add)@got@dtprel@h */
> +#define R_PPC_GOT_DTPREL16_HA 94 /* half16* (sym+add)@got@dtprel@ha */
> +
> +/* keep this the last entry. */
> +#define R_PPC_NUM 95
> +
> +/* PowerPC64 relocations defined by the ABIs */
> +#define R_PPC64_NONE R_PPC_NONE
> +#define R_PPC64_ADDR32 R_PPC_ADDR32 /* 32bit absolute address. */
> +#define R_PPC64_ADDR24 R_PPC_ADDR24 /* 26bit address, word aligned. */
> +#define R_PPC64_ADDR16 R_PPC_ADDR16 /* 16bit absolute address. */
> +#define R_PPC64_ADDR16_LO R_PPC_ADDR16_LO /* lower 16bits of abs. address. */
> +#define R_PPC64_ADDR16_HI R_PPC_ADDR16_HI /* high 16bits of abs. address. */
> +#define R_PPC64_ADDR16_HA R_PPC_ADDR16_HA /* adjusted high 16bits. */
> +#define R_PPC64_ADDR14 R_PPC_ADDR14 /* 16bit address, word aligned. */
> +#define R_PPC64_ADDR14_BRTAKEN R_PPC_ADDR14_BRTAKEN
> +#define R_PPC64_ADDR14_BRNTAKEN R_PPC_ADDR14_BRNTAKEN
> +#define R_PPC64_REL24 R_PPC_REL24 /* PC relative 26 bit, word aligned. */
> +#define R_PPC64_REL14 R_PPC_REL14 /* PC relative 16 bit. */
> +#define R_PPC64_REL14_BRTAKEN R_PPC_REL14_BRTAKEN
> +#define R_PPC64_REL14_BRNTAKEN R_PPC_REL14_BRNTAKEN
> +#define R_PPC64_GOT16 R_PPC_GOT16
> +#define R_PPC64_GOT16_LO R_PPC_GOT16_LO
> +#define R_PPC64_GOT16_HI R_PPC_GOT16_HI
> +#define R_PPC64_GOT16_HA R_PPC_GOT16_HA
> +
> +#define R_PPC64_COPY R_PPC_COPY
> +#define R_PPC64_GLOB_DAT R_PPC_GLOB_DAT
> +#define R_PPC64_JMP_SLOT R_PPC_JMP_SLOT
> +#define R_PPC64_RELATIVE R_PPC_RELATIVE
> +
> +#define R_PPC64_UADDR32 R_PPC_UADDR32
> +#define R_PPC64_UADDR16 R_PPC_UADDR16
> +#define R_PPC64_REL32 R_PPC_REL32
> +#define R_PPC64_PLT32 R_PPC_PLT32
> +#define R_PPC64_PLTREL32 R_PPC_PLTREL32
> +#define R_PPC64_PLT16_LO R_PPC_PLT16_LO
> +#define R_PPC64_PLT16_HI R_PPC_PLT16_HI
> +#define R_PPC64_PLT16_HA R_PPC_PLT16_HA
> +
> +#define R_PPC64_SECTOFF R_PPC_SECTOFF
> +#define R_PPC64_SECTOFF_LO R_PPC_SECTOFF_LO
> +#define R_PPC64_SECTOFF_HI R_PPC_SECTOFF_HI
> +#define R_PPC64_SECTOFF_HA R_PPC_SECTOFF_HA
> +#define R_PPC64_ADDR30 37 /* word30 (S + A - P) >> 2. */
> +#define R_PPC64_ADDR64 38 /* doubleword64 S + A. */
> +#define R_PPC64_ADDR16_HIGHER 39 /* half16 #higher(S + A). */
> +#define R_PPC64_ADDR16_HIGHERA 40 /* half16 #highera(S + A). */
> +#define R_PPC64_ADDR16_HIGHEST 41 /* half16 #highest(S + A). */
> +#define R_PPC64_ADDR16_HIGHESTA 42 /* half16 #highesta(S + A). */
> +#define R_PPC64_UADDR64 43 /* doubleword64 S + A. */
> +#define R_PPC64_REL64 44 /* doubleword64 S + A - P. */
> +#define R_PPC64_PLT64 45 /* doubleword64 L + A. */
> +#define R_PPC64_PLTREL64 46 /* doubleword64 L + A - P. */
> +#define R_PPC64_TOC16 47 /* half16* S + A - .TOC. */
> +#define R_PPC64_TOC16_LO 48 /* half16 #lo(S + A - .TOC.). */
> +#define R_PPC64_TOC16_HI 49 /* half16 #hi(S + A - .TOC.). */
> +#define R_PPC64_TOC16_HA 50 /* half16 #ha(S + A - .TOC.). */
> +#define R_PPC64_TOC 51 /* doubleword64 .TOC. */
> +#define R_PPC64_PLTGOT16 52 /* half16* M + A. */
> +#define R_PPC64_PLTGOT16_LO 53 /* half16 #lo(M + A). */
> +#define R_PPC64_PLTGOT16_HI 54 /* half16 #hi(M + A). */
> +#define R_PPC64_PLTGOT16_HA 55 /* half16 #ha(M + A). */
> +
> +#define R_PPC64_ADDR16_DS 56 /* half16ds* (S + A) >> 2. */
> +#define R_PPC64_ADDR16_LO_DS 57 /* half16ds #lo(S + A) >> 2. */
> +#define R_PPC64_GOT16_DS 58 /* half16ds* (G + A) >> 2. */
> +#define R_PPC64_GOT16_LO_DS 59 /* half16ds #lo(G + A) >> 2. */
> +#define R_PPC64_PLT16_LO_DS 60 /* half16ds #lo(L + A) >> 2. */
> +#define R_PPC64_SECTOFF_DS 61 /* half16ds* (R + A) >> 2. */
> +#define R_PPC64_SECTOFF_LO_DS 62 /* half16ds #lo(R + A) >> 2. */
> +#define R_PPC64_TOC16_DS 63 /* half16ds* (S + A - .TOC.) >> 2. */
> +#define R_PPC64_TOC16_LO_DS 64 /* half16ds #lo(S + A - .TOC.) >> 2. */
> +#define R_PPC64_PLTGOT16_DS 65 /* half16ds* (M + A) >> 2. */
> +#define R_PPC64_PLTGOT16_LO_DS 66 /* half16ds #lo(M + A) >> 2. */
> +
> +/* PowerPC64 relocations defined for the TLS access ABI. */
> +#define R_PPC64_TLS 67 /* none (sym+add)@tls */
> +#define R_PPC64_DTPMOD64 68 /* doubleword64 (sym+add)@dtpmod */
> +#define R_PPC64_TPREL16 69 /* half16* (sym+add)@tprel */
> +#define R_PPC64_TPREL16_LO 70 /* half16 (sym+add)@tprel@l */
> +#define R_PPC64_TPREL16_HI 71 /* half16 (sym+add)@tprel@h */
> +#define R_PPC64_TPREL16_HA 72 /* half16 (sym+add)@tprel@ha */
> +#define R_PPC64_TPREL64 73 /* doubleword64 (sym+add)@tprel */
> +#define R_PPC64_DTPREL16 74 /* half16* (sym+add)@dtprel */
> +#define R_PPC64_DTPREL16_LO 75 /* half16 (sym+add)@dtprel@l */
> +#define R_PPC64_DTPREL16_HI 76 /* half16 (sym+add)@dtprel@h */
> +#define R_PPC64_DTPREL16_HA 77 /* half16 (sym+add)@dtprel@ha */
> +#define R_PPC64_DTPREL64 78 /* doubleword64 (sym+add)@dtprel */
> +#define R_PPC64_GOT_TLSGD16 79 /* half16* (sym+add)@got@tlsgd */
> +#define R_PPC64_GOT_TLSGD16_LO 80 /* half16 (sym+add)@got@tlsgd@l */
> +#define R_PPC64_GOT_TLSGD16_HI 81 /* half16 (sym+add)@got@tlsgd@h */
> +#define R_PPC64_GOT_TLSGD16_HA 82 /* half16 (sym+add)@got@tlsgd@ha */
> +#define R_PPC64_GOT_TLSLD16 83 /* half16* (sym+add)@got@tlsld */
> +#define R_PPC64_GOT_TLSLD16_LO 84 /* half16 (sym+add)@got@tlsld@l */
> +#define R_PPC64_GOT_TLSLD16_HI 85 /* half16 (sym+add)@got@tlsld@h */
> +#define R_PPC64_GOT_TLSLD16_HA 86 /* half16 (sym+add)@got@tlsld@ha */
> +#define R_PPC64_GOT_TPREL16_DS 87 /* half16ds* (sym+add)@got@tprel */
> +#define R_PPC64_GOT_TPREL16_LO_DS 88 /* half16ds (sym+add)@got@tprel@l */
> +#define R_PPC64_GOT_TPREL16_HI 89 /* half16 (sym+add)@got@tprel@h */
> +#define R_PPC64_GOT_TPREL16_HA 90 /* half16 (sym+add)@got@tprel@ha */
> +#define R_PPC64_GOT_DTPREL16_DS 91 /* half16ds* (sym+add)@got@dtprel */
> +#define R_PPC64_GOT_DTPREL16_LO_DS 92 /* half16ds (sym+add)@got@dtprel@l */
> +#define R_PPC64_GOT_DTPREL16_HI 93 /* half16 (sym+add)@got@dtprel@h */
> +#define R_PPC64_GOT_DTPREL16_HA 94 /* half16 (sym+add)@got@dtprel@ha */
> +#define R_PPC64_TPREL16_DS 95 /* half16ds* (sym+add)@tprel */
> +#define R_PPC64_TPREL16_LO_DS 96 /* half16ds (sym+add)@tprel@l */
> +#define R_PPC64_TPREL16_HIGHER 97 /* half16 (sym+add)@tprel@higher */
> +#define R_PPC64_TPREL16_HIGHERA 98 /* half16 (sym+add)@tprel@highera */
> +#define R_PPC64_TPREL16_HIGHEST 99 /* half16 (sym+add)@tprel@highest */
> +#define R_PPC64_TPREL16_HIGHESTA 100 /* half16 (sym+add)@tprel@highesta */
> +#define R_PPC64_DTPREL16_DS 101 /* half16ds* (sym+add)@dtprel */
> +#define R_PPC64_DTPREL16_LO_DS 102 /* half16ds (sym+add)@dtprel@l */
> +#define R_PPC64_DTPREL16_HIGHER 103 /* half16 (sym+add)@dtprel@higher */
> +#define R_PPC64_DTPREL16_HIGHERA 104 /* half16 (sym+add)@dtprel@highera */
> +#define R_PPC64_DTPREL16_HIGHEST 105 /* half16 (sym+add)@dtprel@highest */
> +#define R_PPC64_DTPREL16_HIGHESTA 106 /* half16 (sym+add)@dtprel@highesta */
> +#define R_PPC64_TLSGD 107
> +#define R_PPC64_TLSLD 108
> +#define R_PPC64_TOCSAVE 109
> +
> +#define R_PPC64_REL24_NOTOC 116
> +#define R_PPC64_ENTRY 118
> +
> +#define R_PPC64_PCREL34 132
> +#define R_PPC64_GOT_PCREL34 133
> +
> +#define R_PPC64_REL16 249
> +#define R_PPC64_REL16_LO 250
> +#define R_PPC64_REL16_HI 251
> +#define R_PPC64_REL16_HA 252
> +
> +/* Keep this the last entry. */
> +#define R_PPC64_NUM 253
> +
> #endif /* _UAPI_LINUX_ELF_R_H */
>
> --
> 2.55.0
>
Reviewed-by: Mukesh Kumar Chaurasiya (IBM) <mkchauras@gmail.com>
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 53+ messages in thread
* [PATCH v5 06/24] riscv: elf: Move relocation constants to UAPI
2026-09-08 6:33 [PATCH v5 00/24] vdso: Reject absolute relocations during build Thomas Weißschuh
` (4 preceding siblings ...)
2026-09-08 6:33 ` [PATCH v5 05/24] powerpc/elf: " Thomas Weißschuh
@ 2026-09-08 6:33 ` Thomas Weißschuh
2026-09-08 6:33 ` [PATCH v5 07/24] LoongArch: " Thomas Weißschuh
` (17 subsequent siblings)
23 siblings, 0 replies; 53+ messages in thread
From: Thomas Weißschuh @ 2026-09-08 6:33 UTC (permalink / raw)
To: Paul Walmsley, Palmer Dabbelt, Albert Ou, Alexandre Ghiti,
Nathan Chancellor, Nick Desaulniers, Bill Wendling, Justin Stitt,
Andy Lutomirski, Vincenzo Frascino, Kees Cook, Ingo Molnar,
Borislav Petkov, Dave Hansen, x86, H. Peter Anvin,
Richard Weinberger, Anton Ivanov, Johannes Berg, Russell King,
Catalin Marinas, Will Deacon, Madhavan Srinivasan,
Michael Ellerman, Nicholas Piggin, Huacai Chen, WANG Xuerui,
Heiko Carstens, Vasily Gorbik, Alexander Gordeev,
Christian Borntraeger, Sven Schnelle, Thomas Bogendoerfer,
Miguel Ojeda, Alex Gaynor, Gary Guo, Björn Roy Baron,
Benno Lossin, Andreas Hindborg, Alice Ryhl, Trevor Gross,
Danilo Krummrich, Thomas Gleixner, Christophe Leroy, Boqun Feng,
Nicolas Schier
Cc: linux-riscv, linux-kernel, llvm, linux-mm, linux-um,
linux-arm-kernel, linuxppc-dev, loongarch, linux-s390, linux-mips,
rust-for-linux, linux-kbuild, Jan Stancek,
Arnaldo Carvalho de Melo, Alexandre Ghiti, Thomas Weißschuh
These constants are useful for cross-platform userspace, for example to
process ELF files during kernel cross-compilation.
Move them from the kernel-private architecture-specific header to the UAPI.
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Acked-by: Palmer Dabbelt <palmer@dabbelt.com>
---
arch/riscv/include/uapi/asm/elf.h | 66 ---------------------------------------
include/uapi/linux/elf-r.h | 66 +++++++++++++++++++++++++++++++++++++++
2 files changed, 66 insertions(+), 66 deletions(-)
diff --git a/arch/riscv/include/uapi/asm/elf.h b/arch/riscv/include/uapi/asm/elf.h
index 11a71b8533d5..05cf74a4a535 100644
--- a/arch/riscv/include/uapi/asm/elf.h
+++ b/arch/riscv/include/uapi/asm/elf.h
@@ -32,70 +32,4 @@ typedef union __riscv_fp_state elf_fpregset_t;
#define ELF_RISCV_R_TYPE(r_info) ELF32_R_TYPE(r_info)
#endif
-/*
- * RISC-V relocation types
- */
-
-/* Relocation types used by the dynamic linker */
-#define R_RISCV_NONE 0
-#define R_RISCV_32 1
-#define R_RISCV_64 2
-#define R_RISCV_RELATIVE 3
-#define R_RISCV_COPY 4
-#define R_RISCV_JUMP_SLOT 5
-#define R_RISCV_TLS_DTPMOD32 6
-#define R_RISCV_TLS_DTPMOD64 7
-#define R_RISCV_TLS_DTPREL32 8
-#define R_RISCV_TLS_DTPREL64 9
-#define R_RISCV_TLS_TPREL32 10
-#define R_RISCV_TLS_TPREL64 11
-#define R_RISCV_IRELATIVE 58
-
-/* Relocation types not used by the dynamic linker */
-#define R_RISCV_BRANCH 16
-#define R_RISCV_JAL 17
-#define R_RISCV_CALL 18
-#define R_RISCV_CALL_PLT 19
-#define R_RISCV_GOT_HI20 20
-#define R_RISCV_TLS_GOT_HI20 21
-#define R_RISCV_TLS_GD_HI20 22
-#define R_RISCV_PCREL_HI20 23
-#define R_RISCV_PCREL_LO12_I 24
-#define R_RISCV_PCREL_LO12_S 25
-#define R_RISCV_HI20 26
-#define R_RISCV_LO12_I 27
-#define R_RISCV_LO12_S 28
-#define R_RISCV_TPREL_HI20 29
-#define R_RISCV_TPREL_LO12_I 30
-#define R_RISCV_TPREL_LO12_S 31
-#define R_RISCV_TPREL_ADD 32
-#define R_RISCV_ADD8 33
-#define R_RISCV_ADD16 34
-#define R_RISCV_ADD32 35
-#define R_RISCV_ADD64 36
-#define R_RISCV_SUB8 37
-#define R_RISCV_SUB16 38
-#define R_RISCV_SUB32 39
-#define R_RISCV_SUB64 40
-#define R_RISCV_GNU_VTINHERIT 41
-#define R_RISCV_GNU_VTENTRY 42
-#define R_RISCV_ALIGN 43
-#define R_RISCV_RVC_BRANCH 44
-#define R_RISCV_RVC_JUMP 45
-#define R_RISCV_GPREL_I 47
-#define R_RISCV_GPREL_S 48
-#define R_RISCV_TPREL_I 49
-#define R_RISCV_TPREL_S 50
-#define R_RISCV_RELAX 51
-#define R_RISCV_SUB6 52
-#define R_RISCV_SET6 53
-#define R_RISCV_SET8 54
-#define R_RISCV_SET16 55
-#define R_RISCV_SET32 56
-#define R_RISCV_32_PCREL 57
-#define R_RISCV_PLT32 59
-#define R_RISCV_SET_ULEB128 60
-#define R_RISCV_SUB_ULEB128 61
-
-
#endif /* _UAPI_ASM_RISCV_ELF_H */
diff --git a/include/uapi/linux/elf-r.h b/include/uapi/linux/elf-r.h
index 0d0dfaa7c724..02e420c255df 100644
--- a/include/uapi/linux/elf-r.h
+++ b/include/uapi/linux/elf-r.h
@@ -314,4 +314,70 @@
/* Keep this the last entry. */
#define R_PPC64_NUM 253
+
+/*
+ * RISC-V relocation types
+ */
+
+/* Relocation types used by the dynamic linker */
+#define R_RISCV_NONE 0
+#define R_RISCV_32 1
+#define R_RISCV_64 2
+#define R_RISCV_RELATIVE 3
+#define R_RISCV_COPY 4
+#define R_RISCV_JUMP_SLOT 5
+#define R_RISCV_TLS_DTPMOD32 6
+#define R_RISCV_TLS_DTPMOD64 7
+#define R_RISCV_TLS_DTPREL32 8
+#define R_RISCV_TLS_DTPREL64 9
+#define R_RISCV_TLS_TPREL32 10
+#define R_RISCV_TLS_TPREL64 11
+#define R_RISCV_IRELATIVE 58
+
+/* Relocation types not used by the dynamic linker */
+#define R_RISCV_BRANCH 16
+#define R_RISCV_JAL 17
+#define R_RISCV_CALL 18
+#define R_RISCV_CALL_PLT 19
+#define R_RISCV_GOT_HI20 20
+#define R_RISCV_TLS_GOT_HI20 21
+#define R_RISCV_TLS_GD_HI20 22
+#define R_RISCV_PCREL_HI20 23
+#define R_RISCV_PCREL_LO12_I 24
+#define R_RISCV_PCREL_LO12_S 25
+#define R_RISCV_HI20 26
+#define R_RISCV_LO12_I 27
+#define R_RISCV_LO12_S 28
+#define R_RISCV_TPREL_HI20 29
+#define R_RISCV_TPREL_LO12_I 30
+#define R_RISCV_TPREL_LO12_S 31
+#define R_RISCV_TPREL_ADD 32
+#define R_RISCV_ADD8 33
+#define R_RISCV_ADD16 34
+#define R_RISCV_ADD32 35
+#define R_RISCV_ADD64 36
+#define R_RISCV_SUB8 37
+#define R_RISCV_SUB16 38
+#define R_RISCV_SUB32 39
+#define R_RISCV_SUB64 40
+#define R_RISCV_GNU_VTINHERIT 41
+#define R_RISCV_GNU_VTENTRY 42
+#define R_RISCV_ALIGN 43
+#define R_RISCV_RVC_BRANCH 44
+#define R_RISCV_RVC_JUMP 45
+#define R_RISCV_GPREL_I 47
+#define R_RISCV_GPREL_S 48
+#define R_RISCV_TPREL_I 49
+#define R_RISCV_TPREL_S 50
+#define R_RISCV_RELAX 51
+#define R_RISCV_SUB6 52
+#define R_RISCV_SET6 53
+#define R_RISCV_SET8 54
+#define R_RISCV_SET16 55
+#define R_RISCV_SET32 56
+#define R_RISCV_32_PCREL 57
+#define R_RISCV_PLT32 59
+#define R_RISCV_SET_ULEB128 60
+#define R_RISCV_SUB_ULEB128 61
+
#endif /* _UAPI_LINUX_ELF_R_H */
--
2.55.0
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH v5 07/24] LoongArch: Move relocation constants to UAPI
2026-09-08 6:33 [PATCH v5 00/24] vdso: Reject absolute relocations during build Thomas Weißschuh
` (5 preceding siblings ...)
2026-09-08 6:33 ` [PATCH v5 06/24] riscv: elf: " Thomas Weißschuh
@ 2026-09-08 6:33 ` Thomas Weißschuh
2026-09-08 6:33 ` [PATCH v5 08/24] s390/elf: " Thomas Weißschuh
` (16 subsequent siblings)
23 siblings, 0 replies; 53+ messages in thread
From: Thomas Weißschuh @ 2026-09-08 6:33 UTC (permalink / raw)
To: Paul Walmsley, Palmer Dabbelt, Albert Ou, Alexandre Ghiti,
Nathan Chancellor, Nick Desaulniers, Bill Wendling, Justin Stitt,
Andy Lutomirski, Vincenzo Frascino, Kees Cook, Ingo Molnar,
Borislav Petkov, Dave Hansen, x86, H. Peter Anvin,
Richard Weinberger, Anton Ivanov, Johannes Berg, Russell King,
Catalin Marinas, Will Deacon, Madhavan Srinivasan,
Michael Ellerman, Nicholas Piggin, Huacai Chen, WANG Xuerui,
Heiko Carstens, Vasily Gorbik, Alexander Gordeev,
Christian Borntraeger, Sven Schnelle, Thomas Bogendoerfer,
Miguel Ojeda, Alex Gaynor, Gary Guo, Björn Roy Baron,
Benno Lossin, Andreas Hindborg, Alice Ryhl, Trevor Gross,
Danilo Krummrich, Thomas Gleixner, Christophe Leroy, Boqun Feng,
Nicolas Schier
Cc: linux-riscv, linux-kernel, llvm, linux-mm, linux-um,
linux-arm-kernel, linuxppc-dev, loongarch, linux-s390, linux-mips,
rust-for-linux, linux-kbuild, Jan Stancek,
Arnaldo Carvalho de Melo, Alexandre Ghiti, Thomas Weißschuh
These constants are useful for cross-platform userspace, for example to
process ELF files during kernel cross-compilation.
Move them from the kernel-private architecture-specific header to the UAPI.
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
---
arch/loongarch/include/asm/elf.h | 130 ---------------------------------------
include/uapi/linux/elf-r.h | 130 +++++++++++++++++++++++++++++++++++++++
2 files changed, 130 insertions(+), 130 deletions(-)
diff --git a/arch/loongarch/include/asm/elf.h b/arch/loongarch/include/asm/elf.h
index 912c50cdd6b7..3cbce7e772fa 100644
--- a/arch/loongarch/include/asm/elf.h
+++ b/arch/loongarch/include/asm/elf.h
@@ -21,136 +21,6 @@
#define EF_LOONGARCH_ABI_ILP32_SINGLE_FLOAT 0x6
#define EF_LOONGARCH_ABI_ILP32_DOUBLE_FLOAT 0x7
-/* LoongArch relocation types used by the dynamic linker */
-#define R_LARCH_NONE 0
-#define R_LARCH_32 1
-#define R_LARCH_64 2
-#define R_LARCH_RELATIVE 3
-#define R_LARCH_COPY 4
-#define R_LARCH_JUMP_SLOT 5
-#define R_LARCH_TLS_DTPMOD32 6
-#define R_LARCH_TLS_DTPMOD64 7
-#define R_LARCH_TLS_DTPREL32 8
-#define R_LARCH_TLS_DTPREL64 9
-#define R_LARCH_TLS_TPREL32 10
-#define R_LARCH_TLS_TPREL64 11
-#define R_LARCH_IRELATIVE 12
-#define R_LARCH_MARK_LA 20
-#define R_LARCH_MARK_PCREL 21
-#define R_LARCH_SOP_PUSH_PCREL 22
-#define R_LARCH_SOP_PUSH_ABSOLUTE 23
-#define R_LARCH_SOP_PUSH_DUP 24
-#define R_LARCH_SOP_PUSH_GPREL 25
-#define R_LARCH_SOP_PUSH_TLS_TPREL 26
-#define R_LARCH_SOP_PUSH_TLS_GOT 27
-#define R_LARCH_SOP_PUSH_TLS_GD 28
-#define R_LARCH_SOP_PUSH_PLT_PCREL 29
-#define R_LARCH_SOP_ASSERT 30
-#define R_LARCH_SOP_NOT 31
-#define R_LARCH_SOP_SUB 32
-#define R_LARCH_SOP_SL 33
-#define R_LARCH_SOP_SR 34
-#define R_LARCH_SOP_ADD 35
-#define R_LARCH_SOP_AND 36
-#define R_LARCH_SOP_IF_ELSE 37
-#define R_LARCH_SOP_POP_32_S_10_5 38
-#define R_LARCH_SOP_POP_32_U_10_12 39
-#define R_LARCH_SOP_POP_32_S_10_12 40
-#define R_LARCH_SOP_POP_32_S_10_16 41
-#define R_LARCH_SOP_POP_32_S_10_16_S2 42
-#define R_LARCH_SOP_POP_32_S_5_20 43
-#define R_LARCH_SOP_POP_32_S_0_5_10_16_S2 44
-#define R_LARCH_SOP_POP_32_S_0_10_10_16_S2 45
-#define R_LARCH_SOP_POP_32_U 46
-#define R_LARCH_ADD8 47
-#define R_LARCH_ADD16 48
-#define R_LARCH_ADD24 49
-#define R_LARCH_ADD32 50
-#define R_LARCH_ADD64 51
-#define R_LARCH_SUB8 52
-#define R_LARCH_SUB16 53
-#define R_LARCH_SUB24 54
-#define R_LARCH_SUB32 55
-#define R_LARCH_SUB64 56
-#define R_LARCH_GNU_VTINHERIT 57
-#define R_LARCH_GNU_VTENTRY 58
-#define R_LARCH_B16 64
-#define R_LARCH_B21 65
-#define R_LARCH_B26 66
-#define R_LARCH_ABS_HI20 67
-#define R_LARCH_ABS_LO12 68
-#define R_LARCH_ABS64_LO20 69
-#define R_LARCH_ABS64_HI12 70
-#define R_LARCH_PCALA_HI20 71
-#define R_LARCH_PCALA_LO12 72
-#define R_LARCH_PCALA64_LO20 73
-#define R_LARCH_PCALA64_HI12 74
-#define R_LARCH_GOT_PC_HI20 75
-#define R_LARCH_GOT_PC_LO12 76
-#define R_LARCH_GOT64_PC_LO20 77
-#define R_LARCH_GOT64_PC_HI12 78
-#define R_LARCH_GOT_HI20 79
-#define R_LARCH_GOT_LO12 80
-#define R_LARCH_GOT64_LO20 81
-#define R_LARCH_GOT64_HI12 82
-#define R_LARCH_TLS_LE_HI20 83
-#define R_LARCH_TLS_LE_LO12 84
-#define R_LARCH_TLS_LE64_LO20 85
-#define R_LARCH_TLS_LE64_HI12 86
-#define R_LARCH_TLS_IE_PC_HI20 87
-#define R_LARCH_TLS_IE_PC_LO12 88
-#define R_LARCH_TLS_IE64_PC_LO20 89
-#define R_LARCH_TLS_IE64_PC_HI12 90
-#define R_LARCH_TLS_IE_HI20 91
-#define R_LARCH_TLS_IE_LO12 92
-#define R_LARCH_TLS_IE64_LO20 93
-#define R_LARCH_TLS_IE64_HI12 94
-#define R_LARCH_TLS_LD_PC_HI20 95
-#define R_LARCH_TLS_LD_HI20 96
-#define R_LARCH_TLS_GD_PC_HI20 97
-#define R_LARCH_TLS_GD_HI20 98
-#define R_LARCH_32_PCREL 99
-#define R_LARCH_RELAX 100
-#define R_LARCH_DELETE 101
-#define R_LARCH_ALIGN 102
-#define R_LARCH_PCREL20_S2 103
-#define R_LARCH_CFA 104
-#define R_LARCH_ADD6 105
-#define R_LARCH_SUB6 106
-#define R_LARCH_ADD_ULEB128 107
-#define R_LARCH_SUB_ULEB128 108
-#define R_LARCH_64_PCREL 109
-#define R_LARCH_CALL36 110
-#define R_LARCH_TLS_DESC_PC_HI20 111
-#define R_LARCH_TLS_DESC_PC_LO12 112
-#define R_LARCH_TLS_DESC64_PC_LO20 113
-#define R_LARCH_TLS_DESC64_PC_HI12 114
-#define R_LARCH_TLS_DESC_HI20 115
-#define R_LARCH_TLS_DESC_LO12 116
-#define R_LARCH_TLS_DESC64_LO20 117
-#define R_LARCH_TLS_DESC64_HI12 118
-#define R_LARCH_TLS_DESC_LD 119
-#define R_LARCH_TLS_DESC_CALL 120
-#define R_LARCH_TLS_LE_HI20_R 121
-#define R_LARCH_TLS_LE_ADD_R 122
-#define R_LARCH_TLS_LE_LO12_R 123
-#define R_LARCH_TLS_LD_PCREL20_S2 124
-#define R_LARCH_TLS_GD_PCREL20_S2 125
-#define R_LARCH_TLS_DESC_PCREL20_S2 126
-#define R_LARCH_CALL30 127
-#define R_LARCH_PCADD_HI20 128
-#define R_LARCH_PCADD_LO12 129
-#define R_LARCH_GOT_PCADD_HI20 130
-#define R_LARCH_GOT_PCADD_LO12 131
-#define R_LARCH_TLS_IE_PCADD_HI20 132
-#define R_LARCH_TLS_IE_PCADD_LO12 133
-#define R_LARCH_TLS_LD_PCADD_HI20 134
-#define R_LARCH_TLS_LD_PCADD_LO12 135
-#define R_LARCH_TLS_GD_PCADD_HI20 136
-#define R_LARCH_TLS_GD_PCADD_LO12 137
-#define R_LARCH_TLS_DESC_PCADD_HI20 138
-#define R_LARCH_TLS_DESC_PCADD_LO12 139
-
#ifndef ELF_ARCH
/* ELF register definitions */
diff --git a/include/uapi/linux/elf-r.h b/include/uapi/linux/elf-r.h
index 02e420c255df..4b6d3f111d7b 100644
--- a/include/uapi/linux/elf-r.h
+++ b/include/uapi/linux/elf-r.h
@@ -380,4 +380,134 @@
#define R_RISCV_SET_ULEB128 60
#define R_RISCV_SUB_ULEB128 61
+/* LoongArch relocation types used by the dynamic linker */
+#define R_LARCH_NONE 0
+#define R_LARCH_32 1
+#define R_LARCH_64 2
+#define R_LARCH_RELATIVE 3
+#define R_LARCH_COPY 4
+#define R_LARCH_JUMP_SLOT 5
+#define R_LARCH_TLS_DTPMOD32 6
+#define R_LARCH_TLS_DTPMOD64 7
+#define R_LARCH_TLS_DTPREL32 8
+#define R_LARCH_TLS_DTPREL64 9
+#define R_LARCH_TLS_TPREL32 10
+#define R_LARCH_TLS_TPREL64 11
+#define R_LARCH_IRELATIVE 12
+#define R_LARCH_MARK_LA 20
+#define R_LARCH_MARK_PCREL 21
+#define R_LARCH_SOP_PUSH_PCREL 22
+#define R_LARCH_SOP_PUSH_ABSOLUTE 23
+#define R_LARCH_SOP_PUSH_DUP 24
+#define R_LARCH_SOP_PUSH_GPREL 25
+#define R_LARCH_SOP_PUSH_TLS_TPREL 26
+#define R_LARCH_SOP_PUSH_TLS_GOT 27
+#define R_LARCH_SOP_PUSH_TLS_GD 28
+#define R_LARCH_SOP_PUSH_PLT_PCREL 29
+#define R_LARCH_SOP_ASSERT 30
+#define R_LARCH_SOP_NOT 31
+#define R_LARCH_SOP_SUB 32
+#define R_LARCH_SOP_SL 33
+#define R_LARCH_SOP_SR 34
+#define R_LARCH_SOP_ADD 35
+#define R_LARCH_SOP_AND 36
+#define R_LARCH_SOP_IF_ELSE 37
+#define R_LARCH_SOP_POP_32_S_10_5 38
+#define R_LARCH_SOP_POP_32_U_10_12 39
+#define R_LARCH_SOP_POP_32_S_10_12 40
+#define R_LARCH_SOP_POP_32_S_10_16 41
+#define R_LARCH_SOP_POP_32_S_10_16_S2 42
+#define R_LARCH_SOP_POP_32_S_5_20 43
+#define R_LARCH_SOP_POP_32_S_0_5_10_16_S2 44
+#define R_LARCH_SOP_POP_32_S_0_10_10_16_S2 45
+#define R_LARCH_SOP_POP_32_U 46
+#define R_LARCH_ADD8 47
+#define R_LARCH_ADD16 48
+#define R_LARCH_ADD24 49
+#define R_LARCH_ADD32 50
+#define R_LARCH_ADD64 51
+#define R_LARCH_SUB8 52
+#define R_LARCH_SUB16 53
+#define R_LARCH_SUB24 54
+#define R_LARCH_SUB32 55
+#define R_LARCH_SUB64 56
+#define R_LARCH_GNU_VTINHERIT 57
+#define R_LARCH_GNU_VTENTRY 58
+#define R_LARCH_B16 64
+#define R_LARCH_B21 65
+#define R_LARCH_B26 66
+#define R_LARCH_ABS_HI20 67
+#define R_LARCH_ABS_LO12 68
+#define R_LARCH_ABS64_LO20 69
+#define R_LARCH_ABS64_HI12 70
+#define R_LARCH_PCALA_HI20 71
+#define R_LARCH_PCALA_LO12 72
+#define R_LARCH_PCALA64_LO20 73
+#define R_LARCH_PCALA64_HI12 74
+#define R_LARCH_GOT_PC_HI20 75
+#define R_LARCH_GOT_PC_LO12 76
+#define R_LARCH_GOT64_PC_LO20 77
+#define R_LARCH_GOT64_PC_HI12 78
+#define R_LARCH_GOT_HI20 79
+#define R_LARCH_GOT_LO12 80
+#define R_LARCH_GOT64_LO20 81
+#define R_LARCH_GOT64_HI12 82
+#define R_LARCH_TLS_LE_HI20 83
+#define R_LARCH_TLS_LE_LO12 84
+#define R_LARCH_TLS_LE64_LO20 85
+#define R_LARCH_TLS_LE64_HI12 86
+#define R_LARCH_TLS_IE_PC_HI20 87
+#define R_LARCH_TLS_IE_PC_LO12 88
+#define R_LARCH_TLS_IE64_PC_LO20 89
+#define R_LARCH_TLS_IE64_PC_HI12 90
+#define R_LARCH_TLS_IE_HI20 91
+#define R_LARCH_TLS_IE_LO12 92
+#define R_LARCH_TLS_IE64_LO20 93
+#define R_LARCH_TLS_IE64_HI12 94
+#define R_LARCH_TLS_LD_PC_HI20 95
+#define R_LARCH_TLS_LD_HI20 96
+#define R_LARCH_TLS_GD_PC_HI20 97
+#define R_LARCH_TLS_GD_HI20 98
+#define R_LARCH_32_PCREL 99
+#define R_LARCH_RELAX 100
+#define R_LARCH_DELETE 101
+#define R_LARCH_ALIGN 102
+#define R_LARCH_PCREL20_S2 103
+#define R_LARCH_CFA 104
+#define R_LARCH_ADD6 105
+#define R_LARCH_SUB6 106
+#define R_LARCH_ADD_ULEB128 107
+#define R_LARCH_SUB_ULEB128 108
+#define R_LARCH_64_PCREL 109
+#define R_LARCH_CALL36 110
+#define R_LARCH_TLS_DESC_PC_HI20 111
+#define R_LARCH_TLS_DESC_PC_LO12 112
+#define R_LARCH_TLS_DESC64_PC_LO20 113
+#define R_LARCH_TLS_DESC64_PC_HI12 114
+#define R_LARCH_TLS_DESC_HI20 115
+#define R_LARCH_TLS_DESC_LO12 116
+#define R_LARCH_TLS_DESC64_LO20 117
+#define R_LARCH_TLS_DESC64_HI12 118
+#define R_LARCH_TLS_DESC_LD 119
+#define R_LARCH_TLS_DESC_CALL 120
+#define R_LARCH_TLS_LE_HI20_R 121
+#define R_LARCH_TLS_LE_ADD_R 122
+#define R_LARCH_TLS_LE_LO12_R 123
+#define R_LARCH_TLS_LD_PCREL20_S2 124
+#define R_LARCH_TLS_GD_PCREL20_S2 125
+#define R_LARCH_TLS_DESC_PCREL20_S2 126
+#define R_LARCH_CALL30 127
+#define R_LARCH_PCADD_HI20 128
+#define R_LARCH_PCADD_LO12 129
+#define R_LARCH_GOT_PCADD_HI20 130
+#define R_LARCH_GOT_PCADD_LO12 131
+#define R_LARCH_TLS_IE_PCADD_HI20 132
+#define R_LARCH_TLS_IE_PCADD_LO12 133
+#define R_LARCH_TLS_LD_PCADD_HI20 134
+#define R_LARCH_TLS_LD_PCADD_LO12 135
+#define R_LARCH_TLS_GD_PCADD_HI20 136
+#define R_LARCH_TLS_GD_PCADD_LO12 137
+#define R_LARCH_TLS_DESC_PCADD_HI20 138
+#define R_LARCH_TLS_DESC_PCADD_LO12 139
+
#endif /* _UAPI_LINUX_ELF_R_H */
--
2.55.0
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH v5 08/24] s390/elf: Move relocation constants to UAPI
2026-09-08 6:33 [PATCH v5 00/24] vdso: Reject absolute relocations during build Thomas Weißschuh
` (6 preceding siblings ...)
2026-09-08 6:33 ` [PATCH v5 07/24] LoongArch: " Thomas Weißschuh
@ 2026-09-08 6:33 ` Thomas Weißschuh
2026-09-08 6:33 ` [PATCH v5 09/24] MIPS: ELF: " Thomas Weißschuh
` (15 subsequent siblings)
23 siblings, 0 replies; 53+ messages in thread
From: Thomas Weißschuh @ 2026-09-08 6:33 UTC (permalink / raw)
To: Paul Walmsley, Palmer Dabbelt, Albert Ou, Alexandre Ghiti,
Nathan Chancellor, Nick Desaulniers, Bill Wendling, Justin Stitt,
Andy Lutomirski, Vincenzo Frascino, Kees Cook, Ingo Molnar,
Borislav Petkov, Dave Hansen, x86, H. Peter Anvin,
Richard Weinberger, Anton Ivanov, Johannes Berg, Russell King,
Catalin Marinas, Will Deacon, Madhavan Srinivasan,
Michael Ellerman, Nicholas Piggin, Huacai Chen, WANG Xuerui,
Heiko Carstens, Vasily Gorbik, Alexander Gordeev,
Christian Borntraeger, Sven Schnelle, Thomas Bogendoerfer,
Miguel Ojeda, Alex Gaynor, Gary Guo, Björn Roy Baron,
Benno Lossin, Andreas Hindborg, Alice Ryhl, Trevor Gross,
Danilo Krummrich, Thomas Gleixner, Christophe Leroy, Boqun Feng,
Nicolas Schier
Cc: linux-riscv, linux-kernel, llvm, linux-mm, linux-um,
linux-arm-kernel, linuxppc-dev, loongarch, linux-s390, linux-mips,
rust-for-linux, linux-kbuild, Jan Stancek,
Arnaldo Carvalho de Melo, Alexandre Ghiti, Thomas Weißschuh
These constants are useful for cross-platform userspace, for example to
process ELF files during kernel cross-compilation.
Move them from the kernel-private architecture-specific header to the UAPI.
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
---
arch/s390/include/asm/elf.h | 83 ---------------------------------------------
include/uapi/linux/elf-r.h | 83 +++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 83 insertions(+), 83 deletions(-)
diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h
index bb63fa4d20bb..c3fa168f0c30 100644
--- a/arch/s390/include/asm/elf.h
+++ b/arch/s390/include/asm/elf.h
@@ -8,89 +8,6 @@
#ifndef __ASMS390_ELF_H
#define __ASMS390_ELF_H
-/* s390 relocations defined by the ABIs */
-#define R_390_NONE 0 /* No reloc. */
-#define R_390_8 1 /* Direct 8 bit. */
-#define R_390_12 2 /* Direct 12 bit. */
-#define R_390_16 3 /* Direct 16 bit. */
-#define R_390_32 4 /* Direct 32 bit. */
-#define R_390_PC32 5 /* PC relative 32 bit. */
-#define R_390_GOT12 6 /* 12 bit GOT offset. */
-#define R_390_GOT32 7 /* 32 bit GOT offset. */
-#define R_390_PLT32 8 /* 32 bit PC relative PLT address. */
-#define R_390_COPY 9 /* Copy symbol at runtime. */
-#define R_390_GLOB_DAT 10 /* Create GOT entry. */
-#define R_390_JMP_SLOT 11 /* Create PLT entry. */
-#define R_390_RELATIVE 12 /* Adjust by program base. */
-#define R_390_GOTOFF32 13 /* 32 bit offset to GOT. */
-#define R_390_GOTPC 14 /* 32 bit PC rel. offset to GOT. */
-#define R_390_GOT16 15 /* 16 bit GOT offset. */
-#define R_390_PC16 16 /* PC relative 16 bit. */
-#define R_390_PC16DBL 17 /* PC relative 16 bit shifted by 1. */
-#define R_390_PLT16DBL 18 /* 16 bit PC rel. PLT shifted by 1. */
-#define R_390_PC32DBL 19 /* PC relative 32 bit shifted by 1. */
-#define R_390_PLT32DBL 20 /* 32 bit PC rel. PLT shifted by 1. */
-#define R_390_GOTPCDBL 21 /* 32 bit PC rel. GOT shifted by 1. */
-#define R_390_64 22 /* Direct 64 bit. */
-#define R_390_PC64 23 /* PC relative 64 bit. */
-#define R_390_GOT64 24 /* 64 bit GOT offset. */
-#define R_390_PLT64 25 /* 64 bit PC relative PLT address. */
-#define R_390_GOTENT 26 /* 32 bit PC rel. to GOT entry >> 1. */
-#define R_390_GOTOFF16 27 /* 16 bit offset to GOT. */
-#define R_390_GOTOFF64 28 /* 64 bit offset to GOT. */
-#define R_390_GOTPLT12 29 /* 12 bit offset to jump slot. */
-#define R_390_GOTPLT16 30 /* 16 bit offset to jump slot. */
-#define R_390_GOTPLT32 31 /* 32 bit offset to jump slot. */
-#define R_390_GOTPLT64 32 /* 64 bit offset to jump slot. */
-#define R_390_GOTPLTENT 33 /* 32 bit rel. offset to jump slot. */
-#define R_390_PLTOFF16 34 /* 16 bit offset from GOT to PLT. */
-#define R_390_PLTOFF32 35 /* 32 bit offset from GOT to PLT. */
-#define R_390_PLTOFF64 36 /* 16 bit offset from GOT to PLT. */
-#define R_390_TLS_LOAD 37 /* Tag for load insn in TLS code. */
-#define R_390_TLS_GDCALL 38 /* Tag for function call in general
- dynamic TLS code. */
-#define R_390_TLS_LDCALL 39 /* Tag for function call in local
- dynamic TLS code. */
-#define R_390_TLS_GD32 40 /* Direct 32 bit for general dynamic
- thread local data. */
-#define R_390_TLS_GD64 41 /* Direct 64 bit for general dynamic
- thread local data. */
-#define R_390_TLS_GOTIE12 42 /* 12 bit GOT offset for static TLS
- block offset. */
-#define R_390_TLS_GOTIE32 43 /* 32 bit GOT offset for static TLS
- block offset. */
-#define R_390_TLS_GOTIE64 44 /* 64 bit GOT offset for static TLS
- block offset. */
-#define R_390_TLS_LDM32 45 /* Direct 32 bit for local dynamic
- thread local data in LD code. */
-#define R_390_TLS_LDM64 46 /* Direct 64 bit for local dynamic
- thread local data in LD code. */
-#define R_390_TLS_IE32 47 /* 32 bit address of GOT entry for
- negated static TLS block offset. */
-#define R_390_TLS_IE64 48 /* 64 bit address of GOT entry for
- negated static TLS block offset. */
-#define R_390_TLS_IEENT 49 /* 32 bit rel. offset to GOT entry for
- negated static TLS block offset. */
-#define R_390_TLS_LE32 50 /* 32 bit negated offset relative to
- static TLS block. */
-#define R_390_TLS_LE64 51 /* 64 bit negated offset relative to
- static TLS block. */
-#define R_390_TLS_LDO32 52 /* 32 bit offset relative to TLS
- block. */
-#define R_390_TLS_LDO64 53 /* 64 bit offset relative to TLS
- block. */
-#define R_390_TLS_DTPMOD 54 /* ID of module containing symbol. */
-#define R_390_TLS_DTPOFF 55 /* Offset in TLS block. */
-#define R_390_TLS_TPOFF 56 /* Negate offset in static TLS
- block. */
-#define R_390_20 57 /* Direct 20 bit. */
-#define R_390_GOT20 58 /* 20 bit GOT offset. */
-#define R_390_GOTPLT20 59 /* 20 bit offset to jump slot. */
-#define R_390_TLS_GOTIE20 60 /* 20 bit GOT offset for static TLS
- block offset. */
-/* Keep this the last entry. */
-#define R_390_NUM 61
-
/*
* HWCAP flags - for AT_HWCAP
*
diff --git a/include/uapi/linux/elf-r.h b/include/uapi/linux/elf-r.h
index 4b6d3f111d7b..3d9e3b57f1ff 100644
--- a/include/uapi/linux/elf-r.h
+++ b/include/uapi/linux/elf-r.h
@@ -510,4 +510,87 @@
#define R_LARCH_TLS_DESC_PCADD_HI20 138
#define R_LARCH_TLS_DESC_PCADD_LO12 139
+/* s390 relocations defined by the ABIs */
+#define R_390_NONE 0 /* No reloc. */
+#define R_390_8 1 /* Direct 8 bit. */
+#define R_390_12 2 /* Direct 12 bit. */
+#define R_390_16 3 /* Direct 16 bit. */
+#define R_390_32 4 /* Direct 32 bit. */
+#define R_390_PC32 5 /* PC relative 32 bit. */
+#define R_390_GOT12 6 /* 12 bit GOT offset. */
+#define R_390_GOT32 7 /* 32 bit GOT offset. */
+#define R_390_PLT32 8 /* 32 bit PC relative PLT address. */
+#define R_390_COPY 9 /* Copy symbol at runtime. */
+#define R_390_GLOB_DAT 10 /* Create GOT entry. */
+#define R_390_JMP_SLOT 11 /* Create PLT entry. */
+#define R_390_RELATIVE 12 /* Adjust by program base. */
+#define R_390_GOTOFF32 13 /* 32 bit offset to GOT. */
+#define R_390_GOTPC 14 /* 32 bit PC rel. offset to GOT. */
+#define R_390_GOT16 15 /* 16 bit GOT offset. */
+#define R_390_PC16 16 /* PC relative 16 bit. */
+#define R_390_PC16DBL 17 /* PC relative 16 bit shifted by 1. */
+#define R_390_PLT16DBL 18 /* 16 bit PC rel. PLT shifted by 1. */
+#define R_390_PC32DBL 19 /* PC relative 32 bit shifted by 1. */
+#define R_390_PLT32DBL 20 /* 32 bit PC rel. PLT shifted by 1. */
+#define R_390_GOTPCDBL 21 /* 32 bit PC rel. GOT shifted by 1. */
+#define R_390_64 22 /* Direct 64 bit. */
+#define R_390_PC64 23 /* PC relative 64 bit. */
+#define R_390_GOT64 24 /* 64 bit GOT offset. */
+#define R_390_PLT64 25 /* 64 bit PC relative PLT address. */
+#define R_390_GOTENT 26 /* 32 bit PC rel. to GOT entry >> 1. */
+#define R_390_GOTOFF16 27 /* 16 bit offset to GOT. */
+#define R_390_GOTOFF64 28 /* 64 bit offset to GOT. */
+#define R_390_GOTPLT12 29 /* 12 bit offset to jump slot. */
+#define R_390_GOTPLT16 30 /* 16 bit offset to jump slot. */
+#define R_390_GOTPLT32 31 /* 32 bit offset to jump slot. */
+#define R_390_GOTPLT64 32 /* 64 bit offset to jump slot. */
+#define R_390_GOTPLTENT 33 /* 32 bit rel. offset to jump slot. */
+#define R_390_PLTOFF16 34 /* 16 bit offset from GOT to PLT. */
+#define R_390_PLTOFF32 35 /* 32 bit offset from GOT to PLT. */
+#define R_390_PLTOFF64 36 /* 16 bit offset from GOT to PLT. */
+#define R_390_TLS_LOAD 37 /* Tag for load insn in TLS code. */
+#define R_390_TLS_GDCALL 38 /* Tag for function call in general
+ dynamic TLS code. */
+#define R_390_TLS_LDCALL 39 /* Tag for function call in local
+ dynamic TLS code. */
+#define R_390_TLS_GD32 40 /* Direct 32 bit for general dynamic
+ thread local data. */
+#define R_390_TLS_GD64 41 /* Direct 64 bit for general dynamic
+ thread local data. */
+#define R_390_TLS_GOTIE12 42 /* 12 bit GOT offset for static TLS
+ block offset. */
+#define R_390_TLS_GOTIE32 43 /* 32 bit GOT offset for static TLS
+ block offset. */
+#define R_390_TLS_GOTIE64 44 /* 64 bit GOT offset for static TLS
+ block offset. */
+#define R_390_TLS_LDM32 45 /* Direct 32 bit for local dynamic
+ thread local data in LD code. */
+#define R_390_TLS_LDM64 46 /* Direct 64 bit for local dynamic
+ thread local data in LD code. */
+#define R_390_TLS_IE32 47 /* 32 bit address of GOT entry for
+ negated static TLS block offset. */
+#define R_390_TLS_IE64 48 /* 64 bit address of GOT entry for
+ negated static TLS block offset. */
+#define R_390_TLS_IEENT 49 /* 32 bit rel. offset to GOT entry for
+ negated static TLS block offset. */
+#define R_390_TLS_LE32 50 /* 32 bit negated offset relative to
+ static TLS block. */
+#define R_390_TLS_LE64 51 /* 64 bit negated offset relative to
+ static TLS block. */
+#define R_390_TLS_LDO32 52 /* 32 bit offset relative to TLS
+ block. */
+#define R_390_TLS_LDO64 53 /* 64 bit offset relative to TLS
+ block. */
+#define R_390_TLS_DTPMOD 54 /* ID of module containing symbol. */
+#define R_390_TLS_DTPOFF 55 /* Offset in TLS block. */
+#define R_390_TLS_TPOFF 56 /* Negate offset in static TLS
+ block. */
+#define R_390_20 57 /* Direct 20 bit. */
+#define R_390_GOT20 58 /* 20 bit GOT offset. */
+#define R_390_GOTPLT20 59 /* 20 bit offset to jump slot. */
+#define R_390_TLS_GOTIE20 60 /* 20 bit GOT offset for static TLS
+ block offset. */
+/* Keep this the last entry. */
+#define R_390_NUM 61
+
#endif /* _UAPI_LINUX_ELF_R_H */
--
2.55.0
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH v5 09/24] MIPS: ELF: Move relocation constants to UAPI
2026-09-08 6:33 [PATCH v5 00/24] vdso: Reject absolute relocations during build Thomas Weißschuh
` (7 preceding siblings ...)
2026-09-08 6:33 ` [PATCH v5 08/24] s390/elf: " Thomas Weißschuh
@ 2026-09-08 6:33 ` Thomas Weißschuh
2026-09-08 6:33 ` [PATCH v5 10/24] sparc: elf: " Thomas Weißschuh
` (14 subsequent siblings)
23 siblings, 0 replies; 53+ messages in thread
From: Thomas Weißschuh @ 2026-09-08 6:33 UTC (permalink / raw)
To: Paul Walmsley, Palmer Dabbelt, Albert Ou, Alexandre Ghiti,
Nathan Chancellor, Nick Desaulniers, Bill Wendling, Justin Stitt,
Andy Lutomirski, Vincenzo Frascino, Kees Cook, Ingo Molnar,
Borislav Petkov, Dave Hansen, x86, H. Peter Anvin,
Richard Weinberger, Anton Ivanov, Johannes Berg, Russell King,
Catalin Marinas, Will Deacon, Madhavan Srinivasan,
Michael Ellerman, Nicholas Piggin, Huacai Chen, WANG Xuerui,
Heiko Carstens, Vasily Gorbik, Alexander Gordeev,
Christian Borntraeger, Sven Schnelle, Thomas Bogendoerfer,
Miguel Ojeda, Alex Gaynor, Gary Guo, Björn Roy Baron,
Benno Lossin, Andreas Hindborg, Alice Ryhl, Trevor Gross,
Danilo Krummrich, Thomas Gleixner, Christophe Leroy, Boqun Feng,
Nicolas Schier
Cc: linux-riscv, linux-kernel, llvm, linux-mm, linux-um,
linux-arm-kernel, linuxppc-dev, loongarch, linux-s390, linux-mips,
rust-for-linux, linux-kbuild, Jan Stancek,
Arnaldo Carvalho de Melo, Alexandre Ghiti, Thomas Weißschuh
These constants are useful for cross-platform userspace, for example to
process ELF files during kernel cross-compilation.
Move them from the kernel-private architecture-specific header to the UAPI.
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
---
arch/mips/include/asm/elf.h | 55 --------------------------------------------
include/uapi/linux/elf-r.h | 56 +++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 56 insertions(+), 55 deletions(-)
diff --git a/arch/mips/include/asm/elf.h b/arch/mips/include/asm/elf.h
index aaef0eaa68d5..347e12584bee 100644
--- a/arch/mips/include/asm/elf.h
+++ b/arch/mips/include/asm/elf.h
@@ -70,61 +70,6 @@
#define DT_MIPS_HIPAGENO 0x70000014
#define DT_MIPS_RLD_MAP 0x70000016
-#define R_MIPS_NONE 0
-#define R_MIPS_16 1
-#define R_MIPS_32 2
-#define R_MIPS_REL32 3
-#define R_MIPS_26 4
-#define R_MIPS_HI16 5
-#define R_MIPS_LO16 6
-#define R_MIPS_GPREL16 7
-#define R_MIPS_LITERAL 8
-#define R_MIPS_GOT16 9
-#define R_MIPS_PC16 10
-#define R_MIPS_CALL16 11
-#define R_MIPS_GPREL32 12
-/* The remaining relocs are defined on Irix, although they are not
- in the MIPS ELF ABI. */
-#define R_MIPS_UNUSED1 13
-#define R_MIPS_UNUSED2 14
-#define R_MIPS_UNUSED3 15
-#define R_MIPS_SHIFT5 16
-#define R_MIPS_SHIFT6 17
-#define R_MIPS_64 18
-#define R_MIPS_GOT_DISP 19
-#define R_MIPS_GOT_PAGE 20
-#define R_MIPS_GOT_OFST 21
-/*
- * The following two relocation types are specified in the MIPS ABI
- * conformance guide version 1.2 but not yet in the psABI.
- */
-#define R_MIPS_GOTHI16 22
-#define R_MIPS_GOTLO16 23
-#define R_MIPS_SUB 24
-#define R_MIPS_INSERT_A 25
-#define R_MIPS_INSERT_B 26
-#define R_MIPS_DELETE 27
-#define R_MIPS_HIGHER 28
-#define R_MIPS_HIGHEST 29
-/*
- * The following two relocation types are specified in the MIPS ABI
- * conformance guide version 1.2 but not yet in the psABI.
- */
-#define R_MIPS_CALLHI16 30
-#define R_MIPS_CALLLO16 31
-/*
- * Introduced for MIPSr6.
- */
-#define R_MIPS_PC21_S2 60
-#define R_MIPS_PC26_S2 61
-/*
- * This range is reserved for vendor specific relocations.
- */
-#define R_MIPS_LOVENDOR 100
-#define R_MIPS_HIVENDOR 127
-
-#define R_MIPS_PC32 248
-
#define SHN_MIPS_ACCOMON 0xff00 /* Allocated common symbols */
#define SHN_MIPS_TEXT 0xff01 /* Allocated test symbols. */
#define SHN_MIPS_DATA 0xff02 /* Allocated data symbols. */
diff --git a/include/uapi/linux/elf-r.h b/include/uapi/linux/elf-r.h
index 3d9e3b57f1ff..0c6a8698f300 100644
--- a/include/uapi/linux/elf-r.h
+++ b/include/uapi/linux/elf-r.h
@@ -593,4 +593,60 @@
/* Keep this the last entry. */
#define R_390_NUM 61
+/* MIPS relocations defined by the ABIs */
+#define R_MIPS_NONE 0
+#define R_MIPS_16 1
+#define R_MIPS_32 2
+#define R_MIPS_REL32 3
+#define R_MIPS_26 4
+#define R_MIPS_HI16 5
+#define R_MIPS_LO16 6
+#define R_MIPS_GPREL16 7
+#define R_MIPS_LITERAL 8
+#define R_MIPS_GOT16 9
+#define R_MIPS_PC16 10
+#define R_MIPS_CALL16 11
+#define R_MIPS_GPREL32 12
+/* The remaining relocs are defined on Irix, although they are not
+ in the MIPS ELF ABI. */
+#define R_MIPS_UNUSED1 13
+#define R_MIPS_UNUSED2 14
+#define R_MIPS_UNUSED3 15
+#define R_MIPS_SHIFT5 16
+#define R_MIPS_SHIFT6 17
+#define R_MIPS_64 18
+#define R_MIPS_GOT_DISP 19
+#define R_MIPS_GOT_PAGE 20
+#define R_MIPS_GOT_OFST 21
+/*
+ * The following two relocation types are specified in the MIPS ABI
+ * conformance guide version 1.2 but not yet in the psABI.
+ */
+#define R_MIPS_GOTHI16 22
+#define R_MIPS_GOTLO16 23
+#define R_MIPS_SUB 24
+#define R_MIPS_INSERT_A 25
+#define R_MIPS_INSERT_B 26
+#define R_MIPS_DELETE 27
+#define R_MIPS_HIGHER 28
+#define R_MIPS_HIGHEST 29
+/*
+ * The following two relocation types are specified in the MIPS ABI
+ * conformance guide version 1.2 but not yet in the psABI.
+ */
+#define R_MIPS_CALLHI16 30
+#define R_MIPS_CALLLO16 31
+/*
+ * Introduced for MIPSr6.
+ */
+#define R_MIPS_PC21_S2 60
+#define R_MIPS_PC26_S2 61
+/*
+ * This range is reserved for vendor specific relocations.
+ */
+#define R_MIPS_LOVENDOR 100
+#define R_MIPS_HIVENDOR 127
+
+#define R_MIPS_PC32 248
+
#endif /* _UAPI_LINUX_ELF_R_H */
--
2.55.0
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH v5 10/24] sparc: elf: Move relocation constants to UAPI
2026-09-08 6:33 [PATCH v5 00/24] vdso: Reject absolute relocations during build Thomas Weißschuh
` (8 preceding siblings ...)
2026-09-08 6:33 ` [PATCH v5 09/24] MIPS: ELF: " Thomas Weißschuh
@ 2026-09-08 6:33 ` Thomas Weißschuh
2026-09-08 6:33 ` [PATCH v5 11/24] tools headers UAPI: Sync ELF headers with the kernel sources Thomas Weißschuh
` (13 subsequent siblings)
23 siblings, 0 replies; 53+ messages in thread
From: Thomas Weißschuh @ 2026-09-08 6:33 UTC (permalink / raw)
To: Paul Walmsley, Palmer Dabbelt, Albert Ou, Alexandre Ghiti,
Nathan Chancellor, Nick Desaulniers, Bill Wendling, Justin Stitt,
Andy Lutomirski, Vincenzo Frascino, Kees Cook, Ingo Molnar,
Borislav Petkov, Dave Hansen, x86, H. Peter Anvin,
Richard Weinberger, Anton Ivanov, Johannes Berg, Russell King,
Catalin Marinas, Will Deacon, Madhavan Srinivasan,
Michael Ellerman, Nicholas Piggin, Huacai Chen, WANG Xuerui,
Heiko Carstens, Vasily Gorbik, Alexander Gordeev,
Christian Borntraeger, Sven Schnelle, Thomas Bogendoerfer,
Miguel Ojeda, Alex Gaynor, Gary Guo, Björn Roy Baron,
Benno Lossin, Andreas Hindborg, Alice Ryhl, Trevor Gross,
Danilo Krummrich, Thomas Gleixner, Christophe Leroy, Boqun Feng,
Nicolas Schier
Cc: linux-riscv, linux-kernel, llvm, linux-mm, linux-um,
linux-arm-kernel, linuxppc-dev, loongarch, linux-s390, linux-mips,
rust-for-linux, linux-kbuild, Jan Stancek,
Arnaldo Carvalho de Melo, Alexandre Ghiti, Thomas Weißschuh
These constants are useful for cross-platform userspace, for example to
process ELF files during kernel cross-compilation.
Move them from the kernel-private architecture-specific header to the UAPI.
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
---
arch/sparc/include/asm/elf_32.h | 43 ----------------------------------------
arch/sparc/include/asm/elf_64.h | 44 -----------------------------------------
include/uapi/linux/elf-r.h | 44 +++++++++++++++++++++++++++++++++++++++++
3 files changed, 44 insertions(+), 87 deletions(-)
diff --git a/arch/sparc/include/asm/elf_32.h b/arch/sparc/include/asm/elf_32.h
index 37a6016c9ccd..02736284f7af 100644
--- a/arch/sparc/include/asm/elf_32.h
+++ b/arch/sparc/include/asm/elf_32.h
@@ -13,49 +13,6 @@
*/
#define STT_REGISTER 13
-/*
- * Sparc ELF relocation types
- */
-#define R_SPARC_NONE 0
-#define R_SPARC_8 1
-#define R_SPARC_16 2
-#define R_SPARC_32 3
-#define R_SPARC_DISP8 4
-#define R_SPARC_DISP16 5
-#define R_SPARC_DISP32 6
-#define R_SPARC_WDISP30 7
-#define R_SPARC_WDISP22 8
-#define R_SPARC_HI22 9
-#define R_SPARC_22 10
-#define R_SPARC_13 11
-#define R_SPARC_LO10 12
-#define R_SPARC_GOT10 13
-#define R_SPARC_GOT13 14
-#define R_SPARC_GOT22 15
-#define R_SPARC_PC10 16
-#define R_SPARC_PC22 17
-#define R_SPARC_WPLT30 18
-#define R_SPARC_COPY 19
-#define R_SPARC_GLOB_DAT 20
-#define R_SPARC_JMP_SLOT 21
-#define R_SPARC_RELATIVE 22
-#define R_SPARC_UA32 23
-#define R_SPARC_PLT32 24
-#define R_SPARC_HIPLT22 25
-#define R_SPARC_LOPLT10 26
-#define R_SPARC_PCPLT32 27
-#define R_SPARC_PCPLT22 28
-#define R_SPARC_PCPLT10 29
-#define R_SPARC_10 30
-#define R_SPARC_11 31
-#define R_SPARC_64 32
-#define R_SPARC_OLO10 33
-#define R_SPARC_WDISP16 40
-#define R_SPARC_WDISP19 41
-#define R_SPARC_7 43
-#define R_SPARC_5 44
-#define R_SPARC_6 45
-
/* Bits present in AT_HWCAP, primarily for Sparc32. */
#define HWCAP_SPARC_FLUSH 1 /* CPU supports flush instruction. */
diff --git a/arch/sparc/include/asm/elf_64.h b/arch/sparc/include/asm/elf_64.h
index 694ed081cf8d..3be9e2d3a94a 100644
--- a/arch/sparc/include/asm/elf_64.h
+++ b/arch/sparc/include/asm/elf_64.h
@@ -16,50 +16,6 @@
*/
#define STT_REGISTER 13
-/*
- * Sparc ELF relocation types
- */
-#define R_SPARC_NONE 0
-#define R_SPARC_8 1
-#define R_SPARC_16 2
-#define R_SPARC_32 3
-#define R_SPARC_DISP8 4
-#define R_SPARC_DISP16 5
-#define R_SPARC_DISP32 6
-#define R_SPARC_WDISP30 7
-#define R_SPARC_WDISP22 8
-#define R_SPARC_HI22 9
-#define R_SPARC_22 10
-#define R_SPARC_13 11
-#define R_SPARC_LO10 12
-#define R_SPARC_GOT10 13
-#define R_SPARC_GOT13 14
-#define R_SPARC_GOT22 15
-#define R_SPARC_PC10 16
-#define R_SPARC_PC22 17
-#define R_SPARC_WPLT30 18
-#define R_SPARC_COPY 19
-#define R_SPARC_GLOB_DAT 20
-#define R_SPARC_JMP_SLOT 21
-#define R_SPARC_RELATIVE 22
-#define R_SPARC_UA32 23
-#define R_SPARC_PLT32 24
-#define R_SPARC_HIPLT22 25
-#define R_SPARC_LOPLT10 26
-#define R_SPARC_PCPLT32 27
-#define R_SPARC_PCPLT22 28
-#define R_SPARC_PCPLT10 29
-#define R_SPARC_10 30
-#define R_SPARC_11 31
-#define R_SPARC_64 32
-#define R_SPARC_OLO10 33
-#define R_SPARC_WDISP16 40
-#define R_SPARC_WDISP19 41
-#define R_SPARC_7 43
-#define R_SPARC_5 44
-#define R_SPARC_6 45
-#define R_SPARC_UA64 54
-
/* Bits present in AT_HWCAP, primarily for Sparc32. */
#define HWCAP_SPARC_FLUSH 0x00000001
#define HWCAP_SPARC_STBAR 0x00000002
diff --git a/include/uapi/linux/elf-r.h b/include/uapi/linux/elf-r.h
index 0c6a8698f300..72fc9045a5d4 100644
--- a/include/uapi/linux/elf-r.h
+++ b/include/uapi/linux/elf-r.h
@@ -649,4 +649,48 @@
#define R_MIPS_PC32 248
+/*
+ * Sparc ELF relocation types
+ */
+#define R_SPARC_NONE 0
+#define R_SPARC_8 1
+#define R_SPARC_16 2
+#define R_SPARC_32 3
+#define R_SPARC_DISP8 4
+#define R_SPARC_DISP16 5
+#define R_SPARC_DISP32 6
+#define R_SPARC_WDISP30 7
+#define R_SPARC_WDISP22 8
+#define R_SPARC_HI22 9
+#define R_SPARC_22 10
+#define R_SPARC_13 11
+#define R_SPARC_LO10 12
+#define R_SPARC_GOT10 13
+#define R_SPARC_GOT13 14
+#define R_SPARC_GOT22 15
+#define R_SPARC_PC10 16
+#define R_SPARC_PC22 17
+#define R_SPARC_WPLT30 18
+#define R_SPARC_COPY 19
+#define R_SPARC_GLOB_DAT 20
+#define R_SPARC_JMP_SLOT 21
+#define R_SPARC_RELATIVE 22
+#define R_SPARC_UA32 23
+#define R_SPARC_PLT32 24
+#define R_SPARC_HIPLT22 25
+#define R_SPARC_LOPLT10 26
+#define R_SPARC_PCPLT32 27
+#define R_SPARC_PCPLT22 28
+#define R_SPARC_PCPLT10 29
+#define R_SPARC_10 30
+#define R_SPARC_11 31
+#define R_SPARC_64 32
+#define R_SPARC_OLO10 33
+#define R_SPARC_WDISP16 40
+#define R_SPARC_WDISP19 41
+#define R_SPARC_7 43
+#define R_SPARC_5 44
+#define R_SPARC_6 45
+#define R_SPARC_UA64 54
+
#endif /* _UAPI_LINUX_ELF_R_H */
--
2.55.0
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH v5 11/24] tools headers UAPI: Sync ELF headers with the kernel sources
2026-09-08 6:33 [PATCH v5 00/24] vdso: Reject absolute relocations during build Thomas Weißschuh
` (9 preceding siblings ...)
2026-09-08 6:33 ` [PATCH v5 10/24] sparc: elf: " Thomas Weißschuh
@ 2026-09-08 6:33 ` Thomas Weißschuh
2026-09-08 8:56 ` Christophe Leroy (CS GROUP)
2026-09-08 9:09 ` Christophe Leroy (CS GROUP)
2026-09-08 6:33 ` [PATCH v5 12/24] vdso: Add the vdsocheck tool Thomas Weißschuh
` (12 subsequent siblings)
23 siblings, 2 replies; 53+ messages in thread
From: Thomas Weißschuh @ 2026-09-08 6:33 UTC (permalink / raw)
To: Paul Walmsley, Palmer Dabbelt, Albert Ou, Alexandre Ghiti,
Nathan Chancellor, Nick Desaulniers, Bill Wendling, Justin Stitt,
Andy Lutomirski, Vincenzo Frascino, Kees Cook, Ingo Molnar,
Borislav Petkov, Dave Hansen, x86, H. Peter Anvin,
Richard Weinberger, Anton Ivanov, Johannes Berg, Russell King,
Catalin Marinas, Will Deacon, Madhavan Srinivasan,
Michael Ellerman, Nicholas Piggin, Huacai Chen, WANG Xuerui,
Heiko Carstens, Vasily Gorbik, Alexander Gordeev,
Christian Borntraeger, Sven Schnelle, Thomas Bogendoerfer,
Miguel Ojeda, Alex Gaynor, Gary Guo, Björn Roy Baron,
Benno Lossin, Andreas Hindborg, Alice Ryhl, Trevor Gross,
Danilo Krummrich, Thomas Gleixner, Christophe Leroy, Boqun Feng,
Nicolas Schier
Cc: linux-riscv, linux-kernel, llvm, linux-mm, linux-um,
linux-arm-kernel, linuxppc-dev, loongarch, linux-s390, linux-mips,
rust-for-linux, linux-kbuild, Jan Stancek,
Arnaldo Carvalho de Melo, Alexandre Ghiti, Thomas Weißschuh
Pick up changes from the UAPI ELF header files.
This picks up general changes to elf.h, elf-em.h which was forgotten
previously and the new elf-r.h.
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
---
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/include/uapi/linux/elf-em.h | 71 ++++
tools/include/uapi/linux/elf-r.h | 696 ++++++++++++++++++++++++++++++++++++++
tools/include/uapi/linux/elf.h | 112 +++++-
3 files changed, 868 insertions(+), 11 deletions(-)
diff --git a/tools/include/uapi/linux/elf-em.h b/tools/include/uapi/linux/elf-em.h
new file mode 100644
index 000000000000..ef38c2bc5ab7
--- /dev/null
+++ b/tools/include/uapi/linux/elf-em.h
@@ -0,0 +1,71 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
+#ifndef _LINUX_ELF_EM_H
+#define _LINUX_ELF_EM_H
+
+/* These constants define the various ELF target machines */
+#define EM_NONE 0
+#define EM_M32 1
+#define EM_SPARC 2
+#define EM_386 3
+#define EM_68K 4
+#define EM_88K 5
+#define EM_486 6 /* Perhaps disused */
+#define EM_860 7
+#define EM_MIPS 8 /* MIPS R3000 (officially, big-endian only) */
+ /* Next two are historical and binaries and
+ modules of these types will be rejected by
+ Linux. */
+#define EM_MIPS_RS3_LE 10 /* MIPS R3000 little-endian */
+#define EM_MIPS_RS4_BE 10 /* MIPS R4000 big-endian */
+
+#define EM_PARISC 15 /* HPPA */
+#define EM_SPARC32PLUS 18 /* Sun's "v8plus" */
+#define EM_PPC 20 /* PowerPC */
+#define EM_PPC64 21 /* PowerPC64 */
+#define EM_SPU 23 /* Cell BE SPU */
+#define EM_ARM 40 /* ARM 32 bit */
+#define EM_SH 42 /* SuperH */
+#define EM_SPARCV9 43 /* SPARC v9 64-bit */
+#define EM_H8_300 46 /* Renesas H8/300 */
+#define EM_IA_64 50 /* HP/Intel IA-64 */
+#define EM_X86_64 62 /* AMD x86-64 */
+#define EM_S390 22 /* IBM S/390 */
+#define EM_CRIS 76 /* Axis Communications 32-bit embedded processor */
+#define EM_M32R 88 /* Renesas M32R */
+#define EM_MN10300 89 /* Panasonic/MEI MN10300, AM33 */
+#define EM_OPENRISC 92 /* OpenRISC 32-bit embedded processor */
+#define EM_ARCOMPACT 93 /* ARCompact processor */
+#define EM_XTENSA 94 /* Tensilica Xtensa Architecture */
+#define EM_BLACKFIN 106 /* ADI Blackfin Processor */
+#define EM_UNICORE 110 /* UniCore-32 */
+#define EM_ALTERA_NIOS2 113 /* Altera Nios II soft-core processor */
+#define EM_TI_C6000 140 /* TI C6X DSPs */
+#define EM_HEXAGON 164 /* QUALCOMM Hexagon */
+#define EM_NDS32 167 /* Andes Technology compact code size
+ embedded RISC processor family */
+#define EM_AARCH64 183 /* ARM 64 bit */
+#define EM_TILEPRO 188 /* Tilera TILEPro */
+#define EM_MICROBLAZE 189 /* Xilinx MicroBlaze */
+#define EM_TILEGX 191 /* Tilera TILE-Gx */
+#define EM_ARCV2 195 /* ARCv2 Cores */
+#define EM_RISCV 243 /* RISC-V */
+#define EM_BPF 247 /* Linux BPF - in-kernel virtual machine */
+#define EM_CSKY 252 /* C-SKY */
+#define EM_LOONGARCH 258 /* LoongArch */
+#define EM_FRV 0x5441 /* Fujitsu FR-V */
+
+/*
+ * This is an interim value that we will use until the committee comes
+ * up with a final number.
+ */
+#define EM_ALPHA 0x9026
+
+/* Bogus old m32r magic number, used by old tools. */
+#define EM_CYGNUS_M32R 0x9041
+/* This is the old interim value for S/390 architecture */
+#define EM_S390_OLD 0xA390
+/* Also Panasonic/MEI MN10300, AM33 */
+#define EM_CYGNUS_MN10300 0xbeef
+
+
+#endif /* _LINUX_ELF_EM_H */
diff --git a/tools/include/uapi/linux/elf-r.h b/tools/include/uapi/linux/elf-r.h
new file mode 100644
index 000000000000..72fc9045a5d4
--- /dev/null
+++ b/tools/include/uapi/linux/elf-r.h
@@ -0,0 +1,696 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
+#ifndef _UAPI_LINUX_ELF_R_H
+#define _UAPI_LINUX_ELF_R_H
+
+/* i386 relocation types */
+#define R_386_NONE 0
+#define R_386_32 1
+#define R_386_PC32 2
+#define R_386_GOT32 3
+#define R_386_PLT32 4
+#define R_386_COPY 5
+#define R_386_GLOB_DAT 6
+#define R_386_JMP_SLOT 7
+#define R_386_RELATIVE 8
+#define R_386_GOTOFF 9
+#define R_386_GOTPC 10
+#define R_386_NUM 11
+
+/* x86-64 relocation types */
+#define R_X86_64_NONE 0 /* No reloc */
+#define R_X86_64_64 1 /* Direct 64 bit */
+#define R_X86_64_PC32 2 /* PC relative 32 bit signed */
+#define R_X86_64_GOT32 3 /* 32 bit GOT entry */
+#define R_X86_64_PLT32 4 /* 32 bit PLT address */
+#define R_X86_64_COPY 5 /* Copy symbol at runtime */
+#define R_X86_64_GLOB_DAT 6 /* Create GOT entry */
+#define R_X86_64_JUMP_SLOT 7 /* Create PLT entry */
+#define R_X86_64_RELATIVE 8 /* Adjust by program base */
+#define R_X86_64_GOTPCREL 9 /* 32 bit signed pc relative
+ offset to GOT */
+#define R_X86_64_32 10 /* Direct 32 bit zero extended */
+#define R_X86_64_32S 11 /* Direct 32 bit sign extended */
+#define R_X86_64_16 12 /* Direct 16 bit zero extended */
+#define R_X86_64_PC16 13 /* 16 bit sign extended pc relative */
+#define R_X86_64_8 14 /* Direct 8 bit sign extended */
+#define R_X86_64_PC8 15 /* 8 bit sign extended pc relative */
+#define R_X86_64_PC64 24 /* Place relative 64-bit signed */
+
+/* arm relocation types */
+#define R_ARM_NONE 0
+#define R_ARM_PC24 1
+#define R_ARM_ABS32 2
+#define R_ARM_REL32 3
+#define R_ARM_CALL 28
+#define R_ARM_JUMP24 29
+#define R_ARM_TARGET1 38
+#define R_ARM_V4BX 40
+#define R_ARM_PREL31 42
+#define R_ARM_MOVW_ABS_NC 43
+#define R_ARM_MOVT_ABS 44
+#define R_ARM_MOVW_PREL_NC 45
+#define R_ARM_MOVT_PREL 46
+#define R_ARM_ALU_PC_G0_NC 57
+#define R_ARM_ALU_PC_G1_NC 59
+#define R_ARM_LDR_PC_G2 63
+
+#define R_ARM_THM_CALL 10
+#define R_ARM_THM_JUMP24 30
+#define R_ARM_THM_MOVW_ABS_NC 47
+#define R_ARM_THM_MOVT_ABS 48
+#define R_ARM_THM_MOVW_PREL_NC 49
+#define R_ARM_THM_MOVT_PREL 50
+
+/* AArch64 static relocation types */
+
+/* Miscellaneous. */
+#define R_AARCH64_NONE 256
+
+/* Data. */
+#define R_AARCH64_ABS64 257
+#define R_AARCH64_ABS32 258
+#define R_AARCH64_ABS16 259
+#define R_AARCH64_PREL64 260
+#define R_AARCH64_PREL32 261
+#define R_AARCH64_PREL16 262
+
+/* Instructions. */
+#define R_AARCH64_MOVW_UABS_G0 263
+#define R_AARCH64_MOVW_UABS_G0_NC 264
+#define R_AARCH64_MOVW_UABS_G1 265
+#define R_AARCH64_MOVW_UABS_G1_NC 266
+#define R_AARCH64_MOVW_UABS_G2 267
+#define R_AARCH64_MOVW_UABS_G2_NC 268
+#define R_AARCH64_MOVW_UABS_G3 269
+
+#define R_AARCH64_MOVW_SABS_G0 270
+#define R_AARCH64_MOVW_SABS_G1 271
+#define R_AARCH64_MOVW_SABS_G2 272
+
+#define R_AARCH64_LD_PREL_LO19 273
+#define R_AARCH64_ADR_PREL_LO21 274
+#define R_AARCH64_ADR_PREL_PG_HI21 275
+#define R_AARCH64_ADR_PREL_PG_HI21_NC 276
+#define R_AARCH64_ADD_ABS_LO12_NC 277
+#define R_AARCH64_LDST8_ABS_LO12_NC 278
+
+#define R_AARCH64_TSTBR14 279
+#define R_AARCH64_CONDBR19 280
+#define R_AARCH64_JUMP26 282
+#define R_AARCH64_CALL26 283
+#define R_AARCH64_LDST16_ABS_LO12_NC 284
+#define R_AARCH64_LDST32_ABS_LO12_NC 285
+#define R_AARCH64_LDST64_ABS_LO12_NC 286
+#define R_AARCH64_LDST128_ABS_LO12_NC 299
+
+#define R_AARCH64_MOVW_PREL_G0 287
+#define R_AARCH64_MOVW_PREL_G0_NC 288
+#define R_AARCH64_MOVW_PREL_G1 289
+#define R_AARCH64_MOVW_PREL_G1_NC 290
+#define R_AARCH64_MOVW_PREL_G2 291
+#define R_AARCH64_MOVW_PREL_G2_NC 292
+#define R_AARCH64_MOVW_PREL_G3 293
+
+#define R_AARCH64_RELATIVE 1027
+
+/* PowerPC relocations defined by the ABIs */
+#define R_PPC_NONE 0
+#define R_PPC_ADDR32 1 /* 32bit absolute address */
+#define R_PPC_ADDR24 2 /* 26bit address, 2 bits ignored. */
+#define R_PPC_ADDR16 3 /* 16bit absolute address */
+#define R_PPC_ADDR16_LO 4 /* lower 16bit of absolute address */
+#define R_PPC_ADDR16_HI 5 /* high 16bit of absolute address */
+#define R_PPC_ADDR16_HA 6 /* adjusted high 16bit */
+#define R_PPC_ADDR14 7 /* 16bit address, 2 bits ignored */
+#define R_PPC_ADDR14_BRTAKEN 8
+#define R_PPC_ADDR14_BRNTAKEN 9
+#define R_PPC_REL24 10 /* PC relative 26 bit */
+#define R_PPC_REL14 11 /* PC relative 16 bit */
+#define R_PPC_REL14_BRTAKEN 12
+#define R_PPC_REL14_BRNTAKEN 13
+#define R_PPC_GOT16 14
+#define R_PPC_GOT16_LO 15
+#define R_PPC_GOT16_HI 16
+#define R_PPC_GOT16_HA 17
+#define R_PPC_PLTREL24 18
+#define R_PPC_COPY 19
+#define R_PPC_GLOB_DAT 20
+#define R_PPC_JMP_SLOT 21
+#define R_PPC_RELATIVE 22
+#define R_PPC_LOCAL24PC 23
+#define R_PPC_UADDR32 24
+#define R_PPC_UADDR16 25
+#define R_PPC_REL32 26
+#define R_PPC_PLT32 27
+#define R_PPC_PLTREL32 28
+#define R_PPC_PLT16_LO 29
+#define R_PPC_PLT16_HI 30
+#define R_PPC_PLT16_HA 31
+#define R_PPC_SDAREL16 32
+#define R_PPC_SECTOFF 33
+#define R_PPC_SECTOFF_LO 34
+#define R_PPC_SECTOFF_HI 35
+#define R_PPC_SECTOFF_HA 36
+
+/* PowerPC relocations defined for the TLS access ABI. */
+#define R_PPC_TLS 67 /* none (sym+add)@tls */
+#define R_PPC_DTPMOD32 68 /* word32 (sym+add)@dtpmod */
+#define R_PPC_TPREL16 69 /* half16* (sym+add)@tprel */
+#define R_PPC_TPREL16_LO 70 /* half16 (sym+add)@tprel@l */
+#define R_PPC_TPREL16_HI 71 /* half16 (sym+add)@tprel@h */
+#define R_PPC_TPREL16_HA 72 /* half16 (sym+add)@tprel@ha */
+#define R_PPC_TPREL32 73 /* word32 (sym+add)@tprel */
+#define R_PPC_DTPREL16 74 /* half16* (sym+add)@dtprel */
+#define R_PPC_DTPREL16_LO 75 /* half16 (sym+add)@dtprel@l */
+#define R_PPC_DTPREL16_HI 76 /* half16 (sym+add)@dtprel@h */
+#define R_PPC_DTPREL16_HA 77 /* half16 (sym+add)@dtprel@ha */
+#define R_PPC_DTPREL32 78 /* word32 (sym+add)@dtprel */
+#define R_PPC_GOT_TLSGD16 79 /* half16* (sym+add)@got@tlsgd */
+#define R_PPC_GOT_TLSGD16_LO 80 /* half16 (sym+add)@got@tlsgd@l */
+#define R_PPC_GOT_TLSGD16_HI 81 /* half16 (sym+add)@got@tlsgd@h */
+#define R_PPC_GOT_TLSGD16_HA 82 /* half16 (sym+add)@got@tlsgd@ha */
+#define R_PPC_GOT_TLSLD16 83 /* half16* (sym+add)@got@tlsld */
+#define R_PPC_GOT_TLSLD16_LO 84 /* half16 (sym+add)@got@tlsld@l */
+#define R_PPC_GOT_TLSLD16_HI 85 /* half16 (sym+add)@got@tlsld@h */
+#define R_PPC_GOT_TLSLD16_HA 86 /* half16 (sym+add)@got@tlsld@ha */
+#define R_PPC_GOT_TPREL16 87 /* half16* (sym+add)@got@tprel */
+#define R_PPC_GOT_TPREL16_LO 88 /* half16 (sym+add)@got@tprel@l */
+#define R_PPC_GOT_TPREL16_HI 89 /* half16 (sym+add)@got@tprel@h */
+#define R_PPC_GOT_TPREL16_HA 90 /* half16 (sym+add)@got@tprel@ha */
+#define R_PPC_GOT_DTPREL16 91 /* half16* (sym+add)@got@dtprel */
+#define R_PPC_GOT_DTPREL16_LO 92 /* half16* (sym+add)@got@dtprel@l */
+#define R_PPC_GOT_DTPREL16_HI 93 /* half16* (sym+add)@got@dtprel@h */
+#define R_PPC_GOT_DTPREL16_HA 94 /* half16* (sym+add)@got@dtprel@ha */
+
+/* keep this the last entry. */
+#define R_PPC_NUM 95
+
+/* PowerPC64 relocations defined by the ABIs */
+#define R_PPC64_NONE R_PPC_NONE
+#define R_PPC64_ADDR32 R_PPC_ADDR32 /* 32bit absolute address. */
+#define R_PPC64_ADDR24 R_PPC_ADDR24 /* 26bit address, word aligned. */
+#define R_PPC64_ADDR16 R_PPC_ADDR16 /* 16bit absolute address. */
+#define R_PPC64_ADDR16_LO R_PPC_ADDR16_LO /* lower 16bits of abs. address. */
+#define R_PPC64_ADDR16_HI R_PPC_ADDR16_HI /* high 16bits of abs. address. */
+#define R_PPC64_ADDR16_HA R_PPC_ADDR16_HA /* adjusted high 16bits. */
+#define R_PPC64_ADDR14 R_PPC_ADDR14 /* 16bit address, word aligned. */
+#define R_PPC64_ADDR14_BRTAKEN R_PPC_ADDR14_BRTAKEN
+#define R_PPC64_ADDR14_BRNTAKEN R_PPC_ADDR14_BRNTAKEN
+#define R_PPC64_REL24 R_PPC_REL24 /* PC relative 26 bit, word aligned. */
+#define R_PPC64_REL14 R_PPC_REL14 /* PC relative 16 bit. */
+#define R_PPC64_REL14_BRTAKEN R_PPC_REL14_BRTAKEN
+#define R_PPC64_REL14_BRNTAKEN R_PPC_REL14_BRNTAKEN
+#define R_PPC64_GOT16 R_PPC_GOT16
+#define R_PPC64_GOT16_LO R_PPC_GOT16_LO
+#define R_PPC64_GOT16_HI R_PPC_GOT16_HI
+#define R_PPC64_GOT16_HA R_PPC_GOT16_HA
+
+#define R_PPC64_COPY R_PPC_COPY
+#define R_PPC64_GLOB_DAT R_PPC_GLOB_DAT
+#define R_PPC64_JMP_SLOT R_PPC_JMP_SLOT
+#define R_PPC64_RELATIVE R_PPC_RELATIVE
+
+#define R_PPC64_UADDR32 R_PPC_UADDR32
+#define R_PPC64_UADDR16 R_PPC_UADDR16
+#define R_PPC64_REL32 R_PPC_REL32
+#define R_PPC64_PLT32 R_PPC_PLT32
+#define R_PPC64_PLTREL32 R_PPC_PLTREL32
+#define R_PPC64_PLT16_LO R_PPC_PLT16_LO
+#define R_PPC64_PLT16_HI R_PPC_PLT16_HI
+#define R_PPC64_PLT16_HA R_PPC_PLT16_HA
+
+#define R_PPC64_SECTOFF R_PPC_SECTOFF
+#define R_PPC64_SECTOFF_LO R_PPC_SECTOFF_LO
+#define R_PPC64_SECTOFF_HI R_PPC_SECTOFF_HI
+#define R_PPC64_SECTOFF_HA R_PPC_SECTOFF_HA
+#define R_PPC64_ADDR30 37 /* word30 (S + A - P) >> 2. */
+#define R_PPC64_ADDR64 38 /* doubleword64 S + A. */
+#define R_PPC64_ADDR16_HIGHER 39 /* half16 #higher(S + A). */
+#define R_PPC64_ADDR16_HIGHERA 40 /* half16 #highera(S + A). */
+#define R_PPC64_ADDR16_HIGHEST 41 /* half16 #highest(S + A). */
+#define R_PPC64_ADDR16_HIGHESTA 42 /* half16 #highesta(S + A). */
+#define R_PPC64_UADDR64 43 /* doubleword64 S + A. */
+#define R_PPC64_REL64 44 /* doubleword64 S + A - P. */
+#define R_PPC64_PLT64 45 /* doubleword64 L + A. */
+#define R_PPC64_PLTREL64 46 /* doubleword64 L + A - P. */
+#define R_PPC64_TOC16 47 /* half16* S + A - .TOC. */
+#define R_PPC64_TOC16_LO 48 /* half16 #lo(S + A - .TOC.). */
+#define R_PPC64_TOC16_HI 49 /* half16 #hi(S + A - .TOC.). */
+#define R_PPC64_TOC16_HA 50 /* half16 #ha(S + A - .TOC.). */
+#define R_PPC64_TOC 51 /* doubleword64 .TOC. */
+#define R_PPC64_PLTGOT16 52 /* half16* M + A. */
+#define R_PPC64_PLTGOT16_LO 53 /* half16 #lo(M + A). */
+#define R_PPC64_PLTGOT16_HI 54 /* half16 #hi(M + A). */
+#define R_PPC64_PLTGOT16_HA 55 /* half16 #ha(M + A). */
+
+#define R_PPC64_ADDR16_DS 56 /* half16ds* (S + A) >> 2. */
+#define R_PPC64_ADDR16_LO_DS 57 /* half16ds #lo(S + A) >> 2. */
+#define R_PPC64_GOT16_DS 58 /* half16ds* (G + A) >> 2. */
+#define R_PPC64_GOT16_LO_DS 59 /* half16ds #lo(G + A) >> 2. */
+#define R_PPC64_PLT16_LO_DS 60 /* half16ds #lo(L + A) >> 2. */
+#define R_PPC64_SECTOFF_DS 61 /* half16ds* (R + A) >> 2. */
+#define R_PPC64_SECTOFF_LO_DS 62 /* half16ds #lo(R + A) >> 2. */
+#define R_PPC64_TOC16_DS 63 /* half16ds* (S + A - .TOC.) >> 2. */
+#define R_PPC64_TOC16_LO_DS 64 /* half16ds #lo(S + A - .TOC.) >> 2. */
+#define R_PPC64_PLTGOT16_DS 65 /* half16ds* (M + A) >> 2. */
+#define R_PPC64_PLTGOT16_LO_DS 66 /* half16ds #lo(M + A) >> 2. */
+
+/* PowerPC64 relocations defined for the TLS access ABI. */
+#define R_PPC64_TLS 67 /* none (sym+add)@tls */
+#define R_PPC64_DTPMOD64 68 /* doubleword64 (sym+add)@dtpmod */
+#define R_PPC64_TPREL16 69 /* half16* (sym+add)@tprel */
+#define R_PPC64_TPREL16_LO 70 /* half16 (sym+add)@tprel@l */
+#define R_PPC64_TPREL16_HI 71 /* half16 (sym+add)@tprel@h */
+#define R_PPC64_TPREL16_HA 72 /* half16 (sym+add)@tprel@ha */
+#define R_PPC64_TPREL64 73 /* doubleword64 (sym+add)@tprel */
+#define R_PPC64_DTPREL16 74 /* half16* (sym+add)@dtprel */
+#define R_PPC64_DTPREL16_LO 75 /* half16 (sym+add)@dtprel@l */
+#define R_PPC64_DTPREL16_HI 76 /* half16 (sym+add)@dtprel@h */
+#define R_PPC64_DTPREL16_HA 77 /* half16 (sym+add)@dtprel@ha */
+#define R_PPC64_DTPREL64 78 /* doubleword64 (sym+add)@dtprel */
+#define R_PPC64_GOT_TLSGD16 79 /* half16* (sym+add)@got@tlsgd */
+#define R_PPC64_GOT_TLSGD16_LO 80 /* half16 (sym+add)@got@tlsgd@l */
+#define R_PPC64_GOT_TLSGD16_HI 81 /* half16 (sym+add)@got@tlsgd@h */
+#define R_PPC64_GOT_TLSGD16_HA 82 /* half16 (sym+add)@got@tlsgd@ha */
+#define R_PPC64_GOT_TLSLD16 83 /* half16* (sym+add)@got@tlsld */
+#define R_PPC64_GOT_TLSLD16_LO 84 /* half16 (sym+add)@got@tlsld@l */
+#define R_PPC64_GOT_TLSLD16_HI 85 /* half16 (sym+add)@got@tlsld@h */
+#define R_PPC64_GOT_TLSLD16_HA 86 /* half16 (sym+add)@got@tlsld@ha */
+#define R_PPC64_GOT_TPREL16_DS 87 /* half16ds* (sym+add)@got@tprel */
+#define R_PPC64_GOT_TPREL16_LO_DS 88 /* half16ds (sym+add)@got@tprel@l */
+#define R_PPC64_GOT_TPREL16_HI 89 /* half16 (sym+add)@got@tprel@h */
+#define R_PPC64_GOT_TPREL16_HA 90 /* half16 (sym+add)@got@tprel@ha */
+#define R_PPC64_GOT_DTPREL16_DS 91 /* half16ds* (sym+add)@got@dtprel */
+#define R_PPC64_GOT_DTPREL16_LO_DS 92 /* half16ds (sym+add)@got@dtprel@l */
+#define R_PPC64_GOT_DTPREL16_HI 93 /* half16 (sym+add)@got@dtprel@h */
+#define R_PPC64_GOT_DTPREL16_HA 94 /* half16 (sym+add)@got@dtprel@ha */
+#define R_PPC64_TPREL16_DS 95 /* half16ds* (sym+add)@tprel */
+#define R_PPC64_TPREL16_LO_DS 96 /* half16ds (sym+add)@tprel@l */
+#define R_PPC64_TPREL16_HIGHER 97 /* half16 (sym+add)@tprel@higher */
+#define R_PPC64_TPREL16_HIGHERA 98 /* half16 (sym+add)@tprel@highera */
+#define R_PPC64_TPREL16_HIGHEST 99 /* half16 (sym+add)@tprel@highest */
+#define R_PPC64_TPREL16_HIGHESTA 100 /* half16 (sym+add)@tprel@highesta */
+#define R_PPC64_DTPREL16_DS 101 /* half16ds* (sym+add)@dtprel */
+#define R_PPC64_DTPREL16_LO_DS 102 /* half16ds (sym+add)@dtprel@l */
+#define R_PPC64_DTPREL16_HIGHER 103 /* half16 (sym+add)@dtprel@higher */
+#define R_PPC64_DTPREL16_HIGHERA 104 /* half16 (sym+add)@dtprel@highera */
+#define R_PPC64_DTPREL16_HIGHEST 105 /* half16 (sym+add)@dtprel@highest */
+#define R_PPC64_DTPREL16_HIGHESTA 106 /* half16 (sym+add)@dtprel@highesta */
+#define R_PPC64_TLSGD 107
+#define R_PPC64_TLSLD 108
+#define R_PPC64_TOCSAVE 109
+
+#define R_PPC64_REL24_NOTOC 116
+#define R_PPC64_ENTRY 118
+
+#define R_PPC64_PCREL34 132
+#define R_PPC64_GOT_PCREL34 133
+
+#define R_PPC64_REL16 249
+#define R_PPC64_REL16_LO 250
+#define R_PPC64_REL16_HI 251
+#define R_PPC64_REL16_HA 252
+
+/* Keep this the last entry. */
+#define R_PPC64_NUM 253
+
+
+/*
+ * RISC-V relocation types
+ */
+
+/* Relocation types used by the dynamic linker */
+#define R_RISCV_NONE 0
+#define R_RISCV_32 1
+#define R_RISCV_64 2
+#define R_RISCV_RELATIVE 3
+#define R_RISCV_COPY 4
+#define R_RISCV_JUMP_SLOT 5
+#define R_RISCV_TLS_DTPMOD32 6
+#define R_RISCV_TLS_DTPMOD64 7
+#define R_RISCV_TLS_DTPREL32 8
+#define R_RISCV_TLS_DTPREL64 9
+#define R_RISCV_TLS_TPREL32 10
+#define R_RISCV_TLS_TPREL64 11
+#define R_RISCV_IRELATIVE 58
+
+/* Relocation types not used by the dynamic linker */
+#define R_RISCV_BRANCH 16
+#define R_RISCV_JAL 17
+#define R_RISCV_CALL 18
+#define R_RISCV_CALL_PLT 19
+#define R_RISCV_GOT_HI20 20
+#define R_RISCV_TLS_GOT_HI20 21
+#define R_RISCV_TLS_GD_HI20 22
+#define R_RISCV_PCREL_HI20 23
+#define R_RISCV_PCREL_LO12_I 24
+#define R_RISCV_PCREL_LO12_S 25
+#define R_RISCV_HI20 26
+#define R_RISCV_LO12_I 27
+#define R_RISCV_LO12_S 28
+#define R_RISCV_TPREL_HI20 29
+#define R_RISCV_TPREL_LO12_I 30
+#define R_RISCV_TPREL_LO12_S 31
+#define R_RISCV_TPREL_ADD 32
+#define R_RISCV_ADD8 33
+#define R_RISCV_ADD16 34
+#define R_RISCV_ADD32 35
+#define R_RISCV_ADD64 36
+#define R_RISCV_SUB8 37
+#define R_RISCV_SUB16 38
+#define R_RISCV_SUB32 39
+#define R_RISCV_SUB64 40
+#define R_RISCV_GNU_VTINHERIT 41
+#define R_RISCV_GNU_VTENTRY 42
+#define R_RISCV_ALIGN 43
+#define R_RISCV_RVC_BRANCH 44
+#define R_RISCV_RVC_JUMP 45
+#define R_RISCV_GPREL_I 47
+#define R_RISCV_GPREL_S 48
+#define R_RISCV_TPREL_I 49
+#define R_RISCV_TPREL_S 50
+#define R_RISCV_RELAX 51
+#define R_RISCV_SUB6 52
+#define R_RISCV_SET6 53
+#define R_RISCV_SET8 54
+#define R_RISCV_SET16 55
+#define R_RISCV_SET32 56
+#define R_RISCV_32_PCREL 57
+#define R_RISCV_PLT32 59
+#define R_RISCV_SET_ULEB128 60
+#define R_RISCV_SUB_ULEB128 61
+
+/* LoongArch relocation types used by the dynamic linker */
+#define R_LARCH_NONE 0
+#define R_LARCH_32 1
+#define R_LARCH_64 2
+#define R_LARCH_RELATIVE 3
+#define R_LARCH_COPY 4
+#define R_LARCH_JUMP_SLOT 5
+#define R_LARCH_TLS_DTPMOD32 6
+#define R_LARCH_TLS_DTPMOD64 7
+#define R_LARCH_TLS_DTPREL32 8
+#define R_LARCH_TLS_DTPREL64 9
+#define R_LARCH_TLS_TPREL32 10
+#define R_LARCH_TLS_TPREL64 11
+#define R_LARCH_IRELATIVE 12
+#define R_LARCH_MARK_LA 20
+#define R_LARCH_MARK_PCREL 21
+#define R_LARCH_SOP_PUSH_PCREL 22
+#define R_LARCH_SOP_PUSH_ABSOLUTE 23
+#define R_LARCH_SOP_PUSH_DUP 24
+#define R_LARCH_SOP_PUSH_GPREL 25
+#define R_LARCH_SOP_PUSH_TLS_TPREL 26
+#define R_LARCH_SOP_PUSH_TLS_GOT 27
+#define R_LARCH_SOP_PUSH_TLS_GD 28
+#define R_LARCH_SOP_PUSH_PLT_PCREL 29
+#define R_LARCH_SOP_ASSERT 30
+#define R_LARCH_SOP_NOT 31
+#define R_LARCH_SOP_SUB 32
+#define R_LARCH_SOP_SL 33
+#define R_LARCH_SOP_SR 34
+#define R_LARCH_SOP_ADD 35
+#define R_LARCH_SOP_AND 36
+#define R_LARCH_SOP_IF_ELSE 37
+#define R_LARCH_SOP_POP_32_S_10_5 38
+#define R_LARCH_SOP_POP_32_U_10_12 39
+#define R_LARCH_SOP_POP_32_S_10_12 40
+#define R_LARCH_SOP_POP_32_S_10_16 41
+#define R_LARCH_SOP_POP_32_S_10_16_S2 42
+#define R_LARCH_SOP_POP_32_S_5_20 43
+#define R_LARCH_SOP_POP_32_S_0_5_10_16_S2 44
+#define R_LARCH_SOP_POP_32_S_0_10_10_16_S2 45
+#define R_LARCH_SOP_POP_32_U 46
+#define R_LARCH_ADD8 47
+#define R_LARCH_ADD16 48
+#define R_LARCH_ADD24 49
+#define R_LARCH_ADD32 50
+#define R_LARCH_ADD64 51
+#define R_LARCH_SUB8 52
+#define R_LARCH_SUB16 53
+#define R_LARCH_SUB24 54
+#define R_LARCH_SUB32 55
+#define R_LARCH_SUB64 56
+#define R_LARCH_GNU_VTINHERIT 57
+#define R_LARCH_GNU_VTENTRY 58
+#define R_LARCH_B16 64
+#define R_LARCH_B21 65
+#define R_LARCH_B26 66
+#define R_LARCH_ABS_HI20 67
+#define R_LARCH_ABS_LO12 68
+#define R_LARCH_ABS64_LO20 69
+#define R_LARCH_ABS64_HI12 70
+#define R_LARCH_PCALA_HI20 71
+#define R_LARCH_PCALA_LO12 72
+#define R_LARCH_PCALA64_LO20 73
+#define R_LARCH_PCALA64_HI12 74
+#define R_LARCH_GOT_PC_HI20 75
+#define R_LARCH_GOT_PC_LO12 76
+#define R_LARCH_GOT64_PC_LO20 77
+#define R_LARCH_GOT64_PC_HI12 78
+#define R_LARCH_GOT_HI20 79
+#define R_LARCH_GOT_LO12 80
+#define R_LARCH_GOT64_LO20 81
+#define R_LARCH_GOT64_HI12 82
+#define R_LARCH_TLS_LE_HI20 83
+#define R_LARCH_TLS_LE_LO12 84
+#define R_LARCH_TLS_LE64_LO20 85
+#define R_LARCH_TLS_LE64_HI12 86
+#define R_LARCH_TLS_IE_PC_HI20 87
+#define R_LARCH_TLS_IE_PC_LO12 88
+#define R_LARCH_TLS_IE64_PC_LO20 89
+#define R_LARCH_TLS_IE64_PC_HI12 90
+#define R_LARCH_TLS_IE_HI20 91
+#define R_LARCH_TLS_IE_LO12 92
+#define R_LARCH_TLS_IE64_LO20 93
+#define R_LARCH_TLS_IE64_HI12 94
+#define R_LARCH_TLS_LD_PC_HI20 95
+#define R_LARCH_TLS_LD_HI20 96
+#define R_LARCH_TLS_GD_PC_HI20 97
+#define R_LARCH_TLS_GD_HI20 98
+#define R_LARCH_32_PCREL 99
+#define R_LARCH_RELAX 100
+#define R_LARCH_DELETE 101
+#define R_LARCH_ALIGN 102
+#define R_LARCH_PCREL20_S2 103
+#define R_LARCH_CFA 104
+#define R_LARCH_ADD6 105
+#define R_LARCH_SUB6 106
+#define R_LARCH_ADD_ULEB128 107
+#define R_LARCH_SUB_ULEB128 108
+#define R_LARCH_64_PCREL 109
+#define R_LARCH_CALL36 110
+#define R_LARCH_TLS_DESC_PC_HI20 111
+#define R_LARCH_TLS_DESC_PC_LO12 112
+#define R_LARCH_TLS_DESC64_PC_LO20 113
+#define R_LARCH_TLS_DESC64_PC_HI12 114
+#define R_LARCH_TLS_DESC_HI20 115
+#define R_LARCH_TLS_DESC_LO12 116
+#define R_LARCH_TLS_DESC64_LO20 117
+#define R_LARCH_TLS_DESC64_HI12 118
+#define R_LARCH_TLS_DESC_LD 119
+#define R_LARCH_TLS_DESC_CALL 120
+#define R_LARCH_TLS_LE_HI20_R 121
+#define R_LARCH_TLS_LE_ADD_R 122
+#define R_LARCH_TLS_LE_LO12_R 123
+#define R_LARCH_TLS_LD_PCREL20_S2 124
+#define R_LARCH_TLS_GD_PCREL20_S2 125
+#define R_LARCH_TLS_DESC_PCREL20_S2 126
+#define R_LARCH_CALL30 127
+#define R_LARCH_PCADD_HI20 128
+#define R_LARCH_PCADD_LO12 129
+#define R_LARCH_GOT_PCADD_HI20 130
+#define R_LARCH_GOT_PCADD_LO12 131
+#define R_LARCH_TLS_IE_PCADD_HI20 132
+#define R_LARCH_TLS_IE_PCADD_LO12 133
+#define R_LARCH_TLS_LD_PCADD_HI20 134
+#define R_LARCH_TLS_LD_PCADD_LO12 135
+#define R_LARCH_TLS_GD_PCADD_HI20 136
+#define R_LARCH_TLS_GD_PCADD_LO12 137
+#define R_LARCH_TLS_DESC_PCADD_HI20 138
+#define R_LARCH_TLS_DESC_PCADD_LO12 139
+
+/* s390 relocations defined by the ABIs */
+#define R_390_NONE 0 /* No reloc. */
+#define R_390_8 1 /* Direct 8 bit. */
+#define R_390_12 2 /* Direct 12 bit. */
+#define R_390_16 3 /* Direct 16 bit. */
+#define R_390_32 4 /* Direct 32 bit. */
+#define R_390_PC32 5 /* PC relative 32 bit. */
+#define R_390_GOT12 6 /* 12 bit GOT offset. */
+#define R_390_GOT32 7 /* 32 bit GOT offset. */
+#define R_390_PLT32 8 /* 32 bit PC relative PLT address. */
+#define R_390_COPY 9 /* Copy symbol at runtime. */
+#define R_390_GLOB_DAT 10 /* Create GOT entry. */
+#define R_390_JMP_SLOT 11 /* Create PLT entry. */
+#define R_390_RELATIVE 12 /* Adjust by program base. */
+#define R_390_GOTOFF32 13 /* 32 bit offset to GOT. */
+#define R_390_GOTPC 14 /* 32 bit PC rel. offset to GOT. */
+#define R_390_GOT16 15 /* 16 bit GOT offset. */
+#define R_390_PC16 16 /* PC relative 16 bit. */
+#define R_390_PC16DBL 17 /* PC relative 16 bit shifted by 1. */
+#define R_390_PLT16DBL 18 /* 16 bit PC rel. PLT shifted by 1. */
+#define R_390_PC32DBL 19 /* PC relative 32 bit shifted by 1. */
+#define R_390_PLT32DBL 20 /* 32 bit PC rel. PLT shifted by 1. */
+#define R_390_GOTPCDBL 21 /* 32 bit PC rel. GOT shifted by 1. */
+#define R_390_64 22 /* Direct 64 bit. */
+#define R_390_PC64 23 /* PC relative 64 bit. */
+#define R_390_GOT64 24 /* 64 bit GOT offset. */
+#define R_390_PLT64 25 /* 64 bit PC relative PLT address. */
+#define R_390_GOTENT 26 /* 32 bit PC rel. to GOT entry >> 1. */
+#define R_390_GOTOFF16 27 /* 16 bit offset to GOT. */
+#define R_390_GOTOFF64 28 /* 64 bit offset to GOT. */
+#define R_390_GOTPLT12 29 /* 12 bit offset to jump slot. */
+#define R_390_GOTPLT16 30 /* 16 bit offset to jump slot. */
+#define R_390_GOTPLT32 31 /* 32 bit offset to jump slot. */
+#define R_390_GOTPLT64 32 /* 64 bit offset to jump slot. */
+#define R_390_GOTPLTENT 33 /* 32 bit rel. offset to jump slot. */
+#define R_390_PLTOFF16 34 /* 16 bit offset from GOT to PLT. */
+#define R_390_PLTOFF32 35 /* 32 bit offset from GOT to PLT. */
+#define R_390_PLTOFF64 36 /* 16 bit offset from GOT to PLT. */
+#define R_390_TLS_LOAD 37 /* Tag for load insn in TLS code. */
+#define R_390_TLS_GDCALL 38 /* Tag for function call in general
+ dynamic TLS code. */
+#define R_390_TLS_LDCALL 39 /* Tag for function call in local
+ dynamic TLS code. */
+#define R_390_TLS_GD32 40 /* Direct 32 bit for general dynamic
+ thread local data. */
+#define R_390_TLS_GD64 41 /* Direct 64 bit for general dynamic
+ thread local data. */
+#define R_390_TLS_GOTIE12 42 /* 12 bit GOT offset for static TLS
+ block offset. */
+#define R_390_TLS_GOTIE32 43 /* 32 bit GOT offset for static TLS
+ block offset. */
+#define R_390_TLS_GOTIE64 44 /* 64 bit GOT offset for static TLS
+ block offset. */
+#define R_390_TLS_LDM32 45 /* Direct 32 bit for local dynamic
+ thread local data in LD code. */
+#define R_390_TLS_LDM64 46 /* Direct 64 bit for local dynamic
+ thread local data in LD code. */
+#define R_390_TLS_IE32 47 /* 32 bit address of GOT entry for
+ negated static TLS block offset. */
+#define R_390_TLS_IE64 48 /* 64 bit address of GOT entry for
+ negated static TLS block offset. */
+#define R_390_TLS_IEENT 49 /* 32 bit rel. offset to GOT entry for
+ negated static TLS block offset. */
+#define R_390_TLS_LE32 50 /* 32 bit negated offset relative to
+ static TLS block. */
+#define R_390_TLS_LE64 51 /* 64 bit negated offset relative to
+ static TLS block. */
+#define R_390_TLS_LDO32 52 /* 32 bit offset relative to TLS
+ block. */
+#define R_390_TLS_LDO64 53 /* 64 bit offset relative to TLS
+ block. */
+#define R_390_TLS_DTPMOD 54 /* ID of module containing symbol. */
+#define R_390_TLS_DTPOFF 55 /* Offset in TLS block. */
+#define R_390_TLS_TPOFF 56 /* Negate offset in static TLS
+ block. */
+#define R_390_20 57 /* Direct 20 bit. */
+#define R_390_GOT20 58 /* 20 bit GOT offset. */
+#define R_390_GOTPLT20 59 /* 20 bit offset to jump slot. */
+#define R_390_TLS_GOTIE20 60 /* 20 bit GOT offset for static TLS
+ block offset. */
+/* Keep this the last entry. */
+#define R_390_NUM 61
+
+/* MIPS relocations defined by the ABIs */
+#define R_MIPS_NONE 0
+#define R_MIPS_16 1
+#define R_MIPS_32 2
+#define R_MIPS_REL32 3
+#define R_MIPS_26 4
+#define R_MIPS_HI16 5
+#define R_MIPS_LO16 6
+#define R_MIPS_GPREL16 7
+#define R_MIPS_LITERAL 8
+#define R_MIPS_GOT16 9
+#define R_MIPS_PC16 10
+#define R_MIPS_CALL16 11
+#define R_MIPS_GPREL32 12
+/* The remaining relocs are defined on Irix, although they are not
+ in the MIPS ELF ABI. */
+#define R_MIPS_UNUSED1 13
+#define R_MIPS_UNUSED2 14
+#define R_MIPS_UNUSED3 15
+#define R_MIPS_SHIFT5 16
+#define R_MIPS_SHIFT6 17
+#define R_MIPS_64 18
+#define R_MIPS_GOT_DISP 19
+#define R_MIPS_GOT_PAGE 20
+#define R_MIPS_GOT_OFST 21
+/*
+ * The following two relocation types are specified in the MIPS ABI
+ * conformance guide version 1.2 but not yet in the psABI.
+ */
+#define R_MIPS_GOTHI16 22
+#define R_MIPS_GOTLO16 23
+#define R_MIPS_SUB 24
+#define R_MIPS_INSERT_A 25
+#define R_MIPS_INSERT_B 26
+#define R_MIPS_DELETE 27
+#define R_MIPS_HIGHER 28
+#define R_MIPS_HIGHEST 29
+/*
+ * The following two relocation types are specified in the MIPS ABI
+ * conformance guide version 1.2 but not yet in the psABI.
+ */
+#define R_MIPS_CALLHI16 30
+#define R_MIPS_CALLLO16 31
+/*
+ * Introduced for MIPSr6.
+ */
+#define R_MIPS_PC21_S2 60
+#define R_MIPS_PC26_S2 61
+/*
+ * This range is reserved for vendor specific relocations.
+ */
+#define R_MIPS_LOVENDOR 100
+#define R_MIPS_HIVENDOR 127
+
+#define R_MIPS_PC32 248
+
+/*
+ * Sparc ELF relocation types
+ */
+#define R_SPARC_NONE 0
+#define R_SPARC_8 1
+#define R_SPARC_16 2
+#define R_SPARC_32 3
+#define R_SPARC_DISP8 4
+#define R_SPARC_DISP16 5
+#define R_SPARC_DISP32 6
+#define R_SPARC_WDISP30 7
+#define R_SPARC_WDISP22 8
+#define R_SPARC_HI22 9
+#define R_SPARC_22 10
+#define R_SPARC_13 11
+#define R_SPARC_LO10 12
+#define R_SPARC_GOT10 13
+#define R_SPARC_GOT13 14
+#define R_SPARC_GOT22 15
+#define R_SPARC_PC10 16
+#define R_SPARC_PC22 17
+#define R_SPARC_WPLT30 18
+#define R_SPARC_COPY 19
+#define R_SPARC_GLOB_DAT 20
+#define R_SPARC_JMP_SLOT 21
+#define R_SPARC_RELATIVE 22
+#define R_SPARC_UA32 23
+#define R_SPARC_PLT32 24
+#define R_SPARC_HIPLT22 25
+#define R_SPARC_LOPLT10 26
+#define R_SPARC_PCPLT32 27
+#define R_SPARC_PCPLT22 28
+#define R_SPARC_PCPLT10 29
+#define R_SPARC_10 30
+#define R_SPARC_11 31
+#define R_SPARC_64 32
+#define R_SPARC_OLO10 33
+#define R_SPARC_WDISP16 40
+#define R_SPARC_WDISP19 41
+#define R_SPARC_7 43
+#define R_SPARC_5 44
+#define R_SPARC_6 45
+#define R_SPARC_UA64 54
+
+#endif /* _UAPI_LINUX_ELF_R_H */
diff --git a/tools/include/uapi/linux/elf.h b/tools/include/uapi/linux/elf.h
index 5834b83d7f9a..88bdcbb526c1 100644
--- a/tools/include/uapi/linux/elf.h
+++ b/tools/include/uapi/linux/elf.h
@@ -4,6 +4,7 @@
#include <linux/types.h>
#include <linux/elf-em.h>
+#include <linux/elf-r.h>
/* 32-bit ELF base types. */
typedef __u32 Elf32_Addr;
@@ -32,9 +33,9 @@ typedef __u16 Elf64_Versym;
#define PT_NOTE 4
#define PT_SHLIB 5
#define PT_PHDR 6
-#define PT_TLS 7 /* Thread local storage segment */
-#define PT_LOOS 0x60000000 /* OS-specific */
-#define PT_HIOS 0x6fffffff /* OS-specific */
+#define PT_TLS 7 /* Thread local storage segment */
+#define PT_LOOS 0x60000000 /* OS-specific */
+#define PT_HIOS 0x6fffffff /* OS-specific */
#define PT_LOPROC 0x70000000
#define PT_HIPROC 0x7fffffff
#define PT_GNU_EH_FRAME (PT_LOOS + 0x474e550)
@@ -95,7 +96,7 @@ typedef __u16 Elf64_Versym;
#define DT_SONAME 14
#define DT_RPATH 15
#define DT_SYMBOLIC 16
-#define DT_REL 17
+#define DT_REL 17
#define DT_RELSZ 18
#define DT_RELENT 19
#define DT_PLTREL 20
@@ -299,8 +300,18 @@ typedef struct elf64_phdr {
#define SHF_WRITE 0x1
#define SHF_ALLOC 0x2
#define SHF_EXECINSTR 0x4
+#define SHF_MERGE 0x10
+#define SHF_STRINGS 0x20
+#define SHF_INFO_LINK 0x40
+#define SHF_LINK_ORDER 0x80
+#define SHF_OS_NONCONFORMING 0x100
+#define SHF_GROUP 0x200
+#define SHF_TLS 0x400
#define SHF_RELA_LIVEPATCH 0x00100000
#define SHF_RO_AFTER_INIT 0x00200000
+#define SHF_ORDERED 0x04000000
+#define SHF_EXCLUDE 0x08000000
+#define SHF_MASKOS 0x0ff00000
#define SHF_MASKPROC 0xf0000000
/* special section indexes */
@@ -312,7 +323,7 @@ typedef struct elf64_phdr {
#define SHN_ABS 0xfff1
#define SHN_COMMON 0xfff2
#define SHN_HIRESERVE 0xffff
-
+
typedef struct elf32_shdr {
Elf32_Word sh_name;
Elf32_Word sh_type;
@@ -376,101 +387,180 @@ typedef struct elf64_shdr {
#define ELF_OSABI ELFOSABI_NONE
#endif
+/* Note definitions: NN_ defines names. NT_ defines types. */
+
+#define NN_GNU_PROPERTY_TYPE_0 "GNU"
+#define NT_GNU_PROPERTY_TYPE_0 5
+
/*
* Notes used in ET_CORE. Architectures export some of the arch register sets
* using the corresponding note types via the PTRACE_GETREGSET and
* PTRACE_SETREGSET requests.
- * The note name for these types is "LINUX", except NT_PRFPREG that is named
- * "CORE".
*/
+#define NN_PRSTATUS "CORE"
#define NT_PRSTATUS 1
+#define NN_PRFPREG "CORE"
#define NT_PRFPREG 2
+#define NN_PRPSINFO "CORE"
#define NT_PRPSINFO 3
+#define NN_TASKSTRUCT "CORE"
#define NT_TASKSTRUCT 4
+#define NN_AUXV "CORE"
#define NT_AUXV 6
/*
* Note to userspace developers: size of NT_SIGINFO note may increase
* in the future to accomodate more fields, don't assume it is fixed!
*/
+#define NN_SIGINFO "CORE"
#define NT_SIGINFO 0x53494749
-#define NT_FILE 0x46494c45
+#define NN_FILE "CORE"
+#define NT_FILE 0x46494c45
+#define NN_PRXFPREG "LINUX"
#define NT_PRXFPREG 0x46e62b7f /* copied from gdb5.1/include/elf/common.h */
+#define NN_PPC_VMX "LINUX"
#define NT_PPC_VMX 0x100 /* PowerPC Altivec/VMX registers */
+#define NN_PPC_SPE "LINUX"
#define NT_PPC_SPE 0x101 /* PowerPC SPE/EVR registers */
+#define NN_PPC_VSX "LINUX"
#define NT_PPC_VSX 0x102 /* PowerPC VSX registers */
+#define NN_PPC_TAR "LINUX"
#define NT_PPC_TAR 0x103 /* Target Address Register */
+#define NN_PPC_PPR "LINUX"
#define NT_PPC_PPR 0x104 /* Program Priority Register */
+#define NN_PPC_DSCR "LINUX"
#define NT_PPC_DSCR 0x105 /* Data Stream Control Register */
+#define NN_PPC_EBB "LINUX"
#define NT_PPC_EBB 0x106 /* Event Based Branch Registers */
+#define NN_PPC_PMU "LINUX"
#define NT_PPC_PMU 0x107 /* Performance Monitor Registers */
+#define NN_PPC_TM_CGPR "LINUX"
#define NT_PPC_TM_CGPR 0x108 /* TM checkpointed GPR Registers */
+#define NN_PPC_TM_CFPR "LINUX"
#define NT_PPC_TM_CFPR 0x109 /* TM checkpointed FPR Registers */
+#define NN_PPC_TM_CVMX "LINUX"
#define NT_PPC_TM_CVMX 0x10a /* TM checkpointed VMX Registers */
+#define NN_PPC_TM_CVSX "LINUX"
#define NT_PPC_TM_CVSX 0x10b /* TM checkpointed VSX Registers */
+#define NN_PPC_TM_SPR "LINUX"
#define NT_PPC_TM_SPR 0x10c /* TM Special Purpose Registers */
+#define NN_PPC_TM_CTAR "LINUX"
#define NT_PPC_TM_CTAR 0x10d /* TM checkpointed Target Address Register */
+#define NN_PPC_TM_CPPR "LINUX"
#define NT_PPC_TM_CPPR 0x10e /* TM checkpointed Program Priority Register */
+#define NN_PPC_TM_CDSCR "LINUX"
#define NT_PPC_TM_CDSCR 0x10f /* TM checkpointed Data Stream Control Register */
+#define NN_PPC_PKEY "LINUX"
#define NT_PPC_PKEY 0x110 /* Memory Protection Keys registers */
+#define NN_PPC_DEXCR "LINUX"
#define NT_PPC_DEXCR 0x111 /* PowerPC DEXCR registers */
+#define NN_PPC_HASHKEYR "LINUX"
#define NT_PPC_HASHKEYR 0x112 /* PowerPC HASHKEYR register */
+#define NN_386_TLS "LINUX"
#define NT_386_TLS 0x200 /* i386 TLS slots (struct user_desc) */
+#define NN_386_IOPERM "LINUX"
#define NT_386_IOPERM 0x201 /* x86 io permission bitmap (1=deny) */
+#define NN_X86_XSTATE "LINUX"
#define NT_X86_XSTATE 0x202 /* x86 extended state using xsave */
/* Old binutils treats 0x203 as a CET state */
+#define NN_X86_SHSTK "LINUX"
#define NT_X86_SHSTK 0x204 /* x86 SHSTK state */
+#define NN_X86_XSAVE_LAYOUT "LINUX"
#define NT_X86_XSAVE_LAYOUT 0x205 /* XSAVE layout description */
+#define NN_S390_HIGH_GPRS "LINUX"
#define NT_S390_HIGH_GPRS 0x300 /* s390 upper register halves */
+#define NN_S390_TIMER "LINUX"
#define NT_S390_TIMER 0x301 /* s390 timer register */
+#define NN_S390_TODCMP "LINUX"
#define NT_S390_TODCMP 0x302 /* s390 TOD clock comparator register */
+#define NN_S390_TODPREG "LINUX"
#define NT_S390_TODPREG 0x303 /* s390 TOD programmable register */
+#define NN_S390_CTRS "LINUX"
#define NT_S390_CTRS 0x304 /* s390 control registers */
+#define NN_S390_PREFIX "LINUX"
#define NT_S390_PREFIX 0x305 /* s390 prefix register */
+#define NN_S390_LAST_BREAK "LINUX"
#define NT_S390_LAST_BREAK 0x306 /* s390 breaking event address */
+#define NN_S390_SYSTEM_CALL "LINUX"
#define NT_S390_SYSTEM_CALL 0x307 /* s390 system call restart data */
+#define NN_S390_TDB "LINUX"
#define NT_S390_TDB 0x308 /* s390 transaction diagnostic block */
+#define NN_S390_VXRS_LOW "LINUX"
#define NT_S390_VXRS_LOW 0x309 /* s390 vector registers 0-15 upper half */
+#define NN_S390_VXRS_HIGH "LINUX"
#define NT_S390_VXRS_HIGH 0x30a /* s390 vector registers 16-31 */
+#define NN_S390_GS_CB "LINUX"
#define NT_S390_GS_CB 0x30b /* s390 guarded storage registers */
+#define NN_S390_GS_BC "LINUX"
#define NT_S390_GS_BC 0x30c /* s390 guarded storage broadcast control block */
+#define NN_S390_RI_CB "LINUX"
#define NT_S390_RI_CB 0x30d /* s390 runtime instrumentation */
+#define NN_S390_PV_CPU_DATA "LINUX"
#define NT_S390_PV_CPU_DATA 0x30e /* s390 protvirt cpu dump data */
+#define NN_ARM_VFP "LINUX"
#define NT_ARM_VFP 0x400 /* ARM VFP/NEON registers */
+#define NN_ARM_TLS "LINUX"
#define NT_ARM_TLS 0x401 /* ARM TLS register */
+#define NN_ARM_HW_BREAK "LINUX"
#define NT_ARM_HW_BREAK 0x402 /* ARM hardware breakpoint registers */
+#define NN_ARM_HW_WATCH "LINUX"
#define NT_ARM_HW_WATCH 0x403 /* ARM hardware watchpoint registers */
+#define NN_ARM_SYSTEM_CALL "LINUX"
#define NT_ARM_SYSTEM_CALL 0x404 /* ARM system call number */
+#define NN_ARM_SVE "LINUX"
#define NT_ARM_SVE 0x405 /* ARM Scalable Vector Extension registers */
+#define NN_ARM_PAC_MASK "LINUX"
#define NT_ARM_PAC_MASK 0x406 /* ARM pointer authentication code masks */
+#define NN_ARM_PACA_KEYS "LINUX"
#define NT_ARM_PACA_KEYS 0x407 /* ARM pointer authentication address keys */
+#define NN_ARM_PACG_KEYS "LINUX"
#define NT_ARM_PACG_KEYS 0x408 /* ARM pointer authentication generic key */
+#define NN_ARM_TAGGED_ADDR_CTRL "LINUX"
#define NT_ARM_TAGGED_ADDR_CTRL 0x409 /* arm64 tagged address control (prctl()) */
+#define NN_ARM_PAC_ENABLED_KEYS "LINUX"
#define NT_ARM_PAC_ENABLED_KEYS 0x40a /* arm64 ptr auth enabled keys (prctl()) */
+#define NN_ARM_SSVE "LINUX"
#define NT_ARM_SSVE 0x40b /* ARM Streaming SVE registers */
+#define NN_ARM_ZA "LINUX"
#define NT_ARM_ZA 0x40c /* ARM SME ZA registers */
+#define NN_ARM_ZT "LINUX"
#define NT_ARM_ZT 0x40d /* ARM SME ZT registers */
+#define NN_ARM_FPMR "LINUX"
#define NT_ARM_FPMR 0x40e /* ARM floating point mode register */
+#define NN_ARM_POE "LINUX"
#define NT_ARM_POE 0x40f /* ARM POE registers */
+#define NN_ARM_GCS "LINUX"
#define NT_ARM_GCS 0x410 /* ARM GCS state */
+#define NN_ARC_V2 "LINUX"
#define NT_ARC_V2 0x600 /* ARCv2 accumulator/extra registers */
+#define NN_VMCOREDD "LINUX"
#define NT_VMCOREDD 0x700 /* Vmcore Device Dump Note */
+#define NN_MIPS_DSP "LINUX"
#define NT_MIPS_DSP 0x800 /* MIPS DSP ASE registers */
+#define NN_MIPS_FP_MODE "LINUX"
#define NT_MIPS_FP_MODE 0x801 /* MIPS floating-point mode */
+#define NN_MIPS_MSA "LINUX"
#define NT_MIPS_MSA 0x802 /* MIPS SIMD registers */
+#define NN_RISCV_CSR "LINUX"
#define NT_RISCV_CSR 0x900 /* RISC-V Control and Status Registers */
+#define NN_RISCV_VECTOR "LINUX"
#define NT_RISCV_VECTOR 0x901 /* RISC-V vector registers */
+#define NN_RISCV_TAGGED_ADDR_CTRL "LINUX"
#define NT_RISCV_TAGGED_ADDR_CTRL 0x902 /* RISC-V tagged address control (prctl()) */
+#define NN_LOONGARCH_CPUCFG "LINUX"
#define NT_LOONGARCH_CPUCFG 0xa00 /* LoongArch CPU config registers */
+#define NN_LOONGARCH_CSR "LINUX"
#define NT_LOONGARCH_CSR 0xa01 /* LoongArch control and status registers */
+#define NN_LOONGARCH_LSX "LINUX"
#define NT_LOONGARCH_LSX 0xa02 /* LoongArch Loongson SIMD Extension registers */
+#define NN_LOONGARCH_LASX "LINUX"
#define NT_LOONGARCH_LASX 0xa03 /* LoongArch Loongson Advanced SIMD Extension registers */
+#define NN_LOONGARCH_LBT "LINUX"
#define NT_LOONGARCH_LBT 0xa04 /* LoongArch Loongson Binary Translation registers */
+#define NN_LOONGARCH_HW_BREAK "LINUX"
#define NT_LOONGARCH_HW_BREAK 0xa05 /* LoongArch hardware breakpoint registers */
+#define NN_LOONGARCH_HW_WATCH "LINUX"
#define NT_LOONGARCH_HW_WATCH 0xa06 /* LoongArch hardware watchpoint registers */
-/* Note types with note name "GNU" */
-#define NT_GNU_PROPERTY_TYPE_0 5
-
/* Note header in a PT_NOTE section */
typedef struct elf32_note {
Elf32_Word n_namesz; /* Name size */
--
2.55.0
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 53+ messages in thread* Re: [PATCH v5 11/24] tools headers UAPI: Sync ELF headers with the kernel sources
2026-09-08 6:33 ` [PATCH v5 11/24] tools headers UAPI: Sync ELF headers with the kernel sources Thomas Weißschuh
@ 2026-09-08 8:56 ` Christophe Leroy (CS GROUP)
2026-09-08 9:37 ` Thomas Weißschuh
2026-09-08 9:09 ` Christophe Leroy (CS GROUP)
1 sibling, 1 reply; 53+ messages in thread
From: Christophe Leroy (CS GROUP) @ 2026-09-08 8:56 UTC (permalink / raw)
To: Thomas Weißschuh, Paul Walmsley, Palmer Dabbelt, Albert Ou,
Alexandre Ghiti, Nathan Chancellor, Nick Desaulniers,
Bill Wendling, Justin Stitt, Andy Lutomirski, Vincenzo Frascino,
Kees Cook, Ingo Molnar, Borislav Petkov, Dave Hansen, x86,
H. Peter Anvin, Richard Weinberger, Anton Ivanov, Johannes Berg,
Russell King, Catalin Marinas, Will Deacon, Madhavan Srinivasan,
Michael Ellerman, Nicholas Piggin, Huacai Chen, WANG Xuerui,
Heiko Carstens, Vasily Gorbik, Alexander Gordeev,
Christian Borntraeger, Sven Schnelle, Thomas Bogendoerfer,
Miguel Ojeda, Alex Gaynor, Gary Guo, Björn Roy Baron,
Benno Lossin, Andreas Hindborg, Alice Ryhl, Trevor Gross,
Danilo Krummrich, Thomas Gleixner, Boqun Feng, Nicolas Schier
Cc: linux-riscv, linux-kernel, llvm, linux-mm, linux-um,
linux-arm-kernel, linuxppc-dev, loongarch, linux-s390, linux-mips,
rust-for-linux, linux-kbuild, Jan Stancek,
Arnaldo Carvalho de Melo, Alexandre Ghiti
Le 08/09/2026 à 08:33, Thomas Weißschuh a écrit :
> Pick up changes from the UAPI ELF header files.
> This picks up general changes to elf.h, elf-em.h which was forgotten
> previously and the new elf-r.h.
>
> Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
>
> ---
> Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
> ---
> tools/include/uapi/linux/elf-em.h | 71 ++++
> tools/include/uapi/linux/elf-r.h | 696 ++++++++++++++++++++++++++++++++++++++
> tools/include/uapi/linux/elf.h | 112 +++++-
> 3 files changed, 868 insertions(+), 11 deletions(-)
>
> diff --git a/tools/include/uapi/linux/elf.h b/tools/include/uapi/linux/elf.h
> index 5834b83d7f9a..88bdcbb526c1 100644
> --- a/tools/include/uapi/linux/elf.h
> +++ b/tools/include/uapi/linux/elf.h
> @@ -312,7 +323,7 @@ typedef struct elf64_phdr {
> #define SHN_ABS 0xfff1
> #define SHN_COMMON 0xfff2
> #define SHN_HIRESERVE 0xffff
> -
> +
Getting the following warning when applying this series with 'b4 shazam'.
/home/chleroy/linux-powerpc/.git/rebase-apply/patch:846: trailing
whitespace.
Seems to come from here.
> typedef struct elf32_shdr {
> Elf32_Word sh_name;
> Elf32_Word sh_type;
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 53+ messages in thread* Re: [PATCH v5 11/24] tools headers UAPI: Sync ELF headers with the kernel sources
2026-09-08 8:56 ` Christophe Leroy (CS GROUP)
@ 2026-09-08 9:37 ` Thomas Weißschuh
0 siblings, 0 replies; 53+ messages in thread
From: Thomas Weißschuh @ 2026-09-08 9:37 UTC (permalink / raw)
To: Christophe Leroy (CS GROUP)
Cc: Paul Walmsley, Palmer Dabbelt, Albert Ou, Alexandre Ghiti,
Nathan Chancellor, Nick Desaulniers, Bill Wendling, Justin Stitt,
Andy Lutomirski, Vincenzo Frascino, Kees Cook, Ingo Molnar,
Borislav Petkov, Dave Hansen, x86, H. Peter Anvin,
Richard Weinberger, Anton Ivanov, Johannes Berg, Russell King,
Catalin Marinas, Will Deacon, Madhavan Srinivasan,
Michael Ellerman, Nicholas Piggin, Huacai Chen, WANG Xuerui,
Heiko Carstens, Vasily Gorbik, Alexander Gordeev,
Christian Borntraeger, Sven Schnelle, Thomas Bogendoerfer,
Miguel Ojeda, Alex Gaynor, Gary Guo, Björn Roy Baron,
Benno Lossin, Andreas Hindborg, Alice Ryhl, Trevor Gross,
Danilo Krummrich, Thomas Gleixner, Boqun Feng, Nicolas Schier,
linux-riscv, linux-kernel, llvm, linux-mm, linux-um,
linux-arm-kernel, linuxppc-dev, loongarch, linux-s390, linux-mips,
rust-for-linux, linux-kbuild, Jan Stancek,
Arnaldo Carvalho de Melo, Alexandre Ghiti
On Tue, Sep 08, 2026 at 10:56:58AM +0200, Christophe Leroy (CS GROUP) wrote:
> Le 08/09/2026 à 08:33, Thomas Weißschuh a écrit :
> > Pick up changes from the UAPI ELF header files.
> > This picks up general changes to elf.h, elf-em.h which was forgotten
> > previously and the new elf-r.h.
> >
> > Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
> >
> > ---
> > Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
> > ---
> > tools/include/uapi/linux/elf-em.h | 71 ++++
> > tools/include/uapi/linux/elf-r.h | 696 ++++++++++++++++++++++++++++++++++++++
> > tools/include/uapi/linux/elf.h | 112 +++++-
> > 3 files changed, 868 insertions(+), 11 deletions(-)
> >
>
> > diff --git a/tools/include/uapi/linux/elf.h b/tools/include/uapi/linux/elf.h
> > index 5834b83d7f9a..88bdcbb526c1 100644
> > --- a/tools/include/uapi/linux/elf.h
> > +++ b/tools/include/uapi/linux/elf.h
>
> > @@ -312,7 +323,7 @@ typedef struct elf64_phdr {
> > #define SHN_ABS 0xfff1
> > #define SHN_COMMON 0xfff2
> > #define SHN_HIRESERVE 0xffff
> > -
> > +
>
> Getting the following warning when applying this series with 'b4 shazam'.
>
> /home/chleroy/linux-powerpc/.git/rebase-apply/patch:846: trailing
> whitespace.
>
> Seems to come from here.
That's also present in include/uapi/linux/elf.h.
I'll add a fix for that, too.
>
> > typedef struct elf32_shdr {
> > Elf32_Word sh_name;
> > Elf32_Word sh_type;
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v5 11/24] tools headers UAPI: Sync ELF headers with the kernel sources
2026-09-08 6:33 ` [PATCH v5 11/24] tools headers UAPI: Sync ELF headers with the kernel sources Thomas Weißschuh
2026-09-08 8:56 ` Christophe Leroy (CS GROUP)
@ 2026-09-08 9:09 ` Christophe Leroy (CS GROUP)
1 sibling, 0 replies; 53+ messages in thread
From: Christophe Leroy (CS GROUP) @ 2026-09-08 9:09 UTC (permalink / raw)
To: Thomas Weißschuh, Paul Walmsley, Palmer Dabbelt, Albert Ou,
Alexandre Ghiti, Nathan Chancellor, Nick Desaulniers,
Bill Wendling, Justin Stitt, Andy Lutomirski, Vincenzo Frascino,
Kees Cook, Ingo Molnar, Borislav Petkov, Dave Hansen, x86,
H. Peter Anvin, Richard Weinberger, Anton Ivanov, Johannes Berg,
Russell King, Catalin Marinas, Will Deacon, Madhavan Srinivasan,
Michael Ellerman, Nicholas Piggin, Huacai Chen, WANG Xuerui,
Heiko Carstens, Vasily Gorbik, Alexander Gordeev,
Christian Borntraeger, Sven Schnelle, Thomas Bogendoerfer,
Miguel Ojeda, Alex Gaynor, Gary Guo, Björn Roy Baron,
Benno Lossin, Andreas Hindborg, Alice Ryhl, Trevor Gross,
Danilo Krummrich, Thomas Gleixner, Boqun Feng, Nicolas Schier
Cc: linux-riscv, linux-kernel, llvm, linux-mm, linux-um,
linux-arm-kernel, linuxppc-dev, loongarch, linux-s390, linux-mips,
rust-for-linux, linux-kbuild, Jan Stancek,
Arnaldo Carvalho de Melo, Alexandre Ghiti
Le 08/09/2026 à 08:33, Thomas Weißschuh a écrit :
> Pick up changes from the UAPI ELF header files.
> This picks up general changes to elf.h, elf-em.h which was forgotten
> previously and the new elf-r.h.
>
> Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
>
> ---
> Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
> ---
> tools/include/uapi/linux/elf-em.h | 71 ++++
> tools/include/uapi/linux/elf-r.h | 696 ++++++++++++++++++++++++++++++++++++++
> tools/include/uapi/linux/elf.h | 112 +++++-
> 3 files changed, 868 insertions(+), 11 deletions(-)
>
> diff --git a/tools/include/uapi/linux/elf-em.h b/tools/include/uapi/linux/elf-em.h
> new file mode 100644
> index 000000000000..ef38c2bc5ab7
> --- /dev/null
> +++ b/tools/include/uapi/linux/elf-em.h
> @@ -0,0 +1,71 @@
> +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
> +#ifndef _LINUX_ELF_EM_H
> +#define _LINUX_ELF_EM_H
> +
> +/* These constants define the various ELF target machines */
> +#define EM_NONE 0
> +#define EM_M32 1
> +#define EM_SPARC 2
> +#define EM_386 3
> +#define EM_68K 4
> +#define EM_88K 5
> +#define EM_486 6 /* Perhaps disused */
> +#define EM_860 7
Add a comment that it is /* Intel 80860 */ to avoid confusion with
powerpc 860
> +#define EM_MIPS 8 /* MIPS R3000 (officially, big-endian only) */
> + /* Next two are historical and binaries and
> + modules of these types will be rejected by
> + Linux. */
> +#define EM_MIPS_RS3_LE 10 /* MIPS R3000 little-endian */
> +#define EM_MIPS_RS4_BE 10 /* MIPS R4000 big-endian */
> +
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 53+ messages in thread
* [PATCH v5 12/24] vdso: Add the vdsocheck tool
2026-09-08 6:33 [PATCH v5 00/24] vdso: Reject absolute relocations during build Thomas Weißschuh
` (10 preceding siblings ...)
2026-09-08 6:33 ` [PATCH v5 11/24] tools headers UAPI: Sync ELF headers with the kernel sources Thomas Weißschuh
@ 2026-09-08 6:33 ` Thomas Weißschuh
2026-09-08 7:19 ` Peter Zijlstra
2026-09-10 6:52 ` Mukesh Kumar Chaurasiya
2026-09-08 6:33 ` [PATCH v5 13/24] x86/vdso: Enable " Thomas Weißschuh
` (11 subsequent siblings)
23 siblings, 2 replies; 53+ messages in thread
From: Thomas Weißschuh @ 2026-09-08 6:33 UTC (permalink / raw)
To: Paul Walmsley, Palmer Dabbelt, Albert Ou, Alexandre Ghiti,
Nathan Chancellor, Nick Desaulniers, Bill Wendling, Justin Stitt,
Andy Lutomirski, Vincenzo Frascino, Kees Cook, Ingo Molnar,
Borislav Petkov, Dave Hansen, x86, H. Peter Anvin,
Richard Weinberger, Anton Ivanov, Johannes Berg, Russell King,
Catalin Marinas, Will Deacon, Madhavan Srinivasan,
Michael Ellerman, Nicholas Piggin, Huacai Chen, WANG Xuerui,
Heiko Carstens, Vasily Gorbik, Alexander Gordeev,
Christian Borntraeger, Sven Schnelle, Thomas Bogendoerfer,
Miguel Ojeda, Alex Gaynor, Gary Guo, Björn Roy Baron,
Benno Lossin, Andreas Hindborg, Alice Ryhl, Trevor Gross,
Danilo Krummrich, Thomas Gleixner, Christophe Leroy, Boqun Feng,
Nicolas Schier
Cc: linux-riscv, linux-kernel, llvm, linux-mm, linux-um,
linux-arm-kernel, linuxppc-dev, loongarch, linux-s390, linux-mips,
rust-for-linux, linux-kbuild, Jan Stancek,
Arnaldo Carvalho de Melo, Alexandre Ghiti, Thomas Weißschuh
All vDSO code needs to be completely position independent. Symbol
references are marked as hidden so the compiler emits PC-relative
relocations. However there are cases where the compiler may still
emit absolute relocations, as they are valid in regular PIC DSO code.
These would be resolved by the linker and will break at runtime.
This has been observed on arm64, see commit 0c314cda9325 ("arm64: vdso:
Work around invalid absolute relocations from GCC")
Introduce a tool to check for absolute relocations during the build,
as the current inline-shell logic is not expressive enough.
The check is done on the object files as the relocations will not exist
anymore in the final DSO. As there is no extension point for the
compilation of each object file, perform the validation in vdso_check.
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
---
Makefile | 19 ++
lib/vdso/Kconfig | 5 +
lib/vdso/Makefile | 2 +
lib/vdso/Makefile.include | 14 ++
lib/vdso/check/.gitignore | 3 +
lib/vdso/check/Makefile | 34 +++
lib/vdso/check/elf.rs | 498 ++++++++++++++++++++++++++++++++++++++++++++
lib/vdso/check/vdsocheck.rs | 154 ++++++++++++++
8 files changed, 729 insertions(+)
diff --git a/Makefile b/Makefile
index 4ad67b737af7..e6e0dd7818ef 100644
--- a/Makefile
+++ b/Makefile
@@ -1559,6 +1559,25 @@ vdso_install: export INSTALL_FILES = $(vdso-install-y)
vdso_install:
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.vdsoinst
+# ---------------------------------------------------------------------------
+# vDSO check
+
+ifdef CONFIG_RUST_IS_AVAILABLE
+ifdef CONFIG_VDSO_CHECK
+
+# Build the checker early.
+prepare: vdsocheck
+
+# If the architecture builds the vDSO early, make sure to be earlier.
+PHONY += vdso_prepare
+vdso_prepare: vdsocheck
+
+PHONY += vdsocheck
+vdsocheck:
+ $(Q)$(MAKE) $(build)=lib/vdso/check $@
+endif
+endif
+
# ---------------------------------------------------------------------------
# Tools
diff --git a/lib/vdso/Kconfig b/lib/vdso/Kconfig
index 597f5f0f9681..112b42a5aeb1 100644
--- a/lib/vdso/Kconfig
+++ b/lib/vdso/Kconfig
@@ -23,3 +23,8 @@ config VDSO_GETRANDOM
select VDSO_DATASTORE
help
Selected by architectures that support vDSO getrandom().
+
+config VDSO_CHECK
+ bool
+ help
+ Selected for architectures that are supported by the 'vdsocheck' progam.
diff --git a/lib/vdso/Makefile b/lib/vdso/Makefile
index ac304def42d6..9932b43d5bac 100644
--- a/lib/vdso/Makefile
+++ b/lib/vdso/Makefile
@@ -1,3 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-only
obj-$(CONFIG_VDSO_DATASTORE) += datastore.o
+
+obj-y += check/
diff --git a/lib/vdso/Makefile.include b/lib/vdso/Makefile.include
index cedbf15f8087..5528e548f02e 100644
--- a/lib/vdso/Makefile.include
+++ b/lib/vdso/Makefile.include
@@ -6,6 +6,12 @@ GENERIC_VDSO_DIR := $(dir $(GENERIC_VDSO_MK_PATH))
c-gettimeofday-$(CONFIG_GENERIC_GETTIMEOFDAY) := $(addprefix $(GENERIC_VDSO_DIR), gettimeofday.c)
c-getrandom-$(CONFIG_VDSO_GETRANDOM) := $(addprefix $(GENERIC_VDSO_DIR), getrandom.c)
+ifeq ($(CONFIG_RUST_IS_AVAILABLE)$(CONFIG_VDSO_CHECK),yy)
+vdsocheck := lib/vdso/check/vdsocheck
+else
+vdsocheck :=
+endif
+
# This cmd checks that the vdso library does not contain dynamic relocations.
# It has to be called after the linking of the vdso library and requires it
# as a parameter.
@@ -13,6 +19,14 @@ c-getrandom-$(CONFIG_VDSO_GETRANDOM) := $(addprefix $(GENERIC_VDSO_DIR), getrand
# As a workaround for some GNU ld ports which produce unneeded R_*_NONE
# dynamic relocations, ignore R_*_NONE.
quiet_cmd_vdso_check = VDSOCHK $@
+ifneq ($(vdsocheck),)
+ cmd_vdso_check = $(vdsocheck) $(filter %.o, $(real-prereqs)) $@
+else
cmd_vdso_check = if $(READELF) -rW $@ | grep -v _NONE | grep -q " R_\w*_"; \
then (echo >&2 "$@: dynamic relocations are not supported"; \
rm -f $@; /bin/false); fi
+endif
+
+# Variant of cmd_ld which does not try to link the vdsocheck tool.
+quiet_cmd_ld_vdso = VDSOLD $@
+ cmd_ld_vdso = $(LD) $(ld_flags) $(filter-out $(vdsocheck), $(real-prereqs)) -o $@
diff --git a/lib/vdso/check/.gitignore b/lib/vdso/check/.gitignore
new file mode 100644
index 000000000000..751be38f11f2
--- /dev/null
+++ b/lib/vdso/check/.gitignore
@@ -0,0 +1,3 @@
+/bindings.rs
+/libbindings.rlib
+/vdsocheck
diff --git a/lib/vdso/check/Makefile b/lib/vdso/check/Makefile
new file mode 100644
index 000000000000..98de42c6c0eb
--- /dev/null
+++ b/lib/vdso/check/Makefile
@@ -0,0 +1,34 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+quiet_cmd_host_bindgen = HOSTBINDGEN $@
+ cmd_host_bindgen = $(BINDGEN) $< -o $@ --depfile $(depfile) -- $(HOSTBINDGEN_FLAGS)
+
+quiet_cmd_host_rustlib = HOSTRUSTC L $@
+ cmd_host_rustlib = \
+ $(HOSTRUSTC) $(hostrust_flags) \
+ --emit=dep-info=$(depfile) --emit=link=$@ \
+ --crate-type rlib \
+ --crate-name $(patsubst %.rlib,%,$(notdir $@)) $<
+
+uapi-directory := $(srctree)/tools/include/uapi
+
+# bindings.rs will be generated in the build directory, but rustc can not use
+# source code from both the source and build directory together.
+# Compile the binding code into a library first.
+$(obj)/bindings.rs: HOSTBINDGEN_FLAGS := -I$(uapi-directory)
+$(obj)/bindings.rs: $(uapi-directory)/linux/elf.h FORCE
+ $(call if_changed_dep,host_bindgen)
+
+HOSTRUSTFLAGS_libbindings := -Amissing_docs -Anon-camel-case-types
+$(obj)/libbindings.rlib: $(obj)/bindings.rs FORCE
+ $(call if_changed_dep,host_rustlib)
+
+targets += bindings.rs libbindings.rlib
+
+hostprogs += vdsocheck
+vdsocheck-rust := y
+HOSTRUSTFLAGS_vdsocheck := --extern=bindings=$(obj)/libbindings.rlib
+$(obj)/vdsocheck: $(obj)/libbindings.rlib
+
+PHONY += vdsocheck
+vdsocheck: $(obj)/vdsocheck
diff --git a/lib/vdso/check/elf.rs b/lib/vdso/check/elf.rs
new file mode 100644
index 000000000000..520285d6fd10
--- /dev/null
+++ b/lib/vdso/check/elf.rs
@@ -0,0 +1,498 @@
+// SPDX-License-Identifier: GPL-2.0
+
+#![allow(unreachable_pub)]
+
+use core::fmt;
+use core::iter::Iterator;
+use core::result::Result;
+use core::str;
+
+use ::bindings;
+
+#[derive(Debug, Copy, Clone)]
+enum ByteOrder {
+ LittleEndian,
+ BigEndian,
+}
+
+trait ToCpu {
+ fn to_cpu(self, byteorder: ByteOrder) -> Self;
+}
+
+macro_rules! declare_to_cpu {
+ ($t:ty) => {
+ impl ToCpu for $t {
+ fn to_cpu(self, byteorder: ByteOrder) -> Self {
+ match byteorder {
+ ByteOrder::LittleEndian => Self::from_le(self),
+ ByteOrder::BigEndian => Self::from_be(self),
+ }
+ }
+ }
+ };
+}
+
+declare_to_cpu!(u16);
+declare_to_cpu!(u32);
+declare_to_cpu!(u64);
+
+#[derive(Debug, Copy, Clone)]
+enum Class {
+ Elf32,
+ Elf64,
+}
+
+enum ClassAlternative<T32, T64> {
+ Elf32(T32),
+ Elf64(T64),
+}
+
+#[derive(Debug)]
+pub enum ParseError {
+ InvalidFileMagic([u8; 4]),
+ InvalidFileClass(u32),
+ InvalidFileByteOrder(u32),
+ InvalidSectionSize,
+ MissingStringTable,
+ StrtabIndexOutOfRange,
+ IndexOutOfRange,
+ StrtabInvalidData(str::Utf8Error),
+}
+
+pub type ParseResult<T> = Result<T, ParseError>;
+
+impl fmt::Display for ParseError {
+ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+ match self {
+ ParseError::InvalidFileMagic(m) => write!(f, "Invalid ELF magic {:?}", m),
+ ParseError::InvalidFileClass(c) => write!(f, "Invalid ELF class {}", c),
+ ParseError::InvalidFileByteOrder(b) => write!(f, "Invalid ELF byteorder {}", b),
+ ParseError::InvalidSectionSize => write!(f, "Invalid ELF section size"),
+ ParseError::MissingStringTable => write!(f, "Missing string table"),
+ ParseError::IndexOutOfRange => write!(f, "Index out of range"),
+ ParseError::StrtabIndexOutOfRange => write!(f, "String table index out of range"),
+ ParseError::StrtabInvalidData(e) => write!(f, "Invalid data in string table: {}", e),
+ }
+ }
+}
+
+fn read_from_bytes<T: Copy>(data: &[u8]) -> ParseResult<T> {
+ if data.len() < core::mem::size_of::<T>() {
+ Err(ParseError::IndexOutOfRange)?
+ }
+ let ptr = data.as_ptr() as *const T;
+ // SAFETY: `T` is `Copy` by the type constraints.
+ // `ptr` is valid as it is derived from the slice `data` above.
+ // `self.data.len()` being large enough is guaranteed by the runtime check above.
+ Ok(unsafe { ptr.read_unaligned() })
+}
+
+fn get_data_subslice(data: &[u8], offset: u64, size: u64) -> ParseResult<&[u8]> {
+ let start: usize = offset.try_into().map_err(|_| ParseError::IndexOutOfRange)?;
+ let size: usize = size.try_into().map_err(|_| ParseError::IndexOutOfRange)?;
+ let end = start.checked_add(size).ok_or(ParseError::IndexOutOfRange)?;
+
+ Ok(&data[start..end])
+}
+
+/// Representation of a complete ELF file.
+#[derive(Debug)]
+pub struct File<'a> {
+ byteorder: ByteOrder,
+ class: Class,
+ pub type_: u16,
+ pub machine: u16,
+ pub data: &'a [u8],
+ section_headers: SectionInfo<'a>,
+ section_names: StrtabSection<'a>,
+}
+
+impl<'a> File<'a> {
+ pub fn new_from_bytes(data: &'a [u8]) -> Result<Self, ParseError> {
+ const ELF_MAGIC: [u8; 4] = [
+ bindings::ELFMAG0 as u8,
+ bindings::ELFMAG1 as u8,
+ bindings::ELFMAG2 as u8,
+ bindings::ELFMAG3 as u8,
+ ];
+ let ehdr: bindings::elf32_hdr = read_from_bytes(data)?;
+
+ let magic = [
+ ehdr.e_ident[bindings::EI_MAG0 as usize],
+ ehdr.e_ident[bindings::EI_MAG1 as usize],
+ ehdr.e_ident[bindings::EI_MAG2 as usize],
+ ehdr.e_ident[bindings::EI_MAG3 as usize],
+ ];
+
+ if magic != ELF_MAGIC {
+ return Err(ParseError::InvalidFileMagic(magic));
+ }
+
+ let class = match ehdr.e_ident[bindings::EI_CLASS as usize] as u32 {
+ bindings::ELFCLASS32 => Class::Elf32,
+ bindings::ELFCLASS64 => Class::Elf64,
+ c => return Err(ParseError::InvalidFileClass(c)),
+ };
+
+ let byteorder = match ehdr.e_ident[bindings::EI_DATA as usize] as u32 {
+ bindings::ELFDATA2LSB => ByteOrder::LittleEndian,
+ bindings::ELFDATA2MSB => ByteOrder::BigEndian,
+ b => return Err(ParseError::InvalidFileByteOrder(b)),
+ };
+
+ let (type_, machine, shnum, shoff, shentsize, shstrndx) = match class {
+ Class::Elf32 => {
+ let ehdr: bindings::elf32_hdr = read_from_bytes(data)?;
+ (
+ ehdr.e_type.to_cpu(byteorder),
+ ehdr.e_machine.to_cpu(byteorder),
+ ehdr.e_shnum.to_cpu(byteorder),
+ ehdr.e_shoff.to_cpu(byteorder).into(),
+ ehdr.e_shentsize.to_cpu(byteorder),
+ ehdr.e_shstrndx.to_cpu(byteorder),
+ )
+ }
+ Class::Elf64 => {
+ let ehdr: bindings::elf64_hdr = read_from_bytes(data)?;
+ (
+ ehdr.e_type.to_cpu(byteorder),
+ ehdr.e_machine.to_cpu(byteorder),
+ ehdr.e_shnum.to_cpu(byteorder),
+ ehdr.e_shoff.to_cpu(byteorder),
+ ehdr.e_shentsize.to_cpu(byteorder),
+ ehdr.e_shstrndx.to_cpu(byteorder),
+ )
+ }
+ };
+
+ let section_headers = SectionInfo {
+ byteorder,
+ class,
+ entsize: shentsize.into(),
+ data: get_data_subslice(data, shoff, u64::from(shnum) * u64::from(shentsize))?,
+ name: "<section headers>",
+ };
+
+ let string_table = SectionHeaderIterator::new(§ion_headers, data)?
+ .nth(shstrndx.into())
+ .ok_or(ParseError::MissingStringTable)??;
+
+ let section_names = StrtabSection(SectionInfo {
+ name: "<section header names>",
+ byteorder,
+ class,
+ data: string_table.data,
+ entsize: string_table.entsize,
+ });
+
+ Ok(File {
+ byteorder,
+ class,
+ type_,
+ machine,
+ section_headers,
+ section_names,
+ data,
+ })
+ }
+
+ pub fn sections(&self) -> ParseResult<SectionIterator<'_>> {
+ Ok(SectionIterator {
+ file: self,
+ section_headers: SectionHeaderIterator::new(&self.section_headers, self.data)?,
+ })
+ }
+}
+
+/// High-level representation of an ELF section.
+#[derive(Clone, Debug)]
+pub struct SectionInfo<'a> {
+ byteorder: ByteOrder,
+ class: Class,
+ pub name: &'a str,
+ entsize: u64,
+ pub data: &'a [u8],
+}
+
+/// Typed high-level iterator over all sections in a `File`.
+#[derive(Debug)]
+pub enum Section<'a> {
+ Null(SectionInfo<'a>),
+ Rel(RelSection<'a>),
+ Rela(RelaSection<'a>),
+ Strtab(StrtabSection<'a>),
+ Unknown(SectionInfo<'a>),
+}
+
+impl<'a> Section<'a> {
+ pub fn info(&'a self) -> &'a SectionInfo<'a> {
+ match self {
+ Section::Null(info) | Section::Unknown(info) => info,
+ Section::Rel(rel) => &rel.0,
+ Section::Rela(rela) => &rela.0,
+ Section::Strtab(strtab) => &strtab.0,
+ }
+ }
+}
+
+pub struct SectionIterator<'a> {
+ file: &'a File<'a>,
+ section_headers: SectionHeaderIterator<'a, 'a>,
+}
+
+impl<'a> Iterator for SectionIterator<'a> {
+ type Item = ParseResult<Section<'a>>;
+
+ fn next(&mut self) -> Option<Self::Item> {
+ self.section_headers.next().map(|header| {
+ let header = header?;
+ let info = SectionInfo {
+ byteorder: self.file.byteorder,
+ class: self.file.class,
+ name: self.file.section_names.entry(header.name)?,
+ entsize: header.entsize,
+ data: header.data,
+ };
+
+ Ok(match header.type_ {
+ bindings::SHT_NULL => Section::Null(info),
+ bindings::SHT_RELA => Section::Rela(RelaSection(info)),
+ bindings::SHT_REL => Section::Rel(RelSection(info)),
+ bindings::SHT_STRTAB => Section::Strtab(StrtabSection(info)),
+ _ => Section::Unknown(info),
+ })
+ })
+ }
+}
+
+/// Iterator over a section of data containing instances of type `T`.
+struct SectionEntityIterator<'a, T: Copy> {
+ data: &'a [u8],
+ byteorder: ByteOrder,
+ _phantom: core::marker::PhantomData<T>,
+}
+
+impl<'a, T: Copy> SectionEntityIterator<'a, T> {
+ const ENTITY_SIZE: usize = core::mem::size_of::<T>();
+
+ fn new(section: &'a SectionInfo<'a>) -> ParseResult<Self> {
+ let data = section.data;
+
+ if section.entsize != Self::ENTITY_SIZE as u64 {
+ return Err(ParseError::InvalidSectionSize);
+ }
+
+ if !data.len().is_multiple_of(Self::ENTITY_SIZE) {
+ return Err(ParseError::InvalidSectionSize);
+ }
+
+ Ok(Self {
+ data,
+ byteorder: section.byteorder,
+ _phantom: core::marker::PhantomData,
+ })
+ }
+}
+
+impl<'a, T: Copy> Iterator for SectionEntityIterator<'a, T> {
+ type Item = T;
+
+ fn next(&mut self) -> Option<Self::Item> {
+ if self.data.len() != 0 {
+ let ptr = self.data.as_ptr() as *const T;
+ // SAFETY: `T` is `Copy` by the type constraints.
+ // `ptr` is valid as it is derived from the slice `data` above.
+ // `self.data.len()` being a multiple of `Self::ENTITY_SIZE` is
+ // guaranteed by `SectionEntityIterator::new`.
+ let entity: T = unsafe { ptr.read_unaligned() };
+ self.data = &self.data[Self::ENTITY_SIZE..];
+ Some(entity)
+ } else {
+ None
+ }
+ }
+}
+
+/// Class-independent representation of an entry in a section header table.
+#[derive(Debug)]
+struct SectionHeader<'a> {
+ name: u32,
+ type_: u32,
+ entsize: u64,
+ data: &'a [u8],
+}
+
+/// Iterator over the section header table.
+struct SectionHeaderIterator<'f: 'a, 'a>(
+ ClassAlternative<
+ SectionEntityIterator<'a, bindings::elf32_shdr>,
+ SectionEntityIterator<'a, bindings::elf64_shdr>,
+ >,
+ &'f [u8],
+);
+
+impl<'f: 'a, 'a> SectionHeaderIterator<'f, 'a> {
+ fn new(section: &'a SectionInfo<'a>, file_data: &'f [u8]) -> ParseResult<Self> {
+ Ok(Self(
+ match section.class {
+ Class::Elf32 => ClassAlternative::Elf32(SectionEntityIterator::new(section)?),
+ Class::Elf64 => ClassAlternative::Elf64(SectionEntityIterator::new(section)?),
+ },
+ file_data,
+ ))
+ }
+}
+
+impl<'f: 'a, 'a> Iterator for SectionHeaderIterator<'f, 'a> {
+ type Item = ParseResult<SectionHeader<'f>>;
+
+ fn next(&mut self) -> Option<Self::Item> {
+ let file_data = self.1;
+
+ match &mut self.0 {
+ ClassAlternative::Elf32(iter) => iter.next().map(|n| {
+ Ok(SectionHeader {
+ name: n.sh_name.to_cpu(iter.byteorder).into(),
+ type_: n.sh_type.to_cpu(iter.byteorder).into(),
+ entsize: n.sh_entsize.to_cpu(iter.byteorder).into(),
+ data: get_data_subslice(
+ file_data,
+ n.sh_offset.to_cpu(iter.byteorder).into(),
+ n.sh_size.to_cpu(iter.byteorder).into(),
+ )?,
+ })
+ }),
+ ClassAlternative::Elf64(iter) => iter.next().map(|n| {
+ Ok(SectionHeader {
+ name: n.sh_name.to_cpu(iter.byteorder).into(),
+ type_: n.sh_type.to_cpu(iter.byteorder).into(),
+ entsize: n.sh_entsize.to_cpu(iter.byteorder).into(),
+ data: get_data_subslice(
+ file_data,
+ n.sh_offset.to_cpu(iter.byteorder).into(),
+ n.sh_size.to_cpu(iter.byteorder).into(),
+ )?,
+ })
+ }),
+ }
+ }
+}
+
+/// High-level interface to a SHT_STRTAB string table.
+#[derive(Debug)]
+pub struct StrtabSection<'a>(SectionInfo<'a>);
+
+impl<'a> StrtabSection<'a> {
+ pub fn entry(&'a self, index: u32) -> ParseResult<&'a str> {
+ let data = self.0.data;
+ let index = index as usize;
+
+ if index >= data.len() {
+ Err(ParseError::StrtabIndexOutOfRange)
+ } else {
+ let len = data[index..]
+ .iter()
+ .position(|b| *b == 0x00)
+ .ok_or(ParseError::StrtabIndexOutOfRange)?;
+ let s = str::from_utf8(&data[index..index + len])
+ .map_err(|e| ParseError::StrtabInvalidData(e))?;
+ Ok(s)
+ }
+ }
+}
+
+/// High-level interface to a SHT_REL relocation table.
+#[derive(Debug)]
+pub struct RelSection<'a>(SectionInfo<'a>);
+
+impl<'a> RelSection<'a> {
+ pub fn entries(&'a self) -> ParseResult<RelSectionIterator<'a>> {
+ RelSectionIterator::new(&self.0)
+ }
+}
+
+#[derive(Debug)]
+pub struct Rel {
+ pub type_: u32,
+}
+
+pub struct RelSectionIterator<'a>(
+ ClassAlternative<
+ SectionEntityIterator<'a, bindings::elf32_rel>,
+ SectionEntityIterator<'a, bindings::elf64_rel>,
+ >,
+);
+
+impl<'a> RelSectionIterator<'a> {
+ fn new(section: &'a SectionInfo<'a>) -> ParseResult<Self> {
+ Ok(Self(match section.class {
+ Class::Elf32 => ClassAlternative::Elf32(SectionEntityIterator::new(section)?),
+ Class::Elf64 => ClassAlternative::Elf64(SectionEntityIterator::new(section)?),
+ }))
+ }
+}
+
+impl<'a> Iterator for RelSectionIterator<'a> {
+ type Item = Rel;
+
+ fn next(&mut self) -> Option<Self::Item> {
+ match &mut self.0 {
+ ClassAlternative::Elf32(iter) => iter.next().map(|n| {
+ let type_ = n.r_info.to_cpu(iter.byteorder) & 0xff;
+ Self::Item { type_ }
+ }),
+ ClassAlternative::Elf64(iter) => iter.next().map(|n| {
+ let type_ = n.r_info.to_cpu(iter.byteorder) as u32;
+ Self::Item { type_ }
+ }),
+ }
+ }
+}
+
+/// High-level interface to a SHT_RELA relocation table.
+#[derive(Debug)]
+pub struct RelaSection<'a>(SectionInfo<'a>);
+
+impl<'a> RelaSection<'a> {
+ pub fn entries(&'a self) -> ParseResult<RelaSectionIterator<'a>> {
+ RelaSectionIterator::new(&self.0)
+ }
+}
+
+#[derive(Debug)]
+pub struct Rela {
+ pub type_: u32,
+}
+
+pub struct RelaSectionIterator<'a>(
+ ClassAlternative<
+ SectionEntityIterator<'a, bindings::elf32_rela>,
+ SectionEntityIterator<'a, bindings::elf64_rela>,
+ >,
+);
+
+impl<'a> RelaSectionIterator<'a> {
+ fn new(section: &'a SectionInfo<'a>) -> ParseResult<Self> {
+ Ok(Self(match section.class {
+ Class::Elf32 => ClassAlternative::Elf32(SectionEntityIterator::new(section)?),
+ Class::Elf64 => ClassAlternative::Elf64(SectionEntityIterator::new(section)?),
+ }))
+ }
+}
+
+impl<'a> Iterator for RelaSectionIterator<'a> {
+ type Item = Rela;
+
+ fn next(&mut self) -> Option<Self::Item> {
+ match &mut self.0 {
+ ClassAlternative::Elf32(iter) => iter.next().map(|n| {
+ let type_ = n.r_info.to_cpu(iter.byteorder) & 0xff;
+ Self::Item { type_ }
+ }),
+ ClassAlternative::Elf64(iter) => iter.next().map(|n| {
+ let type_ = n.r_info.to_cpu(iter.byteorder) as u32;
+ Self::Item { type_ }
+ }),
+ }
+ }
+}
diff --git a/lib/vdso/check/vdsocheck.rs b/lib/vdso/check/vdsocheck.rs
new file mode 100644
index 000000000000..f4c0730bc976
--- /dev/null
+++ b/lib/vdso/check/vdsocheck.rs
@@ -0,0 +1,154 @@
+// SPDX-License-Identifier: GPL-2.0
+
+//! vDSO build-time validation
+//!
+//! Check that the vDSO library does not contain dynamic relocations.
+
+use std::default::Default;
+use std::fmt;
+use std::fs;
+use std::option::Option;
+use std::process;
+
+use ::bindings;
+
+mod elf;
+
+#[derive(Default)]
+struct AllowedRelocations<'a> {
+ ignored_object_file_sections: &'a [&'a str],
+ in_object_file: &'a [u32],
+}
+
+impl<'a> AllowedRelocations<'a> {
+ fn is_ignored_section(&self, section: &elf::Section<'_>) -> bool {
+ let name = section.info().name;
+
+ if name.starts_with(".rel.debug_") || name.starts_with(".rela.debug_") {
+ true
+ } else {
+ self.ignored_object_file_sections.contains(&name)
+ }
+ }
+}
+
+fn allowed_relocations_for_machine(machine: u16) -> Option<AllowedRelocations<'static>> {
+ match machine as u32 {
+ _ => None,
+ }
+}
+
+#[derive(Debug)]
+enum ValidationError<'a> {
+ ParseError(elf::ParseError),
+ UnsupportedArchitecture(u16),
+ UnrecognizedElfFileType(u32),
+ UnexpectedSection(elf::Section<'a>),
+ InvalidRelocation(elf::Section<'a>, u32),
+}
+
+impl<'a> From<elf::ParseError> for ValidationError<'a> {
+ fn from(parse_error: elf::ParseError) -> Self {
+ Self::ParseError(parse_error)
+ }
+}
+
+impl fmt::Display for ValidationError<'_> {
+ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+ match self {
+ ValidationError::ParseError(e) => write!(f, "Parsing error: {}", e),
+ ValidationError::UnsupportedArchitecture(n) => {
+ write!(f, "Unsupported ELF architecture {}", n)
+ }
+ ValidationError::UnrecognizedElfFileType(t) => {
+ write!(f, "Unrecognized ELF file type {}", t)
+ }
+ ValidationError::UnexpectedSection(ref s) => {
+ write!(f, "Unexpected section '{}'", s.info().name)
+ }
+ ValidationError::InvalidRelocation(ref s, t) => {
+ write!(f, "Invalid relocation {} in section '{}'", t, s.info().name)
+ }
+ }
+ }
+}
+
+type ValidationResult<'a> = Result<(), ValidationError<'a>>;
+
+fn validate_linked_dso<'a>(file: &'a elf::File<'a>) -> ValidationResult<'a> {
+ for section in file.sections()? {
+ let section = section?;
+
+ /* No relocations are allowed */
+ match section {
+ elf::Section::Rel(_) | elf::Section::Rela(_) => {
+ return Err(ValidationError::UnexpectedSection(section))
+ }
+ _ => {}
+ }
+ }
+
+ Ok(())
+}
+
+fn validate_object_file<'a>(file: &'a elf::File<'a>) -> ValidationResult<'a> {
+ let allowed_relocs = allowed_relocations_for_machine(file.machine)
+ .ok_or(ValidationError::UnsupportedArchitecture(file.machine))?;
+
+ for section in file.sections()? {
+ let section = section?;
+
+ if allowed_relocs.is_ignored_section(§ion) {
+ continue;
+ }
+
+ match section {
+ elf::Section::Rel(ref rel) => {
+ for entry in rel.entries()? {
+ if !allowed_relocs.in_object_file.contains(&entry.type_) {
+ return Err(ValidationError::InvalidRelocation(section, entry.type_));
+ }
+ }
+ }
+ elf::Section::Rela(ref rela) => {
+ for entry in rela.entries()? {
+ if !allowed_relocs.in_object_file.contains(&entry.type_) {
+ return Err(ValidationError::InvalidRelocation(section, entry.type_));
+ }
+ }
+ }
+ _ => {}
+ };
+ }
+
+ Ok(())
+}
+
+fn main() {
+ let mut args = std::env::args_os();
+
+ let program_name = args.next().unwrap_or("vdsocheck".into());
+
+ for path in args {
+ let data = fs::read(&path).unwrap_or_else(|err| {
+ println!("{}: {}: {}", program_name.display(), path.display(), err);
+ process::exit(1);
+ });
+
+ let file = elf::File::new_from_bytes(&data).unwrap_or_else(|err| {
+ println!("{}: {}: {}", program_name.display(), path.display(), err);
+ process::exit(2);
+ });
+
+ let result = match file.type_ as u32 {
+ bindings::ET_DYN => validate_linked_dso(&file),
+ bindings::ET_REL => validate_object_file(&file),
+ t => Err(ValidationError::UnrecognizedElfFileType(t)),
+ };
+
+ result.unwrap_or_else(|err| {
+ println!("{}: {}: {}", program_name.display(), path.display(), err);
+ process::exit(3);
+ });
+ }
+}
--
2.55.0
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 53+ messages in thread* Re: [PATCH v5 12/24] vdso: Add the vdsocheck tool
2026-09-08 6:33 ` [PATCH v5 12/24] vdso: Add the vdsocheck tool Thomas Weißschuh
@ 2026-09-08 7:19 ` Peter Zijlstra
2026-09-08 7:35 ` Thomas Weißschuh
2026-09-09 19:31 ` H. Peter Anvin
2026-09-10 6:52 ` Mukesh Kumar Chaurasiya
1 sibling, 2 replies; 53+ messages in thread
From: Peter Zijlstra @ 2026-09-08 7:19 UTC (permalink / raw)
To: Thomas Weißschuh
Cc: Paul Walmsley, Palmer Dabbelt, Albert Ou, Alexandre Ghiti,
Nathan Chancellor, Nick Desaulniers, Bill Wendling, Justin Stitt,
Andy Lutomirski, Vincenzo Frascino, Kees Cook, Ingo Molnar,
Borislav Petkov, Dave Hansen, x86, H. Peter Anvin,
Richard Weinberger, Anton Ivanov, Johannes Berg, Russell King,
Catalin Marinas, Will Deacon, Madhavan Srinivasan,
Michael Ellerman, Nicholas Piggin, Huacai Chen, WANG Xuerui,
Heiko Carstens, Vasily Gorbik, Alexander Gordeev,
Christian Borntraeger, Sven Schnelle, Thomas Bogendoerfer,
Miguel Ojeda, Alex Gaynor, Gary Guo, Björn Roy Baron,
Benno Lossin, Andreas Hindborg, Alice Ryhl, Trevor Gross,
Danilo Krummrich, Thomas Gleixner, Christophe Leroy, Boqun Feng,
Nicolas Schier, linux-riscv, linux-kernel, llvm, linux-mm,
linux-um, linux-arm-kernel, linuxppc-dev, loongarch, linux-s390,
linux-mips, rust-for-linux, linux-kbuild, Jan Stancek,
Arnaldo Carvalho de Melo, Alexandre Ghiti
On Tue, Sep 08, 2026 at 08:33:46AM +0200, Thomas Weißschuh wrote:
> All vDSO code needs to be completely position independent. Symbol
> references are marked as hidden so the compiler emits PC-relative
> relocations. However there are cases where the compiler may still
> emit absolute relocations, as they are valid in regular PIC DSO code.
> These would be resolved by the linker and will break at runtime.
> This has been observed on arm64, see commit 0c314cda9325 ("arm64: vdso:
> Work around invalid absolute relocations from GCC")
>
> Introduce a tool to check for absolute relocations during the build,
> as the current inline-shell logic is not expressive enough.
> The check is done on the object files as the relocations will not exist
> anymore in the final DSO. As there is no extension point for the
> compilation of each object file, perform the validation in vdso_check.
>
> Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
> ---
> Makefile | 19 ++
> lib/vdso/Kconfig | 5 +
> lib/vdso/Makefile | 2 +
> lib/vdso/Makefile.include | 14 ++
> lib/vdso/check/.gitignore | 3 +
> lib/vdso/check/Makefile | 34 +++
> lib/vdso/check/elf.rs | 498 ++++++++++++++++++++++++++++++++++++++++++++
> lib/vdso/check/vdsocheck.rs | 154 ++++++++++++++
> 8 files changed, 729 insertions(+)
Urgh, does this mean I have to have rust installed just to build a
kernel now?
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 53+ messages in thread* Re: [PATCH v5 12/24] vdso: Add the vdsocheck tool
2026-09-08 7:19 ` Peter Zijlstra
@ 2026-09-08 7:35 ` Thomas Weißschuh
2026-09-08 7:37 ` Peter Zijlstra
2026-09-09 19:31 ` H. Peter Anvin
1 sibling, 1 reply; 53+ messages in thread
From: Thomas Weißschuh @ 2026-09-08 7:35 UTC (permalink / raw)
To: Peter Zijlstra
Cc: Paul Walmsley, Palmer Dabbelt, Albert Ou, Alexandre Ghiti,
Nathan Chancellor, Nick Desaulniers, Bill Wendling, Justin Stitt,
Andy Lutomirski, Vincenzo Frascino, Kees Cook, Ingo Molnar,
Borislav Petkov, Dave Hansen, x86, H. Peter Anvin,
Richard Weinberger, Anton Ivanov, Johannes Berg, Russell King,
Catalin Marinas, Will Deacon, Madhavan Srinivasan,
Michael Ellerman, Nicholas Piggin, Huacai Chen, WANG Xuerui,
Heiko Carstens, Vasily Gorbik, Alexander Gordeev,
Christian Borntraeger, Sven Schnelle, Thomas Bogendoerfer,
Miguel Ojeda, Alex Gaynor, Gary Guo, Björn Roy Baron,
Benno Lossin, Andreas Hindborg, Alice Ryhl, Trevor Gross,
Danilo Krummrich, Thomas Gleixner, Christophe Leroy, Boqun Feng,
Nicolas Schier, linux-riscv, linux-kernel, llvm, linux-mm,
linux-um, linux-arm-kernel, linuxppc-dev, loongarch, linux-s390,
linux-mips, rust-for-linux, linux-kbuild, Jan Stancek,
Arnaldo Carvalho de Melo, Alexandre Ghiti
On Tue, Sep 08, 2026 at 09:19:11AM +0200, Peter Zijlstra wrote:
> On Tue, Sep 08, 2026 at 08:33:46AM +0200, Thomas Weißschuh wrote:
> > All vDSO code needs to be completely position independent. Symbol
> > references are marked as hidden so the compiler emits PC-relative
> > relocations. However there are cases where the compiler may still
> > emit absolute relocations, as they are valid in regular PIC DSO code.
> > These would be resolved by the linker and will break at runtime.
> > This has been observed on arm64, see commit 0c314cda9325 ("arm64: vdso:
> > Work around invalid absolute relocations from GCC")
> >
> > Introduce a tool to check for absolute relocations during the build,
> > as the current inline-shell logic is not expressive enough.
> > The check is done on the object files as the relocations will not exist
> > anymore in the final DSO. As there is no extension point for the
> > compilation of each object file, perform the validation in vdso_check.
> >
> > Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
> > ---
> > Makefile | 19 ++
> > lib/vdso/Kconfig | 5 +
> > lib/vdso/Makefile | 2 +
> > lib/vdso/Makefile.include | 14 ++
> > lib/vdso/check/.gitignore | 3 +
> > lib/vdso/check/Makefile | 34 +++
> > lib/vdso/check/elf.rs | 498 ++++++++++++++++++++++++++++++++++++++++++++
> > lib/vdso/check/vdsocheck.rs | 154 ++++++++++++++
> > 8 files changed, 729 insertions(+)
>
> Urgh, does this mean I have to have rust installed just to build a
> kernel now?
No.
If you don't have rust installed the build will instead use the existing shell
script for a less thorough check. We only need one build machine at some point
to have rust installed to report issues and this check to be useful.
Thomas
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 53+ messages in thread* Re: [PATCH v5 12/24] vdso: Add the vdsocheck tool
2026-09-08 7:35 ` Thomas Weißschuh
@ 2026-09-08 7:37 ` Peter Zijlstra
0 siblings, 0 replies; 53+ messages in thread
From: Peter Zijlstra @ 2026-09-08 7:37 UTC (permalink / raw)
To: Thomas Weißschuh
Cc: Paul Walmsley, Palmer Dabbelt, Albert Ou, Alexandre Ghiti,
Nathan Chancellor, Nick Desaulniers, Bill Wendling, Justin Stitt,
Andy Lutomirski, Vincenzo Frascino, Kees Cook, Ingo Molnar,
Borislav Petkov, Dave Hansen, x86, H. Peter Anvin,
Richard Weinberger, Anton Ivanov, Johannes Berg, Russell King,
Catalin Marinas, Will Deacon, Madhavan Srinivasan,
Michael Ellerman, Nicholas Piggin, Huacai Chen, WANG Xuerui,
Heiko Carstens, Vasily Gorbik, Alexander Gordeev,
Christian Borntraeger, Sven Schnelle, Thomas Bogendoerfer,
Miguel Ojeda, Alex Gaynor, Gary Guo, Björn Roy Baron,
Benno Lossin, Andreas Hindborg, Alice Ryhl, Trevor Gross,
Danilo Krummrich, Thomas Gleixner, Christophe Leroy, Boqun Feng,
Nicolas Schier, linux-riscv, linux-kernel, llvm, linux-mm,
linux-um, linux-arm-kernel, linuxppc-dev, loongarch, linux-s390,
linux-mips, rust-for-linux, linux-kbuild, Jan Stancek,
Arnaldo Carvalho de Melo, Alexandre Ghiti
On Tue, Sep 08, 2026 at 09:35:46AM +0200, Thomas Weißschuh wrote:
> On Tue, Sep 08, 2026 at 09:19:11AM +0200, Peter Zijlstra wrote:
> > On Tue, Sep 08, 2026 at 08:33:46AM +0200, Thomas Weißschuh wrote:
> > > All vDSO code needs to be completely position independent. Symbol
> > > references are marked as hidden so the compiler emits PC-relative
> > > relocations. However there are cases where the compiler may still
> > > emit absolute relocations, as they are valid in regular PIC DSO code.
> > > These would be resolved by the linker and will break at runtime.
> > > This has been observed on arm64, see commit 0c314cda9325 ("arm64: vdso:
> > > Work around invalid absolute relocations from GCC")
> > >
> > > Introduce a tool to check for absolute relocations during the build,
> > > as the current inline-shell logic is not expressive enough.
> > > The check is done on the object files as the relocations will not exist
> > > anymore in the final DSO. As there is no extension point for the
> > > compilation of each object file, perform the validation in vdso_check.
> > >
> > > Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
> > > ---
> > > Makefile | 19 ++
> > > lib/vdso/Kconfig | 5 +
> > > lib/vdso/Makefile | 2 +
> > > lib/vdso/Makefile.include | 14 ++
> > > lib/vdso/check/.gitignore | 3 +
> > > lib/vdso/check/Makefile | 34 +++
> > > lib/vdso/check/elf.rs | 498 ++++++++++++++++++++++++++++++++++++++++++++
> > > lib/vdso/check/vdsocheck.rs | 154 ++++++++++++++
> > > 8 files changed, 729 insertions(+)
> >
> > Urgh, does this mean I have to have rust installed just to build a
> > kernel now?
>
> No.
>
> If you don't have rust installed the build will instead use the existing shell
> script for a less thorough check. We only need one build machine at some point
> to have rust installed to report issues and this check to be useful.
Ah, *phew*. Thanks!
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v5 12/24] vdso: Add the vdsocheck tool
2026-09-08 7:19 ` Peter Zijlstra
2026-09-08 7:35 ` Thomas Weißschuh
@ 2026-09-09 19:31 ` H. Peter Anvin
2026-09-09 19:38 ` Miguel Ojeda
1 sibling, 1 reply; 53+ messages in thread
From: H. Peter Anvin @ 2026-09-09 19:31 UTC (permalink / raw)
To: Peter Zijlstra, Thomas Weißschuh
Cc: Paul Walmsley, Palmer Dabbelt, Albert Ou, Alexandre Ghiti,
Nathan Chancellor, Nick Desaulniers, Bill Wendling, Justin Stitt,
Andy Lutomirski, Vincenzo Frascino, Kees Cook, Ingo Molnar,
Borislav Petkov, Dave Hansen, x86, Richard Weinberger,
Anton Ivanov, Johannes Berg, Russell King, Catalin Marinas,
Will Deacon, Madhavan Srinivasan, Michael Ellerman,
Nicholas Piggin, Huacai Chen, WANG Xuerui, Heiko Carstens,
Vasily Gorbik, Alexander Gordeev, Christian Borntraeger,
Sven Schnelle, Thomas Bogendoerfer, Miguel Ojeda, Alex Gaynor,
Gary Guo, Björn Roy Baron, Benno Lossin, Andreas Hindborg,
Alice Ryhl, Trevor Gross, Danilo Krummrich, Thomas Gleixner,
Christophe Leroy, Boqun Feng, Nicolas Schier, linux-riscv,
linux-kernel, llvm, linux-mm, linux-um, linux-arm-kernel,
linuxppc-dev, loongarch, linux-s390, linux-mips, rust-for-linux,
linux-kbuild, Jan Stancek, Arnaldo Carvalho de Melo,
Alexandre Ghiti
On September 8, 2026 12:19:11 AM PDT, Peter Zijlstra <peterz@infradead.org> wrote:
>On Tue, Sep 08, 2026 at 08:33:46AM +0200, Thomas Weißschuh wrote:
>> All vDSO code needs to be completely position independent. Symbol
>> references are marked as hidden so the compiler emits PC-relative
>> relocations. However there are cases where the compiler may still
>> emit absolute relocations, as they are valid in regular PIC DSO code.
>> These would be resolved by the linker and will break at runtime.
>> This has been observed on arm64, see commit 0c314cda9325 ("arm64: vdso:
>> Work around invalid absolute relocations from GCC")
>>
>> Introduce a tool to check for absolute relocations during the build,
>> as the current inline-shell logic is not expressive enough.
>> The check is done on the object files as the relocations will not exist
>> anymore in the final DSO. As there is no extension point for the
>> compilation of each object file, perform the validation in vdso_check.
>>
>> Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
>> ---
>> Makefile | 19 ++
>> lib/vdso/Kconfig | 5 +
>> lib/vdso/Makefile | 2 +
>> lib/vdso/Makefile.include | 14 ++
>> lib/vdso/check/.gitignore | 3 +
>> lib/vdso/check/Makefile | 34 +++
>> lib/vdso/check/elf.rs | 498 ++++++++++++++++++++++++++++++++++++++++++++
>> lib/vdso/check/vdsocheck.rs | 154 ++++++++++++++
>> 8 files changed, 729 insertions(+)
>
>Urgh, does this mean I have to have rust installed just to build a
>kernel now?
It was going to happen, and now we'll have to suffer the instability of rust...
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 53+ messages in thread* Re: [PATCH v5 12/24] vdso: Add the vdsocheck tool
2026-09-09 19:31 ` H. Peter Anvin
@ 2026-09-09 19:38 ` Miguel Ojeda
0 siblings, 0 replies; 53+ messages in thread
From: Miguel Ojeda @ 2026-09-09 19:38 UTC (permalink / raw)
To: H. Peter Anvin
Cc: Peter Zijlstra, Thomas Weißschuh, Paul Walmsley,
Palmer Dabbelt, Albert Ou, Alexandre Ghiti, Nathan Chancellor,
Nick Desaulniers, Bill Wendling, Justin Stitt, Andy Lutomirski,
Vincenzo Frascino, Kees Cook, Ingo Molnar, Borislav Petkov,
Dave Hansen, x86, Richard Weinberger, Anton Ivanov, Johannes Berg,
Russell King, Catalin Marinas, Will Deacon, Madhavan Srinivasan,
Michael Ellerman, Nicholas Piggin, Huacai Chen, WANG Xuerui,
Heiko Carstens, Vasily Gorbik, Alexander Gordeev,
Christian Borntraeger, Sven Schnelle, Thomas Bogendoerfer,
Miguel Ojeda, Alex Gaynor, Gary Guo, Björn Roy Baron,
Benno Lossin, Andreas Hindborg, Alice Ryhl, Trevor Gross,
Danilo Krummrich, Thomas Gleixner, Christophe Leroy, Boqun Feng,
Nicolas Schier, linux-riscv, linux-kernel, llvm, linux-mm,
linux-um, linux-arm-kernel, linuxppc-dev, loongarch, linux-s390,
linux-mips, rust-for-linux, linux-kbuild, Jan Stancek,
Arnaldo Carvalho de Melo, Alexandre Ghiti
On Wed, Sep 9, 2026 at 9:33 PM H. Peter Anvin <hpa@zytor.com> wrote:
>
> It was going to happen, and now we'll have to suffer the instability of rust...
What instability?
Cheers,
Miguel
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v5 12/24] vdso: Add the vdsocheck tool
2026-09-08 6:33 ` [PATCH v5 12/24] vdso: Add the vdsocheck tool Thomas Weißschuh
2026-09-08 7:19 ` Peter Zijlstra
@ 2026-09-10 6:52 ` Mukesh Kumar Chaurasiya
1 sibling, 0 replies; 53+ messages in thread
From: Mukesh Kumar Chaurasiya @ 2026-09-10 6:52 UTC (permalink / raw)
To: Thomas Weißschuh
Cc: Paul Walmsley, Palmer Dabbelt, Albert Ou, Alexandre Ghiti,
Nathan Chancellor, Nick Desaulniers, Bill Wendling, Justin Stitt,
Andy Lutomirski, Vincenzo Frascino, Kees Cook, Ingo Molnar,
Borislav Petkov, Dave Hansen, x86, H. Peter Anvin,
Richard Weinberger, Anton Ivanov, Johannes Berg, Russell King,
Catalin Marinas, Will Deacon, Madhavan Srinivasan,
Michael Ellerman, Nicholas Piggin, Huacai Chen, WANG Xuerui,
Heiko Carstens, Vasily Gorbik, Alexander Gordeev,
Christian Borntraeger, Sven Schnelle, Thomas Bogendoerfer,
Miguel Ojeda, Alex Gaynor, Gary Guo, Björn Roy Baron,
Benno Lossin, Andreas Hindborg, Alice Ryhl, Trevor Gross,
Danilo Krummrich, Thomas Gleixner, Christophe Leroy, Boqun Feng,
Nicolas Schier, linux-riscv, linux-kernel, llvm, linux-mm,
linux-um, linux-arm-kernel, linuxppc-dev, loongarch, linux-s390,
linux-mips, rust-for-linux, linux-kbuild, Jan Stancek,
Arnaldo Carvalho de Melo, Alexandre Ghiti
On Tue, Sep 08, 2026 at 08:33:46AM +0200, Thomas Weißschuh wrote:
> All vDSO code needs to be completely position independent. Symbol
> references are marked as hidden so the compiler emits PC-relative
> relocations. However there are cases where the compiler may still
> emit absolute relocations, as they are valid in regular PIC DSO code.
> These would be resolved by the linker and will break at runtime.
> This has been observed on arm64, see commit 0c314cda9325 ("arm64: vdso:
> Work around invalid absolute relocations from GCC")
>
> Introduce a tool to check for absolute relocations during the build,
> as the current inline-shell logic is not expressive enough.
> The check is done on the object files as the relocations will not exist
> anymore in the final DSO. As there is no extension point for the
> compilation of each object file, perform the validation in vdso_check.
>
> Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
> ---
> Makefile | 19 ++
> lib/vdso/Kconfig | 5 +
> lib/vdso/Makefile | 2 +
> lib/vdso/Makefile.include | 14 ++
> lib/vdso/check/.gitignore | 3 +
> lib/vdso/check/Makefile | 34 +++
> lib/vdso/check/elf.rs | 498 ++++++++++++++++++++++++++++++++++++++++++++
> lib/vdso/check/vdsocheck.rs | 154 ++++++++++++++
> 8 files changed, 729 insertions(+)
>
> diff --git a/Makefile b/Makefile
> index 4ad67b737af7..e6e0dd7818ef 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1559,6 +1559,25 @@ vdso_install: export INSTALL_FILES = $(vdso-install-y)
> vdso_install:
> $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.vdsoinst
>
> +# ---------------------------------------------------------------------------
> +# vDSO check
> +
> +ifdef CONFIG_RUST_IS_AVAILABLE
> +ifdef CONFIG_VDSO_CHECK
> +
> +# Build the checker early.
> +prepare: vdsocheck
> +
> +# If the architecture builds the vDSO early, make sure to be earlier.
> +PHONY += vdso_prepare
> +vdso_prepare: vdsocheck
> +
> +PHONY += vdsocheck
> +vdsocheck:
> + $(Q)$(MAKE) $(build)=lib/vdso/check $@
> +endif
> +endif
> +
> # ---------------------------------------------------------------------------
> # Tools
>
> diff --git a/lib/vdso/Kconfig b/lib/vdso/Kconfig
> index 597f5f0f9681..112b42a5aeb1 100644
> --- a/lib/vdso/Kconfig
> +++ b/lib/vdso/Kconfig
> @@ -23,3 +23,8 @@ config VDSO_GETRANDOM
> select VDSO_DATASTORE
> help
> Selected by architectures that support vDSO getrandom().
> +
> +config VDSO_CHECK
> + bool
> + help
> + Selected for architectures that are supported by the 'vdsocheck' progam.
s/progam/program
Regards,
Mukesh
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 53+ messages in thread
* [PATCH v5 13/24] x86/vdso: Enable the vdsocheck tool
2026-09-08 6:33 [PATCH v5 00/24] vdso: Reject absolute relocations during build Thomas Weißschuh
` (11 preceding siblings ...)
2026-09-08 6:33 ` [PATCH v5 12/24] vdso: Add the vdsocheck tool Thomas Weißschuh
@ 2026-09-08 6:33 ` Thomas Weißschuh
2026-09-08 6:33 ` [PATCH v5 14/24] ARM: vdso: " Thomas Weißschuh
` (10 subsequent siblings)
23 siblings, 0 replies; 53+ messages in thread
From: Thomas Weißschuh @ 2026-09-08 6:33 UTC (permalink / raw)
To: Paul Walmsley, Palmer Dabbelt, Albert Ou, Alexandre Ghiti,
Nathan Chancellor, Nick Desaulniers, Bill Wendling, Justin Stitt,
Andy Lutomirski, Vincenzo Frascino, Kees Cook, Ingo Molnar,
Borislav Petkov, Dave Hansen, x86, H. Peter Anvin,
Richard Weinberger, Anton Ivanov, Johannes Berg, Russell King,
Catalin Marinas, Will Deacon, Madhavan Srinivasan,
Michael Ellerman, Nicholas Piggin, Huacai Chen, WANG Xuerui,
Heiko Carstens, Vasily Gorbik, Alexander Gordeev,
Christian Borntraeger, Sven Schnelle, Thomas Bogendoerfer,
Miguel Ojeda, Alex Gaynor, Gary Guo, Björn Roy Baron,
Benno Lossin, Andreas Hindborg, Alice Ryhl, Trevor Gross,
Danilo Krummrich, Thomas Gleixner, Christophe Leroy, Boqun Feng,
Nicolas Schier
Cc: linux-riscv, linux-kernel, llvm, linux-mm, linux-um,
linux-arm-kernel, linuxppc-dev, loongarch, linux-s390, linux-mips,
rust-for-linux, linux-kbuild, Jan Stancek,
Arnaldo Carvalho de Melo, Alexandre Ghiti, Thomas Weißschuh
The vdsocheck tool validates the object files and final .so library.
It can detect if the compiler created relocations which are incompatible
with the vDSO which need to be worked around.
Wire it up for the architecture.
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
---
arch/x86/Kconfig | 1 +
arch/x86/entry/vdso/common/Makefile.include | 2 +-
lib/vdso/check/vdsocheck.rs | 14 ++++++++++++++
3 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 15fd9ec5ecac..ee0f2c401980 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -305,6 +305,7 @@ config X86
select HAVE_UNSTABLE_SCHED_CLOCK
select HAVE_UNWIND_USER_FP if X86_64
select HAVE_USER_RETURN_NOTIFIER
+ select VDSO_CHECK
select VDSO_GETRANDOM if X86_64
select HOTPLUG_PARALLEL if SMP && X86_64
select HOTPLUG_SMT if SMP
diff --git a/arch/x86/entry/vdso/common/Makefile.include b/arch/x86/entry/vdso/common/Makefile.include
index 687b3d89b40d..510d5e79857e 100644
--- a/arch/x86/entry/vdso/common/Makefile.include
+++ b/arch/x86/entry/vdso/common/Makefile.include
@@ -71,7 +71,7 @@ quiet_cmd_vdso = VDSO $@
quiet_cmd_vdso_and_check = VDSO $@
cmd_vdso_and_check = $(cmd_vdso); $(cmd_vdso_check)
-$(obj)/vdso%.so.dbg: $(obj)/vdso%.lds FORCE
+$(obj)/vdso%.so.dbg: $(obj)/vdso%.lds $(vdsocheck) FORCE
$(call if_changed,vdso_and_check)
$(obj)/%.so: OBJCOPYFLAGS := -S --remove-section __ex_table
diff --git a/lib/vdso/check/vdsocheck.rs b/lib/vdso/check/vdsocheck.rs
index f4c0730bc976..1174d896a68b 100644
--- a/lib/vdso/check/vdsocheck.rs
+++ b/lib/vdso/check/vdsocheck.rs
@@ -34,6 +34,20 @@ fn is_ignored_section(&self, section: &elf::Section<'_>) -> bool {
fn allowed_relocations_for_machine(machine: u16) -> Option<AllowedRelocations<'static>> {
match machine as u32 {
+ bindings::EM_386 => AllowedRelocations {
+ in_object_file: &[
+ bindings::R_386_PC32,
+ bindings::R_386_GOTOFF,
+ bindings::R_386_GOTPC,
+ ],
+ ..Default::default()
+ }
+ .into(),
+ bindings::EM_X86_64 => AllowedRelocations {
+ in_object_file: &[bindings::R_X86_64_PC32, bindings::R_X86_64_PLT32],
+ ..Default::default()
+ }
+ .into(),
_ => None,
}
}
--
2.55.0
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH v5 14/24] ARM: vdso: Enable the vdsocheck tool
2026-09-08 6:33 [PATCH v5 00/24] vdso: Reject absolute relocations during build Thomas Weißschuh
` (12 preceding siblings ...)
2026-09-08 6:33 ` [PATCH v5 13/24] x86/vdso: Enable " Thomas Weißschuh
@ 2026-09-08 6:33 ` Thomas Weißschuh
2026-09-08 6:33 ` [PATCH v5 15/24] arm64: " Thomas Weißschuh
` (9 subsequent siblings)
23 siblings, 0 replies; 53+ messages in thread
From: Thomas Weißschuh @ 2026-09-08 6:33 UTC (permalink / raw)
To: Paul Walmsley, Palmer Dabbelt, Albert Ou, Alexandre Ghiti,
Nathan Chancellor, Nick Desaulniers, Bill Wendling, Justin Stitt,
Andy Lutomirski, Vincenzo Frascino, Kees Cook, Ingo Molnar,
Borislav Petkov, Dave Hansen, x86, H. Peter Anvin,
Richard Weinberger, Anton Ivanov, Johannes Berg, Russell King,
Catalin Marinas, Will Deacon, Madhavan Srinivasan,
Michael Ellerman, Nicholas Piggin, Huacai Chen, WANG Xuerui,
Heiko Carstens, Vasily Gorbik, Alexander Gordeev,
Christian Borntraeger, Sven Schnelle, Thomas Bogendoerfer,
Miguel Ojeda, Alex Gaynor, Gary Guo, Björn Roy Baron,
Benno Lossin, Andreas Hindborg, Alice Ryhl, Trevor Gross,
Danilo Krummrich, Thomas Gleixner, Christophe Leroy, Boqun Feng,
Nicolas Schier
Cc: linux-riscv, linux-kernel, llvm, linux-mm, linux-um,
linux-arm-kernel, linuxppc-dev, loongarch, linux-s390, linux-mips,
rust-for-linux, linux-kbuild, Jan Stancek,
Arnaldo Carvalho de Melo, Alexandre Ghiti, Thomas Weißschuh
The vdsocheck tool validates the object files and final .so library.
It can detect if the compiler created relocations which are incompatible
with the vDSO which need to be worked around.
Wire it up for the architecture.
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
---
arch/arm/mm/Kconfig | 1 +
arch/arm/vdso/Makefile | 4 ++--
lib/vdso/check/vdsocheck.rs | 9 +++++++++
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index 6574659dfb61..565988a66e98 100644
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -950,6 +950,7 @@ config VDSO
depends on AEABI && MMU && CPU_V7
default y if ARM_ARCH_TIMER
select GENERIC_GETTIMEOFDAY
+ select VDSO_CHECK
help
Place in the process address space an ELF shared object
providing fast implementations of gettimeofday and
diff --git a/arch/arm/vdso/Makefile b/arch/arm/vdso/Makefile
index cf8cd39ab804..fd34d0ff018a 100644
--- a/arch/arm/vdso/Makefile
+++ b/arch/arm/vdso/Makefile
@@ -37,7 +37,7 @@ endif
$(obj)/vdso.o : $(obj)/vdso.so
# Link rule for the .so file
-$(obj)/vdso.so.raw: $(obj)/vdso.lds $(obj-vdso) FORCE
+$(obj)/vdso.so.raw: $(obj)/vdso.lds $(obj-vdso) $(vdsocheck) FORCE
$(call if_changed,vdsold_and_vdso_check)
$(obj)/vdso.so.dbg: $(obj)/vdso.so.raw $(obj)/vdsomunge FORCE
@@ -50,7 +50,7 @@ $(obj)/%.so: $(obj)/%.so.dbg FORCE
# Actual build commands
quiet_cmd_vdsold_and_vdso_check = LD $@
- cmd_vdsold_and_vdso_check = $(cmd_ld); $(cmd_vdso_check)
+ cmd_vdsold_and_vdso_check = $(cmd_ld_vdso); $(cmd_vdso_check)
quiet_cmd_vdsomunge = MUNGE $@
cmd_vdsomunge = $(objtree)/$(obj)/vdsomunge $< $@
diff --git a/lib/vdso/check/vdsocheck.rs b/lib/vdso/check/vdsocheck.rs
index 1174d896a68b..fb88ef0be09d 100644
--- a/lib/vdso/check/vdsocheck.rs
+++ b/lib/vdso/check/vdsocheck.rs
@@ -48,6 +48,15 @@ fn allowed_relocations_for_machine(machine: u16) -> Option<AllowedRelocations<'s
..Default::default()
}
.into(),
+ bindings::EM_ARM => AllowedRelocations {
+ in_object_file: &[
+ bindings::R_ARM_NONE,
+ bindings::R_ARM_REL32,
+ bindings::R_ARM_PREL31,
+ ],
+ ..Default::default()
+ }
+ .into(),
_ => None,
}
}
--
2.55.0
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH v5 15/24] arm64: vdso: Enable the vdsocheck tool
2026-09-08 6:33 [PATCH v5 00/24] vdso: Reject absolute relocations during build Thomas Weißschuh
` (13 preceding siblings ...)
2026-09-08 6:33 ` [PATCH v5 14/24] ARM: vdso: " Thomas Weißschuh
@ 2026-09-08 6:33 ` Thomas Weißschuh
2026-09-08 6:33 ` [PATCH v5 16/24] powerpc/elf: Add 32-bit REL16 relocation definitions Thomas Weißschuh
` (8 subsequent siblings)
23 siblings, 0 replies; 53+ messages in thread
From: Thomas Weißschuh @ 2026-09-08 6:33 UTC (permalink / raw)
To: Paul Walmsley, Palmer Dabbelt, Albert Ou, Alexandre Ghiti,
Nathan Chancellor, Nick Desaulniers, Bill Wendling, Justin Stitt,
Andy Lutomirski, Vincenzo Frascino, Kees Cook, Ingo Molnar,
Borislav Petkov, Dave Hansen, x86, H. Peter Anvin,
Richard Weinberger, Anton Ivanov, Johannes Berg, Russell King,
Catalin Marinas, Will Deacon, Madhavan Srinivasan,
Michael Ellerman, Nicholas Piggin, Huacai Chen, WANG Xuerui,
Heiko Carstens, Vasily Gorbik, Alexander Gordeev,
Christian Borntraeger, Sven Schnelle, Thomas Bogendoerfer,
Miguel Ojeda, Alex Gaynor, Gary Guo, Björn Roy Baron,
Benno Lossin, Andreas Hindborg, Alice Ryhl, Trevor Gross,
Danilo Krummrich, Thomas Gleixner, Christophe Leroy, Boqun Feng,
Nicolas Schier
Cc: linux-riscv, linux-kernel, llvm, linux-mm, linux-um,
linux-arm-kernel, linuxppc-dev, loongarch, linux-s390, linux-mips,
rust-for-linux, linux-kbuild, Jan Stancek,
Arnaldo Carvalho de Melo, Alexandre Ghiti, Thomas Weißschuh
The vdsocheck tool validates the object files and final .so library.
It can detect if the compiler created relocations which are incompatible
with the vDSO which need to be worked around.
Wire it up for the architecture.
The compat vDSO will be handled by the existing 32-bit ARM configuration.
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
---
arch/arm64/Kconfig | 1 +
arch/arm64/kernel/vdso/Makefile | 4 ++--
lib/vdso/check/vdsocheck.rs | 12 ++++++++++++
3 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index b5a51b0ef944..1caaf4737f02 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -258,6 +258,7 @@ config ARM64
select TRACE_IRQFLAGS_NMI_SUPPORT
select HAVE_SOFTIRQ_ON_OWN_STACK
select USER_STACKTRACE_SUPPORT
+ select VDSO_CHECK
select VDSO_GETRANDOM
select VMAP_STACK
help
diff --git a/arch/arm64/kernel/vdso/Makefile b/arch/arm64/kernel/vdso/Makefile
index 7dec05dd33b7..9fac0e54097d 100644
--- a/arch/arm64/kernel/vdso/Makefile
+++ b/arch/arm64/kernel/vdso/Makefile
@@ -61,7 +61,7 @@ targets += vdso.lds
CPPFLAGS_vdso.lds += -P -C -U$(ARCH)
# Link rule for the .so file, .lds has to be first
-$(obj)/vdso.so.dbg: $(obj)/vdso.lds $(obj-vdso) FORCE
+$(obj)/vdso.so.dbg: $(obj)/vdso.lds $(obj-vdso) $(vdsocheck) FORCE
$(call if_changed,vdsold_and_vdso_check)
# Strip rule for the .so file
@@ -79,4 +79,4 @@ include/generated/vdso-offsets.h: $(obj)/vdso.so.dbg FORCE
# Actual build commands
quiet_cmd_vdsold_and_vdso_check = LD $@
- cmd_vdsold_and_vdso_check = $(cmd_ld); $(cmd_vdso_check)
+ cmd_vdsold_and_vdso_check = $(cmd_ld_vdso); $(cmd_vdso_check)
diff --git a/lib/vdso/check/vdsocheck.rs b/lib/vdso/check/vdsocheck.rs
index fb88ef0be09d..e45a1fbc6829 100644
--- a/lib/vdso/check/vdsocheck.rs
+++ b/lib/vdso/check/vdsocheck.rs
@@ -57,6 +57,18 @@ fn allowed_relocations_for_machine(machine: u16) -> Option<AllowedRelocations<'s
..Default::default()
}
.into(),
+ bindings::EM_AARCH64 => AllowedRelocations {
+ in_object_file: &[
+ bindings::R_AARCH64_PREL64,
+ bindings::R_AARCH64_PREL32,
+ bindings::R_AARCH64_PREL16,
+ bindings::R_AARCH64_LD_PREL_LO19,
+ bindings::R_AARCH64_ADR_PREL_LO21,
+ bindings::R_AARCH64_CALL26,
+ ],
+ ..Default::default()
+ }
+ .into(),
_ => None,
}
}
--
2.55.0
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH v5 16/24] powerpc/elf: Add 32-bit REL16 relocation definitions
2026-09-08 6:33 [PATCH v5 00/24] vdso: Reject absolute relocations during build Thomas Weißschuh
` (14 preceding siblings ...)
2026-09-08 6:33 ` [PATCH v5 15/24] arm64: " Thomas Weißschuh
@ 2026-09-08 6:33 ` Thomas Weißschuh
2026-09-08 9:21 ` Christophe Leroy (CS GROUP)
2026-09-08 14:01 ` R Nageswara Sastry
2026-09-08 6:33 ` [PATCH v5 17/24] powerpc/vdso: Enable the vdsocheck tool Thomas Weißschuh
` (7 subsequent siblings)
23 siblings, 2 replies; 53+ messages in thread
From: Thomas Weißschuh @ 2026-09-08 6:33 UTC (permalink / raw)
To: Paul Walmsley, Palmer Dabbelt, Albert Ou, Alexandre Ghiti,
Nathan Chancellor, Nick Desaulniers, Bill Wendling, Justin Stitt,
Andy Lutomirski, Vincenzo Frascino, Kees Cook, Ingo Molnar,
Borislav Petkov, Dave Hansen, x86, H. Peter Anvin,
Richard Weinberger, Anton Ivanov, Johannes Berg, Russell King,
Catalin Marinas, Will Deacon, Madhavan Srinivasan,
Michael Ellerman, Nicholas Piggin, Huacai Chen, WANG Xuerui,
Heiko Carstens, Vasily Gorbik, Alexander Gordeev,
Christian Borntraeger, Sven Schnelle, Thomas Bogendoerfer,
Miguel Ojeda, Alex Gaynor, Gary Guo, Björn Roy Baron,
Benno Lossin, Andreas Hindborg, Alice Ryhl, Trevor Gross,
Danilo Krummrich, Thomas Gleixner, Christophe Leroy, Boqun Feng,
Nicolas Schier
Cc: linux-riscv, linux-kernel, llvm, linux-mm, linux-um,
linux-arm-kernel, linuxppc-dev, loongarch, linux-s390, linux-mips,
rust-for-linux, linux-kbuild, Jan Stancek,
Arnaldo Carvalho de Melo, Alexandre Ghiti, Thomas Weißschuh
These are used by userspace and are necessary for the vdsocheck tool.
They share the numbers with their 64-bit variants.
Also update the copy in tools/ so they can be used by vdsocheck.
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
---
include/uapi/linux/elf-r.h | 7 ++++++-
tools/include/uapi/linux/elf-r.h | 7 ++++++-
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/include/uapi/linux/elf-r.h b/include/uapi/linux/elf-r.h
index 72fc9045a5d4..170888422400 100644
--- a/include/uapi/linux/elf-r.h
+++ b/include/uapi/linux/elf-r.h
@@ -182,8 +182,13 @@
#define R_PPC_GOT_DTPREL16_HI 93 /* half16* (sym+add)@got@dtprel@h */
#define R_PPC_GOT_DTPREL16_HA 94 /* half16* (sym+add)@got@dtprel@ha */
+#define R_PPC_REL16 249
+#define R_PPC_REL16_LO 250
+#define R_PPC_REL16_HI 251
+#define R_PPC_REL16_HA 252
+
/* keep this the last entry. */
-#define R_PPC_NUM 95
+#define R_PPC_NUM 253
/* PowerPC64 relocations defined by the ABIs */
#define R_PPC64_NONE R_PPC_NONE
diff --git a/tools/include/uapi/linux/elf-r.h b/tools/include/uapi/linux/elf-r.h
index 72fc9045a5d4..170888422400 100644
--- a/tools/include/uapi/linux/elf-r.h
+++ b/tools/include/uapi/linux/elf-r.h
@@ -182,8 +182,13 @@
#define R_PPC_GOT_DTPREL16_HI 93 /* half16* (sym+add)@got@dtprel@h */
#define R_PPC_GOT_DTPREL16_HA 94 /* half16* (sym+add)@got@dtprel@ha */
+#define R_PPC_REL16 249
+#define R_PPC_REL16_LO 250
+#define R_PPC_REL16_HI 251
+#define R_PPC_REL16_HA 252
+
/* keep this the last entry. */
-#define R_PPC_NUM 95
+#define R_PPC_NUM 253
/* PowerPC64 relocations defined by the ABIs */
#define R_PPC64_NONE R_PPC_NONE
--
2.55.0
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 53+ messages in thread* Re: [PATCH v5 16/24] powerpc/elf: Add 32-bit REL16 relocation definitions
2026-09-08 6:33 ` [PATCH v5 16/24] powerpc/elf: Add 32-bit REL16 relocation definitions Thomas Weißschuh
@ 2026-09-08 9:21 ` Christophe Leroy (CS GROUP)
2026-09-08 14:01 ` R Nageswara Sastry
1 sibling, 0 replies; 53+ messages in thread
From: Christophe Leroy (CS GROUP) @ 2026-09-08 9:21 UTC (permalink / raw)
To: Thomas Weißschuh, Paul Walmsley, Palmer Dabbelt, Albert Ou,
Alexandre Ghiti, Nathan Chancellor, Nick Desaulniers,
Bill Wendling, Justin Stitt, Andy Lutomirski, Vincenzo Frascino,
Kees Cook, Ingo Molnar, Borislav Petkov, Dave Hansen, x86,
H. Peter Anvin, Richard Weinberger, Anton Ivanov, Johannes Berg,
Russell King, Catalin Marinas, Will Deacon, Madhavan Srinivasan,
Michael Ellerman, Nicholas Piggin, Huacai Chen, WANG Xuerui,
Heiko Carstens, Vasily Gorbik, Alexander Gordeev,
Christian Borntraeger, Sven Schnelle, Thomas Bogendoerfer,
Miguel Ojeda, Alex Gaynor, Gary Guo, Björn Roy Baron,
Benno Lossin, Andreas Hindborg, Alice Ryhl, Trevor Gross,
Danilo Krummrich, Thomas Gleixner, Boqun Feng, Nicolas Schier
Cc: linux-riscv, linux-kernel, llvm, linux-mm, linux-um,
linux-arm-kernel, linuxppc-dev, loongarch, linux-s390, linux-mips,
rust-for-linux, linux-kbuild, Jan Stancek,
Arnaldo Carvalho de Melo, Alexandre Ghiti
Le 08/09/2026 à 08:33, Thomas Weißschuh a écrit :
> These are used by userspace and are necessary for the vdsocheck tool.
> They share the numbers with their 64-bit variants.
>
> Also update the copy in tools/ so they can be used by vdsocheck.
>
> Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Reviewed-by: Christophe Leroy (CS GROUP) <chleroy@kernel.org>
> ---
> include/uapi/linux/elf-r.h | 7 ++++++-
> tools/include/uapi/linux/elf-r.h | 7 ++++++-
> 2 files changed, 12 insertions(+), 2 deletions(-)
>
> diff --git a/include/uapi/linux/elf-r.h b/include/uapi/linux/elf-r.h
> index 72fc9045a5d4..170888422400 100644
> --- a/include/uapi/linux/elf-r.h
> +++ b/include/uapi/linux/elf-r.h
> @@ -182,8 +182,13 @@
> #define R_PPC_GOT_DTPREL16_HI 93 /* half16* (sym+add)@got@dtprel@h */
> #define R_PPC_GOT_DTPREL16_HA 94 /* half16* (sym+add)@got@dtprel@ha */
>
> +#define R_PPC_REL16 249
> +#define R_PPC_REL16_LO 250
> +#define R_PPC_REL16_HI 251
> +#define R_PPC_REL16_HA 252
> +
> /* keep this the last entry. */
> -#define R_PPC_NUM 95
> +#define R_PPC_NUM 253
>
> /* PowerPC64 relocations defined by the ABIs */
> #define R_PPC64_NONE R_PPC_NONE
> diff --git a/tools/include/uapi/linux/elf-r.h b/tools/include/uapi/linux/elf-r.h
> index 72fc9045a5d4..170888422400 100644
> --- a/tools/include/uapi/linux/elf-r.h
> +++ b/tools/include/uapi/linux/elf-r.h
> @@ -182,8 +182,13 @@
> #define R_PPC_GOT_DTPREL16_HI 93 /* half16* (sym+add)@got@dtprel@h */
> #define R_PPC_GOT_DTPREL16_HA 94 /* half16* (sym+add)@got@dtprel@ha */
>
> +#define R_PPC_REL16 249
> +#define R_PPC_REL16_LO 250
> +#define R_PPC_REL16_HI 251
> +#define R_PPC_REL16_HA 252
> +
> /* keep this the last entry. */
> -#define R_PPC_NUM 95
> +#define R_PPC_NUM 253
>
> /* PowerPC64 relocations defined by the ABIs */
> #define R_PPC64_NONE R_PPC_NONE
>
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PATCH v5 16/24] powerpc/elf: Add 32-bit REL16 relocation definitions
2026-09-08 6:33 ` [PATCH v5 16/24] powerpc/elf: Add 32-bit REL16 relocation definitions Thomas Weißschuh
2026-09-08 9:21 ` Christophe Leroy (CS GROUP)
@ 2026-09-08 14:01 ` R Nageswara Sastry
1 sibling, 0 replies; 53+ messages in thread
From: R Nageswara Sastry @ 2026-09-08 14:01 UTC (permalink / raw)
To: Thomas Weißschuh, Paul Walmsley, Palmer Dabbelt, Albert Ou,
Alexandre Ghiti, Nathan Chancellor, Nick Desaulniers,
Bill Wendling, Justin Stitt, Andy Lutomirski, Vincenzo Frascino,
Kees Cook, Ingo Molnar, Borislav Petkov, Dave Hansen, x86,
H. Peter Anvin, Richard Weinberger, Anton Ivanov, Johannes Berg,
Russell King, Catalin Marinas, Will Deacon, Madhavan Srinivasan,
Michael Ellerman, Nicholas Piggin, Huacai Chen, WANG Xuerui,
Heiko Carstens, Vasily Gorbik, Alexander Gordeev,
Christian Borntraeger, Sven Schnelle, Thomas Bogendoerfer,
Miguel Ojeda, Alex Gaynor, Gary Guo, Björn Roy Baron,
Benno Lossin, Andreas Hindborg, Alice Ryhl, Trevor Gross,
Danilo Krummrich, Thomas Gleixner, Christophe Leroy, Boqun Feng,
Nicolas Schier
Cc: linux-riscv, linux-kernel, llvm, linux-mm, linux-um,
linux-arm-kernel, linuxppc-dev, loongarch, linux-s390, linux-mips,
rust-for-linux, linux-kbuild, Jan Stancek,
Arnaldo Carvalho de Melo, Alexandre Ghiti
On 08.09.2026 12:03 PM, Thomas Weißschuh wrote:
> These are used by userspace and are necessary for the vdsocheck tool.
> They share the numbers with their 64-bit variants.
>
> Also update the copy in tools/ so they can be used by vdsocheck.
>
> Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Tested-by: R Nageswara Sastry <rnsastry@linux.ibm.com>
System: ppc64le LPAR (IBM POWER), Linux 7.3-rc2
> ---
> include/uapi/linux/elf-r.h | 7 ++++++-
> tools/include/uapi/linux/elf-r.h | 7 ++++++-
> 2 files changed, 12 insertions(+), 2 deletions(-)
>
> diff --git a/include/uapi/linux/elf-r.h b/include/uapi/linux/elf-r.h
> index 72fc9045a5d4..170888422400 100644
> --- a/include/uapi/linux/elf-r.h
> +++ b/include/uapi/linux/elf-r.h
> @@ -182,8 +182,13 @@
> #define R_PPC_GOT_DTPREL16_HI 93 /* half16* (sym+add)@got@dtprel@h */
> #define R_PPC_GOT_DTPREL16_HA 94 /* half16* (sym+add)@got@dtprel@ha */
>
> +#define R_PPC_REL16 249
> +#define R_PPC_REL16_LO 250
> +#define R_PPC_REL16_HI 251
> +#define R_PPC_REL16_HA 252
> +
> /* keep this the last entry. */
> -#define R_PPC_NUM 95
> +#define R_PPC_NUM 253
>
> /* PowerPC64 relocations defined by the ABIs */
> #define R_PPC64_NONE R_PPC_NONE
> diff --git a/tools/include/uapi/linux/elf-r.h b/tools/include/uapi/linux/elf-r.h
> index 72fc9045a5d4..170888422400 100644
> --- a/tools/include/uapi/linux/elf-r.h
> +++ b/tools/include/uapi/linux/elf-r.h
> @@ -182,8 +182,13 @@
> #define R_PPC_GOT_DTPREL16_HI 93 /* half16* (sym+add)@got@dtprel@h */
> #define R_PPC_GOT_DTPREL16_HA 94 /* half16* (sym+add)@got@dtprel@ha */
>
> +#define R_PPC_REL16 249
> +#define R_PPC_REL16_LO 250
> +#define R_PPC_REL16_HI 251
> +#define R_PPC_REL16_HA 252
> +
> /* keep this the last entry. */
> -#define R_PPC_NUM 95
> +#define R_PPC_NUM 253
>
> /* PowerPC64 relocations defined by the ABIs */
> #define R_PPC64_NONE R_PPC_NONE
>
--
Thanks and Regards
R.Nageswara Sastry
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 53+ messages in thread
* [PATCH v5 17/24] powerpc/vdso: Enable the vdsocheck tool
2026-09-08 6:33 [PATCH v5 00/24] vdso: Reject absolute relocations during build Thomas Weißschuh
` (15 preceding siblings ...)
2026-09-08 6:33 ` [PATCH v5 16/24] powerpc/elf: Add 32-bit REL16 relocation definitions Thomas Weißschuh
@ 2026-09-08 6:33 ` Thomas Weißschuh
2026-09-08 14:02 ` R Nageswara Sastry
2026-09-08 14:41 ` Christophe Leroy (CS GROUP)
2026-09-08 6:33 ` [PATCH v5 18/24] riscv: vdso: " Thomas Weißschuh
` (6 subsequent siblings)
23 siblings, 2 replies; 53+ messages in thread
From: Thomas Weißschuh @ 2026-09-08 6:33 UTC (permalink / raw)
To: Paul Walmsley, Palmer Dabbelt, Albert Ou, Alexandre Ghiti,
Nathan Chancellor, Nick Desaulniers, Bill Wendling, Justin Stitt,
Andy Lutomirski, Vincenzo Frascino, Kees Cook, Ingo Molnar,
Borislav Petkov, Dave Hansen, x86, H. Peter Anvin,
Richard Weinberger, Anton Ivanov, Johannes Berg, Russell King,
Catalin Marinas, Will Deacon, Madhavan Srinivasan,
Michael Ellerman, Nicholas Piggin, Huacai Chen, WANG Xuerui,
Heiko Carstens, Vasily Gorbik, Alexander Gordeev,
Christian Borntraeger, Sven Schnelle, Thomas Bogendoerfer,
Miguel Ojeda, Alex Gaynor, Gary Guo, Björn Roy Baron,
Benno Lossin, Andreas Hindborg, Alice Ryhl, Trevor Gross,
Danilo Krummrich, Thomas Gleixner, Christophe Leroy, Boqun Feng,
Nicolas Schier
Cc: linux-riscv, linux-kernel, llvm, linux-mm, linux-um,
linux-arm-kernel, linuxppc-dev, loongarch, linux-s390, linux-mips,
rust-for-linux, linux-kbuild, Jan Stancek,
Arnaldo Carvalho de Melo, Alexandre Ghiti, Thomas Weißschuh
The vdsocheck tool validates the object files and final .so library.
It can detect if the compiler created relocations which are incompatible
with the vDSO which need to be worked around.
Wire it up for the architecture.
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
---
arch/powerpc/Kconfig | 1 +
arch/powerpc/kernel/vdso/Makefile | 4 ++--
lib/vdso/check/vdsocheck.rs | 27 +++++++++++++++++++++++++++
3 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 2580e27e4328..f19e225cfc5c 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -330,6 +330,7 @@ config PPC
select SYSCTL_EXCEPTION_TRACE
select THREAD_INFO_IN_TASK
select TRACE_IRQFLAGS_SUPPORT
+ select VDSO_CHECK
select VDSO_DATASTORE
select VDSO_GETRANDOM
#
diff --git a/arch/powerpc/kernel/vdso/Makefile b/arch/powerpc/kernel/vdso/Makefile
index 368759f81708..ca20b91b4373 100644
--- a/arch/powerpc/kernel/vdso/Makefile
+++ b/arch/powerpc/kernel/vdso/Makefile
@@ -81,9 +81,9 @@ targets += vdso64.lds
CPPFLAGS_vdso64.lds += -P -C
# link rule for the .so file, .lds has to be first
-$(obj)/vdso32.so.dbg: $(obj)/vdso32.lds $(obj-vdso32) $(obj)/vgettimeofday-32.o $(obj)/vgetrandom-32.o $(obj)/crtsavres-32.o FORCE
+$(obj)/vdso32.so.dbg: $(obj)/vdso32.lds $(obj-vdso32) $(obj)/vgettimeofday-32.o $(obj)/vgetrandom-32.o $(obj)/crtsavres-32.o $(vdsocheck) FORCE
$(call if_changed,vdso32ld_and_check)
-$(obj)/vdso64.so.dbg: $(obj)/vdso64.lds $(obj-vdso64) $(obj)/vgettimeofday-64.o $(obj)/vgetrandom-64.o FORCE
+$(obj)/vdso64.so.dbg: $(obj)/vdso64.lds $(obj-vdso64) $(obj)/vgettimeofday-64.o $(obj)/vgetrandom-64.o $(vdsocheck) FORCE
$(call if_changed,vdso64ld_and_check)
# assembly rules for the .S files
diff --git a/lib/vdso/check/vdsocheck.rs b/lib/vdso/check/vdsocheck.rs
index e45a1fbc6829..429bdcd65818 100644
--- a/lib/vdso/check/vdsocheck.rs
+++ b/lib/vdso/check/vdsocheck.rs
@@ -69,6 +69,33 @@ fn allowed_relocations_for_machine(machine: u16) -> Option<AllowedRelocations<'s
..Default::default()
}
.into(),
+ bindings::EM_PPC => AllowedRelocations {
+ in_object_file: &[
+ bindings::R_PPC_REL24,
+ bindings::R_PPC_REL14,
+ bindings::R_PPC_REL32,
+ bindings::R_PPC_REL16,
+ bindings::R_PPC_REL16_LO,
+ bindings::R_PPC_REL16_HI,
+ bindings::R_PPC_REL16_HA,
+ ],
+ ..Default::default()
+ }
+ .into(),
+ bindings::EM_PPC64 => AllowedRelocations {
+ in_object_file: &[
+ bindings::R_PPC64_REL24,
+ bindings::R_PPC64_REL14,
+ bindings::R_PPC64_REL32,
+ bindings::R_PPC64_REL64,
+ bindings::R_PPC64_REL16,
+ bindings::R_PPC64_REL16_LO,
+ bindings::R_PPC64_REL16_HI,
+ bindings::R_PPC64_REL16_HA,
+ ],
+ ..Default::default()
+ }
+ .into(),
_ => None,
}
}
--
2.55.0
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 53+ messages in thread* Re: [PATCH v5 17/24] powerpc/vdso: Enable the vdsocheck tool
2026-09-08 6:33 ` [PATCH v5 17/24] powerpc/vdso: Enable the vdsocheck tool Thomas Weißschuh
@ 2026-09-08 14:02 ` R Nageswara Sastry
2026-09-08 14:41 ` Christophe Leroy (CS GROUP)
1 sibling, 0 replies; 53+ messages in thread
From: R Nageswara Sastry @ 2026-09-08 14:02 UTC (permalink / raw)
To: Thomas Weißschuh, Paul Walmsley, Palmer Dabbelt, Albert Ou,
Alexandre Ghiti, Nathan Chancellor, Nick Desaulniers,
Bill Wendling, Justin Stitt, Andy Lutomirski, Vincenzo Frascino,
Kees Cook, Ingo Molnar, Borislav Petkov, Dave Hansen, x86,
H. Peter Anvin, Richard Weinberger, Anton Ivanov, Johannes Berg,
Russell King, Catalin Marinas, Will Deacon, Madhavan Srinivasan,
Michael Ellerman, Nicholas Piggin, Huacai Chen, WANG Xuerui,
Heiko Carstens, Vasily Gorbik, Alexander Gordeev,
Christian Borntraeger, Sven Schnelle, Thomas Bogendoerfer,
Miguel Ojeda, Alex Gaynor, Gary Guo, Björn Roy Baron,
Benno Lossin, Andreas Hindborg, Alice Ryhl, Trevor Gross,
Danilo Krummrich, Thomas Gleixner, Christophe Leroy, Boqun Feng,
Nicolas Schier
Cc: linux-riscv, linux-kernel, llvm, linux-mm, linux-um,
linux-arm-kernel, linuxppc-dev, loongarch, linux-s390, linux-mips,
rust-for-linux, linux-kbuild, Jan Stancek,
Arnaldo Carvalho de Melo, Alexandre Ghiti
On 08.09.2026 12:03 PM, Thomas Weißschuh wrote:
> The vdsocheck tool validates the object files and final .so library.
> It can detect if the compiler created relocations which are incompatible
> with the vDSO which need to be worked around.
>
> Wire it up for the architecture.
>
> Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Tested-by: R Nageswara Sastry <rnsastry@linux.ibm.com>
System: ppc64le LPAR (IBM POWER), Linux 7.3-rc2
> ---
> arch/powerpc/Kconfig | 1 +
> arch/powerpc/kernel/vdso/Makefile | 4 ++--
> lib/vdso/check/vdsocheck.rs | 27 +++++++++++++++++++++++++++
> 3 files changed, 30 insertions(+), 2 deletions(-)
>
> diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
> index 2580e27e4328..f19e225cfc5c 100644
> --- a/arch/powerpc/Kconfig
> +++ b/arch/powerpc/Kconfig
> @@ -330,6 +330,7 @@ config PPC
> select SYSCTL_EXCEPTION_TRACE
> select THREAD_INFO_IN_TASK
> select TRACE_IRQFLAGS_SUPPORT
> + select VDSO_CHECK
> select VDSO_DATASTORE
> select VDSO_GETRANDOM
> #
> diff --git a/arch/powerpc/kernel/vdso/Makefile b/arch/powerpc/kernel/vdso/Makefile
> index 368759f81708..ca20b91b4373 100644
> --- a/arch/powerpc/kernel/vdso/Makefile
> +++ b/arch/powerpc/kernel/vdso/Makefile
> @@ -81,9 +81,9 @@ targets += vdso64.lds
> CPPFLAGS_vdso64.lds += -P -C
>
> # link rule for the .so file, .lds has to be first
> -$(obj)/vdso32.so.dbg: $(obj)/vdso32.lds $(obj-vdso32) $(obj)/vgettimeofday-32.o $(obj)/vgetrandom-32.o $(obj)/crtsavres-32.o FORCE
> +$(obj)/vdso32.so.dbg: $(obj)/vdso32.lds $(obj-vdso32) $(obj)/vgettimeofday-32.o $(obj)/vgetrandom-32.o $(obj)/crtsavres-32.o $(vdsocheck) FORCE
> $(call if_changed,vdso32ld_and_check)
> -$(obj)/vdso64.so.dbg: $(obj)/vdso64.lds $(obj-vdso64) $(obj)/vgettimeofday-64.o $(obj)/vgetrandom-64.o FORCE
> +$(obj)/vdso64.so.dbg: $(obj)/vdso64.lds $(obj-vdso64) $(obj)/vgettimeofday-64.o $(obj)/vgetrandom-64.o $(vdsocheck) FORCE
> $(call if_changed,vdso64ld_and_check)
>
> # assembly rules for the .S files
> diff --git a/lib/vdso/check/vdsocheck.rs b/lib/vdso/check/vdsocheck.rs
> index e45a1fbc6829..429bdcd65818 100644
> --- a/lib/vdso/check/vdsocheck.rs
> +++ b/lib/vdso/check/vdsocheck.rs
> @@ -69,6 +69,33 @@ fn allowed_relocations_for_machine(machine: u16) -> Option<AllowedRelocations<'s
> ..Default::default()
> }
> .into(),
> + bindings::EM_PPC => AllowedRelocations {
> + in_object_file: &[
> + bindings::R_PPC_REL24,
> + bindings::R_PPC_REL14,
> + bindings::R_PPC_REL32,
> + bindings::R_PPC_REL16,
> + bindings::R_PPC_REL16_LO,
> + bindings::R_PPC_REL16_HI,
> + bindings::R_PPC_REL16_HA,
> + ],
> + ..Default::default()
> + }
> + .into(),
> + bindings::EM_PPC64 => AllowedRelocations {
> + in_object_file: &[
> + bindings::R_PPC64_REL24,
> + bindings::R_PPC64_REL14,
> + bindings::R_PPC64_REL32,
> + bindings::R_PPC64_REL64,
> + bindings::R_PPC64_REL16,
> + bindings::R_PPC64_REL16_LO,
> + bindings::R_PPC64_REL16_HI,
> + bindings::R_PPC64_REL16_HA,
> + ],
> + ..Default::default()
> + }
> + .into(),
> _ => None,
> }
> }
>
--
Thanks and Regards
R.Nageswara Sastry
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 53+ messages in thread* Re: [PATCH v5 17/24] powerpc/vdso: Enable the vdsocheck tool
2026-09-08 6:33 ` [PATCH v5 17/24] powerpc/vdso: Enable the vdsocheck tool Thomas Weißschuh
2026-09-08 14:02 ` R Nageswara Sastry
@ 2026-09-08 14:41 ` Christophe Leroy (CS GROUP)
2026-09-09 6:09 ` Thomas Weißschuh
1 sibling, 1 reply; 53+ messages in thread
From: Christophe Leroy (CS GROUP) @ 2026-09-08 14:41 UTC (permalink / raw)
To: Thomas Weißschuh, Paul Walmsley, Palmer Dabbelt, Albert Ou,
Alexandre Ghiti, Nathan Chancellor, Nick Desaulniers,
Bill Wendling, Justin Stitt, Andy Lutomirski, Vincenzo Frascino,
Kees Cook, Ingo Molnar, Borislav Petkov, Dave Hansen, x86,
H. Peter Anvin, Richard Weinberger, Anton Ivanov, Johannes Berg,
Russell King, Catalin Marinas, Will Deacon, Madhavan Srinivasan,
Michael Ellerman, Nicholas Piggin, Huacai Chen, WANG Xuerui,
Heiko Carstens, Vasily Gorbik, Alexander Gordeev,
Christian Borntraeger, Sven Schnelle, Thomas Bogendoerfer,
Miguel Ojeda, Alex Gaynor, Gary Guo, Björn Roy Baron,
Benno Lossin, Andreas Hindborg, Alice Ryhl, Trevor Gross,
Danilo Krummrich, Thomas Gleixner, Boqun Feng, Nicolas Schier
Cc: linux-riscv, linux-kernel, llvm, linux-mm, linux-um,
linux-arm-kernel, linuxppc-dev, loongarch, linux-s390, linux-mips,
rust-for-linux, linux-kbuild, Jan Stancek,
Arnaldo Carvalho de Melo, Alexandre Ghiti
Le 08/09/2026 à 08:33, Thomas Weißschuh a écrit :
> The vdsocheck tool validates the object files and final .so library.
> It can detect if the compiler created relocations which are incompatible
> with the vDSO which need to be worked around.
>
> Wire it up for the architecture.
>
> Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
> ---
> arch/powerpc/Kconfig | 1 +
> arch/powerpc/kernel/vdso/Makefile | 4 ++--
> lib/vdso/check/vdsocheck.rs | 27 +++++++++++++++++++++++++++
> 3 files changed, 30 insertions(+), 2 deletions(-)
>
> diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
> index 2580e27e4328..f19e225cfc5c 100644
> --- a/arch/powerpc/Kconfig
> +++ b/arch/powerpc/Kconfig
> @@ -330,6 +330,7 @@ config PPC
> select SYSCTL_EXCEPTION_TRACE
> select THREAD_INFO_IN_TASK
> select TRACE_IRQFLAGS_SUPPORT
> + select VDSO_CHECK
> select VDSO_DATASTORE
> select VDSO_GETRANDOM
> #
> diff --git a/arch/powerpc/kernel/vdso/Makefile b/arch/powerpc/kernel/vdso/Makefile
> index 368759f81708..ca20b91b4373 100644
> --- a/arch/powerpc/kernel/vdso/Makefile
> +++ b/arch/powerpc/kernel/vdso/Makefile
> @@ -81,9 +81,9 @@ targets += vdso64.lds
> CPPFLAGS_vdso64.lds += -P -C
>
> # link rule for the .so file, .lds has to be first
> -$(obj)/vdso32.so.dbg: $(obj)/vdso32.lds $(obj-vdso32) $(obj)/vgettimeofday-32.o $(obj)/vgetrandom-32.o $(obj)/crtsavres-32.o FORCE
> +$(obj)/vdso32.so.dbg: $(obj)/vdso32.lds $(obj-vdso32) $(obj)/vgettimeofday-32.o $(obj)/vgetrandom-32.o $(obj)/crtsavres-32.o $(vdsocheck) FORCE
> $(call if_changed,vdso32ld_and_check)
> -$(obj)/vdso64.so.dbg: $(obj)/vdso64.lds $(obj-vdso64) $(obj)/vgettimeofday-64.o $(obj)/vgetrandom-64.o FORCE
> +$(obj)/vdso64.so.dbg: $(obj)/vdso64.lds $(obj-vdso64) $(obj)/vgettimeofday-64.o $(obj)/vgetrandom-64.o $(vdsocheck) FORCE
> $(call if_changed,vdso64ld_and_check)
>
> # assembly rules for the .S files
> diff --git a/lib/vdso/check/vdsocheck.rs b/lib/vdso/check/vdsocheck.rs
> index e45a1fbc6829..429bdcd65818 100644
> --- a/lib/vdso/check/vdsocheck.rs
> +++ b/lib/vdso/check/vdsocheck.rs
> @@ -69,6 +69,33 @@ fn allowed_relocations_for_machine(machine: u16) -> Option<AllowedRelocations<'s
> ..Default::default()
> }
> .into(),
> + bindings::EM_PPC => AllowedRelocations {
> + in_object_file: &[
> + bindings::R_PPC_REL24,
Not sure this is correct, see commit 42ed6d56ade2 ("powerpc/vdso: Block
R_PPC_REL24 relocations")
> + bindings::R_PPC_REL14,
> + bindings::R_PPC_REL32,
> + bindings::R_PPC_REL16,
> + bindings::R_PPC_REL16_LO,
> + bindings::R_PPC_REL16_HI,
> + bindings::R_PPC_REL16_HA,
> + ],
> + ..Default::default()
> + }
> + .into(),
> + bindings::EM_PPC64 => AllowedRelocations {
> + in_object_file: &[
> + bindings::R_PPC64_REL24,
Not sure this is correct, see commit 42ed6d56ade2 ("powerpc/vdso: Block
R_PPC_REL24 relocations")
> + bindings::R_PPC64_REL14,
> + bindings::R_PPC64_REL32,
> + bindings::R_PPC64_REL64,
> + bindings::R_PPC64_REL16,
> + bindings::R_PPC64_REL16_LO,
> + bindings::R_PPC64_REL16_HI,
> + bindings::R_PPC64_REL16_HA,
> + ],
> + ..Default::default()
> + }
> + .into(),
> _ => None,
> }
> }
>
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 53+ messages in thread* Re: [PATCH v5 17/24] powerpc/vdso: Enable the vdsocheck tool
2026-09-08 14:41 ` Christophe Leroy (CS GROUP)
@ 2026-09-09 6:09 ` Thomas Weißschuh
0 siblings, 0 replies; 53+ messages in thread
From: Thomas Weißschuh @ 2026-09-09 6:09 UTC (permalink / raw)
To: Christophe Leroy (CS GROUP)
Cc: Paul Walmsley, Palmer Dabbelt, Albert Ou, Alexandre Ghiti,
Nathan Chancellor, Nick Desaulniers, Bill Wendling, Justin Stitt,
Andy Lutomirski, Vincenzo Frascino, Kees Cook, Ingo Molnar,
Borislav Petkov, Dave Hansen, x86, H. Peter Anvin,
Richard Weinberger, Anton Ivanov, Johannes Berg, Russell King,
Catalin Marinas, Will Deacon, Madhavan Srinivasan,
Michael Ellerman, Nicholas Piggin, Huacai Chen, WANG Xuerui,
Heiko Carstens, Vasily Gorbik, Alexander Gordeev,
Christian Borntraeger, Sven Schnelle, Thomas Bogendoerfer,
Miguel Ojeda, Alex Gaynor, Gary Guo, Björn Roy Baron,
Benno Lossin, Andreas Hindborg, Alice Ryhl, Trevor Gross,
Danilo Krummrich, Thomas Gleixner, Boqun Feng, Nicolas Schier,
linux-riscv, linux-kernel, llvm, linux-mm, linux-um,
linux-arm-kernel, linuxppc-dev, loongarch, linux-s390, linux-mips,
rust-for-linux, linux-kbuild, Jan Stancek,
Arnaldo Carvalho de Melo, Alexandre Ghiti
On Tue, Sep 08, 2026 at 04:41:09PM +0200, Christophe Leroy (CS GROUP) wrote:
(...)
> > diff --git a/arch/powerpc/kernel/vdso/Makefile b/arch/powerpc/kernel/vdso/Makefile
> > index 368759f81708..ca20b91b4373 100644
> > --- a/arch/powerpc/kernel/vdso/Makefile
> > +++ b/arch/powerpc/kernel/vdso/Makefile
> > @@ -81,9 +81,9 @@ targets += vdso64.lds
> > CPPFLAGS_vdso64.lds += -P -C
> > # link rule for the .so file, .lds has to be first
> > -$(obj)/vdso32.so.dbg: $(obj)/vdso32.lds $(obj-vdso32) $(obj)/vgettimeofday-32.o $(obj)/vgetrandom-32.o $(obj)/crtsavres-32.o FORCE
> > +$(obj)/vdso32.so.dbg: $(obj)/vdso32.lds $(obj-vdso32) $(obj)/vgettimeofday-32.o $(obj)/vgetrandom-32.o $(obj)/crtsavres-32.o $(vdsocheck) FORCE
> > $(call if_changed,vdso32ld_and_check)
> > -$(obj)/vdso64.so.dbg: $(obj)/vdso64.lds $(obj-vdso64) $(obj)/vgettimeofday-64.o $(obj)/vgetrandom-64.o FORCE
> > +$(obj)/vdso64.so.dbg: $(obj)/vdso64.lds $(obj-vdso64) $(obj)/vgettimeofday-64.o $(obj)/vgetrandom-64.o $(vdsocheck) FORCE
> > $(call if_changed,vdso64ld_and_check)
> > # assembly rules for the .S files
> > diff --git a/lib/vdso/check/vdsocheck.rs b/lib/vdso/check/vdsocheck.rs
> > index e45a1fbc6829..429bdcd65818 100644
> > --- a/lib/vdso/check/vdsocheck.rs
> > +++ b/lib/vdso/check/vdsocheck.rs
> > @@ -69,6 +69,33 @@ fn allowed_relocations_for_machine(machine: u16) -> Option<AllowedRelocations<'s
> > ..Default::default()
> > }
> > .into(),
> > + bindings::EM_PPC => AllowedRelocations {
> > + in_object_file: &[
> > + bindings::R_PPC_REL24,
>
> Not sure this is correct, see commit 42ed6d56ade2 ("powerpc/vdso: Block
> R_PPC_REL24 relocations")
(...)
The mentioned commit prevents the relocation in the final vDSO,
while my patch allows it in the intermediate object files.
In the final vDSO no relocations are accepted whatsovever.
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 53+ messages in thread
* [PATCH v5 18/24] riscv: vdso: Enable the vdsocheck tool
2026-09-08 6:33 [PATCH v5 00/24] vdso: Reject absolute relocations during build Thomas Weißschuh
` (16 preceding siblings ...)
2026-09-08 6:33 ` [PATCH v5 17/24] powerpc/vdso: Enable the vdsocheck tool Thomas Weißschuh
@ 2026-09-08 6:33 ` Thomas Weißschuh
2026-09-08 6:33 ` [PATCH v5 19/24] LoongArch: vDSO: " Thomas Weißschuh
` (5 subsequent siblings)
23 siblings, 0 replies; 53+ messages in thread
From: Thomas Weißschuh @ 2026-09-08 6:33 UTC (permalink / raw)
To: Paul Walmsley, Palmer Dabbelt, Albert Ou, Alexandre Ghiti,
Nathan Chancellor, Nick Desaulniers, Bill Wendling, Justin Stitt,
Andy Lutomirski, Vincenzo Frascino, Kees Cook, Ingo Molnar,
Borislav Petkov, Dave Hansen, x86, H. Peter Anvin,
Richard Weinberger, Anton Ivanov, Johannes Berg, Russell King,
Catalin Marinas, Will Deacon, Madhavan Srinivasan,
Michael Ellerman, Nicholas Piggin, Huacai Chen, WANG Xuerui,
Heiko Carstens, Vasily Gorbik, Alexander Gordeev,
Christian Borntraeger, Sven Schnelle, Thomas Bogendoerfer,
Miguel Ojeda, Alex Gaynor, Gary Guo, Björn Roy Baron,
Benno Lossin, Andreas Hindborg, Alice Ryhl, Trevor Gross,
Danilo Krummrich, Thomas Gleixner, Christophe Leroy, Boqun Feng,
Nicolas Schier
Cc: linux-riscv, linux-kernel, llvm, linux-mm, linux-um,
linux-arm-kernel, linuxppc-dev, loongarch, linux-s390, linux-mips,
rust-for-linux, linux-kbuild, Jan Stancek,
Arnaldo Carvalho de Melo, Alexandre Ghiti, Thomas Weißschuh
The vdsocheck tool validates the object files and final .so library.
It can detect if the compiler created relocations which are incompatible
with the vDSO which need to be worked around.
Wire it up for the architecture.
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
---
arch/riscv/Kconfig | 1 +
arch/riscv/kernel/vdso/Makefile | 4 ++--
lib/vdso/check/vdsocheck.rs | 26 ++++++++++++++++++++++++++
3 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
index f8e26c4bed2b..f580d2afecf7 100644
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@ -229,6 +229,7 @@ config RISCV
select THREAD_INFO_IN_TASK
select TRACE_IRQFLAGS_SUPPORT
select UACCESS_MEMCPY if !MMU
+ select VDSO_CHECK if MMU
select VDSO_DATASTORE if MMU
select VDSO_GETRANDOM if MMU && 64BIT
select USER_STACKTRACE_SUPPORT
diff --git a/arch/riscv/kernel/vdso/Makefile b/arch/riscv/kernel/vdso/Makefile
index 8dbf2532a573..7e707fdff26c 100644
--- a/arch/riscv/kernel/vdso/Makefile
+++ b/arch/riscv/kernel/vdso/Makefile
@@ -74,7 +74,7 @@ endif
$(obj)/$(vdso_o): $(obj)/$(vdso_so)
# link rule for the .so file, .lds has to be first
-$(obj)/$(vdso_so_dbg): $(obj)/$(vdso_lds) $(obj-vdso) FORCE
+$(obj)/$(vdso_so_dbg): $(obj)/$(vdso_lds) $(obj-vdso) $(vdsocheck) FORCE
$(call if_changed,vdsold_and_check)
LDFLAGS_$(vdso_so_dbg) = -shared -soname=linux-vdso.so.1 \
--build-id=sha1 --eh-frame-hdr
@@ -96,7 +96,7 @@ include/generated/$(vdso_offsets): $(obj)/$(vdso_so_dbg) FORCE
# The DSO images are built using a special linker script
# Make sure only to export the intended __vdso_xxx symbol offsets.
quiet_cmd_vdsold_and_check = VDSOLD $@
- cmd_vdsold_and_check = $(LD) $(CFI_FULL) $(ld_flags) -T $(filter-out FORCE,$^) -o $@.tmp && \
+ cmd_vdsold_and_check = $(LD) $(CFI_FULL) $(ld_flags) -T $(filter-out FORCE $(vdsocheck),$^) -o $@.tmp && \
$(OBJCOPY) $(patsubst %, -G __vdso_%, $(vdso-syms)) $@.tmp $@ && \
rm $@.tmp && \
$(cmd_vdso_check)
diff --git a/lib/vdso/check/vdsocheck.rs b/lib/vdso/check/vdsocheck.rs
index 429bdcd65818..67562d21f877 100644
--- a/lib/vdso/check/vdsocheck.rs
+++ b/lib/vdso/check/vdsocheck.rs
@@ -96,6 +96,32 @@ fn allowed_relocations_for_machine(machine: u16) -> Option<AllowedRelocations<'s
..Default::default()
}
.into(),
+ bindings::EM_RISCV => AllowedRelocations {
+ in_object_file: &[
+ bindings::R_RISCV_BRANCH,
+ bindings::R_RISCV_JAL,
+ bindings::R_RISCV_CALL,
+ bindings::R_RISCV_CALL_PLT,
+ bindings::R_RISCV_PCREL_HI20,
+ bindings::R_RISCV_PCREL_LO12_I,
+ bindings::R_RISCV_PCREL_LO12_S,
+ bindings::R_RISCV_ADD8,
+ bindings::R_RISCV_ADD16,
+ bindings::R_RISCV_ADD32,
+ bindings::R_RISCV_ADD64,
+ bindings::R_RISCV_SUB8,
+ bindings::R_RISCV_SUB16,
+ bindings::R_RISCV_SUB32,
+ bindings::R_RISCV_SUB64,
+ bindings::R_RISCV_ALIGN,
+ bindings::R_RISCV_RVC_BRANCH,
+ bindings::R_RISCV_RVC_JUMP,
+ bindings::R_RISCV_RELAX,
+ bindings::R_RISCV_32_PCREL,
+ ],
+ ..Default::default()
+ }
+ .into(),
_ => None,
}
}
--
2.55.0
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH v5 19/24] LoongArch: vDSO: Enable the vdsocheck tool
2026-09-08 6:33 [PATCH v5 00/24] vdso: Reject absolute relocations during build Thomas Weißschuh
` (17 preceding siblings ...)
2026-09-08 6:33 ` [PATCH v5 18/24] riscv: vdso: " Thomas Weißschuh
@ 2026-09-08 6:33 ` Thomas Weißschuh
2026-09-08 6:33 ` [PATCH v5 20/24] s390/vdso: " Thomas Weißschuh
` (4 subsequent siblings)
23 siblings, 0 replies; 53+ messages in thread
From: Thomas Weißschuh @ 2026-09-08 6:33 UTC (permalink / raw)
To: Paul Walmsley, Palmer Dabbelt, Albert Ou, Alexandre Ghiti,
Nathan Chancellor, Nick Desaulniers, Bill Wendling, Justin Stitt,
Andy Lutomirski, Vincenzo Frascino, Kees Cook, Ingo Molnar,
Borislav Petkov, Dave Hansen, x86, H. Peter Anvin,
Richard Weinberger, Anton Ivanov, Johannes Berg, Russell King,
Catalin Marinas, Will Deacon, Madhavan Srinivasan,
Michael Ellerman, Nicholas Piggin, Huacai Chen, WANG Xuerui,
Heiko Carstens, Vasily Gorbik, Alexander Gordeev,
Christian Borntraeger, Sven Schnelle, Thomas Bogendoerfer,
Miguel Ojeda, Alex Gaynor, Gary Guo, Björn Roy Baron,
Benno Lossin, Andreas Hindborg, Alice Ryhl, Trevor Gross,
Danilo Krummrich, Thomas Gleixner, Christophe Leroy, Boqun Feng,
Nicolas Schier
Cc: linux-riscv, linux-kernel, llvm, linux-mm, linux-um,
linux-arm-kernel, linuxppc-dev, loongarch, linux-s390, linux-mips,
rust-for-linux, linux-kbuild, Jan Stancek,
Arnaldo Carvalho de Melo, Alexandre Ghiti, Thomas Weißschuh
The vdsocheck tool validates the object files and final .so library.
It can detect if the compiler created relocations which are incompatible
with the vDSO which need to be worked around.
Wire it up for the architecture.
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
---
arch/loongarch/Kconfig | 1 +
arch/loongarch/vdso/Makefile | 4 ++--
lib/vdso/check/vdsocheck.rs | 26 ++++++++++++++++++++++++++
3 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/arch/loongarch/Kconfig b/arch/loongarch/Kconfig
index a21f51e5815e..5dc98a4b9c7f 100644
--- a/arch/loongarch/Kconfig
+++ b/arch/loongarch/Kconfig
@@ -213,6 +213,7 @@ config LOONGARCH
select TRACE_IRQFLAGS_SUPPORT
select USE_PERCPU_NUMA_NODE_ID
select USER_STACKTRACE_SUPPORT
+ select VDSO_CHECK
select VDSO_DATASTORE
select VDSO_GETRANDOM
select ZONE_DMA32 if 64BIT
diff --git a/arch/loongarch/vdso/Makefile b/arch/loongarch/vdso/Makefile
index 9c9181bb4071..b0dc58328664 100644
--- a/arch/loongarch/vdso/Makefile
+++ b/arch/loongarch/vdso/Makefile
@@ -50,7 +50,7 @@ ldflags-y := -Bsymbolic --no-undefined -soname=linux-vdso.so.1 \
#
quiet_cmd_vdsold_and_vdso_check = LD $@
- cmd_vdsold_and_vdso_check = $(cmd_ld); $(cmd_vdso_check)
+ cmd_vdsold_and_vdso_check = $(cmd_ld_vdso); $(cmd_vdso_check)
quiet_cmd_vdsoas_o_S = AS $@
cmd_vdsoas_o_S = $(CC) $(a_flags) -c -o $@ $<
@@ -79,7 +79,7 @@ $(obj-vdso): KBUILD_AFLAGS := $(aflags-vdso) $(native-abi)
$(obj)/vdso.lds: KBUILD_CPPFLAGS := $(ccflags-vdso) $(native-abi)
-$(obj)/vdso.so.dbg: $(obj)/vdso.lds $(obj-vdso) FORCE
+$(obj)/vdso.so.dbg: $(obj)/vdso.lds $(obj-vdso) $(vdsocheck) FORCE
$(call if_changed,vdsold_and_vdso_check)
$(obj)/vdso.so: OBJCOPYFLAGS := -S
diff --git a/lib/vdso/check/vdsocheck.rs b/lib/vdso/check/vdsocheck.rs
index 67562d21f877..4aeb7094e552 100644
--- a/lib/vdso/check/vdsocheck.rs
+++ b/lib/vdso/check/vdsocheck.rs
@@ -122,6 +122,32 @@ fn allowed_relocations_for_machine(machine: u16) -> Option<AllowedRelocations<'s
..Default::default()
}
.into(),
+ bindings::EM_LOONGARCH => AllowedRelocations {
+ in_object_file: &[
+ bindings::R_LARCH_ADD8,
+ bindings::R_LARCH_ADD16,
+ bindings::R_LARCH_ADD24,
+ bindings::R_LARCH_ADD32,
+ bindings::R_LARCH_ADD64,
+ bindings::R_LARCH_SUB8,
+ bindings::R_LARCH_SUB16,
+ bindings::R_LARCH_SUB24,
+ bindings::R_LARCH_SUB32,
+ bindings::R_LARCH_SUB64,
+ bindings::R_LARCH_B16,
+ bindings::R_LARCH_B21,
+ bindings::R_LARCH_B26,
+ bindings::R_LARCH_PCALA_HI20,
+ bindings::R_LARCH_PCALA_LO12,
+ bindings::R_LARCH_PCALA64_LO20,
+ bindings::R_LARCH_PCALA64_HI12,
+ bindings::R_LARCH_32_PCREL,
+ bindings::R_LARCH_PCADD_HI20,
+ bindings::R_LARCH_PCADD_LO12,
+ ],
+ ..Default::default()
+ }
+ .into(),
_ => None,
}
}
--
2.55.0
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH v5 20/24] s390/vdso: Enable the vdsocheck tool
2026-09-08 6:33 [PATCH v5 00/24] vdso: Reject absolute relocations during build Thomas Weißschuh
` (18 preceding siblings ...)
2026-09-08 6:33 ` [PATCH v5 19/24] LoongArch: vDSO: " Thomas Weißschuh
@ 2026-09-08 6:33 ` Thomas Weißschuh
2026-09-08 6:33 ` [PATCH v5 21/24] MIPS: ELF: Add more PC-relative relocation definitions Thomas Weißschuh
` (3 subsequent siblings)
23 siblings, 0 replies; 53+ messages in thread
From: Thomas Weißschuh @ 2026-09-08 6:33 UTC (permalink / raw)
To: Paul Walmsley, Palmer Dabbelt, Albert Ou, Alexandre Ghiti,
Nathan Chancellor, Nick Desaulniers, Bill Wendling, Justin Stitt,
Andy Lutomirski, Vincenzo Frascino, Kees Cook, Ingo Molnar,
Borislav Petkov, Dave Hansen, x86, H. Peter Anvin,
Richard Weinberger, Anton Ivanov, Johannes Berg, Russell King,
Catalin Marinas, Will Deacon, Madhavan Srinivasan,
Michael Ellerman, Nicholas Piggin, Huacai Chen, WANG Xuerui,
Heiko Carstens, Vasily Gorbik, Alexander Gordeev,
Christian Borntraeger, Sven Schnelle, Thomas Bogendoerfer,
Miguel Ojeda, Alex Gaynor, Gary Guo, Björn Roy Baron,
Benno Lossin, Andreas Hindborg, Alice Ryhl, Trevor Gross,
Danilo Krummrich, Thomas Gleixner, Christophe Leroy, Boqun Feng,
Nicolas Schier
Cc: linux-riscv, linux-kernel, llvm, linux-mm, linux-um,
linux-arm-kernel, linuxppc-dev, loongarch, linux-s390, linux-mips,
rust-for-linux, linux-kbuild, Jan Stancek,
Arnaldo Carvalho de Melo, Alexandre Ghiti, Thomas Weißschuh
The vdsocheck tool validates the object files and final .so library.
It can detect if the compiler created relocations which are incompatible
with the vDSO which need to be worked around.
Wire it up for the architecture.
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
---
arch/s390/Kconfig | 1 +
arch/s390/kernel/vdso/Makefile | 4 ++--
lib/vdso/check/vdsocheck.rs | 9 +++++++++
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 4b51bc6e8948..bc12367a7b00 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -291,6 +291,7 @@ config S390
select TRACE_IRQFLAGS_SUPPORT
select TTY
select USER_STACKTRACE_SUPPORT
+ select VDSO_CHECK
select VDSO_GETRANDOM
select VIRT_CPU_ACCOUNTING
select VMAP_STACK
diff --git a/arch/s390/kernel/vdso/Makefile b/arch/s390/kernel/vdso/Makefile
index 35c834b895ec..509ef3f1e2eb 100644
--- a/arch/s390/kernel/vdso/Makefile
+++ b/arch/s390/kernel/vdso/Makefile
@@ -44,10 +44,10 @@ CPPFLAGS_vdso.lds += -P -C -U$(ARCH)
$(obj)/vdso_wrapper.o : $(obj)/vdso.so
quiet_cmd_vdso_and_check = VDSO $@
- cmd_vdso_and_check = $(cmd_ld); $(cmd_vdso_check)
+ cmd_vdso_and_check = $(cmd_ld_vdso); $(cmd_vdso_check)
# link rule for the .so file, .lds has to be first
-$(obj)/vdso.so.dbg: $(obj)/vdso.lds $(obj-vdso) $(obj-cvdso) FORCE
+$(obj)/vdso.so.dbg: $(obj)/vdso.lds $(obj-vdso) $(obj-cvdso) $(vdsocheck) FORCE
$(call if_changed,vdso_and_check)
# strip rule for the .so file
diff --git a/lib/vdso/check/vdsocheck.rs b/lib/vdso/check/vdsocheck.rs
index 4aeb7094e552..b2135cf9add3 100644
--- a/lib/vdso/check/vdsocheck.rs
+++ b/lib/vdso/check/vdsocheck.rs
@@ -148,6 +148,15 @@ fn allowed_relocations_for_machine(machine: u16) -> Option<AllowedRelocations<'s
..Default::default()
}
.into(),
+ bindings::EM_S390 => AllowedRelocations {
+ in_object_file: &[
+ bindings::R_390_PC32,
+ bindings::R_390_PC32DBL,
+ bindings::R_390_PLT32DBL,
+ ],
+ ..Default::default()
+ }
+ .into(),
_ => None,
}
}
--
2.55.0
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH v5 21/24] MIPS: ELF: Add more PC-relative relocation definitions
2026-09-08 6:33 [PATCH v5 00/24] vdso: Reject absolute relocations during build Thomas Weißschuh
` (19 preceding siblings ...)
2026-09-08 6:33 ` [PATCH v5 20/24] s390/vdso: " Thomas Weißschuh
@ 2026-09-08 6:33 ` Thomas Weißschuh
2026-09-08 6:33 ` [PATCH v5 22/24] MIPS: vdso: Enable the vdsocheck tool Thomas Weißschuh
` (2 subsequent siblings)
23 siblings, 0 replies; 53+ messages in thread
From: Thomas Weißschuh @ 2026-09-08 6:33 UTC (permalink / raw)
To: Paul Walmsley, Palmer Dabbelt, Albert Ou, Alexandre Ghiti,
Nathan Chancellor, Nick Desaulniers, Bill Wendling, Justin Stitt,
Andy Lutomirski, Vincenzo Frascino, Kees Cook, Ingo Molnar,
Borislav Petkov, Dave Hansen, x86, H. Peter Anvin,
Richard Weinberger, Anton Ivanov, Johannes Berg, Russell King,
Catalin Marinas, Will Deacon, Madhavan Srinivasan,
Michael Ellerman, Nicholas Piggin, Huacai Chen, WANG Xuerui,
Heiko Carstens, Vasily Gorbik, Alexander Gordeev,
Christian Borntraeger, Sven Schnelle, Thomas Bogendoerfer,
Miguel Ojeda, Alex Gaynor, Gary Guo, Björn Roy Baron,
Benno Lossin, Andreas Hindborg, Alice Ryhl, Trevor Gross,
Danilo Krummrich, Thomas Gleixner, Christophe Leroy, Boqun Feng,
Nicolas Schier
Cc: linux-riscv, linux-kernel, llvm, linux-mm, linux-um,
linux-arm-kernel, linuxppc-dev, loongarch, linux-s390, linux-mips,
rust-for-linux, linux-kbuild, Jan Stancek,
Arnaldo Carvalho de Melo, Alexandre Ghiti, Thomas Weißschuh
These are used by userspace and are necessary for the vdsocheck tool.
Also update the copy in tools/ so they can be used by vdsocheck.
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
---
include/uapi/linux/elf-r.h | 4 ++++
tools/include/uapi/linux/elf-r.h | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/include/uapi/linux/elf-r.h b/include/uapi/linux/elf-r.h
index 170888422400..a6a4d7643c5d 100644
--- a/include/uapi/linux/elf-r.h
+++ b/include/uapi/linux/elf-r.h
@@ -646,6 +646,10 @@
*/
#define R_MIPS_PC21_S2 60
#define R_MIPS_PC26_S2 61
+#define R_MIPS_PC18_S3 62
+#define R_MIPS_PC19_S2 63
+#define R_MIPS_PCHI16 64
+#define R_MIPS_PCLO16 65
/*
* This range is reserved for vendor specific relocations.
*/
diff --git a/tools/include/uapi/linux/elf-r.h b/tools/include/uapi/linux/elf-r.h
index 170888422400..a6a4d7643c5d 100644
--- a/tools/include/uapi/linux/elf-r.h
+++ b/tools/include/uapi/linux/elf-r.h
@@ -646,6 +646,10 @@
*/
#define R_MIPS_PC21_S2 60
#define R_MIPS_PC26_S2 61
+#define R_MIPS_PC18_S3 62
+#define R_MIPS_PC19_S2 63
+#define R_MIPS_PCHI16 64
+#define R_MIPS_PCLO16 65
/*
* This range is reserved for vendor specific relocations.
*/
--
2.55.0
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH v5 22/24] MIPS: vdso: Enable the vdsocheck tool
2026-09-08 6:33 [PATCH v5 00/24] vdso: Reject absolute relocations during build Thomas Weißschuh
` (20 preceding siblings ...)
2026-09-08 6:33 ` [PATCH v5 21/24] MIPS: ELF: Add more PC-relative relocation definitions Thomas Weißschuh
@ 2026-09-08 6:33 ` Thomas Weißschuh
2026-09-08 6:33 ` [PATCH v5 23/24] sparc: " Thomas Weißschuh
2026-09-08 6:33 ` [PATCH v5 24/24] vDSO: Automatically enable VDSO_CHECK Thomas Weißschuh
23 siblings, 0 replies; 53+ messages in thread
From: Thomas Weißschuh @ 2026-09-08 6:33 UTC (permalink / raw)
To: Paul Walmsley, Palmer Dabbelt, Albert Ou, Alexandre Ghiti,
Nathan Chancellor, Nick Desaulniers, Bill Wendling, Justin Stitt,
Andy Lutomirski, Vincenzo Frascino, Kees Cook, Ingo Molnar,
Borislav Petkov, Dave Hansen, x86, H. Peter Anvin,
Richard Weinberger, Anton Ivanov, Johannes Berg, Russell King,
Catalin Marinas, Will Deacon, Madhavan Srinivasan,
Michael Ellerman, Nicholas Piggin, Huacai Chen, WANG Xuerui,
Heiko Carstens, Vasily Gorbik, Alexander Gordeev,
Christian Borntraeger, Sven Schnelle, Thomas Bogendoerfer,
Miguel Ojeda, Alex Gaynor, Gary Guo, Björn Roy Baron,
Benno Lossin, Andreas Hindborg, Alice Ryhl, Trevor Gross,
Danilo Krummrich, Thomas Gleixner, Christophe Leroy, Boqun Feng,
Nicolas Schier
Cc: linux-riscv, linux-kernel, llvm, linux-mm, linux-um,
linux-arm-kernel, linuxppc-dev, loongarch, linux-s390, linux-mips,
rust-for-linux, linux-kbuild, Jan Stancek,
Arnaldo Carvalho de Melo, Alexandre Ghiti, Thomas Weißschuh
The vdsocheck tool validates the object files and final .so library.
It can detect if the compiler created relocations which are incompatible
with the vDSO which need to be worked around.
Wire it up for the architecture.
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
---
arch/mips/Kconfig | 1 +
arch/mips/vdso/Makefile | 8 ++++----
lib/vdso/check/vdsocheck.rs | 15 +++++++++++++++
3 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index e2eb9627bd14..9a3ce550c95d 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -107,6 +107,7 @@ config MIPS
select TRACE_IRQFLAGS_SUPPORT
select ARCH_HAS_ELFCORE_COMPAT
select HAVE_ARCH_KCSAN if 64BIT
+ select VDSO_CHECK
config MIPS_FIXUP_BIGPHYS_ADDR
bool
diff --git a/arch/mips/vdso/Makefile b/arch/mips/vdso/Makefile
index 00d3ba2c482a..63060057cd21 100644
--- a/arch/mips/vdso/Makefile
+++ b/arch/mips/vdso/Makefile
@@ -66,7 +66,7 @@ quiet_cmd_vdso_mips_check = VDSOCHK $@
#
quiet_cmd_vdsold_and_vdso_check = LD $@
- cmd_vdsold_and_vdso_check = $(cmd_ld); $(cmd_vdso_check); $(cmd_vdso_mips_check)
+ cmd_vdsold_and_vdso_check = $(cmd_ld_vdso); $(cmd_vdso_check); $(cmd_vdso_mips_check)
quiet_cmd_vdsoas_o_S = AS $@
cmd_vdsoas_o_S = $(CC) $(a_flags) -c -o $@ $<
@@ -103,7 +103,7 @@ $(obj-vdso): KBUILD_AFLAGS := $(aflags-vdso) $(native-abi)
$(obj)/vdso.lds: KBUILD_CPPFLAGS := $(ccflags-vdso) $(native-abi)
-$(obj)/vdso.so.dbg.raw: $(obj)/vdso.lds $(obj-vdso) FORCE
+$(obj)/vdso.so.dbg.raw: $(obj)/vdso.lds $(obj-vdso) $(vdsocheck) FORCE
$(call if_changed,vdsold_and_vdso_check)
$(obj)/vdso-image.c: $(obj)/vdso.so.dbg.raw $(obj)/vdso.so.raw \
@@ -141,7 +141,7 @@ $(obj)/vdso-o32.lds: KBUILD_CPPFLAGS := $(ccflags-vdso) -mabi=32
$(obj)/vdso-o32.lds: $(src)/vdso.lds.S FORCE
$(call if_changed_dep,cpp_lds_S)
-$(obj)/vdso-o32.so.dbg.raw: $(obj)/vdso-o32.lds $(obj-vdso-o32) FORCE
+$(obj)/vdso-o32.so.dbg.raw: $(obj)/vdso-o32.lds $(obj-vdso-o32) $(vdsocheck) FORCE
$(call if_changed,vdsold_and_vdso_check)
$(obj)/vdso-o32-image.c: VDSO_NAME := o32
@@ -181,7 +181,7 @@ $(obj)/vdso-n32.lds: KBUILD_CPPFLAGS := $(ccflags-vdso) -mabi=n32
$(obj)/vdso-n32.lds: $(src)/vdso.lds.S FORCE
$(call if_changed_dep,cpp_lds_S)
-$(obj)/vdso-n32.so.dbg.raw: $(obj)/vdso-n32.lds $(obj-vdso-n32) FORCE
+$(obj)/vdso-n32.so.dbg.raw: $(obj)/vdso-n32.lds $(obj-vdso-n32) $(vdsocheck) FORCE
$(call if_changed,vdsold_and_vdso_check)
$(obj)/vdso-n32-image.c: VDSO_NAME := n32
diff --git a/lib/vdso/check/vdsocheck.rs b/lib/vdso/check/vdsocheck.rs
index b2135cf9add3..865e8cf7d4e1 100644
--- a/lib/vdso/check/vdsocheck.rs
+++ b/lib/vdso/check/vdsocheck.rs
@@ -157,6 +157,21 @@ fn allowed_relocations_for_machine(machine: u16) -> Option<AllowedRelocations<'s
..Default::default()
}
.into(),
+ bindings::EM_MIPS => AllowedRelocations {
+ ignored_object_file_sections: &[".rel.pdr", ".rela.pdr"],
+ in_object_file: &[
+ bindings::R_MIPS_PC16,
+ bindings::R_MIPS_PC21_S2,
+ bindings::R_MIPS_PC26_S2,
+ bindings::R_MIPS_PC18_S3,
+ bindings::R_MIPS_PC19_S2,
+ bindings::R_MIPS_PCHI16,
+ bindings::R_MIPS_PCLO16,
+ bindings::R_MIPS_PC32,
+ ],
+ ..Default::default()
+ }
+ .into(),
_ => None,
}
}
--
2.55.0
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH v5 23/24] sparc: vdso: Enable the vdsocheck tool
2026-09-08 6:33 [PATCH v5 00/24] vdso: Reject absolute relocations during build Thomas Weißschuh
` (21 preceding siblings ...)
2026-09-08 6:33 ` [PATCH v5 22/24] MIPS: vdso: Enable the vdsocheck tool Thomas Weißschuh
@ 2026-09-08 6:33 ` Thomas Weißschuh
2026-09-08 6:33 ` [PATCH v5 24/24] vDSO: Automatically enable VDSO_CHECK Thomas Weißschuh
23 siblings, 0 replies; 53+ messages in thread
From: Thomas Weißschuh @ 2026-09-08 6:33 UTC (permalink / raw)
To: Paul Walmsley, Palmer Dabbelt, Albert Ou, Alexandre Ghiti,
Nathan Chancellor, Nick Desaulniers, Bill Wendling, Justin Stitt,
Andy Lutomirski, Vincenzo Frascino, Kees Cook, Ingo Molnar,
Borislav Petkov, Dave Hansen, x86, H. Peter Anvin,
Richard Weinberger, Anton Ivanov, Johannes Berg, Russell King,
Catalin Marinas, Will Deacon, Madhavan Srinivasan,
Michael Ellerman, Nicholas Piggin, Huacai Chen, WANG Xuerui,
Heiko Carstens, Vasily Gorbik, Alexander Gordeev,
Christian Borntraeger, Sven Schnelle, Thomas Bogendoerfer,
Miguel Ojeda, Alex Gaynor, Gary Guo, Björn Roy Baron,
Benno Lossin, Andreas Hindborg, Alice Ryhl, Trevor Gross,
Danilo Krummrich, Thomas Gleixner, Christophe Leroy, Boqun Feng,
Nicolas Schier
Cc: linux-riscv, linux-kernel, llvm, linux-mm, linux-um,
linux-arm-kernel, linuxppc-dev, loongarch, linux-s390, linux-mips,
rust-for-linux, linux-kbuild, Jan Stancek,
Arnaldo Carvalho de Melo, Alexandre Ghiti, Thomas Weißschuh
The vdsocheck tool validates the object files and final .so library.
It can detect if the compiler created relocations which are incompatible
with the vDSO which need to be worked around.
Wire it up for the architecture.
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
---
arch/sparc/Kconfig | 1 +
arch/sparc/vdso/Makefile | 5 +++--
lib/vdso/check/vdsocheck.rs | 7 +++++++
3 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index ab77d3f2536e..628bdfc2f088 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -114,6 +114,7 @@ config SPARC64
select ARCH_SUPPORTS_SCHED_SMT if SMP
select ARCH_SUPPORTS_SCHED_MC if SMP
select ARCH_HAS_LAZY_MMU_MODE
+ select VDSO_CHECK
select GENERIC_GETTIMEOFDAY
config ARCH_PROC_KCORE_TEXT
diff --git a/arch/sparc/vdso/Makefile b/arch/sparc/vdso/Makefile
index 83fb2aca59cb..8bb235c3a618 100644
--- a/arch/sparc/vdso/Makefile
+++ b/arch/sparc/vdso/Makefile
@@ -28,7 +28,7 @@ CPPFLAGS_vdso.lds += -P -C
VDSO_LDFLAGS_vdso.lds = -m elf64_sparc -soname linux-vdso.so.1 \
-z max-page-size=8192
-$(obj)/vdso64.so.dbg: $(obj)/vdso.lds $(vobjs) FORCE
+$(obj)/vdso64.so.dbg: $(obj)/vdso.lds $(vobjs) $(vdsocheck) FORCE
$(call if_changed,vdso)
HOST_EXTRACFLAGS += -I$(srctree)/tools/include
@@ -99,7 +99,8 @@ $(obj)/vdso32.so.dbg: CHECKFLAGS = $(CHECKFLAGS_32)
$(obj)/vdso32.so.dbg: FORCE \
$(obj)/vdso32/vdso32.lds \
$(obj)/vdso32/vclock_gettime.o \
- $(obj)/vdso32/vdso-note.o
+ $(obj)/vdso32/vdso-note.o \
+ $(vdsocheck)
$(call if_changed,vdso)
#
diff --git a/lib/vdso/check/vdsocheck.rs b/lib/vdso/check/vdsocheck.rs
index 865e8cf7d4e1..0d3b47bf57e1 100644
--- a/lib/vdso/check/vdsocheck.rs
+++ b/lib/vdso/check/vdsocheck.rs
@@ -172,6 +172,13 @@ fn allowed_relocations_for_machine(machine: u16) -> Option<AllowedRelocations<'s
..Default::default()
}
.into(),
+ bindings::EM_SPARC | bindings::EM_SPARC32PLUS | bindings::EM_SPARCV9 => {
+ AllowedRelocations {
+ in_object_file: &[bindings::R_SPARC_DISP32],
+ ..Default::default()
+ }
+ .into()
+ }
_ => None,
}
}
--
2.55.0
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 53+ messages in thread* [PATCH v5 24/24] vDSO: Automatically enable VDSO_CHECK
2026-09-08 6:33 [PATCH v5 00/24] vdso: Reject absolute relocations during build Thomas Weißschuh
` (22 preceding siblings ...)
2026-09-08 6:33 ` [PATCH v5 23/24] sparc: " Thomas Weißschuh
@ 2026-09-08 6:33 ` Thomas Weißschuh
23 siblings, 0 replies; 53+ messages in thread
From: Thomas Weißschuh @ 2026-09-08 6:33 UTC (permalink / raw)
To: Paul Walmsley, Palmer Dabbelt, Albert Ou, Alexandre Ghiti,
Nathan Chancellor, Nick Desaulniers, Bill Wendling, Justin Stitt,
Andy Lutomirski, Vincenzo Frascino, Kees Cook, Ingo Molnar,
Borislav Petkov, Dave Hansen, x86, H. Peter Anvin,
Richard Weinberger, Anton Ivanov, Johannes Berg, Russell King,
Catalin Marinas, Will Deacon, Madhavan Srinivasan,
Michael Ellerman, Nicholas Piggin, Huacai Chen, WANG Xuerui,
Heiko Carstens, Vasily Gorbik, Alexander Gordeev,
Christian Borntraeger, Sven Schnelle, Thomas Bogendoerfer,
Miguel Ojeda, Alex Gaynor, Gary Guo, Björn Roy Baron,
Benno Lossin, Andreas Hindborg, Alice Ryhl, Trevor Gross,
Danilo Krummrich, Thomas Gleixner, Christophe Leroy, Boqun Feng,
Nicolas Schier
Cc: linux-riscv, linux-kernel, llvm, linux-mm, linux-um,
linux-arm-kernel, linuxppc-dev, loongarch, linux-s390, linux-mips,
rust-for-linux, linux-kbuild, Jan Stancek,
Arnaldo Carvalho de Melo, Alexandre Ghiti, Thomas Weißschuh
All architectures using the generic vDSO library should enable
VDSO_CHECK. Now that this is the case, enable VDSO_CHECK automatically.
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
---
arch/arm/mm/Kconfig | 1 -
arch/arm64/Kconfig | 1 -
arch/loongarch/Kconfig | 1 -
arch/mips/Kconfig | 1 -
arch/powerpc/Kconfig | 1 -
arch/riscv/Kconfig | 1 -
arch/s390/Kconfig | 1 -
arch/sparc/Kconfig | 1 -
arch/x86/Kconfig | 1 -
lib/vdso/Kconfig | 2 ++
10 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index 565988a66e98..6574659dfb61 100644
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -950,7 +950,6 @@ config VDSO
depends on AEABI && MMU && CPU_V7
default y if ARM_ARCH_TIMER
select GENERIC_GETTIMEOFDAY
- select VDSO_CHECK
help
Place in the process address space an ELF shared object
providing fast implementations of gettimeofday and
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 1caaf4737f02..b5a51b0ef944 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -258,7 +258,6 @@ config ARM64
select TRACE_IRQFLAGS_NMI_SUPPORT
select HAVE_SOFTIRQ_ON_OWN_STACK
select USER_STACKTRACE_SUPPORT
- select VDSO_CHECK
select VDSO_GETRANDOM
select VMAP_STACK
help
diff --git a/arch/loongarch/Kconfig b/arch/loongarch/Kconfig
index 5dc98a4b9c7f..a21f51e5815e 100644
--- a/arch/loongarch/Kconfig
+++ b/arch/loongarch/Kconfig
@@ -213,7 +213,6 @@ config LOONGARCH
select TRACE_IRQFLAGS_SUPPORT
select USE_PERCPU_NUMA_NODE_ID
select USER_STACKTRACE_SUPPORT
- select VDSO_CHECK
select VDSO_DATASTORE
select VDSO_GETRANDOM
select ZONE_DMA32 if 64BIT
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 9a3ce550c95d..e2eb9627bd14 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -107,7 +107,6 @@ config MIPS
select TRACE_IRQFLAGS_SUPPORT
select ARCH_HAS_ELFCORE_COMPAT
select HAVE_ARCH_KCSAN if 64BIT
- select VDSO_CHECK
config MIPS_FIXUP_BIGPHYS_ADDR
bool
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index f19e225cfc5c..2580e27e4328 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -330,7 +330,6 @@ config PPC
select SYSCTL_EXCEPTION_TRACE
select THREAD_INFO_IN_TASK
select TRACE_IRQFLAGS_SUPPORT
- select VDSO_CHECK
select VDSO_DATASTORE
select VDSO_GETRANDOM
#
diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
index f580d2afecf7..f8e26c4bed2b 100644
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@ -229,7 +229,6 @@ config RISCV
select THREAD_INFO_IN_TASK
select TRACE_IRQFLAGS_SUPPORT
select UACCESS_MEMCPY if !MMU
- select VDSO_CHECK if MMU
select VDSO_DATASTORE if MMU
select VDSO_GETRANDOM if MMU && 64BIT
select USER_STACKTRACE_SUPPORT
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index bc12367a7b00..4b51bc6e8948 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -291,7 +291,6 @@ config S390
select TRACE_IRQFLAGS_SUPPORT
select TTY
select USER_STACKTRACE_SUPPORT
- select VDSO_CHECK
select VDSO_GETRANDOM
select VIRT_CPU_ACCOUNTING
select VMAP_STACK
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 628bdfc2f088..ab77d3f2536e 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -114,7 +114,6 @@ config SPARC64
select ARCH_SUPPORTS_SCHED_SMT if SMP
select ARCH_SUPPORTS_SCHED_MC if SMP
select ARCH_HAS_LAZY_MMU_MODE
- select VDSO_CHECK
select GENERIC_GETTIMEOFDAY
config ARCH_PROC_KCORE_TEXT
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index ee0f2c401980..15fd9ec5ecac 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -305,7 +305,6 @@ config X86
select HAVE_UNSTABLE_SCHED_CLOCK
select HAVE_UNWIND_USER_FP if X86_64
select HAVE_USER_RETURN_NOTIFIER
- select VDSO_CHECK
select VDSO_GETRANDOM if X86_64
select HOTPLUG_PARALLEL if SMP && X86_64
select HOTPLUG_SMT if SMP
diff --git a/lib/vdso/Kconfig b/lib/vdso/Kconfig
index 112b42a5aeb1..12a640c78b72 100644
--- a/lib/vdso/Kconfig
+++ b/lib/vdso/Kconfig
@@ -6,6 +6,7 @@ config VDSO_DATASTORE
config GENERIC_GETTIMEOFDAY
bool
select VDSO_DATASTORE
+ select VDSO_CHECK
help
This is a generic implementation of gettimeofday vdso.
Each architecture that enables this feature has to
@@ -21,6 +22,7 @@ config GENERIC_VDSO_OVERFLOW_PROTECT
config VDSO_GETRANDOM
bool
select VDSO_DATASTORE
+ select VDSO_CHECK
help
Selected by architectures that support vDSO getrandom().
--
2.55.0
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 53+ messages in thread