arm64: extable: sort the exception table at build time
PATCH v2 1/1 arm64: extable: sort the exception table at build time
As is done for other architectures, sort the exception table at build-time rather than during boot.
Since sortextable appears to be a standalone C program relying on the host elf.h to provide EM_AARCH64, I've had to add a conditional check in order to allow cross-compilation on machines that aren't running a bleeding-edge libc-dev.
--- arch/arm64/Kconfig | 1 + arch/arm64/kernel/vmlinux.lds.S | 10 +--------- scripts/sortextable.c | 5 +++++ 3 files changed, 7 insertions(+), 9 deletions(-)
arch/arm64/Kconfig +1 -0
@@ -7,6 +7,7 @@ config ARM64 select ARM_AMBA select ARM_ARCH_TIMER select ARM_GIC + select BUILDTIME_EXTABLE_SORT select CLONE_BACKWARDS select COMMON_CLK select GENERIC_CLOCKEVENTS
arch/arm64/kernel/vmlinux.lds.S +1 -9
@@ -56,7 +56,7 @@ SECTIONS } RO_DATA(PAGE_SIZE) - + EXCEPTION_TABLE(8) _etext = .; /* End of text and rodata section */ . = ALIGN(PAGE_SIZE);
@@ -99,14 +99,6 @@ SECTIONS READ_MOSTLY_DATA(64) /* - * The exception fixup table (might need resorting at runtime) - */ - . = ALIGN(32); - __start___ex_table = .; - *(__ex_table) - __stop___ex_table = .; - - /* * and the usual data section */ DATA_DATA
scripts/sortextable.c +5 -0
@@ -31,6 +31,10 @@#include <tools/be_byteshift.h> #include <tools/le_byteshift.h> +#ifndef EM_AARCH64 +#define EM_AARCH64 183 +#endif +static int fd_map;/* File descriptor for file being modified. */ static int mmap_failed;/* Boolean flag. */ static void *ehdr_curr;/* current ElfXX_Ehdr * for resource cleanup */
@@ -249,6 +253,7 @@ do_file(char const *const fname) custom_sort = sort_relative_table;break ;case EM_ARM : +case EM_AARCH64 :case EM_MIPS :break ; }/* end switch */
Signature · 1 line
1.8.2.2
Quoted 14 lines · Will Deacon
As is done for other architectures, sort the exception table at build-time rather than during boot.
Since sortextable appears to be a standalone C program relying on the host
elf.hto provideEM_AARCH64, I've had to add a conditional check in order to allow cross-compilation on machines that aren't running a bleeding-edge libc-dev.Signed-off-by Will Deacon <[email protected]>--- arch/arm64/Kconfig | 1 + arch/arm64/kernel/vmlinux.lds.S | 10 +--------- scripts/sortextable.c | 5 +++++ 3 files changed, 7 insertions(+), 9 deletions(-)
[...]
Quoted 16 lines
scripts/sortextable.c +4
-0@@ -31,6 +31,10 @@#include <tools/be_byteshift.h> #include <tools/le_byteshift.h> +#ifndef EM_AARCH64 +#define EM_AARCH64 183 +#endif +static int fd_map;/* File descriptor for file being modified. */ static int mmap_failed;/* Boolean flag. */ static void *ehdr_curr;/* current ElfXX_Ehdr * for resource cleanup */
scripts/sortextable.c do_file(char const *const fname) · line 259
Quoted 7 lines
scripts/sortextable.c +1
-0@@ -249,6 +253,7 @@ do_file(char const *const fname) custom_sort = sort_relative_table;break ;case EM_ARM : +case EM_AARCH64 :case EM_MIPS :break ; }/* end switch */
Any chance I can have an ack for this part of the patch please? Then we can take it through the arm64 tree.
Cheers,
Will