Cleanup recordmcount and begin objtool conversion
v3 cover Cleanup recordmcount and begin objtool conversion
This series cleans up recordmcount and then makes it into an objtool subcommand.
The series starts with 8 cleanup patches which make recordmcount easier to review and integrate with objtool. The final 5 patches show the beginning steps of converting recordmcount to use objtool's ELF code rather than its own open-coded methods of accessing ELF files.
---
v3:
Rebased on mainline. s/elf_open/elf_read/ in recordmcount.c
v2:
Fix whitespace before line continuation
Add ftrace/mcount/record.h to objtool_dep
Rename the Makefile variable BUILD_C_RECORDMCOUNT to
better reflect its purpose
Similar: rename recordmcount_source => recordmcount_dep
When using objtool we can just depend on the binary rather than the source the binary is built from. This should address Josh's feedback and make the Makefile code a bit clearer
Add a comment to make reading the Makefile a little
easier
Rebased to latest mainline -rc
Collected some build time measurements
Build times measurements (measured for v2 posting) -- median of multiple runs in a VM measured with "time":
mainline (5.2.0-rc4) build times (median of 3 runs): real 2m58.379s user 2m29.621s sys 1m35.116s Post recordmcount-cleanup build times (median of 5 runs): real 2m51.973s user 2m29.094s sys 1m33.688s objtool mcount build times (median of 7 runs): real 2m57.92s user 2m33.73s sys 1m37.06s
Note: I saw some significant variation especially in the "real" time
measurements probably because it was in a VM on a machine with various "idle" GUI tasks running. This is why I took the median rather than the mean. Though I haven't run the statistics, my sense is the numbers don't support concluding that things really got any faster or slower.
Matt Helsley (13):
recordmcount: Remove redundant strcmp
recordmcount: Remove uread()
recordmcount: Remove unused fd from uwrite() and ulseek()
recordmcount: Rewrite error/success handling
recordmcount: Kernel style function signature formatting
recordmcount: Kernel style formatting
recordmcount: Remove redundant cleanup() calls
recordmcount: Clarify what cleanup() does
objtool: Prepare to merge recordmcount
objtool: Make recordmcount into an objtool subcmd
objtool: recordmcount: Start using objtool's elf wrapper
objtool: recordmcount: Search for __mcount_loc before walking the
sections
objtool: recordmcount: Convert do_func() relhdrs
Makefile | 6 +-
scripts/.gitignore | 1 -
scripts/Makefile | 1 -
scripts/Makefile.build | 25 +-
tools/objtool/.gitignore | 1 +
tools/objtool/Build | 1 +
tools/objtool/Makefile | 1 +
tools/objtool/builtin-mcount.c | 72 +++++
tools/objtool/builtin-mcount.h | 23 ++
tools/objtool/builtin.h | 1 +
tools/objtool/objtool.c | 1 +
{scripts => tools/objtool}/recordmcount.c | 350 ++++++++++-----------
{scripts => tools/objtool}/recordmcount.h | 197 +++++++-----
{scripts => tools/objtool}/recordmcount.pl | 0
14 files changed, 406 insertions(+), 274 deletions(-)
create mode 100644 tools/objtool/builtin-mcount.c
create mode 100644 tools/objtool/builtin-mcount.h
rename {scripts => tools/objtool}/recordmcount.c (78%)
rename {scripts => tools/objtool}/recordmcount.h (78%)
rename {scripts => tools/objtool}/recordmcount.pl (100%)Signature · 1 line
2.20.1
PATCH v3 1/13 recordmcount: Remove redundant strcmp
The strcmp is unnecessary since .text is already accepted as a prefix in the strncmp().
--- scripts/recordmcount.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
scripts/recordmcount.c +1 -2
@@ -405,8 +405,7 @@ is_mcounted_section_name(char const *const txtname)strcmp (".irqentry.text" , txtname) ==0 ||strcmp (".softirqentry.text" , txtname) ==0 ||strcmp (".kprobes.text" , txtname) ==0 || -strcmp (".cpuidle.text" , txtname) ==0 || -strcmp (".text.unlikely" , txtname) ==0 ; +strcmp (".cpuidle.text" , txtname) ==0 ; }/* 32 bit and 64 bit are very similar */
Signature · 1 line
2.20.1
PATCH v3 2/13 recordmcount: Remove uread()
In reply to Matt Helsleyuread() is only used to initialize the ELF file's pseudo private-memory mapping while uwrite() and ulseek() work within the pseudo-mapping and extend it as necessary. Thus it is not a complementary function to uwrite() and ulseek(). It also makes no sense to do cleanups inside uread() when its only caller, mmap_file(), is doing the relevant allocations and associated initializations.
Therefore it's clearer to use a plain read() call to initialize the data in mmap_file() and remove uread().
--- scripts/recordmcount.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-)
scripts/recordmcount.c +5 -13
@@ -89,7 +89,7 @@ succeed_file(void)longjmp (jmpenv,SJ_SUCCEED ); } -/* ulseek, uread, ...: Check return value for errors. */ +/* ulseek, uwrite, ...: Check return value for errors. */ static off_t ulseek (int const fd,off_t const offset,int const whence)
@@ -112,17 +112,6 @@ ulseek(int const fd, off_t const offset, int const whence)return file_ptr - file_map; } -static size_t -uread (int const fd,void *const buf,size_t const count) -{ -size_t const n =read (fd, buf, count); -if (n != count) { -perror ("read" ); -fail_file (); - } -return n; -} -static size_t uwrite (int const fd,void const *const buf,size_t const count) {
@@ -298,7 +287,10 @@ static void *mmap_file(char const *fname)if (file_map ==MAP_FAILED ) { mmap_failed =1 ; file_map =umalloc (sb.st_size); -uread (fd_map, file_map, sb.st_size); +if (read (fd_map, file_map, sb.st_size) != sb.st_size) { +perror (fname); +fail_file (); + } }close (fd_map);
Signature · 1 line
2.20.1
PATCH v3 3/13 recordmcount: Remove unused fd from uwrite() and ulseek()
In reply to Matt Helsleyuwrite() works within the pseudo-mapping and extends it as necessary without needing the file descriptor (fd) parameter passed to it. Similarly, ulseek() doesn't need its fd parameter. These parameters were only added because the functions bear a conceptual resemblance to write() and lseek(). Worse, they obscure the fact that at the time uwrite() and ulseek() are called fd_map is not a valid file descriptor.
Remove the unused file descriptor parameters that make it look like fd_map is still valid.
--- scripts/recordmcount.c | 16 ++++++++-------- scripts/recordmcount.h | 26 +++++++++++++------------- 2 files changed, 21 insertions(+), 21 deletions(-)
scripts/recordmcount.c +8 -8
@@ -92,7 +92,7 @@ succeed_file(void)/* ulseek, uwrite, ...: Check return value for errors. */ static off_t -ulseek (int const fd,off_t const offset,int const whence) +ulseek (off_t const offset,int const whence) {switch (whence) {case SEEK_SET :
@@ -113,7 +113,7 @@ ulseek(int const fd, off_t const offset, int const whence) }static size_t -uwrite (int const fd,void const *const buf,size_t const count) +uwrite (void const *const buf,size_t const count) {size_t cnt = count;off_t idx =0 ;
@@ -183,8 +183,8 @@ static int make_nop_x86(void *map, size_t const offset)return -1 ;/* convert to nop */ -ulseek (fd_map, offset -1 ,SEEK_SET ); -uwrite (fd_map, ideal_nop,5 ); +ulseek (offset -1 ,SEEK_SET ); +uwrite (ideal_nop,5 );return 0 ; }
@@ -232,10 +232,10 @@ static int make_nop_arm(void *map, size_t const offset)return -1 ;/* Convert to nop */ -ulseek (fd_map, off,SEEK_SET ); +ulseek (off,SEEK_SET );do { -uwrite (fd_map, ideal_nop, nop_size); +uwrite (ideal_nop, nop_size); }while (--cnt >0 );return 0 ;
@@ -252,8 +252,8 @@ static int make_nop_arm64(void *map, size_t const offset)return -1 ;/* Convert to nop */ -ulseek (fd_map, offset,SEEK_SET ); -uwrite (fd_map, ideal_nop,4 ); +ulseek (offset,SEEK_SET ); +uwrite (ideal_nop,4 );return 0 ; }
scripts/recordmcount.h +13 -13
@@ -202,14 +202,14 @@ static void append_func(Elf_Ehdr *const ehdr, new_e_shoff = t;/* body for new shstrtab */ -ulseek (fd_map, sb.st_size,SEEK_SET ); -uwrite (fd_map, old_shstr_sh_offset + (void *)ehdr, old_shstr_sh_size); -uwrite (fd_map, mc_name,1 +strlen (mc_name)); +ulseek (sb.st_size,SEEK_SET ); +uwrite (old_shstr_sh_offset + (void *)ehdr, old_shstr_sh_size); +uwrite (mc_name,1 +strlen (mc_name));/* old(modified) Elf_Shdr table, word-byte aligned */ -ulseek (fd_map, t,SEEK_SET ); +ulseek (t,SEEK_SET ); t +=sizeof (Elf_Shdr) * old_shnum; -uwrite (fd_map, old_shoff + (void *)ehdr, +uwrite (old_shoff + (void *)ehdr,sizeof (Elf_Shdr) * old_shnum);/* new sections __mcount_loc and .rel__mcount_loc */
@@ -225,7 +225,7 @@ static void append_func(Elf_Ehdr *const ehdr, mcsec.sh_info =0 ; mcsec.sh_addralign =_w (_size); mcsec.sh_entsize =_w (_size); -uwrite (fd_map, &mcsec,sizeof (mcsec)); +uwrite (&mcsec,sizeof (mcsec)); mcsec.sh_name =w (old_shstr_sh_size); mcsec.sh_type = (sizeof (Elf_Rela) == rel_entsize)
@@ -239,15 +239,15 @@ static void append_func(Elf_Ehdr *const ehdr, mcsec.sh_info =w (old_shnum); mcsec.sh_addralign =_w (_size); mcsec.sh_entsize =_w (rel_entsize); -uwrite (fd_map, &mcsec,sizeof (mcsec)); +uwrite (&mcsec,sizeof (mcsec)); -uwrite (fd_map, mloc0, (void *)mlocp - (void *)mloc0); -uwrite (fd_map, mrel0, (void *)mrelp - (void *)mrel0); +uwrite (mloc0, (void *)mlocp - (void *)mloc0); +uwrite (mrel0, (void *)mrelp - (void *)mrel0); ehdr->e_shoff =_w (new_e_shoff); ehdr->e_shnum =w2 (2 +w2 (ehdr->e_shnum));/* {.rel,}__mcount_loc */ -ulseek (fd_map,0 ,SEEK_SET ); -uwrite (fd_map, ehdr,sizeof (*ehdr)); +ulseek (0 ,SEEK_SET ); +uwrite (ehdr,sizeof (*ehdr)); } static unsigned get_mcountsym(Elf_Sym const *const sym0,
@@ -396,8 +396,8 @@ static void nop_mcount(Elf_Shdr const *const relhdr,Elf_Rel rel; rel = *(Elf_Rel *)relp;Elf_r_info (&rel,Elf_r_sym (relp), rel_type_nop); -ulseek (fd_map, (void *)relp - (void *)ehdr,SEEK_SET ); -uwrite (fd_map, &rel,sizeof (rel)); +ulseek ((void *)relp - (void *)ehdr,SEEK_SET ); +uwrite (&rel,sizeof (rel)); } relp = (Elf_Rel const *)(rel_entsize + (void *)relp); }
Signature · 1 line
2.20.1
PATCH v3 4/13 recordmcount: Rewrite error/success handling
In reply to Matt HelsleyRecordmcount uses setjmp/longjmp to manage control flow as it reads and then writes the ELF file. This unusual control flow is hard to follow and check in addition to being unlike kernel coding style.
So we rewrite these paths to use regular return values to indicate error/success. When an error or previously-completed object file is found we return an error code following kernel coding conventions -- negative error values and 0 for success when we're not returning a pointer. We return NULL for those that fail and return non-NULL pointers otherwise.
One oddity is already_has_rel_mcount -- there we use pointer comparison rather than string comparison to differentiate between previously-processed object files and returning the name of a text section.
--- scripts/recordmcount.c | 160 +++++++++++++++++++++-------------------- scripts/recordmcount.h | 134 +++++++++++++++++++++++++--------- 2 files changed, 182 insertions(+), 112 deletions(-)
scripts/recordmcount.c +83 -77
@@ -27,7 +27,6 @@#include <getopt.h> #include <elf.h> #include <fcntl.h> -#include <setjmp.h> #include <stdio.h> #include <stdlib.h> #include <string.h>
@@ -43,7 +42,6 @@ static int fd_map; /* File descriptor for file being modified. */static int mmap_failed;/* Boolean flag. */ static char gpfx;/* prefix for global symbol name (sometimes '_') */ static struct stat sb;/* Remember .st_size, etc. */ -static jmp_buf jmpenv;/* setjmp/longjmp per-file error escape */ static const char *altmcount;/* alternate mcount symbol name */ static int warn_on_notrace_sect;/* warn when section has mcount not being recorded */ static void *file_map;/* pointer of the mapped file */
@@ -53,13 +51,6 @@ static void *file_ptr; /* current file pointer location */static void *file_append;/* added to the end of the file */ static size_t file_append_size;/* how much is added to end of file */ -/* 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 )
@@ -75,20 +66,6 @@ cleanup(void) file_updated =0 ; } -static void __attribute__((noreturn)) -fail_file (void ) -{ -cleanup (); -longjmp (jmpenv,SJ_FAIL ); -} - -static void __attribute__((noreturn)) -succeed_file (void ) -{ -cleanup (); -longjmp (jmpenv,SJ_SUCCEED ); -} -/* ulseek, uwrite, ...: Check return value for errors. */ static off_t
@@ -107,12 +84,12 @@ ulseek(off_t const offset, int const whence) }if (file_ptr < file_map) {fprintf (stderr,"lseek: seek before file\n" ); -fail_file (); +return -1 ; }return file_ptr - file_map; } -static size_t +static ssize_t uwrite (void const *const buf,size_t const count) {size_t cnt = count;
@@ -129,7 +106,8 @@ uwrite(void const *const buf, size_t const count) }if (!file_append) {perror ("write" ); -fail_file (); +cleanup (); +return -1 ; }if (file_ptr < file_end) { cnt = file_end - file_ptr;
@@ -155,7 +133,8 @@ umalloc(size_t size)void *const addr =malloc (size);if (addr ==0 ) {fprintf (stderr,"malloc failed: %zu bytes\n" , size); -fail_file (); +cleanup (); +return NULL ; }return addr; }
@@ -183,8 +162,10 @@ static int make_nop_x86(void *map, size_t const offset)return -1 ;/* convert to nop */ -ulseek (offset -1 ,SEEK_SET ); -uwrite (ideal_nop,5 ); +if (ulseek (offset -1 ,SEEK_SET ) <0 ) +return -1 ; +if (uwrite (ideal_nop,5 ) <0 ) +return -1 ;return 0 ; }
@@ -232,10 +213,12 @@ static int make_nop_arm(void *map, size_t const offset)return -1 ;/* Convert to nop */ -ulseek (off,SEEK_SET ); +if (ulseek (off,SEEK_SET ) <0 ) +return -1 ;do { -uwrite (ideal_nop, nop_size); +if (uwrite (ideal_nop, nop_size) <0 ) +return -1 ; }while (--cnt >0 );return 0 ;
@@ -252,8 +235,10 @@ static int make_nop_arm64(void *map, size_t const offset)return -1 ;/* Convert to nop */ -ulseek (offset,SEEK_SET ); -uwrite (ideal_nop,4 ); +if (ulseek (offset,SEEK_SET ) <0 ) +return -1 ; +if (uwrite (ideal_nop,4 ) <0 ) +return -1 ;return 0 ; }
@@ -272,14 +257,23 @@ static int make_nop_arm64(void *map, size_t const offset)*/ static void *mmap_file (char const *fname) { + file_map =NULL ; + sb.st_size =0 ; fd_map =open (fname,O_RDONLY ); -if (fd_map <0 ||fstat (fd_map, &sb) <0 ) { +if (fd_map <0 ) {perror (fname); -fail_file (); +cleanup (); +return NULL ; + } +if (fstat (fd_map, &sb) <0 ) { +perror (fname); +cleanup (); + goto out; }if (!S_ISREG (sb.st_mode)) {fprintf (stderr,"not a regular file: %s\n" , fname); -fail_file (); +cleanup (); + goto out; } file_map =mmap (0 , sb.st_size,PROT_READ |PROT_WRITE ,MAP_PRIVATE , fd_map,0 );
@@ -287,11 +281,18 @@ static void *mmap_file(char const *fname)if (file_map ==MAP_FAILED ) { mmap_failed =1 ; file_map =umalloc (sb.st_size); +if (!file_map) { +perror (fname); + goto out; + }if (read (fd_map, file_map, sb.st_size) != sb.st_size) {perror (fname); -fail_file (); +free (file_map); + file_map =NULL ; + goto out; } } +out:close (fd_map); file_end = file_map + sb.st_size;
@@ -299,13 +300,13 @@ static void *mmap_file(char const *fname)return file_map; } -static void write_file (const char *fname) +static int write_file (const char *fname) {char tmp_file[strlen (fname) +4 ];size_t n;if (!file_updated) -return ; +return 0 ;sprintf (tmp_file,"%s.rc" , fname);
@@ -317,25 +318,32 @@ static void write_file(const char *fname) fd_map =open (tmp_file,O_WRONLY |O_TRUNC |O_CREAT , sb.st_mode);if (fd_map <0 ) {perror (fname); -fail_file (); +cleanup (); +return -1 ; } n =write (fd_map, file_map, sb.st_size);if (n != sb.st_size) {perror ("write" ); -fail_file (); +cleanup (); +close (fd_map); +return -1 ; }if (file_append_size) { n =write (fd_map, file_append, file_append_size);if (n != file_append_size) {perror ("write" ); -fail_file (); +cleanup (); +close (fd_map); +return -1 ; } }close (fd_map);if (rename (tmp_file, fname) <0 ) {perror (fname); -fail_file (); +cleanup (); +return -1 ; } +return 0 ; }/* w8rev, w8nat, ...: Handle endianness. */
@@ -438,11 +446,15 @@ static void MIPS64_r_info(Elf64_Rel *const rp, unsigned sym, unsigned type) }).r_info; } -static void +static int do_file (char const *const fname) {Elf32_Ehdr *const ehdr =mmap_file (fname);unsigned int reltype =0 ; +int rc =-1 ; + +if (!ehdr) + goto out; w = w4nat; w2 = w2nat;
@@ -452,8 +464,8 @@ do_file(char const *const fname)default :fprintf (stderr,"unrecognized ELF data encoding %d: %s\n" , ehdr->e_ident[EI_DATA ], fname); -fail_file (); -break ; +cleanup (); + goto out;case ELFDATA2LSB :if (*(unsigned char const *)&endian !=1 ) {/* main() is big endian, file.o is little endian. */
@@ -485,7 +497,8 @@ do_file(char const *const fname) || w2(ehdr->e_type) != ET_REL || ehdr->e_ident[EI_VERSION] != EV_CURRENT) {fprintf (stderr,"unrecognized ET_REL file %s\n" , fname); -fail_file (); +cleanup (); + goto out; } gpfx =0 ;
@@ -493,8 +506,8 @@ do_file(char const *const fname)default :fprintf (stderr,"unrecognized e_machine %u %s\n" ,w2 (ehdr->e_machine), fname); -fail_file (); -break ; +cleanup (); + goto out;case EM_386 : reltype =R_386_32 ; rel_type_nop =R_386_NONE ;
@@ -534,20 +547,22 @@ do_file(char const *const fname)default :fprintf (stderr,"unrecognized ELF class %d %s\n" , ehdr->e_ident[EI_CLASS ], fname); -fail_file (); -break ; +cleanup (); + goto out;case ELFCLASS32 :if (w2 (ehdr->e_ehsize) !=sizeof (Elf32_Ehdr) ||w2 (ehdr->e_shentsize) !=sizeof (Elf32_Shdr)) {fprintf (stderr,"unrecognized ET_REL file: %s\n" , fname); -fail_file (); +cleanup (); + goto out; }if (w2 (ehdr->e_machine) ==EM_MIPS ) { reltype =R_MIPS_32 ; is_fake_mcount32 = MIPS32_is_fake_mcount; } -do32 (ehdr, fname, reltype); +if (do32 (ehdr, fname, reltype) <0 ) + goto out;break ;case ELFCLASS64 : {Elf64_Ehdr *const ghdr = (Elf64_Ehdr *)ehdr;
@@ -555,7 +570,8 @@ do_file(char const *const fname) || w2(ghdr->e_shentsize) != sizeof(Elf64_Shdr)) {fprintf (stderr,"unrecognized ET_REL file: %s\n" , fname); -fail_file (); +cleanup (); + goto out; }if (w2 (ghdr->e_machine) ==EM_S390 ) { reltype =R_390_64 ;
@@ -567,13 +583,16 @@ do_file(char const *const fname) Elf64_r_info = MIPS64_r_info; is_fake_mcount64 = MIPS64_is_fake_mcount; } -do64 (ghdr, fname, reltype); +if (do64 (ghdr, fname, reltype) <0 ) + goto out;break ; } }/* end switch */ -write_file (fname); + rc =write_file (fname); +out:cleanup (); +return rc; }int
@@ -604,7 +623,6 @@ main(int argc, char *argv[])/* Process each file in turn, allowing deep failure. */ for (i = optind; i < argc; i++) {char *file = argv[i]; -int const sjval =setjmp (jmpenv);int len;/*
@@ -617,28 +635,16 @@ main(int argc, char *argv[]) strcmp(file + (len - ftrace_size), ftrace) == 0) 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 ; - mmap_failed =1 ; - file_map =NULL ; - file_ptr =NULL ; - file_updated =0 ; -do_file (file); -break ; -case SJ_FAIL :/* error in do_file or below */ +/* Avoid problems if early cleanup() */ + fd_map =-1 ; + mmap_failed =1 ; + file_map =NULL ; + file_ptr =NULL ; + file_updated =0 ; +if (do_file (file)) {fprintf (stderr,"%s: failed\n" , file); ++n_error; -break ; -case SJ_SUCCEED :/* premature success */ -/* do nothing */ -break ; - }/* end switch */ + } }return !!n_error; }
scripts/recordmcount.h +99 -35
269 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH v3 7/13 recordmcount: Remove redundant cleanup() calls
In reply to Matt HelsleyRedundant cleanup calls were introduced when transitioning from the old error/success handling via setjmp/longjmp -- the longjmp ensured the cleanup() call only happened once but replacing the success_file()/fail_file() calls with cleanup() meant that multiple cleanup() calls can happen as we return from function calls.
In do_file(), looking just before and after the "goto out" jumps we can see that multiple cleanups() are being performed. We remove cleanup() calls from the nested functions because it makes the code easier to review -- the resources being cleaned up are generally allocated and initialized in the callers so freeing them there makes more sense.
Other redundant cleanup() calls:
mmap_file() is only called from do_file() and, if mmap_file() fails, then we goto out and do cleanup() there too.
write_file() is only called from do_file() and do_file() calls cleanup() unconditionally after returning from write_file() therefore the cleanup() calls in write_file() are not necessary.
find_secsym_ndx(), called from do_func()'s for-loop, when we are cleaning up here it's obvious that we break out of the loop and do another cleanup().
__has_rel_mcount() is called from two parts of do_func() and calls cleanup(). In theory we move them into do_func(), however these in turn prove redundant so another simplification step removes them as well.
--- scripts/recordmcount.c | 13 ------------- scripts/recordmcount.h | 2 -- 2 files changed, 15 deletions(-)
scripts/recordmcount.c +0 -13
@@ -258,17 +258,14 @@ static void *mmap_file(char const *fname) fd_map =open (fname,O_RDONLY );if (fd_map <0 ) {perror (fname); -cleanup ();return NULL ; }if (fstat (fd_map, &sb) <0 ) {perror (fname); -cleanup (); goto out; }if (!S_ISREG (sb.st_mode)) {fprintf (stderr,"not a regular file: %s\n" , fname); -cleanup (); goto out; } file_map = mmap(0, sb.st_size, PROT_READ|PROT_WRITE, MAP_PRIVATE,
@@ -314,13 +311,11 @@ static int write_file(const char *fname) fd_map =open (tmp_file,O_WRONLY |O_TRUNC |O_CREAT , sb.st_mode);if (fd_map <0 ) {perror (fname); -cleanup ();return -1 ; } n =write (fd_map, file_map, sb.st_size);if (n != sb.st_size) {perror ("write" ); -cleanup ();close (fd_map);return -1 ; }
@@ -328,7 +323,6 @@ static int write_file(const char *fname) n =write (fd_map, file_append, file_append_size);if (n != file_append_size) {perror ("write" ); -cleanup ();close (fd_map);return -1 ; }
@@ -336,7 +330,6 @@ static int write_file(const char *fname)close (fd_map);if (rename (tmp_file, fname) <0 ) {perror (fname); -cleanup ();return -1 ; }return 0 ;
@@ -458,7 +451,6 @@ static int do_file(char const *const fname)default :fprintf (stderr,"unrecognized ELF data encoding %d: %s\n" , ehdr->e_ident[EI_DATA ], fname); -cleanup (); goto out;case ELFDATA2LSB :if (*(unsigned char const *)&endian !=1 ) {
@@ -491,7 +483,6 @@ static int do_file(char const *const fname) w2(ehdr->e_type) != ET_REL || ehdr->e_ident[EI_VERSION] != EV_CURRENT) {fprintf (stderr,"unrecognized ET_REL file %s\n" , fname); -cleanup (); goto out; }
@@ -500,7 +491,6 @@ static int do_file(char const *const fname)default :fprintf (stderr,"unrecognized e_machine %u %s\n" ,w2 (ehdr->e_machine), fname); -cleanup (); goto out;case EM_386 : reltype =R_386_32 ;
@@ -544,14 +534,12 @@ static int do_file(char const *const fname)default :fprintf (stderr,"unrecognized ELF class %d %s\n" , ehdr->e_ident[EI_CLASS ], fname); -cleanup (); goto out;case ELFCLASS32 :if (w2 (ehdr->e_ehsize) !=sizeof (Elf32_Ehdr) ||w2 (ehdr->e_shentsize) !=sizeof (Elf32_Shdr)) {fprintf (stderr,"unrecognized ET_REL file: %s\n" , fname); -cleanup (); goto out; }if (w2 (ehdr->e_machine) ==EM_MIPS ) {
@@ -567,7 +555,6 @@ static int do_file(char const *const fname) || w2(ghdr->e_shentsize) != sizeof(Elf64_Shdr)) {fprintf (stderr,"unrecognized ET_REL file: %s\n" , fname); -cleanup (); goto out; }if (w2 (ghdr->e_machine) ==EM_S390 ) {
scripts/recordmcount.h +0 -2
@@ -469,7 +469,6 @@ static unsigned find_secsym_ndx(unsigned const txtndx, }fprintf (stderr,"Cannot find symbol for section %u: %s.\n" , txtndx, txtname); -cleanup ();return missing_sym; }
@@ -488,7 +487,6 @@ static char const * __has_rel_mcount(Elf_Shdr const *const relhdr, /* reltype */if (strcmp ("__mcount_loc" , txtname) ==0 ) {fprintf (stderr,"warning: __mcount_loc already exists: %s\n" , fname); -cleanup ();return already_has_rel_mcount; } if (w(txthdr->sh_type) != SHT_PROGBITS ||
Signature · 1 line
2.20.1
PATCH v3 10/13 objtool: Make recordmcount into an objtool subcmd
In reply to Matt HelsleyRather than a standalone executable merge recordmcount as a sub command of objtool. This is a small step towards cleaning up recordmcount and eventually saving ELF code with objtool.
For the initial step all that's required is a bit of Makefile changes and invoking the former main() function from recordmcount.c because the subcommand code uses similar function arguments as main when dispatching.
objtool ignores some object files that tracing does not, specifically those with OBJECT_FILES_NON_STANDARD Makefile variables. For this reason we keep the recordmcount_dep separate from the objtool_dep. When using objtool mcount we can also, like the other objtool invocations, just depend on the binary rather than the source the binary is built from.
Subsequent patches will gradually convert recordmcount to use more and more of libelf/objtool's ELF accessor code. This will both clean up recordmcount to be more easily readable and remove recordmcount's crude accessor wrapping code.
--- Makefile | 6 +-- scripts/Makefile.build | 22 +++++------ tools/objtool/Build | 3 +- tools/objtool/Makefile | 12 +----- tools/objtool/builtin-mcount.c | 72 ++++++++++++++++++++++++++++++++++ tools/objtool/builtin-mcount.h | 23 +++++++++++ tools/objtool/builtin.h | 1 + tools/objtool/objtool.c | 1 + tools/objtool/recordmcount.c | 29 +++++--------- 9 files changed, 122 insertions(+), 47 deletions(-) create mode 100644 tools/objtool/builtin-mcount.c create mode 100644 tools/objtool/builtin-mcount.h
Makefile +3 -3
@@ -817,11 +817,11 @@ KBUILD_CFLAGS += $(CC_FLAGS_FTRACE) $(CC_FLAGS_USING) KBUILD_AFLAGS += $(CC_FLAGS_USING) ifdef CONFIG_DYNAMIC_FTRACE ifdef CONFIG_HAVE_C_RECORDMCOUNT - BUILD_C_RECORDMCOUNT := y - export BUILD_C_RECORDMCOUNT + USE_OBJTOOL_MCOUNT := y + export USE_OBJTOOL_MCOUNT endif endif -endif +endif # CONFIG_FUNCTION_TRACER # We trigger additional mismatches with less inlining ifdef CONFIG_DEBUG_SECTION_MISMATCH
scripts/Makefile.build +11 -11
@@ -170,22 +170,21 @@ endif ifdef CONFIG_FTRACE_MCOUNT_RECORD ifndef CC_USING_RECORD_MCOUNT -# compiler will not generate __mcount_loc use recordmcount or recordmcount.pl -ifdef BUILD_C_RECORDMCOUNT +# compiler will not generate __mcount_loc use objtool mcount record or recordmcount.pl +ifdef USE_OBJTOOL_MCOUNT ifeq ("$(origin RECORDMCOUNT_WARN)", "command line") RECORDMCOUNT_FLAGS = -w endif # Due to recursion, we must skip empty.o. # The empty.o file is created in the make process in order to determine # the target endianness and word size. It is made before all other C -# files, including recordmcount. +# files, including objtool. sub_cmd_record_mcount = \ if [ $(@) != "scripts/mod/empty.o" ]; then \ - $(objtree)/tools/objtool/recordmcount $(RECORDMCOUNT_FLAGS) "$(@)"; \ + $(objtree)/tools/objtool/objtool mcount record $(RECORDMCOUNT_FLAGS) "$(@)"; \ fi; -recordmcount_source := $(srctree)/tools/objtool/recordmcount.c \ - $(srctree)/tools/objtool/recordmcount.h +recordmcount_dep := $(objtree)/tools/objtool/objtool else sub_cmd_record_mcount = perl $(srctree)/tools/objtool/recordmcount.pl "$(ARCH)" \ "$(if $(CONFIG_CPU_BIG_ENDIAN),big,little)" \
@@ -193,8 +192,8 @@ sub_cmd_record_mcount = perl $(srctree)/tools/objtool/recordmcount.pl "$(ARCH)" "$(OBJDUMP)" "$(OBJCOPY)" "$(CC) $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS)" \ "$(LD) $(KBUILD_LDFLAGS)" "$(NM)" "$(RM)" "$(MV)" \ "$(if $(part-of-module),1,0)" "$(@)"; -recordmcount_source := $(srctree)/tools/objtool/recordmcount.pl -endif # BUILD_C_RECORDMCOUNT +recordmcount_dep := $(srctree)/tools/objtool/recordmcount.pl +endif # USE_OBJTOOL_MCOUNT cmd_record_mcount = $(if $(findstring $(strip $(CC_FLAGS_FTRACE)),$(_c_flags)), \ $(sub_cmd_record_mcount)) endif # CC_USING_RECORD_MCOUNT
@@ -236,9 +235,10 @@ endif # SKIP_STACK_VALIDATION endif # CONFIG_STACK_VALIDATION # Rebuild all objects when objtool changes, or is enabled/disabled. -objtool_dep = $(objtool_obj) \ +objtool_dep += $(objtool_obj) \ $(wildcard include/config/orc/unwinder.h \ - include/config/stack/validation.h) + include/config/stack/validation.h \ + include/config/ftrace/mcount/record.h) ifdef CONFIG_TRIM_UNUSED_KSYMS cmd_gen_ksymdeps = \
@@ -270,7 +270,7 @@ cmd_undef_syms = echo endif # Built-in and composite module parts -$(obj)/%.o: $(src)/%.c $(recordmcount_source) $(objtool_dep) FORCE +$(obj)/%.o: $(src)/%.c $(recordmcount_dep) $(objtool_dep) FORCE $(call cmd,force_checksrc) $(call if_changed_rule,cc_o_c)
tools/objtool/Build +1 -2
@@ -1,6 +1,7 @@ objtool-y += arch/$(SRCARCH)/ objtool-y += builtin-check.o objtool-y += builtin-orc.o +objtool-y += builtin-mcount.o recordmcount.o objtool-y += check.o objtool-y += orc_gen.o objtool-y += orc_dump.o
@@ -25,5 +26,3 @@ $(OUTPUT)libctype.o: ../lib/ctype.c FORCE $(OUTPUT)str_error_r.o: ../lib/str_error_r.c FORCE $(call rule_mkdir) $(call if_changed_dep,cc_o_c) - -recordmcount-y += recordmcount.o
tools/objtool/Makefile +1 -11
@@ -29,12 +29,6 @@ OBJTOOL_IN := $(OBJTOOL)-in.o LIBELF_FLAGS := $(shell pkg-config libelf --cflags 2>/dev/null) LIBELF_LIBS := $(shell pkg-config libelf --libs 2>/dev/null || echo -lelf) -RECORDMCOUNT := $(OUTPUT)recordmcount -RECORDMCOUNT_IN := $(RECORDMCOUNT)-in.o -ifeq ($(BUILD_C_RECORDMCOUNT),y) -all: $(RECORDMCOUNT) -endif - all: $(OBJTOOL) INCLUDES := -I$(srctree)/tools/include \
@@ -55,21 +49,17 @@ include $(srctree)/tools/build/Makefile.include $(OBJTOOL_IN): fixdep FORCE @$(MAKE) $(build)=objtool -$(RECORDMCOUNT_IN): fixdep FORCE - @$(MAKE) $(build)=recordmcount $(OBJTOOL): $(LIBSUBCMD) $(OBJTOOL_IN) @$(CONFIG_SHELL) ./sync-check.sh $(QUIET_LINK)$(CC) $(OBJTOOL_IN) $(LDFLAGS) -o $@ -$(RECORDMCOUNT): $(RECORDMCOUNT_IN) - $(QUIET_LINK)$(CC) $(RECORDMCOUNT_IN) $(KBUILD_HOSTLDFLAGS) -o $@ $(LIBSUBCMD): fixdep FORCE $(Q)$(MAKE) -C $(SUBCMD_SRCDIR) OUTPUT=$(LIBSUBCMD_OUTPUT) clean: - $(call QUIET_CLEAN, objtool) $(RM) $(OBJTOOL) $(RECORDMCOUNT) + $(call QUIET_CLEAN, objtool) $(RM) $(OBJTOOL) $(Q)find $(OUTPUT) -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete $(Q)$(RM) $(OUTPUT)arch/x86/lib/inat-tables.c $(OUTPUT)fixdep
tools/objtool/builtin-mcount.c new file +72 -0
72 lines not on this page · raw message
tools/objtool/builtin-mcount.h new file +23 -0
@@ -0,0 +1,23 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (C) 2019 Matt Helsley <[email protected]> +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, see <http://www.gnu.org/licenses/>. +*/ +#ifndef BUILTIN_SUBCMD_MCOUNT +#define BUILTIN_SUBCMD_MCOUNT 1 + +extern int record_mcount (int argc,const char **argv); + +#endif /* BUILTIN_SUBCMD_MCOUNT */
tools/objtool/builtin.h +1 -0
@@ -12,5 +12,6 @@ extern bool no_fp, no_unreachable, retpoline, module, backtrace, uaccess;extern int cmd_check (int argc,const char **argv);extern int cmd_orc (int argc,const char **argv); +extern int cmd_mcount (int argc,const char **argv);#endif /* _BUILTIN_H */
tools/objtool/objtool.c +1 -0
@@ -35,6 +35,7 @@ static const char objtool_usage_string[] =static struct cmd_struct objtool_cmds[] = { {"check" , cmd_check,"Perform stack metadata validation on an object file" }, {"orc" , cmd_orc,"Generate in-place ORC unwind tables for an object file" }, + {"mcount" , cmd_mcount,"Construct a table of locations of calls to mcount. Useful for ftrace." }, };bool help;
tools/objtool/recordmcount.c +9 -20
@@ -24,7 +24,6 @@#include <sys/types.h> #include <sys/mman.h> #include <sys/stat.h> -#include <getopt.h> #include <elf.h> #include <fcntl.h> #include <stdio.h>
@@ -32,6 +31,8 @@#include <string.h> #include <unistd.h> +#include "builtin-mcount.h" +#ifndef EM_AARCH64 #define EM_AARCH64 183#define R_AARCH64_NONE 0
@@ -470,7 +471,7 @@ static int do_file(char const *const fname) goto out;case ELFDATA2LSB :if (*(unsigned char const *)&endian !=1 ) { -/* main() is big endian, file.o is little endian. */ +/* objtool is big endian, file.o is little endian. */ w = w4rev; w2 = w2rev; w8 = w8rev;
@@ -483,7 +484,7 @@ static int do_file(char const *const fname)break ;case ELFDATA2MSB :if (*(unsigned char const *)&endian !=0 ) { -/* main() is little endian, file.o is big endian. */ +/* objtool is little endian, file.o is big endian. */ w = w4rev; w2 = w2rev; w8 = w8rev;
@@ -596,33 +597,21 @@ static int do_file(char const *const fname)return rc; } -int main (int argc,char *argv[]) +int record_mcount (int argc,const char **argv) {const char ftrace[] ="/ftrace.o" ;int ftrace_size =sizeof (ftrace) -1 ;int n_error =0 ;/* gcc-4.3.0 false positive complaint */ -int c;int i; -while ((c =getopt (argc, argv,"w" )) >=0 ) { -switch (c) { -case 'w' : - warn_on_notrace_sect =1 ; -break ; -default : -fprintf (stderr,"usage: recordmcount [-w] file.o...\n" ); -return 0 ; - } - } - -if ((argc - optind) <1 ) { -fprintf (stderr,"usage: recordmcount [-w] file.o...\n" ); +if (argc <1 ) { +fprintf (stderr,"usage: objtool mcount record [-w] file.o...\n" );return 0 ; }/* Process each file in turn, allowing deep failure. */ -for (i = optind; i < argc; i++) { -char *file = argv[i]; +for (i =0 ; i < argc; i++) { +const char *file = argv[i];int len;/*
Signature · 1 line
2.20.1
PATCH v3 12/13 objtool: recordmcount: Search for __mcount_loc before walking the sections
In reply to Matt Helsleyrecordmcount iterates over the sections in the order they're listed in the ELF file and checks whether the section name indicates it's of interest. Objtool's elf code works differently
-- it scans the elf file and builds up data structures
representing the headers, sections, etc. and then supplies functions to search these structures. Both walk the elf file in order, however objtool uses more memory to enable faster searches it needs for other tools such as the reliable backtrace support offered by the ORC unwinder.
Rather than walk the section table a second time in the recordmcount code, we use objtool's elf code to search for the section recordmcount is interested in. This also simplifies flow and means we can easily check for already-processed object files before we do any of the more complex things recordmcount does.
This also allows us to remove the already_has_rel_mcount string pointer trick.
--- tools/objtool/recordmcount.c | 2 -- tools/objtool/recordmcount.h | 22 +++------------------- 2 files changed, 3 insertions(+), 21 deletions(-)
tools/objtool/recordmcount.c +0 -2
@@ -204,8 +204,6 @@ static void *mmap_file(char const *fname) }else mmap_failed =0 ; out: -elf_close (lf); - lf =NULL ; fd_map =-1 ; file_end = file_map + sb.st_size;
tools/objtool/recordmcount.h +3 -19
@@ -26,7 +26,6 @@#undef nop_mcount#undef missing_sym#undef find_secsym_ndx -#undef already_has_rel_mcount#undef __has_rel_mcount#undef has_rel_mcount#undef tot_relsize
@@ -58,7 +57,6 @@# define nop_mcount nop_mcount_64# define missing_sym missing_sym_64# define find_secsym_ndx find64_secsym_ndx -# define already_has_rel_mcount already_has_rel_mcount_64# define __has_rel_mcount __has64_rel_mcount# define has_rel_mcount has64_rel_mcount# define tot_relsize tot64_relsize
@@ -93,7 +91,6 @@# define nop_mcount nop_mcount_32# define missing_sym missing_sym_32# define find_secsym_ndx find32_secsym_ndx -# define already_has_rel_mcount already_has_rel_mcount_32# define __has_rel_mcount __has32_rel_mcount# define has_rel_mcount has32_rel_mcount# define tot_relsize tot32_relsize
@@ -472,8 +469,6 @@ static unsigned find_secsym_ndx(unsigned const txtndx,return missing_sym; } -char const *already_has_rel_mcount ="success" ;/* our work here is done! */ -/* Evade ISO C restriction: no declaration after statement in has_rel_mcount. */ static char const * __has_rel_mcount(Elf_Shdr const *const relhdr, /* reltype */ Elf_Shdr const *const shdr0,
@@ -484,11 +479,6 @@ static char const * __has_rel_mcount(Elf_Shdr const *const relhdr, /* reltype */Elf_Shdr const *const txthdr = &shdr0[w (relhdr->sh_info)];char const *const txtname = &shstrtab[w (txthdr->sh_name)]; -if (strcmp ("__mcount_loc" , txtname) ==0 ) { -fprintf (stderr,"warning: __mcount_loc already exists: %s\n" , - fname); -return already_has_rel_mcount; - }if (w (txthdr->sh_type) !=SHT_PROGBITS || !(_w (txthdr->sh_flags) &SHF_EXECINSTR ))return NULL ;
@@ -517,10 +507,6 @@ static unsigned tot_relsize(Elf_Shdr const *const shdr0,for (; nhdr; --nhdr, ++shdrp) { txtname =has_rel_mcount (shdrp, shdr0, shstrtab, fname); -if (txtname == already_has_rel_mcount) { - totrelsz =0 ; -break ; - }if (txtname &&is_mcounted_section_name (txtname)) totrelsz +=_w (shdrp->sh_size); }
@@ -556,6 +542,9 @@ static int do_func(Elf_Ehdr *const ehdr, char const *const fname,int result =0 ; +if (find_section_by_name (lf,"__mcount_loc" ) !=NULL ) +return 0 ; + totrelsz =tot_relsize (shdr0, nhdr, shstrtab, fname);if (totrelsz ==0 )return 0 ;
@@ -575,11 +564,6 @@ static int do_func(Elf_Ehdr *const ehdr, char const *const fname,for (relhdr = shdr0, k = nhdr; k; --k, ++relhdr) {char const *const txtname =has_rel_mcount (relhdr, shdr0, shstrtab, fname); -if (txtname == already_has_rel_mcount) { - result =0 ; - file_updated =0 ; - goto out;/* Nothing to be done; don't append! */ - }if (txtname &&is_mcounted_section_name (txtname)) {uint_t recval =0 ; unsigned const int recsym = find_secsym_ndx(
Signature · 1 line
2.20.1
PATCH v3 13/13 objtool: recordmcount: Convert do_func() relhdrs
In reply to Matt HelsleyUse objtool's ELF data structures to visit the relocation sections in the top-level ELF file walking function, do_func(). This means we can pass pointers to the relocation header structures into nested functions and avoid the indexing patterns for them.
These conversions don't use libelf/objtool to change the ELF file -- it only changes the way we walk the ELF sections and touch pages for memory mapping made by the old recordmcount code.
--- tools/objtool/recordmcount.h | 70 ++++++++++++++++++------------------ 1 file changed, 36 insertions(+), 34 deletions(-)
tools/objtool/recordmcount.h +36 -34
@@ -288,7 +288,7 @@ static unsigned get_mcountsym(Elf_Sym const *const sym0,return mcountsym; } -static void get_sym_str_and_relp(Elf_Shdr const *const relhdr, +static void get_sym_str_and_relp(GElf_Shdr const *const relhdr, Elf_Ehdr const *const ehdr, Elf_Sym const **sym0, char const **str0,
@@ -296,10 +296,10 @@ static void get_sym_str_and_relp(Elf_Shdr const *const relhdr, {Elf_Shdr *const shdr0 = (Elf_Shdr *)(_w (ehdr->e_shoff) + (void *)ehdr); -unsigned const symsec_sh_link =w (relhdr->sh_link); +unsigned const symsec_sh_link = relhdr->sh_link;Elf_Shdr const *const symsec = &shdr0[symsec_sh_link]; -Elf_Shdr const *const strsec = &shdr0[w (symsec->sh_link)]; -Elf_Rel const *const rel0 = (Elf_Rel const *)(_w (relhdr->sh_offset) +Elf_Shdr const *const strsec = &shdr0[symsec->sh_link]; +Elf_Rel const *const rel0 = (Elf_Rel const *)(relhdr->sh_offset + (void *)ehdr); *sym0 = (Elf_Sym const *)(_w(symsec->sh_offset)
@@ -319,9 +319,9 @@ static void get_sym_str_and_relp(Elf_Shdr const *const relhdr,static uint_t *sift_rel_mcount (uint_t *mlocp,unsigned const offbase,Elf_Rel **const mrelpp, -Elf_Shdr const *const relhdr, +GElf_Shdr const *const relhdr,Elf_Ehdr const *const ehdr, -unsigned const recsym, +unsigned const recsym_index,uint_t const recval,unsigned const reltype) {
@@ -330,8 +330,8 @@ static uint_t *sift_rel_mcount(uint_t *mlocp,Elf_Sym const *sym0;char const *str0;Elf_Rel const *relp; -unsigned rel_entsize =_w (relhdr->sh_entsize); -unsigned const nrel =_w (relhdr->sh_size) / rel_entsize; +unsigned int rel_entsize = relhdr->sh_entsize; +unsigned const nrel = relhdr->sh_size / rel_entsize;unsigned mcountsym =0 ;unsigned t;
@@ -347,7 +347,7 @@ static uint_t *sift_rel_mcount(uint_t *mlocp,_w (_w (relp->r_offset) - recval + mcount_adjust); mrelp->r_offset =_w (offbase + ((void *)mlocp - (void *)mloc0)); -Elf_r_info (mrelp, recsym, reltype); +Elf_r_info (mrelp, recsym_index, reltype);if (rel_entsize ==sizeof (Elf_Rela)) { ((Elf_Rela *)mrelp)->r_addend = addend; *mlocp++ =0 ;
@@ -367,7 +367,7 @@ static uint_t *sift_rel_mcount(uint_t *mlocp,* that are not going to be traced. The mcount calls here will be converted * into nops. */ -static int nop_mcount (Elf_Shdr const *const relhdr, +static int nop_mcount (GElf_Shdr const *const relhdr,Elf_Ehdr const *const ehdr,const char *const txtname) {
@@ -376,9 +376,9 @@ static int nop_mcount(Elf_Shdr const *const relhdr,Elf_Sym const *sym0;char const *str0;Elf_Rel const *relp; -Elf_Shdr const *const shdr = &shdr0[w (relhdr->sh_info)]; -unsigned rel_entsize =_w (relhdr->sh_entsize); -unsigned const nrel =_w (relhdr->sh_size) / rel_entsize; +Elf_Shdr const *const shdr = &shdr0[relhdr->sh_info]; +unsigned int rel_entsize = relhdr->sh_entsize; +unsigned const nrel = relhdr->sh_size / rel_entsize;unsigned mcountsym =0 ;unsigned t;int once =0 ;
@@ -470,13 +470,13 @@ static unsigned find_secsym_ndx(unsigned const txtndx, }/* Evade ISO C restriction: no declaration after statement in has_rel_mcount. */ -static char const *__has_rel_mcount (Elf_Shdr const *const relhdr,/* reltype */ +static char const *__has_rel_mcount (GElf_Shdr const *const relhdr,/* reltype */ Elf_Shdr const *const shdr0,char const *const shstrtab,char const *const fname) {/* .sh_info depends on .sh_type == SHT_REL[,A] */ -Elf_Shdr const *const txthdr = &shdr0[w (relhdr->sh_info)]; +Elf_Shdr const *const txthdr = &shdr0[relhdr->sh_info];char const *const txtname = &shstrtab[w (txthdr->sh_name)]; if (w(txthdr->sh_type) != SHT_PROGBITS ||
@@ -485,30 +485,29 @@ static char const * __has_rel_mcount(Elf_Shdr const *const relhdr, /* reltype */return txtname; } -static char const *has_rel_mcount (Elf_Shdr const *const relhdr, +static char const *has_rel_mcount (GElf_Shdr const *const relhdr,Elf_Shdr const *const shdr0,char const *const shstrtab,char const *const fname) { -if (w (relhdr->sh_type) !=SHT_REL &&w (relhdr->sh_type) !=SHT_RELA ) +if (relhdr->sh_type !=SHT_REL && relhdr->sh_type !=SHT_RELA )return NULL ;return __has_rel_mcount (relhdr, shdr0, shstrtab, fname); }static unsigned tot_relsize (Elf_Shdr const *const shdr0, -unsigned nhdr,const char *const shstrtab,const char *const fname) { +struct section *sec;unsigned totrelsz =0 ; -Elf_Shdr const *shdrp = shdr0;char const *txtname; -for (; nhdr; --nhdr, ++shdrp) { - txtname =has_rel_mcount (shdrp, shdr0, shstrtab, fname); +list_for_each_entry (sec, &lf->sections, list) { + txtname =has_rel_mcount (&sec->sh, shdr0, shstrtab, fname);if (txtname &&is_mcounted_section_name (txtname)) - totrelsz +=_w (shdrp->sh_size); + totrelsz += sec->sh.sh_size; }return totrelsz; }
@@ -520,13 +519,11 @@ static int do_func(Elf_Ehdr *const ehdr, char const *const fname, {Elf_Shdr *const shdr0 = (Elf_Shdr *)(_w (ehdr->e_shoff) + (void *)ehdr); -unsigned const nhdr =w2 (ehdr->e_shnum);Elf_Shdr *const shstr = &shdr0[w2 (ehdr->e_shstrndx)];char const *const shstrtab = (char const *)(_w (shstr->sh_offset) + (void *)ehdr); -Elf_Shdr const *relhdr; -unsigned k; +GElf_Shdr const *relhdr;/* Upper bound on space: assume all relevant relocs are for mcount. */ unsigned totrelsz;
@@ -540,12 +537,14 @@ static int do_func(Elf_Ehdr *const ehdr, char const *const fname,unsigned rel_entsize =0 ;unsigned symsec_sh_link =0 ; +struct section *sec; +int result =0 ;if (find_section_by_name (lf,"__mcount_loc" ) !=NULL )return 0 ; - totrelsz =tot_relsize (shdr0, nhdr, shstrtab, fname); + totrelsz =tot_relsize (shdr0, shstrtab, fname);if (totrelsz ==0 )return 0 ; mrel0 =umalloc (totrelsz);
@@ -561,24 +560,27 @@ static int do_func(Elf_Ehdr *const ehdr, char const *const fname,return -1 ; } -for (relhdr = shdr0, k = nhdr; k; --k, ++relhdr) { -char const *const txtname =has_rel_mcount (relhdr, shdr0, +list_for_each_entry (sec, &lf->sections, list) { +char const *txtname; + + relhdr = &sec->sh; + txtname =has_rel_mcount (relhdr, shdr0, shstrtab, fname);if (txtname &&is_mcounted_section_name (txtname)) {uint_t recval =0 ; -unsigned const int recsym =find_secsym_ndx ( -w (relhdr->sh_info), txtname, &recval, - &shdr0[symsec_sh_link =w (relhdr->sh_link)], +unsigned const int recsym_index =find_secsym_ndx ( + relhdr->sh_info, txtname, &recval, + &shdr0[symsec_sh_link = relhdr->sh_link], ehdr); -if (recsym == missing_sym) { +if (recsym_index == missing_sym) { result =-1 ; goto out; } - rel_entsize =_w (relhdr->sh_entsize); + rel_entsize = relhdr->sh_entsize; mlocp =sift_rel_mcount (mlocp, (void *)mlocp - (void *)mloc0, &mrelp, - relhdr, ehdr, recsym, recval, reltype); + relhdr, ehdr, recsym_index, recval, reltype); }else if (txtname && (warn_on_notrace_sect || make_nop)) {/* * This section is ignored by ftrace, but still
Signature · 1 line
2.20.1
PATCH v3 9/13 objtool: Prepare to merge recordmcount
In reply to Matt HelsleyMove recordmcount into the objtool directory. We keep this step separate so changes which turn recordmcount into a subcommand of objtool don't get obscured.
---
scripts/.gitignore | 1 -
scripts/Makefile | 1 -
scripts/Makefile.build | 11 ++++++-----
tools/objtool/.gitignore | 1 +
tools/objtool/Build | 2 ++
tools/objtool/Makefile | 13 ++++++++++++-
{scripts => tools/objtool}/recordmcount.c | 0
{scripts => tools/objtool}/recordmcount.h | 0
{scripts => tools/objtool}/recordmcount.pl | 0
9 files changed, 21 insertions(+), 8 deletions(-)
rename {scripts => tools/objtool}/recordmcount.c (100%)
rename {scripts => tools/objtool}/recordmcount.h (100%)
rename {scripts => tools/objtool}/recordmcount.pl (100%)scripts/.gitignore +0 -1
@@ -6,7 +6,6 @@ conmakehash kallsyms pnmtologo unifdef -recordmcount sortextable asn1_compiler extract-cert
scripts/Makefile +0 -1
@@ -14,7 +14,6 @@ hostprogs-$(CONFIG_BUILD_BIN2C) += bin2c 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_ASN1) += asn1_compiler hostprogs-$(CONFIG_MODULE_SIG) += sign-file
scripts/Makefile.build +6 -5
@@ -181,18 +181,19 @@ endif # files, including recordmcount. sub_cmd_record_mcount = \ if [ $(@) != "scripts/mod/empty.o" ]; then \ - $(objtree)/scripts/recordmcount $(RECORDMCOUNT_FLAGS) "$(@)"; \ + $(objtree)/tools/objtool/recordmcount $(RECORDMCOUNT_FLAGS) "$(@)"; \ fi; -recordmcount_source := $(srctree)/scripts/recordmcount.c \ - $(srctree)/scripts/recordmcount.h + +recordmcount_source := $(srctree)/tools/objtool/recordmcount.c \ + $(srctree)/tools/objtool/recordmcount.h else -sub_cmd_record_mcount = perl $(srctree)/scripts/recordmcount.pl "$(ARCH)" \ +sub_cmd_record_mcount = perl $(srctree)/tools/objtool/recordmcount.pl "$(ARCH)" \ "$(if $(CONFIG_CPU_BIG_ENDIAN),big,little)" \ "$(if $(CONFIG_64BIT),64,32)" \ "$(OBJDUMP)" "$(OBJCOPY)" "$(CC) $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS)" \ "$(LD) $(KBUILD_LDFLAGS)" "$(NM)" "$(RM)" "$(MV)" \ "$(if $(part-of-module),1,0)" "$(@)"; -recordmcount_source := $(srctree)/scripts/recordmcount.pl +recordmcount_source := $(srctree)/tools/objtool/recordmcount.pl endif # BUILD_C_RECORDMCOUNT cmd_record_mcount = $(if $(findstring $(strip $(CC_FLAGS_FTRACE)),$(_c_flags)), \ $(sub_cmd_record_mcount))
tools/objtool/.gitignore +1 -0
@@ -1,3 +1,4 @@ arch/x86/lib/inat-tables.c objtool +recordmcount fixdep
tools/objtool/Build +2 -0
@@ -25,3 +25,5 @@ $(OUTPUT)libctype.o: ../lib/ctype.c FORCE $(OUTPUT)str_error_r.o: ../lib/str_error_r.c FORCE $(call rule_mkdir) $(call if_changed_dep,cc_o_c) + +recordmcount-y += recordmcount.o
tools/objtool/Makefile +12 -1
@@ -29,6 +29,12 @@ OBJTOOL_IN := $(OBJTOOL)-in.o LIBELF_FLAGS := $(shell pkg-config libelf --cflags 2>/dev/null) LIBELF_LIBS := $(shell pkg-config libelf --libs 2>/dev/null || echo -lelf) +RECORDMCOUNT := $(OUTPUT)recordmcount +RECORDMCOUNT_IN := $(RECORDMCOUNT)-in.o +ifeq ($(BUILD_C_RECORDMCOUNT),y) +all: $(RECORDMCOUNT) +endif + all: $(OBJTOOL) INCLUDES := -I$(srctree)/tools/include \
@@ -49,16 +55,21 @@ include $(srctree)/tools/build/Makefile.include $(OBJTOOL_IN): fixdep FORCE @$(MAKE) $(build)=objtool +$(RECORDMCOUNT_IN): fixdep FORCE + @$(MAKE) $(build)=recordmcount + $(OBJTOOL): $(LIBSUBCMD) $(OBJTOOL_IN) @$(CONFIG_SHELL) ./sync-check.sh $(QUIET_LINK)$(CC) $(OBJTOOL_IN) $(LDFLAGS) -o $@ +$(RECORDMCOUNT): $(RECORDMCOUNT_IN) + $(QUIET_LINK)$(CC) $(RECORDMCOUNT_IN) $(KBUILD_HOSTLDFLAGS) -o $@ $(LIBSUBCMD): fixdep FORCE $(Q)$(MAKE) -C $(SUBCMD_SRCDIR) OUTPUT=$(LIBSUBCMD_OUTPUT) clean: - $(call QUIET_CLEAN, objtool) $(RM) $(OBJTOOL) + $(call QUIET_CLEAN, objtool) $(RM) $(OBJTOOL) $(RECORDMCOUNT) $(Q)find $(OUTPUT) -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete $(Q)$(RM) $(OUTPUT)arch/x86/lib/inat-tables.c $(OUTPUT)fixdep
tools/objtool/recordmcount.c renamed from scripts/recordmcount.c +0 -0
tools/objtool/recordmcount.h renamed from scripts/recordmcount.h +0 -0
tools/objtool/recordmcount.pl renamed from scripts/recordmcount.pl +0 -0
Signature · 1 line
2.20.1
PATCH v3 8/13 recordmcount: Clarify what cleanup() does
In reply to Matt Helsleycleanup() mostly frees/unmaps the malloc'd/privately-mapped copy of the ELF file recordmcount is working on, which is set up in mmap_file(). It also deals with positioning within the pseduo prive-mapping of the file and appending to the ELF file.
Split into two steps:
mmap_cleanup() for the mapping itself file_append_cleanup() for allocations storing the
appended ELF data.
Also, move the global variable initializations out of the main, per-object-file loop and nearer to the alloc/init (mmap_file()) and two cleanup functions so we can more clearly see how they're related.
--- scripts/recordmcount.c | 151 ++++++++++++++++++++++------------------- 1 file changed, 81 insertions(+), 70 deletions(-)
scripts/recordmcount.c +81 -70
@@ -48,21 +48,26 @@ static void *file_map; /* pointer of the mapped file */static void *file_end;/* pointer to the end of the mapped file */ static int file_updated;/* flag to state file was changed */ static void *file_ptr;/* current file pointer location */ +static void *file_append;/* added to the end of the file */ static size_t file_append_size;/* how much is added to end of file */ /* Per-file resource cleanup when multiple files. */ -static void cleanup (void ) +static void file_append_cleanup (void ) +{ +free (file_append); + file_append =NULL ; + file_append_size =0 ; + file_updated =0 ; +} + +static void mmap_cleanup (void ) {if (!mmap_failed)munmap (file_map, sb.st_size);else free (file_map); file_map =NULL ; -free (file_append); - file_append =NULL ; - file_append_size =0 ; - file_updated =0 ; }/* ulseek, uwrite, ...: Check return value for errors. */
@@ -103,7 +108,8 @@ static ssize_t uwrite(void const *const buf, size_t const count) }if (!file_append) {perror ("write" ); -cleanup (); +file_append_cleanup (); +mmap_cleanup ();return -1 ; }if (file_ptr < file_end) {
@@ -129,12 +135,76 @@ static void * umalloc(size_t size)void *const addr =malloc (size);if (addr ==0 ) {fprintf (stderr,"malloc failed: %zu bytes\n" , size); -cleanup (); +file_append_cleanup (); +mmap_cleanup ();return NULL ; }return addr; } +/* +* 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; new info will be appended to the file. +* Use MAP_PRIVATE so that a few changes to the in-memory ElfXX_Ehdr +* do not propagate to the file until an explicit overwrite at the last. +* This preserves most aspects of consistency (all except .st_size) +* for simultaneous readers of the file while we are appending to it. +* However, multiple writers still are bad. We choose not to use +* locking because it is expensive and the use case of kernel build +* makes multiple writers unlikely. +*/ +static void *mmap_file (char const *fname) +{ +/* Avoid problems if early cleanup() */ + fd_map =-1 ; + mmap_failed =1 ; + file_map =NULL ; + file_ptr =NULL ; + file_updated =0 ; + sb.st_size =0 ; + + fd_map =open (fname,O_RDONLY ); +if (fd_map <0 ) { +perror (fname); +return NULL ; + } +if (fstat (fd_map, &sb) <0 ) { +perror (fname); + goto out; + } +if (!S_ISREG (sb.st_mode)) { +fprintf (stderr,"not a regular file: %s\n" , fname); + goto out; + } + file_map =mmap (0 , sb.st_size,PROT_READ |PROT_WRITE ,MAP_PRIVATE , + fd_map,0 ); +if (file_map ==MAP_FAILED ) { + mmap_failed =1 ; + file_map =umalloc (sb.st_size); +if (!file_map) { +perror (fname); + goto out; + } +if (read (fd_map, file_map, sb.st_size) != sb.st_size) { +perror (fname); +free (file_map); + file_map =NULL ; + goto out; + } + }else + mmap_failed =0 ; +out: +close (fd_map); + fd_map =-1 ; + + file_end = file_map + sb.st_size; + +return file_map; +} + +static unsigned char ideal_nop5_x86_64[5 ] = {0x0f ,0x1f ,0x44 ,0x00 ,0x00 };static unsigned char ideal_nop5_x86_32[5 ] = {0x3e ,0x8d ,0x74 ,0x26 ,0x00 };static unsigned char *ideal_nop;
@@ -238,61 +308,6 @@ static int make_nop_arm64(void *map, size_t const offset)return 0 ; } -/* -* 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; new info will be appended to the file. -* Use MAP_PRIVATE so that a few changes to the in-memory ElfXX_Ehdr -* do not propagate to the file until an explicit overwrite at the last. -* This preserves most aspects of consistency (all except .st_size) -* for simultaneous readers of the file while we are appending to it. -* However, multiple writers still are bad. We choose not to use -* locking because it is expensive and the use case of kernel build -* makes multiple writers unlikely. -*/ -static void *mmap_file (char const *fname) -{ - file_map =NULL ; - sb.st_size =0 ; - fd_map =open (fname,O_RDONLY ); -if (fd_map <0 ) { -perror (fname); -return NULL ; - } -if (fstat (fd_map, &sb) <0 ) { -perror (fname); - goto out; - } -if (!S_ISREG (sb.st_mode)) { -fprintf (stderr,"not a regular file: %s\n" , fname); - goto out; - } - file_map =mmap (0 , sb.st_size,PROT_READ |PROT_WRITE ,MAP_PRIVATE , - fd_map,0 ); - mmap_failed =0 ; -if (file_map ==MAP_FAILED ) { - mmap_failed =1 ; - file_map =umalloc (sb.st_size); -if (!file_map) { -perror (fname); - goto out; - } -if (read (fd_map, file_map, sb.st_size) != sb.st_size) { -perror (fname); -free (file_map); - file_map =NULL ; - goto out; - } - } -out: -close (fd_map); - - file_end = file_map + sb.st_size; - -return file_map; -} -static int write_file (const char *fname) {char tmp_file[strlen (fname) +4 ];
@@ -436,10 +451,11 @@ static void MIPS64_r_info(Elf64_Rel *const rp, unsigned sym, unsigned type)static int do_file (char const *const fname) { -Elf32_Ehdr *const ehdr =mmap_file (fname); +Elf32_Ehdr *ehdr;unsigned int reltype =0 ;int rc =-1 ; + ehdr =mmap_file (fname);if (!ehdr) goto out;
@@ -575,7 +591,8 @@ static int do_file(char const *const fname) rc =write_file (fname); out: -cleanup (); +file_append_cleanup (); +mmap_cleanup ();return rc; }
@@ -618,12 +635,6 @@ int main(int argc, char *argv[]) strcmp(file + (len - ftrace_size), ftrace) == 0)continue ; -/* Avoid problems if early cleanup() */ - fd_map =-1 ; - mmap_failed =1 ; - file_map =NULL ; - file_ptr =NULL ; - file_updated =0 ;if (do_file (file)) {fprintf (stderr,"%s: failed\n" , file); ++n_error;
Signature · 1 line
2.20.1
PATCH v3 6/13 recordmcount: Kernel style formatting
In reply to Matt HelsleyFix up the whitespace irregularity in the ELF switch blocks.
Swapping the initial value of gpfx allows us to simplify all but one of the one-line switch cases even further.
--- scripts/recordmcount.c | 47 ++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 22 deletions(-)
scripts/recordmcount.c +25 -22
@@ -487,15 +487,15 @@ static int do_file(char const *const fname) push_bl_mcount_thumb = push_bl_mcount_thumb_be;break ; }/* end switch */ -if (memcmp (ELFMAG , ehdr->e_ident,SELFMAG ) !=0 - ||w2 (ehdr->e_type) !=ET_REL - || ehdr->e_ident[EI_VERSION ] !=EV_CURRENT ) { +if (memcmp (ELFMAG , ehdr->e_ident,SELFMAG ) !=0 || +w2 (ehdr->e_type) !=ET_REL || + ehdr->e_ident[EI_VERSION ] !=EV_CURRENT ) {fprintf (stderr,"unrecognized ET_REL file %s\n" , fname);cleanup (); goto out; } - gpfx =0 ; + gpfx ='_' ;switch (w2 (ehdr->e_machine)) {default : fprintf(stderr, "unrecognized e_machine %u %s\n",
@@ -508,32 +508,35 @@ static int do_file(char const *const fname) make_nop = make_nop_x86; ideal_nop = ideal_nop5_x86_32; mcount_adjust_32 =-1 ; + gpfx =0 ; +break ; +case EM_ARM : + reltype =R_ARM_ABS32 ; + altmcount ="__gnu_mcount_nc" ; + make_nop = make_nop_arm; + rel_type_nop =R_ARM_NONE ; + gpfx =0 ;break ; -case EM_ARM : reltype =R_ARM_ABS32 ; - altmcount ="__gnu_mcount_nc" ; - make_nop = make_nop_arm; - rel_type_nop =R_ARM_NONE ; -break ;case EM_AARCH64 : - reltype =R_AARCH64_ABS64 ; - make_nop = make_nop_arm64; - rel_type_nop =R_AARCH64_NONE ; - ideal_nop = ideal_nop4_arm64; - gpfx ='_' ; -break ; -case EM_IA_64 : reltype =R_IA64_IMM64 ; gpfx ='_' ;break ; -case EM_MIPS :/* reltype: e_class */ gpfx ='_' ;break ; -case EM_PPC : reltype =R_PPC_ADDR32 ; gpfx ='_' ;break ; -case EM_PPC64 : reltype =R_PPC64_ADDR64 ; gpfx ='_' ;break ; -case EM_S390 :/* reltype: e_class */ gpfx ='_' ;break ; -case EM_SH : reltype =R_SH_DIR32 ;break ; -case EM_SPARCV9 : reltype =R_SPARC_64 ; gpfx ='_' ;break ; + reltype =R_AARCH64_ABS64 ; + make_nop = make_nop_arm64; + rel_type_nop =R_AARCH64_NONE ; + ideal_nop = ideal_nop4_arm64; +break ; +case EM_IA_64 : reltype =R_IA64_IMM64 ;break ; +case EM_MIPS :/* reltype: e_class */ break ; +case EM_PPC : reltype =R_PPC_ADDR32 ;break ; +case EM_PPC64 : reltype =R_PPC64_ADDR64 ;break ; +case EM_S390 :/* reltype: e_class */ break ; +case EM_SH : reltype =R_SH_DIR32 ; gpfx =0 ;break ; +case EM_SPARCV9 : reltype =R_SPARC_64 ;break ;case EM_X86_64 : make_nop = make_nop_x86; ideal_nop = ideal_nop5_x86_64; reltype =R_X86_64_64 ; rel_type_nop =R_X86_64_NONE ; mcount_adjust_64 =-1 ; + gpfx =0 ;break ; }/* end switch */
Signature · 1 line
2.20.1
PATCH v3 11/13 objtool: recordmcount: Start using objtool's elf wrapper
In reply to Matt HelsleyUse struct elf to grab the file descriptor. We will later move these calls into other functions as we expand the lifetime of the struct elf so that it can be passed to objtool elf.[ch] functions.
This creates the libelf/objcount data structures and gives us two separte ways to walk the ELF file -- the libelf/objtool way and the old recordmcount wrapper way which avoids these extra data structures by using indices, offsets, and pointers into the mmapped ELF file.
Subsequent patches will convert from the old recordmcount accessors to the libelf/objtool accessors.
--- tools/objtool/recordmcount.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)
tools/objtool/recordmcount.c +13 -5
@@ -33,6 +33,8 @@#include "builtin-mcount.h" +#include "elf.h" +#ifndef EM_AARCH64 #define EM_AARCH64 183#define R_AARCH64_NONE 0
@@ -53,6 +55,8 @@ static void *file_ptr; /* current file pointer location */static void *file_append;/* added to the end of the file */ static size_t file_append_size;/* how much is added to end of file */ +static struct elf *lf; +/* Per-file resource cleanup when multiple files. */ static void file_append_cleanup (void ) {
@@ -69,6 +73,9 @@ static void mmap_cleanup(void)else free (file_map); file_map =NULL ; +if (lf) +elf_close (lf); + lf =NULL ; }/* ulseek, uwrite, ...: Check return value for errors. */
@@ -166,11 +173,12 @@ static void *mmap_file(char const *fname) file_updated =0 ; sb.st_size =0 ; - fd_map =open (fname,O_RDONLY ); -if (fd_map <0 ) { + lf =elf_read (fname,O_RDONLY ); +if (!lf) {perror (fname);return NULL ; } + fd_map = lf->fd;if (fstat (fd_map, &sb) <0 ) {perror (fname); goto out;
@@ -190,14 +198,14 @@ static void *mmap_file(char const *fname) }if (read (fd_map, file_map, sb.st_size) != sb.st_size) {perror (fname); -free (file_map); - file_map =NULL ; +mmap_cleanup (); goto out; } }else mmap_failed =0 ; out: -close (fd_map); +elf_close (lf); + lf =NULL ; fd_map =-1 ; file_end = file_map + sb.st_size;
Signature · 1 line
2.20.1
PATCH v3 5/13 recordmcount: Kernel style function signature formatting
In reply to Matt HelsleyThe uwrite() and ulseek() functions are formatted inconsistently with the rest of the file and the kernel overall. While we're making other changes here let's fix this.
--- scripts/recordmcount.c | 21 +++++++-------------- scripts/recordmcount.h | 13 ++++++------- 2 files changed, 13 insertions(+), 21 deletions(-)
scripts/recordmcount.c +7 -14
@@ -52,8 +52,7 @@ static void *file_append; /* added to the end of the file */static size_t file_append_size;/* how much is added to end of file */ /* Per-file resource cleanup when multiple files. */ -static void -cleanup (void ) +static void cleanup (void ) {if (!mmap_failed)munmap (file_map, sb.st_size);
@@ -68,8 +67,7 @@ cleanup(void)/* ulseek, uwrite, ...: Check return value for errors. */ -static off_t -ulseek (off_t const offset,int const whence) +static off_t ulseek (off_t const offset,int const whence) {switch (whence) {case SEEK_SET :
@@ -89,8 +87,7 @@ ulseek(off_t const offset, int const whence)return file_ptr - file_map; } -static ssize_t -uwrite (void const *const buf,size_t const count) +static ssize_t uwrite (void const *const buf,size_t const count) {size_t cnt = count;off_t idx =0 ;
@@ -127,8 +124,7 @@ uwrite(void const *const buf, size_t const count)return count; } -static void * -umalloc (size_t size) +static void *umalloc (size_t size) {void *const addr =malloc (size);if (addr ==0 ) {
@@ -394,8 +390,7 @@ static uint32_t (*w)(uint32_t);static uint32_t (*w2)(uint16_t );/* Names of the sections that could contain calls to mcount. */ -static int -is_mcounted_section_name (char const *const txtname) +static int is_mcounted_section_name (char const *const txtname) {return strncmp (".text" , txtname,5 ) ==0 || strcmp(".init.text", txtname) == 0 ||
@@ -446,8 +441,7 @@ static void MIPS64_r_info(Elf64_Rel *const rp, unsigned sym, unsigned type) }).r_info; } -static int -do_file (char const *const fname) +static int do_file (char const *const fname) {Elf32_Ehdr *const ehdr =mmap_file (fname);unsigned int reltype =0 ;
@@ -595,8 +589,7 @@ do_file(char const *const fname)return rc; } -int -main (int argc,char *argv[]) +int main (int argc,char *argv[]) {const char ftrace[] ="/ftrace.o" ;int ftrace_size =sizeof (ftrace) -1 ;
scripts/recordmcount.h +6 -7
@@ -476,11 +476,10 @@ static unsigned find_secsym_ndx(unsigned const txtndx,char const *already_has_rel_mcount ="success" ;/* our work here is done! */ /* Evade ISO C restriction: no declaration after statement in has_rel_mcount. */ -static char const * -__has_rel_mcount (Elf_Shdr const *const relhdr,/* is SHT_REL or SHT_RELA */ -Elf_Shdr const *const shdr0, -char const *const shstrtab, -char const *const fname) +static char const *__has_rel_mcount (Elf_Shdr const *const relhdr,/* reltype */ +Elf_Shdr const *const shdr0, +char const *const shstrtab, +char const *const fname) {/* .sh_info depends on .sh_type == SHT_REL[,A] */ Elf_Shdr const *const txthdr = &shdr0[w (relhdr->sh_info)];
@@ -532,8 +531,8 @@ static unsigned tot_relsize(Elf_Shdr const *const shdr0,/* Overall supervision for Elf32 ET_REL file. */ -static int -do_func (Elf_Ehdr *const ehdr,char const *const fname,unsigned const reltype) +static int do_func (Elf_Ehdr *const ehdr,char const *const fname, +unsigned const reltype) {Elf_Shdr *const shdr0 = (Elf_Shdr *)(_w (ehdr->e_shoff) + (void *)ehdr);
Signature · 1 line
2.20.1
Re: [PATCH v3 08/13] recordmcount: Clarify what cleanup() does
In reply to Matt HelsleyQuoted 11 lines · On Wed, 24 Jul 2019 14:05:02 -0700 Matt Helsley <[email protected]> wrote:
cleanup()mostly frees/unmaps the malloc'd/privately-mapped copy of the ELF file recordmcount is working on, which is set up inmmap_file(). It also deals with positioning within the pseduo prive-mapping of the file and appending to the ELF file.Split into two steps:
mmap_cleanup()for the mapping itselffile_append_cleanup()for allocations storing the
appended ELF data.
Quoted 8 lines
Also, move the global variable initializations out of the main, per-object-file loop and nearer to the alloc/init (
mmap_file()) and two cleanup functions so we can more clearly see how they're related.Signed-off-by Matt Helsley <[email protected]>---
Hi Matt,
I reviewed up to this patch and they look fine. I may pull these in as I don't need a review form Josh for these patches.
Thanks!
-- Steve
Re: [PATCH v3 08/13] recordmcount: Clarify what cleanup() does
In reply to Matt Helsleyscripts/recordmcount.c static void MIPS64_r_info(Elf64_Rel *const rp, unsigned sym, unsigned type) · line 457
Quoted 9 lines · On Wed, 24 Jul 2019 14:05:02 -0700 Matt Helsley <[email protected]> wrote:
scripts/recordmcount.c +1
-1@@ -436,10 +451,11 @@ static void MIPS64_r_info(Elf64_Rel *const rp, unsigned sym, unsigned type)static int do_file (char const *const fname) { -Elf32_Ehdr *const ehdr =mmap_file (fname); +Elf32_Ehdr *ehdr;unsigned int reltype =0 ;int rc =-1 ;
On small nit that I'm going to tweak, is the ordering of the declarations above. By removing the const and the assignment, you lost the "upside-down x-mas tree" look of the declaration.
That is, we went from:
static int do_file(char const *const fname)
{
Elf32_Ehdr *const ehdr = mmap_file(fname);
unsigned int reltype = 0;
int rc = -1;to:
static int do_file(char const *const fname)
{
Elf32_Ehdr *ehdr;
unsigned int reltype = 0;
int rc = -1;Which, I'll change to:
static int do_file(char const *const fname)
{
unsigned int reltype = 0;
Elf32_Ehdr *ehdr;
int rc = -1;-- Steve
Re: [PATCH v3 04/13] recordmcount: Rewrite error/success handling
In reply to Matt HelsleyOn Wed, 24 Jul 2019 14:04:58 -0700
Matt Helsley <[email protected]> wrote:
Hi Matt,
As I'm applying these for real, I'm taking a deeper look at the patches. This one I have some questions about.
Quoted 12 lines
Recordmcount uses setjmp/longjmp to manage control flow as it reads and then writes the ELF file. This unusual control flow is hard to follow and check in addition to being unlike kernel coding style.
So we rewrite these paths to use regular return values to indicate error/success. When an error or previously-completed object file is found we return an error code following kernel coding conventions -- negative error values and 0 for success when we're not returning a pointer. We return NULL for those that fail and return non-NULL pointers otherwise.
Quoted 4 lines
One oddity is
already_has_rel_mcount-- there we use pointer comparison rather than string comparison to differentiate between previously-processed object files and returning the name of a text section.
This is fine, but it's got a strange implementation.
scripts/recordmcount.h line 29
Quoted 11 lines
scripts/recordmcount.h +2
-0@@ -24,7 +24,9 @@#undef mcount_adjust#undef sift_rel_mcount#undef nop_mcount +#undef missing_sym#undef find_secsym_ndx +#undef already_has_rel_mcount
Why do we need these as defines? Can't you just have a single:
const char *already_has_mcount = "success";
in recordmcount.c before recordmcount.h is included?
And same for missing_sym.
Another, probably more robust way of doing this, is change find_secsym_ndx() to return 0 on success and -1 on missing symbol, and just pass a pointer by reference to fill the recsym (which doesn't have to be a constant).
I've applied the first 3 patches of this series, but stopped here. I'll continue to take a deeper look at your other patches.
Thanks!
-- Steve
Quoted 51 lines
scripts/recordmcount.h +10
-2#undef __has_rel_mcount#undef has_rel_mcount#undef tot_relsize@@ -54,7 +56,9 @@# define append_func append64# define sift_rel_mcount sift64_rel_mcount# define nop_mcount nop_mcount_64 +# define missing_sym missing_sym_64# define find_secsym_ndx find64_secsym_ndx +# define already_has_rel_mcount already_has_rel_mcount_64# define __has_rel_mcount __has64_rel_mcount# define has_rel_mcount has64_rel_mcount# define tot_relsize tot64_relsize@@ -87,7 +91,9 @@# define append_func append32# define sift_rel_mcount sift32_rel_mcount# define nop_mcount nop_mcount_32 +# define missing_sym missing_sym_32# define find_secsym_ndx find32_secsym_ndx +# define already_has_rel_mcount already_has_rel_mcount_32# define __has_rel_mcount __has32_rel_mcount# define has_rel_mcount has32_rel_mcount# define tot_relsize tot32_relsize +static const unsigned int missing_sym = (unsigned int )-1 ;/* * Find a symbol in the given section, to be used as the base for relocating @@ -443,9 +469,11 @@ static unsigned find_secsym_ndx(unsigned const txtndx, }fprintf (stderr,"Cannot find symbol for section %u: %s.\n" , txtndx, txtname); -fail_file (); +cleanup (); +return missing_sym; } +char const *already_has_rel_mcount ="success" ;/* our work here is done! */ /* Evade ISO C restriction: no declaration after statement in has_rel_mcount. */ static char const *@@ -461,7 +489,8 @@ __has_rel_mcount(Elf_Shdr const *const relhdr, /* is SHT_REL or SHT_RELA */if (strcmp ("__mcount_loc" , txtname) ==0 ) {fprintf (stderr,"warning: __mcount_loc already exists: %s\n" , fname); -succeed_file (); +cleanup (); +return already_has_rel_mcount; }if (w (txthdr->sh_type) !=SHT_PROGBITS || !(_w (txthdr->sh_flags) &SHF_EXECINSTR ))
Re: [PATCH v3 04/13] recordmcount: Rewrite error/success handling
Quoted 48 lines · Steven Rostedt
On Wed, 24 Jul 2019 14:04:58 -0700
Matt Helsley <[email protected]> wrote:Hi Matt,
As I'm applying these for real, I'm taking a deeper look at the patches. This one I have some questions about.
Quoted 12 lines
Recordmcount uses setjmp/longjmp to manage control flow as it reads and then writes the ELF file. This unusual control flow is hard to follow and check in addition to being unlike kernel coding style.
So we rewrite these paths to use regular return values to indicate error/success. When an error or previously-completed object file is found we return an error code following kernel coding conventions -- negative error values and 0 for success when we're not returning a pointer. We return NULL for those that fail and return non-NULL pointers otherwise.
Quoted 4 lines
One oddity is
already_has_rel_mcount-- there we use pointer comparison rather than string comparison to differentiate between previously-processed object files and returning the name of a text section.This is fine, but it's got a strange implementation.
scripts/recordmcount.h line 29
Quoted 11 lines
scripts/recordmcount.h +2
-0@@ -24,7 +24,9 @@#undef mcount_adjust#undef sift_rel_mcount#undef nop_mcount +#undef missing_sym#undef find_secsym_ndx +#undef already_has_rel_mcountWhy do we need these as defines? Can't you just have a single:
Quoted 5 lines
const char
*already_has_mcount= "success";in
recordmcount.cbeforerecordmcount.his included?And same for
missing_sym.
Yes, that’s a good point. I’ve been trying to separate the changes to the functions
from moving parts out but in this case it would make just as much sense to add them to recordmcount.c in the first place.
Ultimately, this ugliness gets removed as the next series removes recordmcount.h entirely and one of the steps is moving find_secsym_ndx() out while eliminating these redundant pieces.
Quoted 5 lines
Another, probably more robust way of doing this, is change
find_secsym_ndx()to return 0 on success and -1 on missing symbol, and just pass a pointer by reference to fill the recsym (which doesn't have to be a constant).
That’s easy enough to do and I do like separating the error/success return from returning the index. I can send that out now or tack it onto the next RFC series I’m about to send which completes the conversion if that’s preferable.
Yeah, the original code applies “const” in lots of places -- I presume it’s an attempt to eek out every last bit of performance from the compiler.
Cheers,
-Matt
Re: [PATCH v3 04/13] recordmcount: Rewrite error/success handling
Quoted 20 lines · On Fri, 26 Jul 2019 18:37:11 +0000 Matt Helsley <[email protected]> wrote:
Quoted 14 lines
scripts/recordmcount.h line 29
Quoted 11 lines
scripts/recordmcount.h +2
-0@@ -24,7 +24,9 @@#undef mcount_adjust#undef sift_rel_mcount#undef nop_mcount +#undef missing_sym#undef find_secsym_ndx +#undef already_has_rel_mcountWhy do we need these as defines? Can't you just have a single:
Quoted 5 lines
const char
*already_has_mcount= "success";in
recordmcount.cbeforerecordmcount.his included?And same for
missing_sym.
Quoted 7 lines
Yes, that’s a good point. I’ve been trying to separate the changes to the functions from moving parts out but in this case it would make just as much sense to add them to
recordmcount.cin the first place.Ultimately, this ugliness gets removed as the next series removes
recordmcount.hentirely and one of the steps is movingfind_secsym_ndx()out while eliminating these redundant pieces.
Yeah, this code will be cleaned up later, but let's have the steps in between look fine as well.
Quoted 7 lines
Quoted 6 lines
Another, probably more robust way of doing this, is change
find_secsym_ndx()to return 0 on success and -1 on missing symbol, and just pass a pointer by reference to fill the recsym (which doesn't have to be a constant).
Quoted 8 lines
That’s easy enough to do and I do like separating the error/success return from returning the index. I can send that out now or tack it onto the next RFC series I’m about to send which completes the conversion if that’s preferable.
Yeah, the original code applies “const” in lots of places -- I presume it’s an attempt to eek out every last bit of performance from the compiler.
As I said before, I've applied patches 1-3, so you don't need to resend them. I finished looking at the rest, and only this patch needs to be fixed, and since you are resending, could you fix the "upside-down x-mas" tree declaration I mentioned in patch 8.
Thanks Matt,
-- Steve
Re: [PATCH v3 04/13] recordmcount: Rewrite error/success handling
Quoted 31 lines · Steven Rostedt
Quoted 24 lines · On Fri, 26 Jul 2019 18:37:11 +0000 Matt Helsley <[email protected]> wrote:
Quoted 14 lines
scripts/recordmcount.h line 29
Quoted 11 lines
scripts/recordmcount.h +2
-0@@ -24,7 +24,9 @@#undef mcount_adjust#undef sift_rel_mcount#undef nop_mcount +#undef missing_sym#undef find_secsym_ndx +#undef already_has_rel_mcountWhy do we need these as defines? Can't you just have a single:
Quoted 5 lines
const char
*already_has_mcount= "success";in
recordmcount.cbeforerecordmcount.his included?And same for
missing_sym.Yes, that’s a good point. I’ve been trying to separate the changes to the functions from moving parts out but in this case it would make just as much sense to add them to
recordmcount.cin the first place.
Quoted 6 lines
Quoted 3 lines
Ultimately, this ugliness gets removed as the next series removes
recordmcount.hentirely and one of the steps is movingfind_secsym_ndx()out while eliminating these redundant pieces.Yeah, this code will be cleaned up later, but let's have the steps in between look fine as well.
Makes sense.
Quoted 14 lines
Quoted 14 lines
Quoted 8 lines
Another, probably more robust way of doing this, is change
find_secsym_ndx()to return 0 on success and -1 on missing symbol, and just pass a pointer by reference to fill the recsym (which doesn't have to be a constant).That’s easy enough to do and I do like separating the error/success return from returning the index. I can send that out now or tack it onto the next RFC series I’m about to send which completes the conversion if that’s preferable.
Quoted 8 lines
Quoted 3 lines
Yeah, the original code applies “const” in lots of places -- I presume it’s an attempt to eek out every last bit of performance from the compiler.
As I said before, I've applied patches 1-3, so you don't need to resend them. I finished looking at the rest, and only this patch needs to be fixed, and since you are resending, could you fix the "upside-down x-mas" tree declaration I mentioned in patch 8.
Will do.
Cheers,
-Matt
Re: [PATCH v3 09/13] objtool: Prepare to merge recordmcount
In reply to Matt HelsleyQuoted 5 lines · Matt Helsley
Move recordmcount into the objtool directory. We keep this step separate so changes which turn recordmcount into a subcommand of objtool don't get obscured.
Signed-off-by Matt Helsley <[email protected]>
Quoted 14 lines
---
scripts/.gitignore | 1 -
scripts/Makefile | 1 -
scripts/Makefile.build | 11 ++++++-----
tools/objtool/.gitignore | 1 +
tools/objtool/Build | 2 ++
tools/objtool/Makefile | 13 ++++++++++++-
{scripts => tools/objtool}/recordmcount.c | 0
{scripts => tools/objtool}/recordmcount.h | 0
{scripts => tools/objtool}/recordmcount.pl | 0
9 files changed, 21 insertions(+), 8 deletions(-)
rename {scripts => tools/objtool}/recordmcount.c (100%)
rename {scripts => tools/objtool}/recordmcount.h (100%)
rename {scripts => tools/objtool}/recordmcount.pl (100%)According to "git grep recordmcount" there are a few documentation files which reference recordmcount and recordmount.pl in their old locations.
And they'll probably need updating again for the next patch as well.
Signature · 1 line
Josh
Re: [PATCH v3 10/13] objtool: Make recordmcount into an objtool subcmd
In reply to Matt Helsleyscripts/Makefile.build endif · line 173
Quoted 11 lines · Matt Helsley
scripts/Makefile.build +1
-2@@ -170,22 +170,21 @@ endif ifdef CONFIG_FTRACE_MCOUNT_RECORD ifndef CC_USING_RECORD_MCOUNT -# compiler will not generate __mcount_loc use recordmcount or recordmcount.pl -ifdef BUILD_C_RECORDMCOUNT +# compiler will not generate __mcount_loc use objtool mcount record or recordmcount.pl
This comment could use some English-ification, something like:
# The compiler doesn't support generation of the __mcount_loc section. # Generate it manually with "objtool mcount record" or recordmcount.pl.
scripts/Makefile.build endif # SKIP_STACK_VALIDATION · line 241
Quoted 10 lines
scripts/Makefile.build +3
-2@@ -236,9 +235,10 @@ endif # SKIP_STACK_VALIDATION endif # CONFIG_STACK_VALIDATION # Rebuild all objects when objtool changes, or is enabled/disabled. -objtool_dep = $(objtool_obj) \ +objtool_dep += $(objtool_obj) \ $(wildcard include/config/orc/unwinder.h \ - include/config/stack/validation.h) + include/config/stack/validation.h \ + include/config/ftrace/mcount/record.h)
I think the '+=' isn't needed as this is the only place objtool_dep gets set?
Signature · 1 line
Josh
Quoted 9 lines · Matt Helsley
This series cleans up recordmcount and then makes it into an objtool subcommand.
The series starts with 8 cleanup patches which make recordmcount easier to review and integrate with objtool. The final 5 patches show the beginning steps of converting recordmcount to use objtool's ELF code rather than its own open-coded methods of accessing ELF files.
Quoted 4 lines
---
v3:
Rebased on mainline. s/elf_open/elf_read/ inrecordmcount.c
So this will be the first time objtool will be used on non-x86 arches. Have you tested the other HAVE_C_RECORDMCOUNT arches, both native and cross compilation?
Other than my few minor comments, it looks good. The patches are nicely split up. I'll try to be more prompt next time ;-)
Signature · 1 line
Josh
Re: [PATCH v3 09/13] objtool: Prepare to merge recordmcount
In reply to Josh PoimboeufQuoted 24 lines · Josh Poimboeuf
Quoted 16 lines · Matt Helsley
Move recordmcount into the objtool directory. We keep this step separate so changes which turn recordmcount into a subcommand of objtool don't get obscured.
Signed-off-by Matt Helsley <[email protected]>---
scripts/.gitignore | 1 - scripts/Makefile | 1 - scripts/Makefile.build | 11 ++++++----- tools/objtool/.gitignore | 1 + tools/objtool/Build | 2 ++ tools/objtool/Makefile | 13 ++++++++++++- {scripts => tools/objtool}/recordmcount.c | 0 {scripts => tools/objtool}/recordmcount.h | 0 {scripts => tools/objtool}/recordmcount.pl | 0 9 files changed, 21 insertions(+), 8 deletions(-)Quoted 3 lines
rename {scripts =>
tools/objtool}/recordmcount.c(100%) rename {scripts =>tools/objtool}/recordmcount.h(100%) rename {scripts =>tools/objtool}/recordmcount.pl(100%)
Quoted 4 lines
According to "git grep recordmcount" there are a few documentation files which reference recordmcount and recordmount.pl in their old locations.
And they'll probably need updating again for the next patch as well.
Excellent point. I’ll integrate those changes and resend.
Cheers,
-Matt
Re: [PATCH v3 10/13] objtool: Make recordmcount into an objtool subcmd
In reply to Josh PoimboeufQuoted 19 lines · Josh Poimboeuf
scripts/Makefile.build endif · line 173
Quoted 11 lines · Matt Helsley
scripts/Makefile.build +0
-0@@ -170,22 +170,21 @@ endififdef
CONFIG_FTRACE_MCOUNT_RECORD
ifndefCC_USING_RECORD_MCOUNTscripts/Makefile.build +1
-2-# compiler will not generate __mcount_loc use recordmcount or recordmcount.pl -ifdef BUILD_C_RECORDMCOUNT +# compiler will not generate __mcount_loc use objtool mcount record or recordmcount.plThis comment could use some English-ification, something like:
Quoted 2 lines
# The compiler doesn't support generation of the
__mcount_locsection. # Generate it manually with "objtool mcount record" or recordmcount.pl.
OK, makes sense.
Quoted 4 lines
Quoted 4 lines
scripts/Makefile.build +0
-0@@ -236,9 +235,10 @@ endif # SKIP_STACK_VALIDATIONendif #
CONFIG_STACK_VALIDATION
Quoted 10 lines
scripts/Makefile.build endif # SKIP_STACK_VALIDATION · line 241
Quoted 7 lines
# Rebuild all objects when objtool changes, or is enabled/disabled.
scripts/Makefile.build +1
-1-objtool_dep = $(objtool_obj) \ +objtool_dep += $(objtool_obj) \$(wildcard include/config/orc/unwinder.h \scripts/Makefile.build +2
-1- include/config/stack/validation.h) + include/config/stack/validation.h \ + include/config/ftrace/mcount/record.h)I think the '+=' isn't needed as this is the only place
objtool_depgets set?
Indeed. I think this is an artifact of the way I initially wrote these changes — I tried to eliminate some recordmcount variables by using objtool_dep in the recordmcount portions of the Makefile. Then I realized the .config variable combinations meant the most clearly-correct way to write it is still with separate variables.
Will fix so it’s clear this is the only assignment.
Cheers,
-Matt