Speed booting by sorting ORC unwind tables at build time
Subsystems (12)
v6 cover Speed booting by sorting ORC unwind tables at build time
Hi,
Sorry, update for compile error fix, reported by Intel's kbuild test robot. Any comments or suggestions are welcome!
Thanks!
Changelog:
==========v5->v6:
- fix compile error reported by kbuild test robot;
v4->v5:
- replace sort with qsort, suggested by Andy Lutomirski <[email protected]>;
- add error handling in link scripts;
- fixed some review findings;
https://lore.kernel.org/lkml/[email protected]/
v3->v4:
- Code refactored for Peter's review findings and suggestions.
https://lore.kernel.org/lkml/[email protected]/
v2->v3:
- Discard new added sortorctable tool and related Kconfig changes.
- Refactored sortextable, makes it more readable and extendable.
- Rename 'sortextable' to 'sorttable', for more kernel tables extend.
- Add ORC unwind tables sort into sorttable.
- Remove the runtime ORC tables sort.
https://lore.kernel.org/lkml/[email protected]/
v1->v2:
- Removed new added Kconfig and runtime sort code, advised by Josh Poimboeuf.
- Some minor refactoring.
https://lore.kernel.org/lkml/[email protected]/
v1:
- Added a new sortorctable tool to sort ORC unwind tables at build time, same as sortextable.
- Add a new Kconfigure to control if ORC unwind tables sort at build time.
https://lore.kernel.org/lkml/[email protected]/
Shile Zhang (7):
scripts/sortextable: Rewrite error/success handling scripts/sortextable: kernel coding style formating scripts/sortextable: Remove dead code scripts/sortextable: refactor do_func() function scripts/sorttable: rename sortextable to sorttable scripts/sorttable: Add ORC unwind tables sort concurrently x86/unwind/orc: remove run-time ORC unwind tables sort
arch/arc/Kconfig | 2 +-
arch/arm/Kconfig | 2 +-
arch/arm64/Kconfig | 2 +-
arch/microblaze/Kconfig | 2 +-
arch/mips/Kconfig | 2 +-
arch/parisc/Kconfig | 2 +-
arch/powerpc/Kconfig | 2 +-
arch/s390/Kconfig | 2 +-
arch/x86/Kconfig | 2 +-
arch/x86/kernel/unwind_orc.c | 8 +-
arch/xtensa/Kconfig | 2 +-
init/Kconfig | 2 +-
scripts/.gitignore | 2 +-
scripts/Makefile | 13 +-
scripts/link-vmlinux.sh | 13 +-
scripts/sortextable.h | 209 --------------
scripts/{sortextable.c => sorttable.c} | 305 +++++++++-----------
scripts/sorttable.h | 380 +++++++++++++++++++++++++
18 files changed, 557 insertions(+), 395 deletions(-)
delete mode 100644 scripts/sortextable.h
rename scripts/{sortextable.c => sorttable.c} (67%)
create mode 100644 scripts/sorttable.hSignature · 1 line
2.24.0.rc2
RFC PATCH v6 1/7 scripts/sortextable: Rewrite error/success handling
The sortextable token some code from recordmount, which uses the same setjmp/longjmp to manage control flow.
Now, recordmcount has been rewritten the error handling by commit 3f1df12019f3 ("recordmcount: Rewrite error/success handling").
So rewrite this part as well with more refactors, make it more readable and easy for further extend, no functional changes.
--- scripts/sortextable.c | 119 +++++++++++++++--------------------------- scripts/sortextable.h | 11 ++-- 2 files changed, 48 insertions(+), 82 deletions(-)
scripts/sortextable.c +42 -77
@@ -22,7 +22,6 @@#include <getopt.h> #include <elf.h> #include <fcntl.h> -#include <setjmp.h> #include <stdio.h> #include <stdlib.h> #include <string.h>
@@ -51,61 +50,41 @@#define EM_ARCV2 195#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 */ -static struct stat sb;/* Remember .st_size, etc. */ -static jmp_buf jmpenv;/* setjmp/longjmp per-file error escape */ - -/* setjmp() return values */ -enum { -SJ_SETJMP =0 ,/* hardwired first return */ -SJ_FAIL , -SJ_SUCCEED -}; - -/* Per-file resource cleanup when multiple files. */ -static void -cleanup (void ) -{ -if (!mmap_failed) -munmap (ehdr_curr, sb.st_size); -close (fd_map); -} - -static void __attribute__((noreturn)) -fail_file (void ) -{ -cleanup (); -longjmp (jmpenv,SJ_FAIL ); -} -/* * Get the whole file as a programming convenience in order to avoid * malloc+lseek+read+free of many pieces. If successful, then mmap * avoids copying unused pieces; else just read the whole file. * Open for both read and write. */ -static void *mmap_file (char const *fname) +static void *mmap_file (char const *fname,size_t *size) { -void *addr; +int fd; +struct stat sb; +void *addr =NULL ; - fd_map =open (fname,O_RDWR ); -if (fd_map <0 ||fstat (fd_map, &sb) <0 ) { + fd =open (fname,O_RDWR ); +if (fd <0 ) {perror (fname); -fail_file (); +return NULL ; + } +if (fstat (fd, &sb) <0 ) { +perror (fname); + goto out; }if (!S_ISREG (sb.st_mode)) {fprintf (stderr,"not a regular file: %s\n" , fname); -fail_file (); + goto out; } - addr =mmap (0 , sb.st_size,PROT_READ |PROT_WRITE ,MAP_SHARED , - fd_map,0 ); + addr =mmap (0 , sb.st_size,PROT_READ |PROT_WRITE ,MAP_SHARED , fd,0 );if (addr ==MAP_FAILED ) { - mmap_failed =1 ;fprintf (stderr,"Could not mmap file: %s\n" , fname); -fail_file (); + goto out; } + + *size = sb.st_size; + +out: +close (fd);return addr; }
@@ -264,19 +243,18 @@ static void sort_relative_table(char *extab_image, int image_size) } } -static void -do_file (char const *const fname) +static int +do_file (char const *const fname,void *addr) { -table_sort_t custom_sort; -Elf32_Ehdr *ehdr =mmap_file (fname); +table_sort_t custom_sort =NULL ; +Elf32_Ehdr *ehdr = addr; +int rc =-1 ; - ehdr_curr = ehdr;switch (ehdr->e_ident[EI_DATA ]) {default :fprintf (stderr,"unrecognized ELF data encoding %d: %s\n" , ehdr->e_ident[EI_DATA ], fname); -fail_file (); -break ; +return -1 ;case ELFDATA2LSB : r = rle; r2 = r2le;
@@ -298,7 +276,7 @@ do_file(char const *const fname) || (r2(&ehdr->e_type) != ET_EXEC && r2(&ehdr->e_type) != ET_DYN) || ehdr->e_ident[EI_VERSION] != EV_CURRENT) {fprintf (stderr,"unrecognized ET_EXEC/ET_DYN file %s\n" , fname); -fail_file (); +return -1 ; } custom_sort =NULL ;
@@ -306,7 +284,6 @@ do_file(char const *const fname)default :fprintf (stderr,"unrecognized e_machine %d %s\n" ,r2 (&ehdr->e_machine), fname); -fail_file ();break ;case EM_386 :case EM_X86_64 :
@@ -333,16 +310,15 @@ do_file(char const *const fname)default :fprintf (stderr,"unrecognized ELF class %d %s\n" , ehdr->e_ident[EI_CLASS ], fname); -fail_file ();break ;case ELFCLASS32 :if (r2 (&ehdr->e_ehsize) !=sizeof (Elf32_Ehdr) ||r2 (&ehdr->e_shentsize) !=sizeof (Elf32_Shdr)) {fprintf (stderr,"unrecognized ET_EXEC/ET_DYN file: %s\n" , fname); -fail_file (); +break ; } -do32 (ehdr, fname, custom_sort); + rc =do32 (ehdr, fname, custom_sort);break ;case ELFCLASS64 : {Elf64_Ehdr *const ghdr = (Elf64_Ehdr *)ehdr;
@@ -350,21 +326,22 @@ do_file(char const *const fname) || r2(&ghdr->e_shentsize) != sizeof(Elf64_Shdr)) {fprintf (stderr,"unrecognized ET_EXEC/ET_DYN file: %s\n" , fname); -fail_file (); +break ; } -do64 (ghdr, fname, custom_sort); + rc =do64 (ghdr, fname, custom_sort);break ; } }/* end switch */ -cleanup (); +return rc; }int main (int argc,char *argv[]) { -int n_error =0 ;/* gcc-4.3.0 false positive complaint */ -int i; +int i, n_error =0 ;/* gcc-4.3.0 false positive complaint */ +size_t size =0 ; +void *addr =NULL ;if (argc <2 ) {fprintf (stderr,"usage: sortextable vmlinux...\n" );
@@ -373,28 +350,16 @@ main(int argc, char *argv[])/* Process each file in turn, allowing deep failure. */ for (i =1 ; i < argc; i++) { -char *file = argv[i]; -int const sjval =setjmp (jmpenv); + addr =mmap_file (argv[i], &size); +if (!addr) { + ++n_error; +continue ; + } -switch (sjval) { -default : -fprintf (stderr,"internal error: %s\n" , file); -exit (1 ); -break ; -case SJ_SETJMP :/* normal sequence */ -/* Avoid problems if early cleanup() */ - fd_map =-1 ; - ehdr_curr =NULL ; - mmap_failed =1 ; -do_file (file); -break ; -case SJ_FAIL :/* error in do_file or below */ +if (do_file (argv[i], addr)) ++n_error; -break ; -case SJ_SUCCEED :/* premature success */ -/* do nothing */ -break ; - }/* end switch */ + +munmap (addr, size); }return !!n_error; }
scripts/sortextable.h +6 -5
@@ -87,7 +87,7 @@ static int compare_extable(const void *a, const void *b)return 0 ; } -static void +static int do_func (Elf_Ehdr *ehdr,char const *const fname,table_sort_t custom_sort) {Elf_Shdr *shdr;
@@ -146,17 +146,17 @@ do_func(Elf_Ehdr *ehdr, char const *const fname, table_sort_t custom_sort) }if (strtab_sec ==NULL ) {fprintf (stderr,"no .strtab in file: %s\n" , fname); -fail_file (); +return -1 ; }if (symtab_sec ==NULL ) {fprintf (stderr,"no .symtab in file: %s\n" , fname); -fail_file (); +return -1 ; } symtab = (const Elf_Sym *)((const char *)ehdr +_r (&symtab_sec->sh_offset));if (extab_sec ==NULL ) {fprintf (stderr,"no __ex_table in file: %s\n" , fname); -fail_file (); +return -1 ; } strtab = (const char *)ehdr +_r (&strtab_sec->sh_offset);
@@ -190,7 +190,7 @@ do_func(Elf_Ehdr *ehdr, char const *const fname, table_sort_t custom_sort)fprintf (stderr,"no main_extable_sort_needed symbol in file: %s\n" , fname); -fail_file (); +return -1 ; } sort_needed_sec = &shdr[get_secindex(r2(&sym->st_shndx), sort_needed_sym - symtab,
@@ -206,4 +206,5 @@ do_func(Elf_Ehdr *ehdr, char const *const fname, table_sort_t custom_sort)#endif /* We sorted it, clear the flag. */ w (0 , sort_done_location); +return 0 ; }
Signature · 1 line
2.24.0.rc2
[tip: core/objtool] scripts/sortextable: Rewrite error/success handling
The following commit has been merged into the core/objtool branch of tip:
The following commit has been merged into the core/objtool branch of tip:
Commit-ID: 3c47b787b6516d2c3cbaa193fe13a83adbaaad1f Gitweb: https://git.kernel.org/tip/3c47b787b6516d2c3cbaa193fe13a83adbaaad1f Author: Shile Zhang <[email protected]> AuthorDate: Wed, 04 Dec 2019 08:46:27 +08:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Fri, 13 Dec 2019 10:47:31 +01:00
scripts/sortextable: Rewrite error/success handling
The scripts/sortextable.c code has originally copied some code from scripts/recordmount.c, which used the same setjmp/longjmp method to manage control flow.
Meanwhile recordmcount has improved its error handling via:
3f1df12019f3 ("recordmcount: Rewrite error/success handling").
So rewrite this part of sortextable as well to get rid of the setjmp/longjmp kludges, with additional refactoring, to make it more readable and easier to extend.
No functional changes intended.
[ mingo: Rewrote the changelog. ]
--- scripts/sortextable.c | 119 ++++++++++++++--------------------------- scripts/sortextable.h | 11 ++-- 2 files changed, 48 insertions(+), 82 deletions(-)
scripts/sortextable.c +42 -77
@@ -22,7 +22,6 @@#include <getopt.h> #include <elf.h> #include <fcntl.h> -#include <setjmp.h> #include <stdio.h> #include <stdlib.h> #include <string.h>
@@ -51,61 +50,41 @@#define EM_ARCV2 195#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 */ -static struct stat sb;/* Remember .st_size, etc. */ -static jmp_buf jmpenv;/* setjmp/longjmp per-file error escape */ - -/* setjmp() return values */ -enum { -SJ_SETJMP =0 ,/* hardwired first return */ -SJ_FAIL , -SJ_SUCCEED -}; - -/* Per-file resource cleanup when multiple files. */ -static void -cleanup (void ) -{ -if (!mmap_failed) -munmap (ehdr_curr, sb.st_size); -close (fd_map); -} - -static void __attribute__((noreturn)) -fail_file (void ) -{ -cleanup (); -longjmp (jmpenv,SJ_FAIL ); -} -/* * Get the whole file as a programming convenience in order to avoid * malloc+lseek+read+free of many pieces. If successful, then mmap * avoids copying unused pieces; else just read the whole file. * Open for both read and write. */ -static void *mmap_file (char const *fname) +static void *mmap_file (char const *fname,size_t *size) { -void *addr; +int fd; +struct stat sb; +void *addr =NULL ; - fd_map =open (fname,O_RDWR ); -if (fd_map <0 ||fstat (fd_map, &sb) <0 ) { + fd =open (fname,O_RDWR ); +if (fd <0 ) {perror (fname); -fail_file (); +return NULL ; + } +if (fstat (fd, &sb) <0 ) { +perror (fname); + goto out; }if (!S_ISREG (sb.st_mode)) {fprintf (stderr,"not a regular file: %s\n" , fname); -fail_file (); + goto out; } - addr =mmap (0 , sb.st_size,PROT_READ |PROT_WRITE ,MAP_SHARED , - fd_map,0 ); + addr =mmap (0 , sb.st_size,PROT_READ |PROT_WRITE ,MAP_SHARED , fd,0 );if (addr ==MAP_FAILED ) { - mmap_failed =1 ;fprintf (stderr,"Could not mmap file: %s\n" , fname); -fail_file (); + goto out; } + + *size = sb.st_size; + +out: +close (fd);return addr; }
@@ -264,19 +243,18 @@ static void sort_relative_table(char *extab_image, int image_size) } } -static void -do_file (char const *const fname) +static int +do_file (char const *const fname,void *addr) { -table_sort_t custom_sort; -Elf32_Ehdr *ehdr =mmap_file (fname); +table_sort_t custom_sort =NULL ; +Elf32_Ehdr *ehdr = addr; +int rc =-1 ; - ehdr_curr = ehdr;switch (ehdr->e_ident[EI_DATA ]) {default :fprintf (stderr,"unrecognized ELF data encoding %d: %s\n" , ehdr->e_ident[EI_DATA ], fname); -fail_file (); -break ; +return -1 ;case ELFDATA2LSB : r = rle; r2 = r2le;
@@ -298,7 +276,7 @@ do_file(char const *const fname) || (r2(&ehdr->e_type) != ET_EXEC && r2(&ehdr->e_type) != ET_DYN) || ehdr->e_ident[EI_VERSION] != EV_CURRENT) {fprintf (stderr,"unrecognized ET_EXEC/ET_DYN file %s\n" , fname); -fail_file (); +return -1 ; } custom_sort =NULL ;
@@ -306,7 +284,6 @@ do_file(char const *const fname)default :fprintf (stderr,"unrecognized e_machine %d %s\n" ,r2 (&ehdr->e_machine), fname); -fail_file ();break ;case EM_386 :case EM_X86_64 :
@@ -333,16 +310,15 @@ do_file(char const *const fname)default :fprintf (stderr,"unrecognized ELF class %d %s\n" , ehdr->e_ident[EI_CLASS ], fname); -fail_file ();break ;case ELFCLASS32 :if (r2 (&ehdr->e_ehsize) !=sizeof (Elf32_Ehdr) ||r2 (&ehdr->e_shentsize) !=sizeof (Elf32_Shdr)) {fprintf (stderr,"unrecognized ET_EXEC/ET_DYN file: %s\n" , fname); -fail_file (); +break ; } -do32 (ehdr, fname, custom_sort); + rc =do32 (ehdr, fname, custom_sort);break ;case ELFCLASS64 : {Elf64_Ehdr *const ghdr = (Elf64_Ehdr *)ehdr;
@@ -350,21 +326,22 @@ do_file(char const *const fname) || r2(&ghdr->e_shentsize) != sizeof(Elf64_Shdr)) {fprintf (stderr,"unrecognized ET_EXEC/ET_DYN file: %s\n" , fname); -fail_file (); +break ; } -do64 (ghdr, fname, custom_sort); + rc =do64 (ghdr, fname, custom_sort);break ; } }/* end switch */ -cleanup (); +return rc; }int main (int argc,char *argv[]) { -int n_error =0 ;/* gcc-4.3.0 false positive complaint */ -int i; +int i, n_error =0 ;/* gcc-4.3.0 false positive complaint */ +size_t size =0 ; +void *addr =NULL ;if (argc <2 ) {fprintf (stderr,"usage: sortextable vmlinux...\n" );
@@ -373,28 +350,16 @@ main(int argc, char *argv[])/* Process each file in turn, allowing deep failure. */ for (i =1 ; i < argc; i++) { -char *file = argv[i]; -int const sjval =setjmp (jmpenv); + addr =mmap_file (argv[i], &size); +if (!addr) { + ++n_error; +continue ; + } -switch (sjval) { -default : -fprintf (stderr,"internal error: %s\n" , file); -exit (1 ); -break ; -case SJ_SETJMP :/* normal sequence */ -/* Avoid problems if early cleanup() */ - fd_map =-1 ; - ehdr_curr =NULL ; - mmap_failed =1 ; -do_file (file); -break ; -case SJ_FAIL :/* error in do_file or below */ +if (do_file (argv[i], addr)) ++n_error; -break ; -case SJ_SUCCEED :/* premature success */ -/* do nothing */ -break ; - }/* end switch */ + +munmap (addr, size); }return !!n_error; }
scripts/sortextable.h +6 -5
@@ -87,7 +87,7 @@ static int compare_extable(const void *a, const void *b)return 0 ; } -static void +static int do_func (Elf_Ehdr *ehdr,char const *const fname,table_sort_t custom_sort) {Elf_Shdr *shdr;
@@ -146,17 +146,17 @@ do_func(Elf_Ehdr *ehdr, char const *const fname, table_sort_t custom_sort) }if (strtab_sec ==NULL ) {fprintf (stderr,"no .strtab in file: %s\n" , fname); -fail_file (); +return -1 ; }if (symtab_sec ==NULL ) {fprintf (stderr,"no .symtab in file: %s\n" , fname); -fail_file (); +return -1 ; } symtab = (const Elf_Sym *)((const char *)ehdr +_r (&symtab_sec->sh_offset));if (extab_sec ==NULL ) {fprintf (stderr,"no __ex_table in file: %s\n" , fname); -fail_file (); +return -1 ; } strtab = (const char *)ehdr +_r (&strtab_sec->sh_offset);
@@ -190,7 +190,7 @@ do_func(Elf_Ehdr *ehdr, char const *const fname, table_sort_t custom_sort)fprintf (stderr,"no main_extable_sort_needed symbol in file: %s\n" , fname); -fail_file (); +return -1 ; } sort_needed_sec = &shdr[get_secindex(r2(&sym->st_shndx), sort_needed_sym - symtab,
@@ -206,4 +206,5 @@ do_func(Elf_Ehdr *ehdr, char const *const fname, table_sort_t custom_sort)#endif /* We sorted it, clear the flag. */ w (0 , sort_done_location); +return 0 ; }
RFC PATCH v6 2/7 scripts/sortextable: kernel coding style formating
In reply to Shile ZhangFix the inconsistent function format and kernel code style, referred to commit 3aec8638246f ("recordmcount: Kernel style function signature formatting") and
commit 2e63152bc190 ("recordmcount: Kernel style formatting")
Make the code more readable and extendable, no functional changes.
--- scripts/sortextable.c | 182 ++++++++++++++++++++++-------------------- scripts/sortextable.h | 31 +++---- 2 files changed, 111 insertions(+), 102 deletions(-)
scripts/sortextable.c +95 -87
@@ -50,6 +50,14 @@#define EM_ARCV2 195#endif +static uint32_t (*r)(const uint32_t *); +static uint16_t (*r2)(const uint16_t *); +static uint64_t (*r8)(const uint64_t *); +static void (*w)(uint32_t ,uint32_t *); +static void (*w2)(uint16_t ,uint16_t *); +static void (*w8)(uint64_t ,uint64_t *); +typedef void (*table_sort_t )(char *,int ); +/* * Get the whole file as a programming convenience in order to avoid * malloc+lseek+read+free of many pieces. If successful, then mmap
@@ -75,6 +83,7 @@ static void *mmap_file(char const *fname, size_t *size)fprintf (stderr,"not a regular file: %s\n" , fname); goto out; } + addr =mmap (0 , sb.st_size,PROT_READ |PROT_WRITE ,MAP_SHARED , fd,0 );if (addr ==MAP_FAILED ) {fprintf (stderr,"Could not mmap file: %s\n" , fname);
@@ -88,64 +97,65 @@ static void *mmap_file(char const *fname, size_t *size)return addr; } -static uint64_t r8be (const uint64_t *x) -{ -return get_unaligned_be64 (x); -}static uint32_t rbe (const uint32_t *x) {return get_unaligned_be32 (x); } +static uint16_t r2be (const uint16_t *x) {return get_unaligned_be16 (x); } -static uint64_t r8le (const uint64_t *x) + +static uint64_t r8be (const uint64_t *x) { -return get_unaligned_le64 (x); +return get_unaligned_be64 (x); } +static uint32_t rle (const uint32_t *x) {return get_unaligned_le32 (x); } +static uint16_t r2le (const uint16_t *x) {return get_unaligned_le16 (x); } -static void w8be (uint64_t val,uint64_t *x) +static uint64_t r8le (const uint64_t *x) { -put_unaligned_be64 (val, x); +return get_unaligned_le64 (x); } +static void wbe (uint32_t val,uint32_t *x) {put_unaligned_be32 (val, x); } +static void w2be (uint16_t val,uint16_t *x) {put_unaligned_be16 (val, x); } -static void w8le (uint64_t val,uint64_t *x) + +static void w8be (uint64_t val,uint64_t *x) { -put_unaligned_le64 (val, x); +put_unaligned_be64 (val, x); } +static void wle (uint32_t val,uint32_t *x) {put_unaligned_le32 (val, x); } +static void w2le (uint16_t val,uint16_t *x) {put_unaligned_le16 (val, x); } -static uint64_t (*r8)(const uint64_t *); -static uint32_t (*r)(const uint32_t *); -static uint16_t (*r2)(const uint16_t *); -static void (*w8)(uint64_t ,uint64_t *); -static void (*w)(uint32_t ,uint32_t *); -static void (*w2)(uint16_t ,uint16_t *); - -typedef void (*table_sort_t )(char *,int ); +static void w8le (uint64_t val,uint64_t *x) +{ +put_unaligned_le64 (val, x); +}/* * Move reserved section indices SHN_LORESERVE..SHN_HIRESERVE out of
@@ -188,108 +198,100 @@ static int compare_relative_table(const void *a, const void *b)return 0 ; } -static void x86_sort_relative_table (char *extab_image,int image_size) +static void sort_relative_table (char *extab_image,int image_size) { -int i; +int i =0 ; - i =0 ; +/* +* Do the same thing the runtime sort does, first normalize to +* being relative to the start of the section. +*/ while (i < image_size) {uint32_t *loc = (uint32_t *)(extab_image + i); -w (r (loc) + i, loc); -w (r (loc +1 ) + i +4 , loc +1 ); -w (r (loc +2 ) + i +8 , loc +2 ); - - i +=sizeof (uint32_t ) *3 ; + i +=4 ; } -qsort (extab_image, image_size /12 ,12 , compare_relative_table); +qsort (extab_image, image_size /8 ,8 , compare_relative_table); +/* Now denormalize. */ i =0 ;while (i < image_size) {uint32_t *loc = (uint32_t *)(extab_image + i); -w (r (loc) - i, loc); -w (r (loc +1 ) - (i +4 ), loc +1 ); -w (r (loc +2 ) - (i +8 ), loc +2 ); - - i +=sizeof (uint32_t ) *3 ; + i +=4 ; } } -static void sort_relative_table (char *extab_image,int image_size) +static void x86_sort_relative_table (char *extab_image,int image_size) { -int i; +int i =0 ; -/* -* Do the same thing the runtime sort does, first normalize to -* being relative to the start of the section. -*/ - i =0 ;while (i < image_size) {uint32_t *loc = (uint32_t *)(extab_image + i); +w (r (loc) + i, loc); - i +=4 ; +w (r (loc +1 ) + i +4 , loc +1 ); +w (r (loc +2 ) + i +8 , loc +2 ); + + i +=sizeof (uint32_t ) *3 ; } -qsort (extab_image, image_size /8 ,8 , compare_relative_table); +qsort (extab_image, image_size /12 ,12 , compare_relative_table); -/* Now denormalize. */ i =0 ;while (i < image_size) {uint32_t *loc = (uint32_t *)(extab_image + i); +w (r (loc) - i, loc); - i +=4 ; +w (r (loc +1 ) - (i +4 ), loc +1 ); +w (r (loc +2 ) - (i +8 ), loc +2 ); + + i +=sizeof (uint32_t ) *3 ; } } -static int -do_file (char const *const fname,void *addr) +static int do_file (char const *const fname,void *addr) { -table_sort_t custom_sort =NULL ; -Elf32_Ehdr *ehdr = addr;int rc =-1 ; +Elf32_Ehdr *ehdr = addr; +table_sort_t custom_sort =NULL ;switch (ehdr->e_ident[EI_DATA ]) { -default : -fprintf (stderr,"unrecognized ELF data encoding %d: %s\n" , - ehdr->e_ident[EI_DATA ], fname); -return -1 ;case ELFDATA2LSB : - r = rle; - r2 = r2le; - r8 = r8le; - w = wle; - w2 = w2le; - w8 = w8le; + r = rle; + r2 = r2le; + r8 = r8le; + w = wle; + w2 = w2le; + w8 = w8le;break ;case ELFDATA2MSB : - r = rbe; - r2 = r2be; - r8 = r8be; - w = wbe; - w2 = w2be; - w8 = w8be; + r = rbe; + r2 = r2be; + r8 = r8be; + w = wbe; + w2 = w2be; + w8 = w8be;break ; - }/* end switch */ -if (memcmp (ELFMAG , ehdr->e_ident,SELFMAG ) !=0 - || (r2 (&ehdr->e_type) !=ET_EXEC &&r2 (&ehdr->e_type) !=ET_DYN ) - || ehdr->e_ident[EI_VERSION ] !=EV_CURRENT ) { +default : +fprintf (stderr,"unrecognized ELF data encoding %d: %s\n" , + ehdr->e_ident[EI_DATA ], fname); +return -1 ; + } + +if (memcmp (ELFMAG , ehdr->e_ident,SELFMAG ) !=0 || + (r2 (&ehdr->e_type) !=ET_EXEC &&r2 (&ehdr->e_type) !=ET_DYN ) || + ehdr->e_ident[EI_VERSION ] !=EV_CURRENT ) {fprintf (stderr,"unrecognized ET_EXEC/ET_DYN file %s\n" , fname);return -1 ; } - custom_sort =NULL ;switch (r2 (&ehdr->e_machine)) { -default : -fprintf (stderr,"unrecognized e_machine %d %s\n" , -r2 (&ehdr->e_machine), fname); -break ;case EM_386 :case EM_X86_64 : custom_sort = x86_sort_relative_table;break ; -case EM_S390 :case EM_AARCH64 :case EM_PARISC :
@@ -304,40 +306,45 @@ do_file(char const *const fname, void *addr)case EM_MIPS :case EM_XTENSA :break ; - }/* end switch */ +default : +fprintf (stderr,"unrecognized e_machine %d %s\n" , +r2 (&ehdr->e_machine), fname); +return -1 ; + }switch (ehdr->e_ident[EI_CLASS ]) { -default : -fprintf (stderr,"unrecognized ELF class %d %s\n" , - ehdr->e_ident[EI_CLASS ], fname); -break ;case ELFCLASS32 : -if (r2 (&ehdr->e_ehsize) !=sizeof (Elf32_Ehdr) - ||r2 (&ehdr->e_shentsize) !=sizeof (Elf32_Shdr)) { +if (r2 (&ehdr->e_ehsize) !=sizeof (Elf32_Ehdr) || +r2 (&ehdr->e_shentsize) !=sizeof (Elf32_Shdr)) {fprintf (stderr,"unrecognized ET_EXEC/ET_DYN file: %s\n" , fname);break ; } rc =do32 (ehdr, fname, custom_sort);break ; -case ELFCLASS64 : { +case ELFCLASS64 : + {Elf64_Ehdr *const ghdr = (Elf64_Ehdr *)ehdr; -if (r2 (&ghdr->e_ehsize) !=sizeof (Elf64_Ehdr) - ||r2 (&ghdr->e_shentsize) !=sizeof (Elf64_Shdr)) { +if (r2 (&ghdr->e_ehsize) !=sizeof (Elf64_Ehdr) || +r2 (&ghdr->e_shentsize) !=sizeof (Elf64_Shdr)) {fprintf (stderr, -"unrecognized ET_EXEC/ET_DYN file: %s\n" , fname); +"unrecognized ET_EXEC/ET_DYN file: %s\n" , + fname);break ; } rc =do64 (ghdr, fname, custom_sort); + } +break ; +default : +fprintf (stderr,"unrecognized ELF class %d %s\n" , + ehdr->e_ident[EI_CLASS ], fname);break ; } - }/* end switch */ return rc; } -int -main (int argc,char *argv[]) +int main (int argc,char *argv[]) {int i, n_error =0 ;/* gcc-4.3.0 false positive complaint */ size_t size =0 ;
@@ -361,5 +368,6 @@ main(int argc, char *argv[])munmap (addr, size); } +return !!n_error; }
scripts/sortextable.h +16 -15
@@ -6,7 +6,7 @@* * Some of this code was taken out of recordmcount.h written by: * -* Copyright 2009 John F. Reiser <[email protected]>. All rights reserved. +* Copyright 2009 John F. Reiser <[email protected]>. All rights reserved. * Copyright 2010 Steven Rostedt <[email protected]>, Red Hat Inc. */
@@ -87,8 +87,9 @@ static int compare_extable(const void *a, const void *b)return 0 ; } -static int -do_func (Elf_Ehdr *ehdr,char const *const fname,table_sort_t custom_sort) +static int do_func (Elf_Ehdr *ehdr, +char const *const fname, +table_sort_t custom_sort) {Elf_Shdr *shdr;Elf_Shdr *shstrtab_sec;
@@ -126,7 +127,7 @@ do_func(Elf_Ehdr *ehdr, char const *const fname, table_sort_t custom_sort) secstrtab = (const char *)ehdr +_r (&shstrtab_sec->sh_offset);for (i =0 ; i < num_sections; i++) { idx =r (&shdr[i].sh_name); -if (strcmp (secstrtab + idx,"__ex_table" ) ==0 ) { +if (!strcmp (secstrtab + idx,"__ex_table" )) { extab_sec = shdr + i; extab_index = i; }
@@ -136,26 +137,26 @@ do_func(Elf_Ehdr *ehdr, char const *const fname, table_sort_t custom_sort) relocs = (void *)ehdr +_r (&shdr[i].sh_offset); relocs_size =_r (&shdr[i].sh_size); } -if (strcmp (secstrtab + idx,".symtab" ) ==0 ) +if (!strcmp (secstrtab + idx,".symtab" )) symtab_sec = shdr + i; -if (strcmp (secstrtab + idx,".strtab" ) ==0 ) +if (!strcmp (secstrtab + idx,".strtab" )) strtab_sec = shdr + i;if (r (&shdr[i].sh_type) ==SHT_SYMTAB_SHNDX ) symtab_shndx_start = (Elf32_Word *)( (const char *)ehdr +_r (&shdr[i].sh_offset)); } -if (strtab_sec ==NULL ) { -fprintf (stderr,"no .strtab in file: %s\n" , fname); +if (!strtab_sec) { +fprintf (stderr,"no .strtab in file: %s\n" , fname);return -1 ; } -if (symtab_sec ==NULL ) { -fprintf (stderr,"no .symtab in file: %s\n" , fname); +if (!symtab_sec) { +fprintf (stderr,"no .symtab in file: %s\n" , fname);return -1 ; } symtab = (const Elf_Sym *)((const char *)ehdr +_r (&symtab_sec->sh_offset)); -if (extab_sec ==NULL ) { -fprintf (stderr,"no __ex_table in file: %s\n" , fname); +if (!extab_sec) { +fprintf (stderr,"no __ex_table in file: %s\n" , fname);return -1 ; } strtab = (const char *)ehdr +_r (&strtab_sec->sh_offset);
@@ -181,14 +182,14 @@ do_func(Elf_Ehdr *ehdr, char const *const fname, table_sort_t custom_sort)if (ELF_ST_TYPE (sym->st_info) !=STT_OBJECT )continue ; idx =r (&sym->st_name); -if (strcmp (strtab + idx,"main_extable_sort_needed" ) ==0 ) { +if (!strcmp (strtab + idx,"main_extable_sort_needed" )) { sort_needed_sym = sym;break ; } } -if (sort_needed_sym ==NULL ) { +if (!sort_needed_sym) {fprintf (stderr, -"no main_extable_sort_needed symbol in file: %s\n" , +"no main_extable_sort_needed symbol in file: %s\n" , fname);return -1 ; }
Signature · 1 line
2.24.0.rc2
[tip: core/objtool] scripts/sortextable: Clean up the code to meet the kernel coding style better
The following commit has been merged into the core/objtool branch of tip:
The following commit has been merged into the core/objtool branch of tip:
Commit-ID: 6402e1416255a7bb94834925ba0255c750f54a2d Gitweb: https://git.kernel.org/tip/6402e1416255a7bb94834925ba0255c750f54a2d Author: Shile Zhang <[email protected]> AuthorDate: Wed, 04 Dec 2019 08:46:28 +08:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Fri, 13 Dec 2019 10:47:58 +01:00
scripts/sortextable: Clean up the code to meet the kernel coding style better
Fix various style errors and inconsistencies, no functional changes intended.
--- scripts/sortextable.c | 182 +++++++++++++++++++++-------------------- scripts/sortextable.h | 31 +++---- 2 files changed, 111 insertions(+), 102 deletions(-)
scripts/sortextable.c +95 -87
@@ -50,6 +50,14 @@#define EM_ARCV2 195#endif +static uint32_t (*r)(const uint32_t *); +static uint16_t (*r2)(const uint16_t *); +static uint64_t (*r8)(const uint64_t *); +static void (*w)(uint32_t ,uint32_t *); +static void (*w2)(uint16_t ,uint16_t *); +static void (*w8)(uint64_t ,uint64_t *); +typedef void (*table_sort_t )(char *,int ); +/* * Get the whole file as a programming convenience in order to avoid * malloc+lseek+read+free of many pieces. If successful, then mmap
@@ -75,6 +83,7 @@ static void *mmap_file(char const *fname, size_t *size)fprintf (stderr,"not a regular file: %s\n" , fname); goto out; } + addr =mmap (0 , sb.st_size,PROT_READ |PROT_WRITE ,MAP_SHARED , fd,0 );if (addr ==MAP_FAILED ) {fprintf (stderr,"Could not mmap file: %s\n" , fname);
@@ -88,64 +97,65 @@ out:return addr; } -static uint64_t r8be (const uint64_t *x) -{ -return get_unaligned_be64 (x); -}static uint32_t rbe (const uint32_t *x) {return get_unaligned_be32 (x); } +static uint16_t r2be (const uint16_t *x) {return get_unaligned_be16 (x); } -static uint64_t r8le (const uint64_t *x) + +static uint64_t r8be (const uint64_t *x) { -return get_unaligned_le64 (x); +return get_unaligned_be64 (x); } +static uint32_t rle (const uint32_t *x) {return get_unaligned_le32 (x); } +static uint16_t r2le (const uint16_t *x) {return get_unaligned_le16 (x); } -static void w8be (uint64_t val,uint64_t *x) +static uint64_t r8le (const uint64_t *x) { -put_unaligned_be64 (val, x); +return get_unaligned_le64 (x); } +static void wbe (uint32_t val,uint32_t *x) {put_unaligned_be32 (val, x); } +static void w2be (uint16_t val,uint16_t *x) {put_unaligned_be16 (val, x); } -static void w8le (uint64_t val,uint64_t *x) + +static void w8be (uint64_t val,uint64_t *x) { -put_unaligned_le64 (val, x); +put_unaligned_be64 (val, x); } +static void wle (uint32_t val,uint32_t *x) {put_unaligned_le32 (val, x); } +static void w2le (uint16_t val,uint16_t *x) {put_unaligned_le16 (val, x); } -static uint64_t (*r8)(const uint64_t *); -static uint32_t (*r)(const uint32_t *); -static uint16_t (*r2)(const uint16_t *); -static void (*w8)(uint64_t ,uint64_t *); -static void (*w)(uint32_t ,uint32_t *); -static void (*w2)(uint16_t ,uint16_t *); - -typedef void (*table_sort_t )(char *,int ); +static void w8le (uint64_t val,uint64_t *x) +{ +put_unaligned_le64 (val, x); +}/* * Move reserved section indices SHN_LORESERVE..SHN_HIRESERVE out of
@@ -188,108 +198,100 @@ static int compare_relative_table(const void *a, const void *b)return 0 ; } -static void x86_sort_relative_table (char *extab_image,int image_size) +static void sort_relative_table (char *extab_image,int image_size) { -int i; +int i =0 ; - i =0 ; +/* +* Do the same thing the runtime sort does, first normalize to +* being relative to the start of the section. +*/ while (i < image_size) {uint32_t *loc = (uint32_t *)(extab_image + i); -w (r (loc) + i, loc); -w (r (loc +1 ) + i +4 , loc +1 ); -w (r (loc +2 ) + i +8 , loc +2 ); - - i +=sizeof (uint32_t ) *3 ; + i +=4 ; } -qsort (extab_image, image_size /12 ,12 , compare_relative_table); +qsort (extab_image, image_size /8 ,8 , compare_relative_table); +/* Now denormalize. */ i =0 ;while (i < image_size) {uint32_t *loc = (uint32_t *)(extab_image + i); -w (r (loc) - i, loc); -w (r (loc +1 ) - (i +4 ), loc +1 ); -w (r (loc +2 ) - (i +8 ), loc +2 ); - - i +=sizeof (uint32_t ) *3 ; + i +=4 ; } } -static void sort_relative_table (char *extab_image,int image_size) +static void x86_sort_relative_table (char *extab_image,int image_size) { -int i; +int i =0 ; -/* -* Do the same thing the runtime sort does, first normalize to -* being relative to the start of the section. -*/ - i =0 ;while (i < image_size) {uint32_t *loc = (uint32_t *)(extab_image + i); +w (r (loc) + i, loc); - i +=4 ; +w (r (loc +1 ) + i +4 , loc +1 ); +w (r (loc +2 ) + i +8 , loc +2 ); + + i +=sizeof (uint32_t ) *3 ; } -qsort (extab_image, image_size /8 ,8 , compare_relative_table); +qsort (extab_image, image_size /12 ,12 , compare_relative_table); -/* Now denormalize. */ i =0 ;while (i < image_size) {uint32_t *loc = (uint32_t *)(extab_image + i); +w (r (loc) - i, loc); - i +=4 ; +w (r (loc +1 ) - (i +4 ), loc +1 ); +w (r (loc +2 ) - (i +8 ), loc +2 ); + + i +=sizeof (uint32_t ) *3 ; } } -static int -do_file (char const *const fname,void *addr) +static int do_file (char const *const fname,void *addr) { -table_sort_t custom_sort =NULL ; -Elf32_Ehdr *ehdr = addr;int rc =-1 ; +Elf32_Ehdr *ehdr = addr; +table_sort_t custom_sort =NULL ;switch (ehdr->e_ident[EI_DATA ]) { -default : -fprintf (stderr,"unrecognized ELF data encoding %d: %s\n" , - ehdr->e_ident[EI_DATA ], fname); -return -1 ;case ELFDATA2LSB : - r = rle; - r2 = r2le; - r8 = r8le; - w = wle; - w2 = w2le; - w8 = w8le; + r = rle; + r2 = r2le; + r8 = r8le; + w = wle; + w2 = w2le; + w8 = w8le;break ;case ELFDATA2MSB : - r = rbe; - r2 = r2be; - r8 = r8be; - w = wbe; - w2 = w2be; - w8 = w8be; + r = rbe; + r2 = r2be; + r8 = r8be; + w = wbe; + w2 = w2be; + w8 = w8be;break ; - }/* end switch */ -if (memcmp (ELFMAG , ehdr->e_ident,SELFMAG ) !=0 - || (r2 (&ehdr->e_type) !=ET_EXEC &&r2 (&ehdr->e_type) !=ET_DYN ) - || ehdr->e_ident[EI_VERSION ] !=EV_CURRENT ) { +default : +fprintf (stderr,"unrecognized ELF data encoding %d: %s\n" , + ehdr->e_ident[EI_DATA ], fname); +return -1 ; + } + +if (memcmp (ELFMAG , ehdr->e_ident,SELFMAG ) !=0 || + (r2 (&ehdr->e_type) !=ET_EXEC &&r2 (&ehdr->e_type) !=ET_DYN ) || + ehdr->e_ident[EI_VERSION ] !=EV_CURRENT ) {fprintf (stderr,"unrecognized ET_EXEC/ET_DYN file %s\n" , fname);return -1 ; } - custom_sort =NULL ;switch (r2 (&ehdr->e_machine)) { -default : -fprintf (stderr,"unrecognized e_machine %d %s\n" , -r2 (&ehdr->e_machine), fname); -break ;case EM_386 :case EM_X86_64 : custom_sort = x86_sort_relative_table;break ; -case EM_S390 :case EM_AARCH64 :case EM_PARISC :
@@ -304,40 +306,45 @@ do_file(char const *const fname, void *addr)case EM_MIPS :case EM_XTENSA :break ; - }/* end switch */ +default : +fprintf (stderr,"unrecognized e_machine %d %s\n" , +r2 (&ehdr->e_machine), fname); +return -1 ; + }switch (ehdr->e_ident[EI_CLASS ]) { -default : -fprintf (stderr,"unrecognized ELF class %d %s\n" , - ehdr->e_ident[EI_CLASS ], fname); -break ;case ELFCLASS32 : -if (r2 (&ehdr->e_ehsize) !=sizeof (Elf32_Ehdr) - ||r2 (&ehdr->e_shentsize) !=sizeof (Elf32_Shdr)) { +if (r2 (&ehdr->e_ehsize) !=sizeof (Elf32_Ehdr) || +r2 (&ehdr->e_shentsize) !=sizeof (Elf32_Shdr)) {fprintf (stderr,"unrecognized ET_EXEC/ET_DYN file: %s\n" , fname);break ; } rc =do32 (ehdr, fname, custom_sort);break ; -case ELFCLASS64 : { +case ELFCLASS64 : + {Elf64_Ehdr *const ghdr = (Elf64_Ehdr *)ehdr; -if (r2 (&ghdr->e_ehsize) !=sizeof (Elf64_Ehdr) - ||r2 (&ghdr->e_shentsize) !=sizeof (Elf64_Shdr)) { +if (r2 (&ghdr->e_ehsize) !=sizeof (Elf64_Ehdr) || +r2 (&ghdr->e_shentsize) !=sizeof (Elf64_Shdr)) {fprintf (stderr, -"unrecognized ET_EXEC/ET_DYN file: %s\n" , fname); +"unrecognized ET_EXEC/ET_DYN file: %s\n" , + fname);break ; } rc =do64 (ghdr, fname, custom_sort); + } +break ; +default : +fprintf (stderr,"unrecognized ELF class %d %s\n" , + ehdr->e_ident[EI_CLASS ], fname);break ; } - }/* end switch */ return rc; } -int -main (int argc,char *argv[]) +int main (int argc,char *argv[]) {int i, n_error =0 ;/* gcc-4.3.0 false positive complaint */ size_t size =0 ;
@@ -361,5 +368,6 @@ main(int argc, char *argv[])munmap (addr, size); } +return !!n_error; }
scripts/sortextable.h +16 -15
@@ -6,7 +6,7 @@* * Some of this code was taken out of recordmcount.h written by: * -* Copyright 2009 John F. Reiser <[email protected]>. All rights reserved. +* Copyright 2009 John F. Reiser <[email protected]>. All rights reserved. * Copyright 2010 Steven Rostedt <[email protected]>, Red Hat Inc. */
@@ -87,8 +87,9 @@ static int compare_extable(const void *a, const void *b)return 0 ; } -static int -do_func (Elf_Ehdr *ehdr,char const *const fname,table_sort_t custom_sort) +static int do_func (Elf_Ehdr *ehdr, +char const *const fname, +table_sort_t custom_sort) {Elf_Shdr *shdr;Elf_Shdr *shstrtab_sec;
@@ -126,7 +127,7 @@ do_func(Elf_Ehdr *ehdr, char const *const fname, table_sort_t custom_sort) secstrtab = (const char *)ehdr +_r (&shstrtab_sec->sh_offset);for (i =0 ; i < num_sections; i++) { idx =r (&shdr[i].sh_name); -if (strcmp (secstrtab + idx,"__ex_table" ) ==0 ) { +if (!strcmp (secstrtab + idx,"__ex_table" )) { extab_sec = shdr + i; extab_index = i; }
@@ -136,26 +137,26 @@ do_func(Elf_Ehdr *ehdr, char const *const fname, table_sort_t custom_sort) relocs = (void *)ehdr +_r (&shdr[i].sh_offset); relocs_size =_r (&shdr[i].sh_size); } -if (strcmp (secstrtab + idx,".symtab" ) ==0 ) +if (!strcmp (secstrtab + idx,".symtab" )) symtab_sec = shdr + i; -if (strcmp (secstrtab + idx,".strtab" ) ==0 ) +if (!strcmp (secstrtab + idx,".strtab" )) strtab_sec = shdr + i;if (r (&shdr[i].sh_type) ==SHT_SYMTAB_SHNDX ) symtab_shndx_start = (Elf32_Word *)( (const char *)ehdr +_r (&shdr[i].sh_offset)); } -if (strtab_sec ==NULL ) { -fprintf (stderr,"no .strtab in file: %s\n" , fname); +if (!strtab_sec) { +fprintf (stderr,"no .strtab in file: %s\n" , fname);return -1 ; } -if (symtab_sec ==NULL ) { -fprintf (stderr,"no .symtab in file: %s\n" , fname); +if (!symtab_sec) { +fprintf (stderr,"no .symtab in file: %s\n" , fname);return -1 ; } symtab = (const Elf_Sym *)((const char *)ehdr +_r (&symtab_sec->sh_offset)); -if (extab_sec ==NULL ) { -fprintf (stderr,"no __ex_table in file: %s\n" , fname); +if (!extab_sec) { +fprintf (stderr,"no __ex_table in file: %s\n" , fname);return -1 ; } strtab = (const char *)ehdr +_r (&strtab_sec->sh_offset);
@@ -181,14 +182,14 @@ do_func(Elf_Ehdr *ehdr, char const *const fname, table_sort_t custom_sort)if (ELF_ST_TYPE (sym->st_info) !=STT_OBJECT )continue ; idx =r (&sym->st_name); -if (strcmp (strtab + idx,"main_extable_sort_needed" ) ==0 ) { +if (!strcmp (strtab + idx,"main_extable_sort_needed" )) { sort_needed_sym = sym;break ; } } -if (sort_needed_sym ==NULL ) { +if (!sort_needed_sym) {fprintf (stderr, -"no main_extable_sort_needed symbol in file: %s\n" , +"no main_extable_sort_needed symbol in file: %s\n" , fname);return -1 ; }
RFC PATCH v6 3/7 scripts/sortextable: Remove dead code
In reply to Shile ZhangRemove the comment out dead code, no functional changes.
--- scripts/sortextable.h | 4 ---- 1 file changed, 4 deletions(-)
scripts/sortextable.h +0 -4
@@ -201,10 +201,6 @@ static int do_func(Elf_Ehdr *ehdr,_r (&sort_needed_sym->st_value) -_r (&sort_needed_sec->sh_addr); -#if 0 -printf ("sort done marker at %lx\n" , - (unsigned long )((char *)sort_done_location - (char *)ehdr)); -#endif /* We sorted it, clear the flag. */ w (0 , sort_done_location);return 0 ;
Signature · 1 line
2.24.0.rc2
[tip: core/objtool] scripts/sortextable: Remove dead code
The following commit has been merged into the core/objtool branch of tip:
The following commit has been merged into the core/objtool branch of tip:
Commit-ID: abe4f92ca8948a3e04c56788354933c326909acb Gitweb: https://git.kernel.org/tip/abe4f92ca8948a3e04c56788354933c326909acb Author: Shile Zhang <[email protected]> AuthorDate: Wed, 04 Dec 2019 08:46:29 +08:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Fri, 13 Dec 2019 10:47:58 +01:00
scripts/sortextable: Remove dead code
--- scripts/sortextable.h | 4 ---- 1 file changed, 4 deletions(-)
scripts/sortextable.h +0 -4
@@ -201,10 +201,6 @@ static int do_func(Elf_Ehdr *ehdr,_r (&sort_needed_sym->st_value) -_r (&sort_needed_sec->sh_addr); -#if 0 -printf ("sort done marker at %lx\n" , - (unsigned long )((char *)sort_done_location - (char *)ehdr)); -#endif /* We sorted it, clear the flag. */ w (0 , sort_done_location);return 0 ;
RFC PATCH v6 4/7 scripts/sortextable: refactor do_func() function
In reply to Shile ZhangRefine the loop, naming and code structure, make the code more readable and extendable, no functional changes.
--- scripts/sortextable.c | 4 +- scripts/sortextable.h | 115 ++++++++++++++++++++++-------------------- 2 files changed, 61 insertions(+), 58 deletions(-)
scripts/sortextable.c +2 -2
@@ -320,7 +320,7 @@ static int do_file(char const *const fname, void *addr) "unrecognized ET_EXEC/ET_DYN file: %s\n", fname);break ; } - rc =do32 (ehdr, fname, custom_sort); + rc =do_sort_32 (ehdr, fname, custom_sort);break ;case ELFCLASS64 : {
@@ -332,7 +332,7 @@ static int do_file(char const *const fname, void *addr) fname);break ; } - rc =do64 (ghdr, fname, custom_sort); + rc =do_sort_64 (ghdr, fname, custom_sort); }break ;default :
scripts/sortextable.h +59 -56
199 lines not on this page · raw message
Signature · 1 line
2.24.0.rc2
[tip: core/objtool] scripts/sortextable: Refactor the do_func() function
The following commit has been merged into the core/objtool branch of tip:
The following commit has been merged into the core/objtool branch of tip:
Commit-ID: 57cafdf2a04e161b9654c4ae3888a7549594c499 Gitweb: https://git.kernel.org/tip/57cafdf2a04e161b9654c4ae3888a7549594c499 Author: Shile Zhang <[email protected]> AuthorDate: Wed, 04 Dec 2019 08:46:30 +08:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Fri, 13 Dec 2019 10:47:58 +01:00
scripts/sortextable: Refactor the do_func() function
Refine the loop, naming and code structure, make the code more readable and extendable. No functional changes intended.
--- scripts/sortextable.c | 4 +- scripts/sortextable.h | 115 +++++++++++++++++++++-------------------- 2 files changed, 61 insertions(+), 58 deletions(-)
scripts/sortextable.c +2 -2
@@ -320,7 +320,7 @@ static int do_file(char const *const fname, void *addr) "unrecognized ET_EXEC/ET_DYN file: %s\n", fname);break ; } - rc =do32 (ehdr, fname, custom_sort); + rc =do_sort_32 (ehdr, fname, custom_sort);break ;case ELFCLASS64 : {
@@ -332,7 +332,7 @@ static int do_file(char const *const fname, void *addr) fname);break ; } - rc =do64 (ghdr, fname, custom_sort); + rc =do_sort_64 (ghdr, fname, custom_sort); }break ;default :
scripts/sortextable.h +59 -56
199 lines not on this page · raw message
RFC PATCH v6 5/7 scripts/sorttable: rename sortextable to sorttable
In reply to Shile ZhangUsing commonly name for further more kernel table sort at build time extend, no functional changes.
---
arch/arc/Kconfig | 2 +-
arch/arm/Kconfig | 2 +-
arch/arm64/Kconfig | 2 +-
arch/microblaze/Kconfig | 2 +-
arch/mips/Kconfig | 2 +-
arch/parisc/Kconfig | 2 +-
arch/powerpc/Kconfig | 2 +-
arch/s390/Kconfig | 2 +-
arch/x86/Kconfig | 2 +-
arch/xtensa/Kconfig | 2 +-
init/Kconfig | 2 +-
scripts/.gitignore | 2 +-
scripts/Makefile | 4 ++--
scripts/link-vmlinux.sh | 10 +++++-----
scripts/{sortextable.c => sorttable.c} | 10 +++++-----
scripts/{sortextable.h => sorttable.h} | 4 ++--
16 files changed, 26 insertions(+), 26 deletions(-)
rename scripts/{sortextable.c => sorttable.c} (97%)
rename scripts/{sortextable.h => sorttable.h} (99%)arch/arc/Kconfig +1 -1
@@ -13,7 +13,7 @@ config ARC select ARCH_HAS_SYNC_DMA_FOR_DEVICE select ARCH_SUPPORTS_ATOMIC_RMW if ARC_HAS_LLSC select ARCH_32BIT_OFF_T - select BUILDTIME_EXTABLE_SORT + select BUILDTIME_TABLE_SORT select CLONE_BACKWARDS select COMMON_CLK select DMA_DIRECT_REMAP
arch/arm/Kconfig +1 -1
@@ -36,7 +36,7 @@ config ARM select ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT if MMU select ARCH_WANT_IPC_PARSE_VERSION select BINFMT_FLAT_ARGVP_ENVP_ON_STACK - select BUILDTIME_EXTABLE_SORT if MMU + select BUILDTIME_TABLE_SORT if MMU select CLONE_BACKWARDS select CPU_PM if SUSPEND || CPU_IDLE select DCACHE_WORD_ACCESS if HAVE_EFFICIENT_UNALIGNED_ACCESS
arch/arm64/Kconfig +1 -1
@@ -81,7 +81,7 @@ config ARM64 select ARM_GIC_V3 select ARM_GIC_V3_ITS if PCI select ARM_PSCI_FW - select BUILDTIME_EXTABLE_SORT + select BUILDTIME_TABLE_SORT select CLONE_BACKWARDS select COMMON_CLK select CPU_PM if (SUSPEND || CPU_IDLE)
arch/microblaze/Kconfig +1 -1
@@ -11,7 +11,7 @@ config MICROBLAZE select ARCH_HAS_UNCACHED_SEGMENT if !MMU select ARCH_MIGHT_HAVE_PC_PARPORT select ARCH_WANT_IPC_PARSE_VERSION - select BUILDTIME_EXTABLE_SORT + select BUILDTIME_TABLE_SORT select TIMER_OF select CLONE_BACKWARDS3 select COMMON_CLK
arch/mips/Kconfig +1 -1
@@ -15,7 +15,7 @@ config MIPS select ARCH_USE_QUEUED_SPINLOCKS select ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT if MMU select ARCH_WANT_IPC_PARSE_VERSION - select BUILDTIME_EXTABLE_SORT + select BUILDTIME_TABLE_SORT select CLONE_BACKWARDS select CPU_NO_EFFICIENT_FFS if (TARGET_ISA_REV < 1) select CPU_PM if CPU_IDLE
arch/parisc/Kconfig +1 -1
@@ -18,7 +18,7 @@ config PARISC select RTC_DRV_GENERIC select INIT_ALL_POSSIBLE select BUG - select BUILDTIME_EXTABLE_SORT + select BUILDTIME_TABLE_SORT select HAVE_PCI select HAVE_PERF_EVENTS select HAVE_KERNEL_BZIP2
arch/powerpc/Kconfig +1 -1
@@ -149,7 +149,7 @@ config PPC select ARCH_WANT_IPC_PARSE_VERSION select ARCH_WEAK_RELEASE_ACQUIRE select BINFMT_ELF - select BUILDTIME_EXTABLE_SORT + select BUILDTIME_TABLE_SORT select CLONE_BACKWARDS select DCACHE_WORD_ACCESS if PPC64 && CPU_LITTLE_ENDIAN select DYNAMIC_FTRACE if FUNCTION_TRACER
arch/s390/Kconfig +1 -1
@@ -110,7 +110,7 @@ config S390 select ARCH_USE_CMPXCHG_LOCKREF select ARCH_WANTS_DYNAMIC_TASK_STRUCT select ARCH_WANT_IPC_PARSE_VERSION - select BUILDTIME_EXTABLE_SORT + select BUILDTIME_TABLE_SORT select CLONE_BACKWARDS2 select DYNAMIC_FTRACE if FUNCTION_TRACER select GENERIC_CLOCKEVENTS
arch/x86/Kconfig +1 -1
@@ -96,7 +96,7 @@ config X86 select ARCH_WANTS_DYNAMIC_TASK_STRUCT select ARCH_WANT_HUGE_PMD_SHARE select ARCH_WANTS_THP_SWAP if X86_64 - select BUILDTIME_EXTABLE_SORT + select BUILDTIME_TABLE_SORT select CLKEVT_I8253 select CLOCKSOURCE_VALIDATE_LAST_CYCLE select CLOCKSOURCE_WATCHDOG
arch/xtensa/Kconfig +1 -1
@@ -11,7 +11,7 @@ config XTENSA select ARCH_USE_QUEUED_SPINLOCKS select ARCH_WANT_FRAME_POINTERS select ARCH_WANT_IPC_PARSE_VERSION - select BUILDTIME_EXTABLE_SORT + select BUILDTIME_TABLE_SORT select CLONE_BACKWARDS select COMMON_CLK select DMA_REMAP if MMU
init/Kconfig +1 -1
@@ -58,7 +58,7 @@ config CONSTRUCTORS config IRQ_WORK bool -config BUILDTIME_EXTABLE_SORT +config BUILDTIME_TABLE_SORT bool config THREAD_INFO_IN_TASK
scripts/.gitignore +1 -1
@@ -7,7 +7,7 @@ kallsyms pnmtologo unifdef recordmcount -sortextable +sorttable asn1_compiler extract-cert sign-file
scripts/Makefile +2 -2
@@ -15,13 +15,13 @@ hostprogs-$(CONFIG_KALLSYMS) += kallsyms hostprogs-$(CONFIG_LOGO) += pnmtologo hostprogs-$(CONFIG_VT) += conmakehash hostprogs-$(BUILD_C_RECORDMCOUNT) += recordmcount -hostprogs-$(CONFIG_BUILDTIME_EXTABLE_SORT) += sortextable +hostprogs-$(CONFIG_BUILDTIME_TABLE_SORT) += sorttable hostprogs-$(CONFIG_ASN1) += asn1_compiler hostprogs-$(CONFIG_MODULE_SIG_FORMAT) += sign-file hostprogs-$(CONFIG_SYSTEM_TRUSTED_KEYRING) += extract-cert hostprogs-$(CONFIG_SYSTEM_EXTRA_CERTIFICATE) += insert-sys-cert -HOSTCFLAGS_sortextable.o = -I$(srctree)/tools/include +HOSTCFLAGS_sorttable.o = -I$(srctree)/tools/include HOSTCFLAGS_asn1_compiler.o = -I$(srctree)/include HOSTLDLIBS_sign-file = -lcrypto HOSTLDLIBS_extract-cert = -lcrypto
scripts/link-vmlinux.sh +5 -5
@@ -178,9 +178,9 @@ mksysmap() ${CONFIG_SHELL} "${srctree}/scripts/mksysmap" ${1} ${2} } -sortextable() +sorttable() { - ${objtree}/scripts/sortextable ${1} + ${objtree}/scripts/sorttable ${1} } # Delete output files in case of error
@@ -298,9 +298,9 @@ fi vmlinux_link vmlinux "${kallsymso}" ${btf_vmlinux_bin_o} -if [ -n "${CONFIG_BUILDTIME_EXTABLE_SORT}" ]; then - info SORTEX vmlinux - sortextable vmlinux +if [ -n "${CONFIG_BUILDTIME_TABLE_SORT}" ]; then + info SORTTAB vmlinux + sorttable vmlinux fi info SYSMAP System.map
scripts/sorttable.c renamed from scripts/sortextable.c +5 -5
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0-only /* -* sortextable.c: Sort the kernel's exception table +* sorttable.c: Sort the kernel's table * * Copyright 2011 - 2012 Cavium, Inc. *
@@ -182,9 +182,9 @@ static inline unsigned int get_secindex(unsigned int shndx, }/* 32 bit and 64 bit are very similar */ -#include "sortextable.h" -#define SORTEXTABLE_64 -#include "sortextable.h" +#include "sorttable.h" +#define SORTTABLE_64 +#include "sorttable.h" static int compare_relative_table (const void *a,const void *b) {
@@ -351,7 +351,7 @@ int main(int argc, char *argv[])void *addr =NULL ;if (argc <2 ) { -fprintf (stderr,"usage: sortextable vmlinux...\n" ); +fprintf (stderr,"usage: sorttable vmlinux...\n" );return 0 ; }
scripts/sorttable.h renamed from scripts/sortextable.h +2 -2
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0-only */ /* -* sortextable.h +* sorttable.h * * Copyright 2011 - 2012 Cavium, Inc. *
@@ -31,7 +31,7 @@#undef _r#undef _w -#ifdef SORTEXTABLE_64 +#ifdef SORTTABLE_64 # define extable_ent_size 16# define compare_extable compare_extable_64# define do_sort do_sort_64
Signature · 1 line
2.24.0.rc2
[tip: core/objtool] scripts/sorttable: Rename 'sortextable' to 'sorttable'
The following commit has been merged into the core/objtool branch of tip:
The following commit has been merged into the core/objtool branch of tip:
Commit-ID: 1091670637be8bd34a39dd1ddcc0a10a7c88d4e2 Gitweb: https://git.kernel.org/tip/1091670637be8bd34a39dd1ddcc0a10a7c88d4e2 Author: Shile Zhang <[email protected]> AuthorDate: Wed, 04 Dec 2019 08:46:31 +08:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Fri, 13 Dec 2019 10:47:58 +01:00
scripts/sorttable: Rename 'sortextable' to 'sorttable'
Use a more generic name for additional table sorting usecases, such as the upcoming ORC table sorting feature. This tool is not tied to exception table sorting anymore.
No functional changes intended.
[ mingo: Rewrote the changelog. ]
--- arch/arc/Kconfig | 2 +- arch/arm/Kconfig | 2 +- arch/arm64/Kconfig | 2 +- arch/microblaze/Kconfig | 2 +- arch/mips/Kconfig | 2 +- arch/parisc/Kconfig | 2 +- arch/powerpc/Kconfig | 2 +- arch/s390/Kconfig | 2 +- arch/x86/Kconfig | 2 +- arch/xtensa/Kconfig | 2 +- init/Kconfig | 2 +- scripts/.gitignore | 2 +- scripts/Makefile | 4 +- scripts/link-vmlinux.sh | 10 +- scripts/sortextable.c | 373 +--------------------------------------- scripts/sortextable.h | 210 +---------------------- scripts/sorttable.c | 373 +++++++++++++++++++++++++++++++++++++++- scripts/sorttable.h | 210 ++++++++++++++++++++++- 18 files changed, 602 insertions(+), 602 deletions(-) delete mode 100644 scripts/sortextable.c delete mode 100644 scripts/sortextable.h create mode 100644 scripts/sorttable.c create mode 100644 scripts/sorttable.h
arch/arc/Kconfig +1 -1
@@ -13,7 +13,7 @@ config ARC select ARCH_HAS_SYNC_DMA_FOR_DEVICE select ARCH_SUPPORTS_ATOMIC_RMW if ARC_HAS_LLSC select ARCH_32BIT_OFF_T - select BUILDTIME_EXTABLE_SORT + select BUILDTIME_TABLE_SORT select CLONE_BACKWARDS select COMMON_CLK select DMA_DIRECT_REMAP
arch/arm/Kconfig +1 -1
@@ -36,7 +36,7 @@ config ARM select ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT if MMU select ARCH_WANT_IPC_PARSE_VERSION select BINFMT_FLAT_ARGVP_ENVP_ON_STACK - select BUILDTIME_EXTABLE_SORT if MMU + select BUILDTIME_TABLE_SORT if MMU select CLONE_BACKWARDS select CPU_PM if SUSPEND || CPU_IDLE select DCACHE_WORD_ACCESS if HAVE_EFFICIENT_UNALIGNED_ACCESS
arch/arm64/Kconfig +1 -1
@@ -81,7 +81,7 @@ config ARM64 select ARM_GIC_V3 select ARM_GIC_V3_ITS if PCI select ARM_PSCI_FW - select BUILDTIME_EXTABLE_SORT + select BUILDTIME_TABLE_SORT select CLONE_BACKWARDS select COMMON_CLK select CPU_PM if (SUSPEND || CPU_IDLE)
arch/microblaze/Kconfig +1 -1
@@ -11,7 +11,7 @@ config MICROBLAZE select ARCH_HAS_UNCACHED_SEGMENT if !MMU select ARCH_MIGHT_HAVE_PC_PARPORT select ARCH_WANT_IPC_PARSE_VERSION - select BUILDTIME_EXTABLE_SORT + select BUILDTIME_TABLE_SORT select TIMER_OF select CLONE_BACKWARDS3 select COMMON_CLK
arch/mips/Kconfig +1 -1
@@ -15,7 +15,7 @@ config MIPS select ARCH_USE_QUEUED_SPINLOCKS select ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT if MMU select ARCH_WANT_IPC_PARSE_VERSION - select BUILDTIME_EXTABLE_SORT + select BUILDTIME_TABLE_SORT select CLONE_BACKWARDS select CPU_NO_EFFICIENT_FFS if (TARGET_ISA_REV < 1) select CPU_PM if CPU_IDLE
arch/parisc/Kconfig +1 -1
@@ -18,7 +18,7 @@ config PARISC select RTC_DRV_GENERIC select INIT_ALL_POSSIBLE select BUG - select BUILDTIME_EXTABLE_SORT + select BUILDTIME_TABLE_SORT select HAVE_PCI select HAVE_PERF_EVENTS select HAVE_KERNEL_BZIP2
arch/powerpc/Kconfig +1 -1
@@ -149,7 +149,7 @@ config PPC select ARCH_WANT_IPC_PARSE_VERSION select ARCH_WEAK_RELEASE_ACQUIRE select BINFMT_ELF - select BUILDTIME_EXTABLE_SORT + select BUILDTIME_TABLE_SORT select CLONE_BACKWARDS select DCACHE_WORD_ACCESS if PPC64 && CPU_LITTLE_ENDIAN select DYNAMIC_FTRACE if FUNCTION_TRACER
arch/s390/Kconfig +1 -1
@@ -110,7 +110,7 @@ config S390 select ARCH_USE_CMPXCHG_LOCKREF select ARCH_WANTS_DYNAMIC_TASK_STRUCT select ARCH_WANT_IPC_PARSE_VERSION - select BUILDTIME_EXTABLE_SORT + select BUILDTIME_TABLE_SORT select CLONE_BACKWARDS2 select DYNAMIC_FTRACE if FUNCTION_TRACER select GENERIC_CLOCKEVENTS
arch/x86/Kconfig +1 -1
@@ -96,7 +96,7 @@ config X86 select ARCH_WANTS_DYNAMIC_TASK_STRUCT select ARCH_WANT_HUGE_PMD_SHARE select ARCH_WANTS_THP_SWAP if X86_64 - select BUILDTIME_EXTABLE_SORT + select BUILDTIME_TABLE_SORT select CLKEVT_I8253 select CLOCKSOURCE_VALIDATE_LAST_CYCLE select CLOCKSOURCE_WATCHDOG
arch/xtensa/Kconfig +1 -1
@@ -11,7 +11,7 @@ config XTENSA select ARCH_USE_QUEUED_SPINLOCKS select ARCH_WANT_FRAME_POINTERS select ARCH_WANT_IPC_PARSE_VERSION - select BUILDTIME_EXTABLE_SORT + select BUILDTIME_TABLE_SORT select CLONE_BACKWARDS select COMMON_CLK select DMA_REMAP if MMU
init/Kconfig +1 -1
@@ -58,7 +58,7 @@ config CONSTRUCTORS config IRQ_WORK bool -config BUILDTIME_EXTABLE_SORT +config BUILDTIME_TABLE_SORT bool config THREAD_INFO_IN_TASK
scripts/.gitignore +1 -1
@@ -6,7 +6,7 @@ conmakehash kallsyms unifdef recordmcount -sortextable +sorttable asn1_compiler extract-cert sign-file
scripts/Makefile +2 -2
@@ -13,13 +13,13 @@ hostprogs-$(CONFIG_BUILD_BIN2C) += bin2c hostprogs-$(CONFIG_KALLSYMS) += kallsyms hostprogs-$(CONFIG_VT) += conmakehash hostprogs-$(BUILD_C_RECORDMCOUNT) += recordmcount -hostprogs-$(CONFIG_BUILDTIME_EXTABLE_SORT) += sortextable +hostprogs-$(CONFIG_BUILDTIME_TABLE_SORT) += sorttable hostprogs-$(CONFIG_ASN1) += asn1_compiler hostprogs-$(CONFIG_MODULE_SIG_FORMAT) += sign-file hostprogs-$(CONFIG_SYSTEM_TRUSTED_KEYRING) += extract-cert hostprogs-$(CONFIG_SYSTEM_EXTRA_CERTIFICATE) += insert-sys-cert -HOSTCFLAGS_sortextable.o = -I$(srctree)/tools/include +HOSTCFLAGS_sorttable.o = -I$(srctree)/tools/include HOSTCFLAGS_asn1_compiler.o = -I$(srctree)/include HOSTLDLIBS_sign-file = -lcrypto HOSTLDLIBS_extract-cert = -lcrypto
scripts/link-vmlinux.sh +5 -5
@@ -180,9 +180,9 @@ mksysmap() ${CONFIG_SHELL} "${srctree}/scripts/mksysmap" ${1} ${2} } -sortextable() +sorttable() { - ${objtree}/scripts/sortextable ${1} + ${objtree}/scripts/sorttable ${1} } # Delete output files in case of error
@@ -304,9 +304,9 @@ fi vmlinux_link vmlinux "${kallsymso}" ${btf_vmlinux_bin_o} -if [ -n "${CONFIG_BUILDTIME_EXTABLE_SORT}" ]; then - info SORTEX vmlinux - sortextable vmlinux +if [ -n "${CONFIG_BUILDTIME_TABLE_SORT}" ]; then + info SORTTAB vmlinux + sorttable vmlinux fi info SYSMAP System.map
scripts/sortextable.c deleted +0 -373
373 lines not on this page · raw message
scripts/sortextable.h deleted +0 -210
210 lines not on this page · raw message
scripts/sorttable.c new file +373 -0
373 lines not on this page · raw message
scripts/sorttable.h new file +210 -0
210 lines not on this page · raw message
RFC PATCH v6 6/7 scripts/sorttable: Add ORC unwind tables sort concurrently
In reply to Shile ZhangORC unwinder have two tables, .orc_unwind_ip and .orc_unwind, which needs sorted for binary search. To sort it at build time can save more CPU cycles help to speed up kernel booting.
Add the ORC tables sorting in a sperated thread helps to avoid more link cost of kernel building.
https://lore.kernel.org/lkml/[email protected]/
Fixed compile error
--- scripts/Makefile | 9 +++ scripts/sorttable.c | 6 +- scripts/sorttable.h | 180 ++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 189 insertions(+), 6 deletions(-)
scripts/Makefile +9 -0
@@ -26,6 +26,15 @@ HOSTCFLAGS_asn1_compiler.o = -I$(srctree)/include HOSTLDLIBS_sign-file = -lcrypto HOSTLDLIBS_extract-cert = -lcrypto +ifdef CONFIG_UNWINDER_ORC +ifeq ($(ARCH),x86_64) +ARCH := x86 +endif +HOSTCFLAGS_sorttable.o += -I$(srctree)/tools/arch/x86/include +HOSTCFLAGS_sorttable.o += -DUNWINDER_ORC_ENABLED +HOSTLDLIBS_sorttable = -lpthread +endif + always := $(hostprogs-y) $(hostprogs-m) # The following hostprogs-y programs are only build on demand
scripts/sorttable.c +5 -1
@@ -2,6 +2,10 @@/* * sorttable.c: Sort the kernel's table * +* Added ORC unwind tables sort support, and other updates: +* Copyright (C) 1999-2019 Alibaba Group Holding Limited. by: +* Shile Zhang <[email protected]> +* * Copyright 2011 - 2012 Cavium, Inc. * * Based on code taken from recortmcount.c which is:
@@ -9,7 +13,7 @@* Copyright 2009 John F. Reiser <[email protected]>. All rights reserved. * * Restructured to fit Linux format, as well as other updates: -* Copyright 2010 Steven Rostedt <[email protected]>, Red Hat Inc. +* Copyright 2010 Steven Rostedt <[email protected]>, Red Hat Inc. */ /*
scripts/sorttable.h +175 -5
235 lines not on this page · raw message
Signature · 1 line
2.24.0.rc2
[tip: core/objtool] scripts/sorttable: Implement build-time ORC unwind table sorting
The following commit has been merged into the core/objtool branch of tip:
The following commit has been merged into the core/objtool branch of tip:
Commit-ID: 57fa1899428538e314a7e0d52a5b617af082389a Gitweb: https://git.kernel.org/tip/57fa1899428538e314a7e0d52a5b617af082389a Author: Shile Zhang <[email protected]> AuthorDate: Wed, 04 Dec 2019 08:46:32 +08:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Fri, 13 Dec 2019 10:47:58 +01:00
scripts/sorttable: Implement build-time ORC unwind table sorting
The ORC unwinder has two tables: .orc_unwind_ip and .orc_unwind, which need to be sorted for binary search. Previously this sorting was done during bootup.
Sort them at build time to speed up booting.
Add the ORC tables sorting in a parallel build process to speed up the build.
[ mingo: Rewrote the changelog and fixed some comments. ]
--- scripts/Makefile | 9 ++- scripts/sorttable.c | 6 +- scripts/sorttable.h | 180 +++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 189 insertions(+), 6 deletions(-)
scripts/Makefile +9 -0
@@ -24,6 +24,15 @@ HOSTCFLAGS_asn1_compiler.o = -I$(srctree)/include HOSTLDLIBS_sign-file = -lcrypto HOSTLDLIBS_extract-cert = -lcrypto +ifdef CONFIG_UNWINDER_ORC +ifeq ($(ARCH),x86_64) +ARCH := x86 +endif +HOSTCFLAGS_sorttable.o += -I$(srctree)/tools/arch/x86/include +HOSTCFLAGS_sorttable.o += -DUNWINDER_ORC_ENABLED +HOSTLDLIBS_sorttable = -lpthread +endif + always := $(hostprogs-y) $(hostprogs-m) # The following hostprogs-y programs are only build on demand
scripts/sorttable.c +5 -1
@@ -2,6 +2,10 @@/* * sorttable.c: Sort the kernel's table * +* Added ORC unwind tables sort support and other updates: +* Copyright (C) 1999-2019 Alibaba Group Holding Limited. by: +* Shile Zhang <[email protected]> +* * Copyright 2011 - 2012 Cavium, Inc. * * Based on code taken from recortmcount.c which is:
@@ -9,7 +13,7 @@* Copyright 2009 John F. Reiser <[email protected]>. All rights reserved. * * Restructured to fit Linux format, as well as other updates: -* Copyright 2010 Steven Rostedt <[email protected]>, Red Hat Inc. +* Copyright 2010 Steven Rostedt <[email protected]>, Red Hat Inc. */ /*
scripts/sorttable.h +175 -5
235 lines not on this page · raw message
RFC PATCH v6 7/7 x86/unwind/orc: remove run-time ORC unwind tables sort
In reply to Shile ZhangThe orc_unwind and orc_unwind_ip tables are sorted in vmlinux link phase at build time, just remove the run-time sort.
--- arch/x86/kernel/unwind_orc.c | 8 +++++--- scripts/link-vmlinux.sh | 5 ++++- 2 files changed, 9 insertions(+), 4 deletions(-)
arch/x86/kernel/unwind_orc.c +5 -3
@@ -273,9 +273,11 @@ void __init unwind_init(void)return ; } -/* Sort the .orc_unwind and .orc_unwind_ip tables: */ -sort (__start_orc_unwind_ip, num_entries,sizeof (int ), orc_sort_cmp, - orc_sort_swap); +/* +* Note, orc_unwind and orc_unwind_ip tables has been sorted in +* vmlinux link phase by sorttable tool at build time. +* Its ready for binary search now. +*/ /* Initialize the fast lookup table: */ lookup_num_blocks = orc_lookup_end - orc_lookup;
scripts/link-vmlinux.sh +4 -1
@@ -300,7 +300,10 @@ vmlinux_link vmlinux "${kallsymso}" ${btf_vmlinux_bin_o} if [ -n "${CONFIG_BUILDTIME_TABLE_SORT}" ]; then info SORTTAB vmlinux - sorttable vmlinux + if ! sorttable vmlinux; then + echo >&2 Failed to sort kernel tables + exit 1 + fi fi info SYSMAP System.map
Signature · 1 line
2.24.0.rc2
[tip: core/objtool] x86/unwind/orc: Remove boot-time ORC unwind tables sorting
The following commit has been merged into the core/objtool branch of tip:
The following commit has been merged into the core/objtool branch of tip:
Commit-ID: f14bf6a350dfd6613dbf91be5b423bc7eab690da Gitweb: https://git.kernel.org/tip/f14bf6a350dfd6613dbf91be5b423bc7eab690da Author: Shile Zhang <[email protected]> AuthorDate: Wed, 04 Dec 2019 08:46:33 +08:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Fri, 13 Dec 2019 10:47:58 +01:00
x86/unwind/orc: Remove boot-time ORC unwind tables sorting
Now that the orc_unwind and orc_unwind_ip tables are sorted at build time, remove the boot time sorting pass.
No change in functionality.
[ mingo: Rewrote the changelog and code comments. ]
--- arch/x86/kernel/unwind_orc.c | 8 +++++--- scripts/link-vmlinux.sh | 5 ++++- 2 files changed, 9 insertions(+), 4 deletions(-)
arch/x86/kernel/unwind_orc.c +5 -3
@@ -273,9 +273,11 @@ void __init unwind_init(void)return ; } -/* Sort the .orc_unwind and .orc_unwind_ip tables: */ -sort (__start_orc_unwind_ip, num_entries,sizeof (int ), orc_sort_cmp, - orc_sort_swap); +/* +* Note, the orc_unwind and orc_unwind_ip tables were already +* sorted at build time via the 'sorttable' tool. +* It's ready for binary search straight away, no need to sort it. +*/ /* Initialize the fast lookup table: */ lookup_num_blocks = orc_lookup_end - orc_lookup;
scripts/link-vmlinux.sh +4 -1
@@ -306,7 +306,10 @@ vmlinux_link vmlinux "${kallsymso}" ${btf_vmlinux_bin_o} if [ -n "${CONFIG_BUILDTIME_TABLE_SORT}" ]; then info SORTTAB vmlinux - sorttable vmlinux + if ! sorttable vmlinux; then + echo >&2 Failed to sort kernel tables + exit 1 + fi fi info SYSMAP System.map
Hi Peter, Ingo,
Sorry for ping,
but how about this series? or what can I do next?
Thanks!
Quoted 74 lines · Shile Zhang
Hi,
Sorry, update for compile error fix, reported by Intel's kbuild test robot. Any comments or suggestions are welcome!
Thanks!
Changelog:
==========v5->v6:
- fix compile error reported by kbuild test robot;
v4->v5:
- replace sort with qsort, suggested by Andy Lutomirski <[email protected]>;
- add error handling in link scripts;
- fixed some review findings;
https://lore.kernel.org/lkml/[email protected]/
v3->v4:
- Code refactored for Peter's review findings and suggestions.
https://lore.kernel.org/lkml/[email protected]/
v2->v3:
- Discard new added sortorctable tool and relatedKconfigchanges.
- Refactored sortextable, makes it more readable and extendable.
- Rename 'sortextable' to 'sorttable', for more kernel tables extend.
- Add ORC unwind tables sort into sorttable.
- Remove the runtime ORC tables sort.
https://lore.kernel.org/lkml/[email protected]/
v1->v2:
- Removed new addedKconfigand runtime sort code, advised by Josh Poimboeuf.
- Some minor refactoring.
https://lore.kernel.org/lkml/[email protected]/v1:
- Added a new sortorctable tool to sort ORC unwind tables at build time, same as sortextable.
- Add a new Kconfigure to control if ORC unwind tables sort at build time.
https://lore.kernel.org/lkml/[email protected]/Shile Zhang (7):
scripts/sortextable: Rewrite error/success handlingscripts/sortextable: kernel coding style formatingscripts/sortextable: Remove dead codescripts/sortextable: refactordo_func()functionscripts/sorttable: rename sortextable to sorttablescripts/sorttable: Add ORC unwind tables sort concurrently x86/unwind/orc: remove run-time ORC unwind tables sortarch/arc/Kconfig | 2 +- arch/arm/Kconfig | 2 +- arch/arm64/Kconfig | 2 +- arch/microblaze/Kconfig | 2 +- arch/mips/Kconfig | 2 +- arch/parisc/Kconfig | 2 +- arch/powerpc/Kconfig | 2 +- arch/s390/Kconfig | 2 +- arch/x86/Kconfig | 2 +- arch/x86/kernel/unwind_orc.c | 8 +- arch/xtensa/Kconfig | 2 +- init/Kconfig | 2 +- scripts/.gitignore | 2 +- scripts/Makefile | 13 +- scripts/link-vmlinux.sh | 13 +- scripts/sortextable.h | 209 -------------- scripts/{sortextable.c => sorttable.c} | 305 +++++++++----------- scripts/sorttable.h | 380 +++++++++++++++++++++++++ 18 files changed, 557 insertions(+), 395 deletions(-)delete mode 100644
scripts/sortextable.hrenamescripts/{sortextable.c=>sorttable.c} (67%) create mode 100644scripts/sorttable.h
Quoted 4 lines · Shile Zhang
Hi,
Sorry, update for compile error fix, reported by Intel's kbuild test robot. Any comments or suggestions are welcome!
Could you please send a delta patch to fix these new build warnings on 64-bit allnoconfig kernels:
arch/x86/kernel/unwind_orc.c:210:12: warning: ‘orc_sort_cmp’ defined but not used [-Wunused-function] arch/x86/kernel/unwind_orc.c:190:13: warning: ‘orc_sort_swap’ defined but not used [-Wunused-function]
Thanks,
Ingo
Quoted 2 lines · Ingo Molnar
arch/x86/kernel/unwind_orc.c:210:12: warning: ‘orc_sort_cmp’ defined but not used [-Wunused-function]arch/x86/kernel/unwind_orc.c:190:13: warning: ‘orc_sort_swap’ defined but not used [-Wunused-function]
Hi Ingo,
Sorry for trouble! please help to check the warning-fix patch. Thanks!
---
From b3d34213b4fe5a9cf2efcc1c758a5fb6c5f7676b Mon Sep 17 00:00:00 2001
From: Shile Zhang <[email protected]>
Date: Mon, 16 Dec 2019 10:56:03 +0800
Subject: [PATCH] x86/unwind/orc: fix build warning
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
To fix follwowing warning due to ORC sort moved to build time:
arch/x86/kernel/unwind_orc.c:210:12: warning: ‘orc_sort_cmp’ defined but not used [-Wunused-function] arch/x86/kernel/unwind_orc.c:190:13: warning: ‘orc_sort_swap’ defined but not used [-Wunused-function]
---
arch/x86/kernel/unwind_orc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/unwind_orc.c +0 -0
@@ -187,6 +187,7 @@ static struct orc_entry *orc_find(unsigned long ip)
return orc_ftrace_find(ip);
}
+#ifdef CONFIG_MODULES
static void orc_sort_swap(void *_a, void *_b, int size)
{
struct orc_entry *orc_a, *orc_b;
@@ -229,7 +230,6 @@ static int orc_sort_cmp(const void *_a, const void *_b) return orc_a->sp_reg == ORC_REG_UNDEFINED && !orc_a->end ? -1 : 1; }
-#ifdef CONFIG_MODULES
void unwind_module_init(struct module *mod, void *_orc_ip, size_t orc_ip_size, void *_orc, size_t orc_size)
{
--
2.24.0.rc2
[tip: core/objtool] x86/unwind/orc: Fix !CONFIG_MODULES build warning
The following commit has been merged into the core/objtool branch of tip:
The following commit has been merged into the core/objtool branch of tip:
Commit-ID: 22a7fa8848c5e881d87ef2f7f3c2ea77b286e6f9 Gitweb: https://git.kernel.org/tip/22a7fa8848c5e881d87ef2f7f3c2ea77b286e6f9 Author: Shile Zhang <[email protected]> AuthorDate: Mon, 16 Dec 2019 11:07:29 +08:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Tue, 07 Jan 2020 08:15:11 +01:00
x86/unwind/orc: Fix !CONFIG_MODULES build warning
To fix follwowing warning due to ORC sort moved to build time:
arch/x86/kernel/unwind_orc.c:210:12: warning: ‘orc_sort_cmp’ defined but not used [-Wunused-function] arch/x86/kernel/unwind_orc.c:190:13: warning: ‘orc_sort_swap’ defined but not used [-Wunused-function]
--- arch/x86/kernel/unwind_orc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/x86/kernel/unwind_orc.c +2 -1
@@ -187,6 +187,8 @@ static struct orc_entry *orc_find(unsigned long ip)return orc_ftrace_find (ip); } +#ifdef CONFIG_MODULES +static void orc_sort_swap (void *_a,void *_b,int size) {struct orc_entry *orc_a, *orc_b;
@@ -229,7 +231,6 @@ static int orc_sort_cmp(const void *_a, const void *_b)return orc_a->sp_reg ==ORC_REG_UNDEFINED && !orc_a->end ?-1 :1 ; } -#ifdef CONFIG_MODULES void unwind_module_init (struct module *mod,void *_orc_ip,size_t orc_ip_size,void *_orc,size_t orc_size) {