Re: [RFC][PATCH v5 00/51] objtool: Make recordmcount a subcommand
On Thu, Jun 18, 2020 at 01:37:46PM -0700, Matt Helsley wrote: > recordmcount has its own ELF wrapper code and could utilize > objtool's ELF code to more-portably handle architecture variations. > This series makes recordmcount a subcommand of objtool. It very > gradually converts recordmcount to become a subcommand of objtool and > then reuses parts of objtool's ELF code. > > recordmcount maps the file in and collects simple information it needs to > append a section to the object file. The only part of the original file it > modifies is the address of new section tables -- interestingly enough this > resembles RCU in that we don't really trim the old tables so > much as unlink them via a critical offset and then rely on > future tooling, in this case, to drop the unused bits. > > Much of the recordmcount ELF code is only reading and walking the data > structures to collect the mcount locations it records in a separate > area of memory. This means it's safe to mix access to the mapped > file with access to the objtool-style linked data > structures as we gradually convert it to using only the linked data > structures. Once the old ELF code is no longer in use we can drop it > and use objtool to take over the task of writing the results without > using the RCU-like trick any more. > > After that we greatly simplify the mcount subcommand by adding a > few flags to the ELF reading code in objtool. Overall the series > removes about 600 lines of recordmcount while adding little to > objtool's ELF code. > > Testing so far: > > I've been using scripts to test cross compilation and execution of > objtool, and mcount on objects built for x86, ppc64le, arm64, s390, and > sparc. > > > Applies on top of: > objtool/core > > Peter Zijlstra's "x86/entry: noinstr fixes" [2] Just thought I'd note for anyone reviewing/playing with this series: Peter's patches are now in objtool/core > Sami Tolvanen's patch enabling support for more than 64k > sections in recordmcount, already going upstream. [3] Sami's patch is now in Linus' master branch Cheers, -Matt
[RFC][PATCH v5 12/51] objtool: mcount: Walk relocation lists
Rather than walk the section tables using the old recordmcount mapping
of the ELF file, walk the section list provided by objtool's ELF code.
This removes the last use of of the Elf_r_sym wrapper so we remove
that too.
Signed-off-by: Matt Helsley
---
tools/objtool/recordmcount.c | 10 +---
tools/objtool/recordmcount.h | 103 +--
2 files changed, 28 insertions(+), 85 deletions(-)
diff --git a/tools/objtool/recordmcount.c b/tools/objtool/recordmcount.c
index 843027a46e1b..dafa6dd10d04 100644
--- a/tools/objtool/recordmcount.c
+++ b/tools/objtool/recordmcount.c
@@ -429,9 +429,9 @@ static const unsigned int missing_sym = (unsigned int)-1;
#define RECORD_MCOUNT_64
#include "recordmcount.h"
-static int arm_is_fake_mcount(Elf32_Rel const *rp)
+static int arm_is_fake_mcount(struct reloc const *rp)
{
- switch (ELF32_R_TYPE(w(rp->r_info))) {
+ switch (rp->type) {
case R_ARM_THM_CALL:
case R_ARM_CALL:
case R_ARM_PC24:
@@ -462,11 +462,6 @@ union mips_r_info {
} r_mips;
};
-static uint64_t MIPS64_r_sym(Elf64_Rel const *rp)
-{
- return w(((union mips_r_info){ .r_info = rp->r_info }).r_mips.r_sym);
-}
-
static void MIPS64_r_info(Elf64_Rel *const rp, unsigned sym, unsigned type)
{
rp->r_info = ((union mips_r_info){
@@ -605,7 +600,6 @@ static int do_file(char const *const fname)
}
if (w2(ghdr->e_machine) == EM_MIPS) {
reltype = R_MIPS_64;
- Elf64_r_sym = MIPS64_r_sym;
Elf64_r_info = MIPS64_r_info;
is_fake_mcount64 = MIPS64_is_fake_mcount;
}
diff --git a/tools/objtool/recordmcount.h b/tools/objtool/recordmcount.h
index 3dae878f11a8..df8384f8e9e7 100644
--- a/tools/objtool/recordmcount.h
+++ b/tools/objtool/recordmcount.h
@@ -31,21 +31,14 @@
#undef get_shnum
#undef set_shnum
#undef get_shstrndx
-#undef get_relp
#undef do_func
#undef Elf_Addr
#undef Elf_Ehdr
#undef Elf_Shdr
#undef Elf_Rel
#undef Elf_Rela
-#undef Elf_Sym
-#undef ELF_R_SYM
-#undef Elf_r_sym
#undef ELF_R_INFO
#undef Elf_r_info
-#undef ELF_ST_BIND
-#undef ELF_ST_TYPE
-#undef fn_ELF_R_SYM
#undef fn_ELF_R_INFO
#undef uint_t
#undef _w
@@ -62,7 +55,6 @@
# define get_shnum get_shnum64
# define set_shnum set_shnum64
# define get_shstrndx get_shstrndx64
-# define get_relp get_relp_64
# define do_func do64
# define get_mcountsym get_mcountsym_64
# define is_fake_mcountis_fake_mcount64
@@ -74,14 +66,8 @@
# define Elf_Shdr Elf64_Shdr
# define Elf_Rel Elf64_Rel
# define Elf_Rela Elf64_Rela
-# define Elf_Sym Elf64_Sym
-# define ELF_R_SYM ELF64_R_SYM
-# define Elf_r_sym Elf64_r_sym
# define ELF_R_INFOELF64_R_INFO
# define Elf_r_infoElf64_r_info
-# define ELF_ST_BIND ELF64_ST_BIND
-# define ELF_ST_TYPE ELF64_ST_TYPE
-# define fn_ELF_R_SYM fn_ELF64_R_SYM
# define fn_ELF_R_INFO fn_ELF64_R_INFO
# define uint_tuint64_t
# define _ww8
@@ -97,7 +83,6 @@
# define get_shnum get_shnum32
# define set_shnum set_shnum32
# define get_shstrndx get_shstrndx32
-# define get_relp get_relp_32
# define do_func do32
# define get_mcountsym get_mcountsym_32
# define is_fake_mcountis_fake_mcount32
@@ -109,14 +94,8 @@
# define Elf_Shdr Elf32_Shdr
# define Elf_Rel Elf32_Rel
# define Elf_Rela Elf32_Rela
-# define Elf_Sym Elf32_Sym
-# define ELF_R_SYM ELF32_R_SYM
-# define Elf_r_sym Elf32_r_sym
# define ELF_R_INFOELF32_R_INFO
# define Elf_r_infoElf32_r_info
-# define ELF_ST_BIND ELF32_ST_BIND
-# define ELF_ST_TYPE ELF32_ST_TYPE
-# define fn_ELF_R_SYM fn_ELF32_R_SYM
# define fn_ELF_R_INFO fn_ELF32_R_INFO
# define uint_tuint32_t
# define _ww
@@ -125,17 +104,11 @@
#endif
/* Functions and pointers that do_file() may override for specific e_machine.
*/
-static int fn_is_fake_mcount(Elf_Rel const *rp)
+static int fn_is_fake_mcount(struct reloc const *reloc)
{
return 0;
}
-static int (*is_fake_mcount)(Elf_Rel const *rp) = fn_is_fake_mcount;
-
-static uint_t fn_ELF_R_SYM(Elf_Rel const *rp)
-{
- return ELF_R_SYM(_w(rp->r_info));
-}
-static uint_t (*Elf_r_sym)(Elf_Rel const *rp) = fn_ELF_R_SYM;
+static int (*is_fake_mcount)(struct reloc const *reloc) = fn_is_fake_mcount;
static void fn_ELF_R_INFO(Elf_Rel *const rp, unsigned sym, unsigned type)
{
@@ -166,10 +139,10 @@ static int mcount_adjust = 0;
*/
#define MIPS_FAKEMCOUNT_OFFSET 4
-static int MIPS_
[RFC][PATCH v5 04/51] objtool: recordmcount: Start using objtool's elf wrapper
Use 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/objtool data structures and gives
us two separate 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.
Signed-off-by: Matt Helsley
---
tools/objtool/recordmcount.c | 18 +-
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/tools/objtool/recordmcount.c b/tools/objtool/recordmcount.c
index 601e83840085..b2c606eb269b 100644
--- a/tools/objtool/recordmcount.c
+++ b/tools/objtool/recordmcount.c
@@ -33,6 +33,8 @@
#include "objtool.h"
+#include "elf.h"
+
#ifndef EM_AARCH64
#define EM_AARCH64 183
#define R_AARCH64_NONE 0
@@ -57,6 +59,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)
{
@@ -73,6 +77,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. */
@@ -170,11 +177,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_open_read(fname, O_RDONLY);
+ if (!lf) {
perror(fname);
return NULL;
}
+ fd_map = lf->fd;
if (fstat(fd_map, ) < 0) {
perror(fname);
goto out;
@@ -194,14 +202,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;
--
2.20.1
[RFC][PATCH v5 10/51] objtool: mcount: Walk objtool Elf structs in find_secsym_ndx
Rather than using indices into raw ELF32/64 tables mapped for the
wrapper, use the objtool functions to find the suitable symbol
in the given text section. This also removes all callers to
find_symtab() and get_symindex() so we can remove them as well.
Also take advantage of this commit to rename the function to
something that reads more easily.
Signed-off-by: Matt Helsley
---
tools/objtool/recordmcount.c | 2 +
tools/objtool/recordmcount.h | 94
2 files changed, 22 insertions(+), 74 deletions(-)
diff --git a/tools/objtool/recordmcount.c b/tools/objtool/recordmcount.c
index f20582ac99e2..843027a46e1b 100644
--- a/tools/objtool/recordmcount.c
+++ b/tools/objtool/recordmcount.c
@@ -422,6 +422,8 @@ static int is_mcounted_section_name(char const *const
txtname)
strcmp(".cpuidle.text", txtname) == 0;
}
+static const unsigned int missing_sym = (unsigned int)-1;
+
/* 32 bit and 64 bit are very similar */
#include "recordmcount.h"
#define RECORD_MCOUNT_64
diff --git a/tools/objtool/recordmcount.h b/tools/objtool/recordmcount.h
index 30f8913aa841..b10f7fcd33c3 100644
--- a/tools/objtool/recordmcount.h
+++ b/tools/objtool/recordmcount.h
@@ -24,15 +24,13 @@
#undef mcount_adjust
#undef sift_rel_mcount
#undef nop_mcount
-#undef find_secsym_ndx
+#undef find_section_sym_index
#undef has_rel_mcount
#undef tot_relsize
#undef get_mcountsym
-#undef find_symtab
#undef get_shnum
#undef set_shnum
#undef get_shstrndx
-#undef get_symindex
#undef get_sym_str_and_relp
#undef do_func
#undef Elf_Addr
@@ -58,14 +56,12 @@
# define append_func append64
# define sift_rel_mcount sift64_rel_mcount
# define nop_mcountnop_mcount_64
-# define find_secsym_ndx find64_secsym_ndx
+# define find_section_sym_indexfind64_section_sym_index
# define has_rel_mcounthas64_rel_mcount
# define tot_relsize tot64_relsize
-# define find_symtab find_symtab64
# define get_shnum get_shnum64
# define set_shnum set_shnum64
# define get_shstrndx get_shstrndx64
-# define get_symindex get_symindex64
# define get_sym_str_and_relp get_sym_str_and_relp_64
# define do_func do64
# define get_mcountsym get_mcountsym_64
@@ -95,14 +91,12 @@
# define append_func append32
# define sift_rel_mcount sift32_rel_mcount
# define nop_mcountnop_mcount_32
-# define find_secsym_ndx find32_secsym_ndx
+# define find_section_sym_indexfind32_section_sym_index
# define has_rel_mcounthas32_rel_mcount
# define tot_relsize tot32_relsize
-# define find_symtab find_symtab32
# define get_shnum get_shnum32
# define set_shnum set_shnum32
# define get_shstrndx get_shstrndx32
-# define get_symindex get_symindex32
# define get_sym_str_and_relp get_sym_str_and_relp_32
# define do_func do32
# define get_mcountsym get_mcountsym_32
@@ -185,21 +179,6 @@ static int MIPS_is_fake_mcount(Elf_Rel const *rp)
return is_fake;
}
-static unsigned int get_symindex(Elf_Sym const *sym, Elf32_Word const *symtab,
-Elf32_Word const *symtab_shndx)
-{
- unsigned long offset;
- int index;
-
- if (sym->st_shndx != SHN_XINDEX)
- return w2(sym->st_shndx);
-
- offset = (unsigned long)sym - (unsigned long)symtab;
- index = offset / sizeof(*sym);
-
- return w(symtab_shndx[index]);
-}
-
static unsigned int get_shnum(Elf_Ehdr const *ehdr, Elf_Shdr const *shdr0)
{
if (shdr0 && !ehdr->e_shnum)
@@ -225,28 +204,6 @@ static int get_shstrndx(Elf_Ehdr const *ehdr, Elf_Shdr
const *shdr0)
return w(shdr0->sh_link);
}
-static void find_symtab(Elf_Ehdr *const ehdr, Elf_Shdr const *shdr0,
- Elf32_Word **symtab,
- Elf32_Word **symtab_shndx)
-{
- unsigned const nhdr = get_shnum(ehdr, shdr0);
- Elf_Shdr const *relhdr;
- unsigned k;
-
- *symtab = NULL;
- *symtab_shndx = NULL;
-
- for (relhdr = shdr0, k = nhdr; k; --k, ++relhdr) {
- if (relhdr->sh_type == SHT_SYMTAB)
- *symtab = (void *)ehdr + relhdr->sh_offset;
- else if (relhdr->sh_type == SHT_SYMTAB_SHNDX)
- *symtab_shndx = (void *)ehdr + relhdr->sh_offset;
-
- if (*symtab && *symtab_shndx)
- break;
- }
-}
-
/* Append the new shstrtab, Elf_Shdr[], __mcount_loc and its relocations. */
static int append_func(Elf_Ehdr *const ehdr,
Elf_Shdr *const shstr,
@@ -507,40 +464,37 @@ static int nop_mcount(const struct section * const rels,
*Num:Value Size TypeBind Vis Ndx Name
* 2: 0 SECTION LOCAL
[RFC][PATCH v5 26/51] objtool: mcount: Remove unused file mapping
The ELF data is now accessed completely through objtool's
ELF code. We can remove the mapping of the original ELF
file and propagate elf_open_read(), elf_close(), and malloc()
up in place of mmap_file(), mmap_cleanup(), and umalloc()
respectively. This also eliminates the last use of the
umalloc() wrapper, reduces the number of global
variables, and limits the use of globals to:
The struct elf for the file we're working on. This
saves passing it to nearly every function as a parameter.
Variables set depending on the ELF file endian, wordsize,
and arch so that the appropriate relocation structures,
offset sizes, architecture quirks, and nop encodings will
be used.
One command-line option
Note that we're still using the recordmcount wrapper to change
variable sizes and structure definitions we use to build the
mcount relocation data and call instruction offsets.
Signed-off-by: Matt Helsley
---
tools/objtool/recordmcount.c | 99 +++-
tools/objtool/recordmcount.h | 4 +-
2 files changed, 9 insertions(+), 94 deletions(-)
diff --git a/tools/objtool/recordmcount.c b/tools/objtool/recordmcount.c
index f8699e52e7e5..a263062c9c64 100644
--- a/tools/objtool/recordmcount.c
+++ b/tools/objtool/recordmcount.c
@@ -41,104 +41,14 @@
#define R_AARCH64_ABS64257
#endif
-#define R_ARM_PC24 1
#define R_ARM_THM_CALL 10
-#define R_ARM_CALL 28
-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 const char *altmcount; /* alternate mcount symbol name */
extern int warn_on_notrace_sect; /* warn when section has mcount not being
recorded */
-static void *file_map; /* pointer of the mapped file */
-static size_t file_map_size; /* original ELF file size */
static struct elf *lf;
-static void mmap_cleanup(void)
-{
- if (!mmap_failed)
- munmap(file_map, file_map_size);
- else
- free(file_map);
- file_map = NULL;
- if (lf)
- elf_close(lf);
- lf = NULL;
-}
-
-static void * umalloc(size_t size)
-{
- void *const addr = malloc(size);
- if (addr == 0) {
- fprintf(stderr, "malloc failed: %zu bytes\n", size);
- 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)
-{
- struct stat sb;
-
- /* Avoid problems if early cleanup() */
- fd_map = -1;
- mmap_failed = 1;
- file_map = NULL;
- file_map_size = 0;
-
- lf = elf_open_read(fname, O_RDWR);
- if (!lf) {
- perror(fname);
- return NULL;
- }
- fd_map = lf->fd;
- if (fstat(fd_map, ) < 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);
- mmap_cleanup();
- goto out;
- }
- } else
- mmap_failed = 0;
- file_map_size = sb.st_size;
-out:
- fd_map = -1;
-
- 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;
@@ -527,8 +437,11 @@ static int do_file(char const *const fname)
unsigned int reltype = 0;
int rc = -1;
- if (!mmap_file(fname))
+ lf = elf_open_read(fname, O_RDWR);
+ if (!lf) {
+
[RFC][PATCH v5 29/51] objtool: mcount: Pre-allocate new ELF sections
Rather than allocating the ELF sections after collecting the
mcount locations and building the relocation entries, create
the empty sections beforehand. This has the benefit of
removing the memcpy() and just using the resulting libelf
buffers directly.
Signed-off-by: Matt Helsley
---
tools/objtool/recordmcount.h | 122 +++
1 file changed, 53 insertions(+), 69 deletions(-)
diff --git a/tools/objtool/recordmcount.h b/tools/objtool/recordmcount.h
index e2c8b9d4725d..ce88f0c2f79b 100644
--- a/tools/objtool/recordmcount.h
+++ b/tools/objtool/recordmcount.h
@@ -17,7 +17,6 @@
* This conversion to macros was done by:
* Copyright 2010 Steven Rostedt , Red Hat Inc.
*/
-#undef append_func
#undef sift_rel_mcount
#undef do_func
#undef Elf_Shdr
@@ -31,7 +30,6 @@
#undef _size
#ifdef RECORD_MCOUNT_64
-# define append_func append64
# define sift_rel_mcount sift64_rel_mcount
# define do_func do64
# define Elf_Rel Elf64_Rel
@@ -43,7 +41,6 @@
# define _ww8
# define _size 8
#else
-# define append_func append32
# define sift_rel_mcount sift32_rel_mcount
# define do_func do32
# define Elf_Rel Elf32_Rel
@@ -62,57 +59,6 @@ static void fn_ELF_R_INFO(Elf_Rel *const rp, unsigned sym,
unsigned type)
}
static void (*Elf_r_info)(Elf_Rel *const rp, unsigned sym, unsigned type) =
fn_ELF_R_INFO;
-/* Append the new __mcount_loc and its relocations. */
-static int append_func(uint_t const *const mloc0,
- uint_t const *const mlocp,
- Elf_Rel const *const mrel0,
- Elf_Rel const *const mrelp,
- unsigned int const loc_size,
- unsigned int const rel_entsize,
- unsigned int const symsec_sh_link)
-{
- /* Begin constructing output file */
- struct section *mcount_loc_sec, *reloc_sec;
- char const *mc_name = (sizeof(Elf_Rela) == rel_entsize)
- ? ".rela__mcount_loc"
- : ".rel__mcount_loc";
-
- /* add section: __mcount_loc */
- mcount_loc_sec = elf_create_section(lf,
- mc_name + (sizeof(Elf_Rela) == rel_entsize) + strlen(".rel"),
- loc_size, mlocp - mloc0);
- if (!mcount_loc_sec)
- return -1;
- // created mcount_loc_sec->sh.sh_size = (void *)mlocp - (void *)mloc0;
- mcount_loc_sec->sh.sh_link = 0;
- mcount_loc_sec->sh.sh_info = 0;
- mcount_loc_sec->sh.sh_addralign = loc_size;
- // created mcount_loc_sec->sh.sh_entsize = loc_size;
-
- // assert mcount_loc_sec->data->d_size == (void *)mlocp - (void *)mloc0
- memcpy(mcount_loc_sec->data->d_buf, mloc0,
- mcount_loc_sec->data->d_size);
- elf_flagdata(mcount_loc_sec->data, ELF_C_SET, ELF_F_DIRTY);
-
- /* add section .rel[a]__mcount_loc */
- reloc_sec = elf_create_section(lf, mc_name, rel_entsize,
- mrelp - mrel0);
- if (!reloc_sec)
- return -1;
- reloc_sec->sh.sh_type = (sizeof(Elf_Rela) == rel_entsize) ?
- SHT_RELA : SHT_REL;
- reloc_sec->sh.sh_flags = 0; /* clear SHF_ALLOC */
- reloc_sec->sh.sh_link = find_section_by_name(lf, ".symtab")->idx;
- reloc_sec->sh.sh_info = mcount_loc_sec->idx;
- reloc_sec->sh.sh_addralign = loc_size;
-
- // assert reloc_sec->data->d_size == (void *)mrelp - (void *)mrel0
- memcpy(reloc_sec->data->d_buf, mrel0, reloc_sec->data->d_size);
- elf_flagdata(reloc_sec->data, ELF_C_SET, ELF_F_DIRTY);
-
- return elf_write(lf);
-}
-
/*
* Look at the relocations in order to find the calls to mcount.
* Accumulate the section offsets that are found, and their relocation info,
@@ -167,12 +113,12 @@ static int do_func(unsigned const reltype)
uint_t * mloc0;
uint_t * mlocp;
- unsigned int rel_entsize = 0;
- unsigned symsec_sh_link = 0;
-
- struct section *sec;
+ struct section *sec, *mlocs, *mrels;
+ char const *mc_name;
- int result = 0;
+ unsigned int rel_entsize = 0;
+ int result = -1;
+ bool is_rela;
if (find_section_by_name(lf, "__mcount_loc") != NULL)
return 0;
@@ -180,6 +126,7 @@ static int do_func(unsigned const reltype)
totrelsz = tot_relsize(_entsize);
if (totrelsz == 0)
return 0;
+
mrel0 = malloc(totrelsz);
mrelp = mrel0;
if (!mrel0)
@@ -193,6 +140,31 @@ static int do_func(unsigned const reltype)
return -1;
}
+ is_rela = (sizeof(Elf_Rela) == rel_entsize);
+ mc_name = is_rela
+
[RFC][PATCH v5 16/51] objtool: mcount: Move is_fake_mcount()
Promote the now-bit-independent is_fake_mcount() out of the old
recordmcount ELF wrapper.
Signed-off-by: Matt Helsley
---
tools/objtool/recordmcount.c | 48 +++---
tools/objtool/recordmcount.h | 50
2 files changed, 45 insertions(+), 53 deletions(-)
diff --git a/tools/objtool/recordmcount.c b/tools/objtool/recordmcount.c
index d5f7c06afd57..24b019b82795 100644
--- a/tools/objtool/recordmcount.c
+++ b/tools/objtool/recordmcount.c
@@ -438,6 +438,48 @@ static struct symbol *get_mcountsym(struct reloc *reloc)
return NULL;
}
+/*
+ * MIPS mcount long call has 2 _mcount symbols, only the position of the 1st
+ * _mcount symbol is needed for dynamic function tracer, with it, to disable
+ * tracing(ftrace_make_nop), the instruction in the position is replaced with
+ * the "b label" instruction, to enable tracing(ftrace_make_call), replace the
+ * instruction back. So, here, we set the 2nd one as fake and filter it.
+ *
+ * c: 3c03lui v1,0x0 <-->b label
+ * c: R_MIPS_HI16 _mcount
+ * c: R_MIPS_NONE *ABS*
+ * c: R_MIPS_NONE *ABS*
+ * 10: 6463daddiu v1,v1,0
+ * 10: R_MIPS_LO16 _mcount
+ * 10: R_MIPS_NONE *ABS*
+ * 10: R_MIPS_NONE *ABS*
+ * 14: 03e0082dmoveat,ra
+ * 18: 0060f809jalrv1
+ * label:
+ */
+#define MIPS_FAKEMCOUNT_OFFSET 4
+
+static int MIPS_is_fake_mcount(struct reloc const *reloc)
+{
+ static unsigned long old_r_offset = ~0UL;
+ unsigned long current_r_offset = reloc->offset;
+ int is_fake;
+
+ is_fake = (old_r_offset != ~0UL) &&
+ (current_r_offset - old_r_offset == MIPS_FAKEMCOUNT_OFFSET);
+ old_r_offset = current_r_offset;
+
+ return is_fake;
+}
+
+/* Functions and pointers that do_file() may override for specific e_machine.
*/
+static int fn_is_fake_mcount(struct reloc const *reloc)
+{
+ return 0;
+}
+
+static int (*is_fake_mcount)(struct reloc const *reloc) = fn_is_fake_mcount;
+
static const unsigned int missing_sym = (unsigned int)-1;
/* 32 bit and 64 bit are very similar */
@@ -557,7 +599,7 @@ static int do_file(char const *const fname)
altmcount = "__gnu_mcount_nc";
make_nop = make_nop_arm;
rel_type_nop = R_ARM_NONE;
- is_fake_mcount32 = arm_is_fake_mcount;
+ is_fake_mcount = arm_is_fake_mcount;
gpfx = 0;
break;
case EM_AARCH64:
@@ -597,7 +639,7 @@ static int do_file(char const *const fname)
}
if (w2(ehdr->e_machine) == EM_MIPS) {
reltype = R_MIPS_32;
- is_fake_mcount32 = MIPS32_is_fake_mcount;
+ is_fake_mcount = MIPS_is_fake_mcount;
}
if (do32(ehdr, reltype) < 0)
goto out;
@@ -617,7 +659,7 @@ static int do_file(char const *const fname)
if (w2(ghdr->e_machine) == EM_MIPS) {
reltype = R_MIPS_64;
Elf64_r_info = MIPS64_r_info;
- is_fake_mcount64 = MIPS64_is_fake_mcount;
+ is_fake_mcount = MIPS_is_fake_mcount;
}
if (do64(ghdr, reltype) < 0)
goto out;
diff --git a/tools/objtool/recordmcount.h b/tools/objtool/recordmcount.h
index dde2ec054e51..941f96e4f74b 100644
--- a/tools/objtool/recordmcount.h
+++ b/tools/objtool/recordmcount.h
@@ -18,9 +18,6 @@
* Copyright 2010 Steven Rostedt , Red Hat Inc.
*/
#undef append_func
-#undef is_fake_mcount
-#undef fn_is_fake_mcount
-#undef MIPS_is_fake_mcount
#undef mcount_adjust
#undef sift_rel_mcount
#undef nop_mcount
@@ -54,9 +51,6 @@
# define set_shnum set_shnum64
# define get_shstrndx get_shstrndx64
# define do_func do64
-# define is_fake_mcountis_fake_mcount64
-# define fn_is_fake_mcount fn_is_fake_mcount64
-# define MIPS_is_fake_mcount MIPS64_is_fake_mcount
# define mcount_adjust mcount_adjust_64
# define Elf_Ehdr Elf64_Ehdr
# define Elf_Shdr Elf64_Shdr
@@ -80,9 +74,6 @@
# define set_shnum set_shnum32
# define get_shstrndx get_shstrndx32
# define do_func do32
-# define is_fake_mcountis_fake_mcount32
-# define fn_is_fake_mcount fn_is_fake_mcount32
-# define MIPS_is_fake_mcount MIPS32_is_fake_mcount
# define mcount_adjust mcount_adjust_32
# define Elf_Ehdr Elf32_Ehdr
# define Elf_Shdr Elf32_Shdr
@@ -97,13 +88,6 @@
# define _size 4
#endif
-/* Functions and pointers that do_file() may override for specific e_machine.
*/
-static int fn_is_fake_mcount(struct reloc const *reloc)
-{
-
[RFC][PATCH v5 27/51] objtool: mcount: Reduce usage of _size wrapper
Use a new loc_size parameter to append_func() rather than
use the wrapper's _size macro directly.
Signed-off-by: Matt Helsley
---
tools/objtool/recordmcount.h | 11 ++-
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/tools/objtool/recordmcount.h b/tools/objtool/recordmcount.h
index fcc4f1a74d60..a74a80b3356e 100644
--- a/tools/objtool/recordmcount.h
+++ b/tools/objtool/recordmcount.h
@@ -72,6 +72,7 @@ static int append_func(uint_t const *const mloc0,
uint_t const *const mlocp,
Elf_Rel const *const mrel0,
Elf_Rel const *const mrelp,
+ unsigned int const loc_size,
unsigned int const rel_entsize,
unsigned int const symsec_sh_link)
{
@@ -84,14 +85,14 @@ static int append_func(uint_t const *const mloc0,
/* add section: __mcount_loc */
mcount_loc_sec = elf_create_section(lf,
mc_name + (sizeof(Elf_Rela) == rel_entsize) + strlen(".rel"),
- _size, mlocp - mloc0);
+ loc_size, mlocp - mloc0);
if (!mcount_loc_sec)
return -1;
// created mcount_loc_sec->sh.sh_size = (void *)mlocp - (void *)mloc0;
mcount_loc_sec->sh.sh_link = 0;
mcount_loc_sec->sh.sh_info = 0;
- mcount_loc_sec->sh.sh_addralign = _size;
- // created mcount_loc_sec->sh.sh_entsize = _size;
+ mcount_loc_sec->sh.sh_addralign = loc_size;
+ // created mcount_loc_sec->sh.sh_entsize = loc_size;
// assert mcount_loc_sec->data->d_size == (void *)mlocp - (void *)mloc0
memcpy(mcount_loc_sec->data->d_buf, mloc0,
@@ -108,7 +109,7 @@ static int append_func(uint_t const *const mloc0,
reloc_sec->sh.sh_flags = 0; /* clear SHF_ALLOC */
reloc_sec->sh.sh_link = find_section_by_name(lf, ".symtab")->idx;
reloc_sec->sh.sh_info = mcount_loc_sec->idx;
- reloc_sec->sh.sh_addralign = _size;
+ reloc_sec->sh.sh_addralign = loc_size;
// assert reloc_sec->data->d_size == (void *)mrelp - (void *)mrel0
memcpy(reloc_sec->data->d_buf, mrel0, reloc_sec->data->d_size);
@@ -227,7 +228,7 @@ static int do_func(unsigned const reltype)
}
if (!result && mloc0 != mlocp)
result = append_func(mloc0, mlocp, mrel0, mrelp,
-rel_entsize, symsec_sh_link);
+_size, rel_entsize, symsec_sh_link);
out:
free(mrel0);
free(mloc0);
--
2.20.1
[RFC][PATCH v5 03/51] objtool: Make recordmcount into mcount subcmd
Rather than a standalone executable merge recordmcount as a sub command of objtool. This is a small step towards cleaning up recordmcount and eventually sharing 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. Signed-off-by: Matt Helsley --- Documentation/dontdiff | 2 +- Documentation/trace/ftrace.rst | 6 ++-- Makefile| 15 -- arch/arm64/include/asm/ftrace.h | 2 +- arch/x86/include/asm/ftrace.h | 2 +- kernel/trace/Kconfig| 9 +- scripts/Makefile.build | 19 +++-- scripts/sorttable.h | 2 +- tools/objtool/Build | 4 +-- tools/objtool/Makefile | 20 ++--- tools/objtool/builtin-mcount.c | 50 + tools/objtool/builtin.h | 1 + tools/objtool/objtool.c | 1 + tools/objtool/objtool.h | 1 + tools/objtool/recordmcount.c| 36 +++- tools/objtool/weak.c| 5 16 files changed, 104 insertions(+), 71 deletions(-) create mode 100644 tools/objtool/builtin-mcount.c diff --git a/Documentation/dontdiff b/Documentation/dontdiff index ef9519c32c55..82cc4e3bb713 100644 --- a/Documentation/dontdiff +++ b/Documentation/dontdiff @@ -211,7 +211,7 @@ r420_reg_safe.h r600_reg_safe.h randomize_layout_hash.h randomize_layout_seed.h -recordmcount +objtool relocs rlim_names.h rn50_reg_safe.h diff --git a/Documentation/trace/ftrace.rst b/Documentation/trace/ftrace.rst index 24ec4ec2d98d..eefb966e5832 100644 --- a/Documentation/trace/ftrace.rst +++ b/Documentation/trace/ftrace.rst @@ -2684,8 +2684,8 @@ every kernel function, produced by the -pg switch in gcc), starts of pointing to a simple return. (Enabling FTRACE will include the -pg switch in the compiling of the kernel.) -At compile time every C file object is run through the -recordmcount program (located in the tools/objtool directory). This +At compile time every C file object is run through objtool's +mcount subcommand (located in the tools/objtool directory). This program will parse the ELF headers in the C object to find all the locations in the .text section that call mcount. Starting with gcc version 4.6, the -mfentry has been added for x86, which @@ -2699,7 +2699,7 @@ can be traced. A section called "__mcount_loc" is created that holds references to all the mcount/fentry call sites in the .text section. -The recordmcount program re-links this section back into the +Running "objtool mcount" re-links this section back into the original object. The final linking stage of the kernel will add all these references into a single table. diff --git a/Makefile b/Makefile index e20c30f82c58..3842d7258b43 100644 --- a/Makefile +++ b/Makefile @@ -841,6 +841,7 @@ ifdef CONFIG_FTRACE_MCOUNT_RECORD ifeq ($(call cc-option-yn,-mrecord-mcount),y) CC_FLAGS_FTRACE+= -mrecord-mcount export CC_USING_RECORD_MCOUNT := 1 +undefine CONFIG_OBJTOOL_SUBCMD_MCOUNT endif ifdef CONFIG_HAVE_NOP_MCOUNT ifeq ($(call cc-option-yn, -mnop-mcount),y) @@ -848,7 +849,7 @@ ifdef CONFIG_FTRACE_MCOUNT_RECORD CC_FLAGS_USING += -DCC_USING_NOP_MCOUNT endif endif -endif +endif # CONFIG_FTRACE_MCOUNT_RECORD ifdef CONFIG_HAVE_FENTRY ifeq ($(call cc-option-yn, -mfentry),y) CC_FLAGS_FTRACE+= -mfentry @@ -858,14 +859,7 @@ endif export CC_FLAGS_FTRACE 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 - objtool_target := tools/objtool FORCE - endif -endif -endif +endif # CONFIG_FUNCTION_TRACER # We trigger additional mismatches with less inlining ifdef CONFIG_DEBUG_SECTION_MISMATCH @@ -1196,6 +1190,9 @@ ifneq ($(has_libelf),1) ifdef CONFIG_UNWINDER_ORC @echo "error: Cannot generate ORC metadata for CONFIG_UNWINDER_ORC=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel" >&2 @false + else ifdef CONFIG_OBJTOOL_SUBCMD_MCOUNT + @echo &qu
[RFC][PATCH v5 02/51] objtool: Prepare to merge recordmcount
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
---
Documentation/trace/ftrace-design.rst | 4 ++--
Documentation/trace/ftrace.rst | 2 +-
Makefile | 11 +++
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
12 files changed, 31 insertions(+), 15 deletions(-)
rename {scripts => tools/objtool}/recordmcount.c (100%)
rename {scripts => tools/objtool}/recordmcount.h (100%)
rename {scripts => tools/objtool}/recordmcount.pl (100%)
diff --git a/Documentation/trace/ftrace-design.rst
b/Documentation/trace/ftrace-design.rst
index 6893399157f0..f793a76ff65a 100644
--- a/Documentation/trace/ftrace-design.rst
+++ b/Documentation/trace/ftrace-design.rst
@@ -253,7 +253,7 @@ You need very few things to get the syscalls tracing in an
arch.
HAVE_FTRACE_MCOUNT_RECORD
-
-See scripts/recordmcount.pl for more info. Just fill in the arch-specific
+See tools/objtool/recordmcount.pl for more info. Just fill in the
arch-specific
details for how to locate the addresses of mcount call sites via objdump.
This option doesn't make much sense without also implementing dynamic ftrace.
@@ -371,7 +371,7 @@ linux/ftrace.h for the functions::
ftrace_make_call()
The rec->ip value is the address of the mcount call site that was collected
-by the scripts/recordmcount.pl during build time.
+by the tools/objtool/recordmcount.pl during build time.
The last function is used to do runtime patching of the active tracer. This
will be modifying the assembly code at the location of the ftrace_call symbol
diff --git a/Documentation/trace/ftrace.rst b/Documentation/trace/ftrace.rst
index 430a16283103..24ec4ec2d98d 100644
--- a/Documentation/trace/ftrace.rst
+++ b/Documentation/trace/ftrace.rst
@@ -2685,7 +2685,7 @@ starts of pointing to a simple return. (Enabling FTRACE
will
include the -pg switch in the compiling of the kernel.)
At compile time every C file object is run through the
-recordmcount program (located in the scripts directory). This
+recordmcount program (located in the tools/objtool directory). This
program will parse the ELF headers in the C object to find all
the locations in the .text section that call mcount. Starting
with gcc version 4.6, the -mfentry has been added for x86, which
diff --git a/Makefile b/Makefile
index cf731709ebe7..e20c30f82c58 100644
--- a/Makefile
+++ b/Makefile
@@ -862,6 +862,7 @@ ifdef CONFIG_DYNAMIC_FTRACE
ifdef CONFIG_HAVE_C_RECORDMCOUNT
BUILD_C_RECORDMCOUNT := y
export BUILD_C_RECORDMCOUNT
+ objtool_target := tools/objtool FORCE
endif
endif
endif
@@ -1191,13 +1192,15 @@ uapi-asm-generic:
PHONY += prepare-objtool
prepare-objtool: $(objtool_target)
-ifeq ($(SKIP_STACK_VALIDATION),1)
-ifdef CONFIG_UNWINDER_ORC
+ifneq ($(has_libelf),1)
+ ifdef CONFIG_UNWINDER_ORC
@echo "error: Cannot generate ORC metadata for CONFIG_UNWINDER_ORC=y,
please install libelf-dev, libelf-devel or elfutils-libelf-devel" >&2
@false
-else
+ else
+ifeq ($(SKIP_STACK_VALIDATION),1)
@echo "warning: Cannot use CONFIG_STACK_VALIDATION=y, please install
libelf-dev, libelf-devel or elfutils-libelf-devel" >&2
-endif
+endif
+ endif
endif
# Generate some files
diff --git a/scripts/.gitignore b/scripts/.gitignore
index 0d1c8e217cd7..dafda6d2c306 100644
--- a/scripts/.gitignore
+++ b/scripts/.gitignore
@@ -2,7 +2,6 @@
bin2c
kallsyms
unifdef
-recordmcount
sorttable
asn1_compiler
extract-cert
diff --git a/scripts/Makefile b/scripts/Makefile
index 95ecf970c74c..d8d81de4f1cb 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -5,7 +5,6 @@
always-$(CONFIG_BUILD_BIN2C) += bin2c
always-$(CONFIG_KALLSYMS) += kallsyms
-always-$(BUILD_C_RECORDMCOUNT) += recordmcount
always-$(CONFIG_BUILDTIME_TABLE_SORT) += sorttable
always-$(CONFIG_ASN1) += asn1_compiler
always-$(CONFIG_MODULE_SIG_FORMAT) += sign-file
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 2e8810b7e5ed..f3f58d71951c 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -188,18 +188,19 @@ endif
# files, including recordmcount.
sub_cmd_record_mcount =
[RFC][PATCH v5 07/51] objtool: mcount: Move nhdr into find_symtab()
Since it's no longer needed in the rest of do_func() we can move
it to where it's needed rather than pass it as a parameter.
Signed-off-by: Matt Helsley
---
tools/objtool/recordmcount.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/objtool/recordmcount.h b/tools/objtool/recordmcount.h
index b46e855d32bf..4bd61c9d1fd5 100644
--- a/tools/objtool/recordmcount.h
+++ b/tools/objtool/recordmcount.h
@@ -229,9 +229,10 @@ static int get_shstrndx(Elf_Ehdr const *ehdr, Elf_Shdr
const *shdr0)
}
static void find_symtab(Elf_Ehdr *const ehdr, Elf_Shdr const *shdr0,
- unsigned const nhdr, Elf32_Word **symtab,
+ Elf32_Word **symtab,
Elf32_Word **symtab_shndx)
{
+ unsigned const nhdr = get_shnum(ehdr, shdr0);
Elf_Shdr const *relhdr;
unsigned k;
@@ -593,7 +594,6 @@ 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 = get_shnum(ehdr, shdr0);
Elf_Shdr *const shstr = [get_shstrndx(ehdr, shdr0)];
char const *const shstrtab = (char const *)(_w(shstr->sh_offset)
+ (void *)ehdr);
@@ -638,7 +638,7 @@ static int do_func(Elf_Ehdr *const ehdr, char const *const
fname,
return -1;
}
- find_symtab(ehdr, shdr0, nhdr, , _shndx);
+ find_symtab(ehdr, shdr0, , _shndx);
list_for_each_entry(sec, >sections, list) {
char const *txtname;
--
2.20.1
[RFC][PATCH v5 28/51] objtool: mcount: Move mcount_adjust out of wrapper
The mcount_adjust variable defines how many bytes to move back
from the relocation address in order to be able to get to the
start of the function call instruction(s) needed to turn it
into a no-op. The values are very small and signed so we don't
need to worry about changing the size of the variable's type
inside the wrapper -- we can just use a regular int.
Signed-off-by: Matt Helsley
---
tools/objtool/recordmcount.c | 11 ---
tools/objtool/recordmcount.h | 5 -
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/tools/objtool/recordmcount.c b/tools/objtool/recordmcount.c
index a263062c9c64..bb53927612fb 100644
--- a/tools/objtool/recordmcount.c
+++ b/tools/objtool/recordmcount.c
@@ -387,6 +387,11 @@ static unsigned tot_relsize(unsigned int *rel_entsize)
return totrelsz;
}
+/* zero or a small negative offset added to get the start of the call
+ * instruction
+ */
+static int mcount_adjust = 0;
+
/* 32 bit and 64 bit are very similar */
#include "recordmcount.h"
#define RECORD_MCOUNT_64
@@ -497,7 +502,7 @@ static int do_file(char const *const fname)
rel_type_nop = R_386_NONE;
make_nop = make_nop_x86;
ideal_nop = ideal_nop5_x86_32;
- mcount_adjust_32 = -1;
+ mcount_adjust = -1;
gpfx = 0;
break;
case EM_ARM:
@@ -526,7 +531,7 @@ static int do_file(char const *const fname)
ideal_nop = ideal_nop5_x86_64;
reltype = R_X86_64_64;
rel_type_nop = R_X86_64_NONE;
- mcount_adjust_64 = -1;
+ mcount_adjust = -1;
gpfx = 0;
break;
} /* end switch */
@@ -558,7 +563,7 @@ static int do_file(char const *const fname)
}
if (lf->ehdr.e_machine == EM_S390) {
reltype = R_390_64;
- mcount_adjust_64 = -14;
+ mcount_adjust = -14;
}
if (lf->ehdr.e_machine == EM_MIPS) {
reltype = R_MIPS_64;
diff --git a/tools/objtool/recordmcount.h b/tools/objtool/recordmcount.h
index a74a80b3356e..e2c8b9d4725d 100644
--- a/tools/objtool/recordmcount.h
+++ b/tools/objtool/recordmcount.h
@@ -18,7 +18,6 @@
* Copyright 2010 Steven Rostedt , Red Hat Inc.
*/
#undef append_func
-#undef mcount_adjust
#undef sift_rel_mcount
#undef do_func
#undef Elf_Shdr
@@ -35,7 +34,6 @@
# define append_func append64
# define sift_rel_mcount sift64_rel_mcount
# define do_func do64
-# define mcount_adjust mcount_adjust_64
# define Elf_Rel Elf64_Rel
# define Elf_Rela Elf64_Rela
# define ELF_R_INFOELF64_R_INFO
@@ -48,7 +46,6 @@
# define append_func append32
# define sift_rel_mcount sift32_rel_mcount
# define do_func do32
-# define mcount_adjust mcount_adjust_32
# define Elf_Rel Elf32_Rel
# define Elf_Rela Elf32_Rela
# define ELF_R_INFOELF32_R_INFO
@@ -65,8 +62,6 @@ static void fn_ELF_R_INFO(Elf_Rel *const rp, unsigned sym,
unsigned type)
}
static void (*Elf_r_info)(Elf_Rel *const rp, unsigned sym, unsigned type) =
fn_ELF_R_INFO;
-static int mcount_adjust = 0;
-
/* Append the new __mcount_loc and its relocations. */
static int append_func(uint_t const *const mloc0,
uint_t const *const mlocp,
--
2.20.1
[RFC][PATCH v5 19/51] objtool: mcount: Restrict using ehdr in append_func()
Use the ehdr parameter to append_func() to write the ELF file's
header but use the objtool ELF header data as the basis for
making changes. The makes it clearer when we can switch from
using the old recordmcount wrapper to write the ELF file
because ehdr will only be passed on to uwrite() calls and those
will get replaced later.
Signed-off-by: Matt Helsley
---
tools/objtool/recordmcount.h | 9 -
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/tools/objtool/recordmcount.h b/tools/objtool/recordmcount.h
index eed592954f37..19bff5a7c8ce 100644
--- a/tools/objtool/recordmcount.h
+++ b/tools/objtool/recordmcount.h
@@ -93,7 +93,7 @@ static void (*Elf_r_info)(Elf_Rel *const rp, unsigned sym,
unsigned type) = fn_E
static int mcount_adjust = 0;
-static unsigned int get_shnum(Elf_Ehdr const *ehdr, Elf_Shdr const *shdr0)
+static unsigned int get_shnum(GElf_Ehdr const *ehdr, Elf_Shdr const *shdr0)
{
if (shdr0 && !ehdr->e_shnum)
return w(shdr0->sh_size);
@@ -133,11 +133,11 @@ static int append_func(Elf_Ehdr *const ehdr,
char const *mc_name = (sizeof(Elf_Rela) == rel_entsize)
? ".rela__mcount_loc"
: ".rel__mcount_loc";
- uint_t const old_shoff = _w(ehdr->e_shoff);
+ uint_t const old_shoff = lf->ehdr.e_shoff;
uint_t const old_shstr_sh_size = _w(shstr->sh_size);
uint_t const old_shstr_sh_offset = _w(shstr->sh_offset);
Elf_Shdr *const shdr0 = (Elf_Shdr *)(old_shoff + (void *)ehdr);
- unsigned int const old_shnum = get_shnum(ehdr, shdr0);
+ unsigned int const old_shnum = get_shnum(>ehdr, shdr0);
unsigned int const new_shnum = 2 + old_shnum; /* {.rel,}__mcount_loc */
uint_t t = 1 + strlen(mc_name) + _w(shstr->sh_size);
uint_t new_e_shoff;
@@ -149,8 +149,6 @@ static int append_func(Elf_Ehdr *const ehdr,
t += (_align & -t); /* word-byte align */
new_e_shoff = t;
- set_shnum(ehdr, shdr0, new_shnum);
-
/* body for new shstrtab */
if (ulseek(sb.st_size, SEEK_SET) < 0)
return -1;
@@ -205,6 +203,7 @@ static int append_func(Elf_Ehdr *const ehdr,
return -1;
ehdr->e_shoff = _w(new_e_shoff);
+ set_shnum(ehdr, shdr0, new_shnum);
if (ulseek(0, SEEK_SET) < 0)
return -1;
if (uwrite(ehdr, sizeof(*ehdr)) < 0)
--
2.20.1
[RFC][PATCH v5 37/51] objtool: mcount: Simplify mcount name matching
Setting altmcount only when processing ARM ELF files is
not necessary -- we can make the code easier to read
by always checking for the string.
Signed-off-by: Matt Helsley
---
tools/objtool/mcount.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/tools/objtool/mcount.c b/tools/objtool/mcount.c
index ff52697613b1..7e621769c488 100644
--- a/tools/objtool/mcount.c
+++ b/tools/objtool/mcount.c
@@ -44,7 +44,6 @@
#define R_ARM_THM_CALL 10
static char gpfx; /* prefix for global symbol name (sometimes '_') */
-static const char *altmcount; /* alternate mcount symbol name */
extern int warn_on_notrace_sect; /* warn when section has mcount not being
recorded */
static struct elf *lf;
@@ -173,7 +172,7 @@ static struct symbol *get_mcount_sym(struct reloc *reloc)
if (symname[0] == '.')
++symname; /* ppc64 hack */
if (strcmp(mcount, symname) == 0 ||
- (altmcount && strcmp(altmcount, symname) == 0) ||
+ (strcmp("__gnu_mcount_nc", symname) == 0) ||
(strcmp(fentry, symname) == 0))
return sym;
return NULL;
@@ -567,7 +566,6 @@ static int do_file(char const *const fname)
break;
case EM_ARM:
reltype = R_ARM_ABS32;
- altmcount = "__gnu_mcount_nc";
make_nop = make_nop_arm;
rel_type_nop = R_ARM_NONE;
is_fake_mcount = arm_is_fake_mcount;
--
2.20.1
[RFC][PATCH v5 30/51] objtool: mcount: Generic location and relocation table types
Rather than building the exact ELF section data we need and
avoiding libelf's conversion step, use more GElf types
and then libelf's elfxx_xlatetof() functions to convert
the mcount locations (GElf_Addr) and associated relocations.
This converts sift_rel_mcount() so that it doesn't use the
recordmcount wrapper. The next patch will move it out of the
wrapper.
Signed-off-by: Matt Helsley
---
tools/objtool/recordmcount.c | 44 +++--
tools/objtool/recordmcount.h | 122 ++-
2 files changed, 60 insertions(+), 106 deletions(-)
diff --git a/tools/objtool/recordmcount.c b/tools/objtool/recordmcount.c
index bb53927612fb..34976f3294ac 100644
--- a/tools/objtool/recordmcount.c
+++ b/tools/objtool/recordmcount.c
@@ -210,7 +210,7 @@ static int is_mcounted_section_name(char const *const
txtname)
strcmp(".cpuidle.text", txtname) == 0;
}
-static struct symbol *get_mcountsym(struct reloc *reloc)
+static struct symbol *get_mcount_sym(struct reloc *reloc)
{
struct symbol *sym = reloc->sym;
char const *symname = sym->name;
@@ -322,16 +322,16 @@ static int nop_mcount(struct section * const rels,
{
struct reloc *reloc;
struct section *txts = find_section_by_index(lf, rels->sh.sh_info);
- struct symbol *mcountsym = NULL;
+ struct symbol *mcount_sym = NULL;
int once = 0;
list_for_each_entry(reloc, >reloc_list, list) {
int ret = -1;
- if (!mcountsym)
- mcountsym = get_mcountsym(reloc);
+ if (!mcount_sym)
+ mcount_sym = get_mcount_sym(reloc);
- if (mcountsym == reloc->sym && !is_fake_mcount(reloc)) {
+ if (mcount_sym == reloc->sym && !is_fake_mcount(reloc)) {
if (make_nop) {
ret = make_nop(txts, reloc->offset);
if (ret < 0)
@@ -392,6 +392,9 @@ static unsigned tot_relsize(unsigned int *rel_entsize)
*/
static int mcount_adjust = 0;
+/* Size of an entry in __mcount_loc; 4 or 8 */
+static size_t loc_size;
+
/* 32 bit and 64 bit are very similar */
#include "recordmcount.h"
#define RECORD_MCOUNT_64
@@ -409,34 +412,6 @@ static int arm_is_fake_mcount(struct reloc const *rp)
return 1;
}
-/* 64-bit EM_MIPS has weird ELF64_Rela.r_info.
- *
http://techpubs.sgi.com/library/manuals/4000/007-4658-001/pdf/007-4658-001.pdf
- * We interpret Table 29 Relocation Operation (Elf64_Rel, Elf64_Rela) [p.40]
- * to imply the order of the members; the spec does not say so.
- * typedef unsigned char Elf64_Byte;
- * fails on MIPS64 because their already has it!
- */
-
-typedef uint8_t myElf64_Byte; /* Type for a 8-bit quantity. */
-
-union mips_r_info {
- Elf64_Xword r_info;
- struct {
- Elf64_Word r_sym; /* Symbol index. */
- myElf64_Byte r_ssym;/* Special symbol. */
- myElf64_Byte r_type3; /* Third relocation. */
- myElf64_Byte r_type2; /* Second relocation. */
- myElf64_Byte r_type;/* First relocation. */
- } r_mips;
-};
-
-static void MIPS64_r_info(Elf64_Rel *const rp, unsigned sym, unsigned type)
-{
- rp->r_info = ((union mips_r_info){
- .r_mips = { .r_sym = w(sym), .r_type = type }
- }).r_info;
-}
-
static int do_file(char const *const fname)
{
unsigned int reltype = 0;
@@ -552,6 +527,7 @@ static int do_file(char const *const fname)
reltype = R_MIPS_32;
is_fake_mcount = MIPS_is_fake_mcount;
}
+ loc_size = 4;
rc = do32(reltype);
break;
case ELFCLASS64: {
@@ -567,9 +543,9 @@ static int do_file(char const *const fname)
}
if (lf->ehdr.e_machine == EM_MIPS) {
reltype = R_MIPS_64;
- Elf64_r_info = MIPS64_r_info;
is_fake_mcount = MIPS_is_fake_mcount;
}
+ loc_size = 8;
rc = do64(reltype);
break;
}
diff --git a/tools/objtool/recordmcount.h b/tools/objtool/recordmcount.h
index ce88f0c2f79b..1d11dfc40d09 100644
--- a/tools/objtool/recordmcount.h
+++ b/tools/objtool/recordmcount.h
@@ -19,86 +19,63 @@
*/
#undef sift_rel_mcount
#undef do_func
-#undef Elf_Shdr
-#undef Elf_Rel
#undef Elf_Rela
-#undef ELF_R_INFO
-#undef Elf_r_info
-#undef fn_ELF_R_INFO
-#undef uint_t
-#undef _w
-#undef _size
#ifdef RECORD_MCOUNT_64
# define sift_rel_mcount sift64_rel_mcount
# define do_func do64
-# define Elf_Rel Elf64_Rel
# define Elf_Rela Elf64_Rela
-# define ELF_R_INFOELF64_R_INFO
-# define Elf_r_infoElf6
[RFC][PATCH v5 50/51] objtool: mcount: Remove useless lookup
Since the relocation section's sh_info points back to the text
section it applies to and we already have that we can just pass
it in and greatly simplify find_section_sym_index().
Signed-off-by: Matt Helsley
---
tools/objtool/mcount.c | 39 +++
1 file changed, 15 insertions(+), 24 deletions(-)
diff --git a/tools/objtool/mcount.c b/tools/objtool/mcount.c
index 084bbc02de0c..a74625aed09b 100644
--- a/tools/objtool/mcount.c
+++ b/tools/objtool/mcount.c
@@ -198,35 +198,27 @@ static const unsigned int missing_sym = (unsigned int)-1;
*Num:Value Size TypeBind Vis Ndx Name
* 2: 0 SECTION LOCAL DEFAULT1
*/
-static int find_section_sym_index(unsigned const txtndx,
- char const *const txtname,
- unsigned long *const recvalp,
- unsigned int *sym_index)
+static int find_section_sym_index(const struct section * const txts,
+ unsigned long *const recvalp,
+ unsigned int *sym_index)
{
struct symbol *sym;
- struct section *txts = find_section_by_index(lf, txtndx);
-
- if (!txts) {
- fprintf(stderr, "Cannot find section %u: %s.\n",
- txtndx, txtname);
- return missing_sym;
- }
list_for_each_entry(sym, >symbol_list, list) {
/* avoid symbols with weak binding */
- if ((sym->bind == STB_LOCAL) || (sym->bind == STB_GLOBAL)) {
- /* function symbols on ARM have quirks, avoid them */
- if (lf->ehdr.e_machine == EM_ARM
- && sym->type == STT_FUNC)
- continue;
-
- *recvalp = sym->sym.st_value;
- *sym_index = sym->idx;
- return 0;
- }
+ if ((sym->bind != STB_LOCAL) && (sym->bind != STB_GLOBAL))
+ continue;
+
+ /* function symbols on ARM have quirks, avoid them */
+ if (lf->ehdr.e_machine == EM_ARM && sym->type == STT_FUNC)
+ continue;
+
+ *recvalp = sym->sym.st_value;
+ *sym_index = sym->idx;
+ return 0;
}
fprintf(stderr, "Cannot find symbol for section %u: %s.\n",
- txtndx, txtname);
+ txts->idx, txts->name);
return missing_sym;
}
@@ -414,8 +406,7 @@ static int do_mcount(unsigned const reltype)
unsigned long recval = 0;
unsigned int recsym;
- if (find_section_sym_index(sec->sh.sh_info,
- txts->name, , ))
+ if (find_section_sym_index(txts, , ))
goto out;
sift_rel_mcount(_offset, sec, mrels, mlocs,
--
2.20.1
[RFC][PATCH v5 13/51] objtool: mcount: Return symbol from mcountsym
Before we can move this function out of the wrapper and into
wordsize-independent code we need to return the relocation
symbol information in a size-independent fashion. Previously
we compared the raw info bits but that requires passing around
an unsigned long. Instead we just use a pointer to the objtool
struct symbol which callers can use as-needed.
Reported-by: Kamalesh Babulal
Signed-off-by: Matt Helsley
Co-developed-by: Kamalesh Babulal
Co-developed-by: Peter Zijlstra
--
Thanks to Kamalesh Babulal for reporting this problem and suggesting
a fix. Thanks to Peter Zijlstra for recommending an enhancement to
the fix.
---
tools/objtool/recordmcount.h | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/tools/objtool/recordmcount.h b/tools/objtool/recordmcount.h
index df8384f8e9e7..6ac120aa45af 100644
--- a/tools/objtool/recordmcount.h
+++ b/tools/objtool/recordmcount.h
@@ -271,7 +271,7 @@ static int append_func(Elf_Ehdr *const ehdr,
return elf_write(lf);
}
-static unsigned get_mcountsym(struct reloc *reloc)
+static struct symbol *get_mcountsym(struct reloc *reloc)
{
struct symbol *sym = reloc->sym;
char const *symname = sym->name;
@@ -283,8 +283,8 @@ static unsigned get_mcountsym(struct reloc *reloc)
if (strcmp(mcount, symname) == 0 ||
(altmcount && strcmp(altmcount, symname) == 0) ||
(strcmp(fentry, symname) == 0))
- return GELF_R_INFO(reloc->sym->idx, reloc->type);
- return 0;
+ return sym;
+ return NULL;
}
/*
@@ -303,14 +303,14 @@ static uint_t *sift_rel_mcount(uint_t *mlocp,
uint_t *const mloc0 = mlocp;
Elf_Rel *mrelp = *mrelpp;
unsigned int rel_entsize = rels->sh.sh_entsize;
- unsigned mcountsym = 0;
+ struct symbol *mcountsym = NULL;
struct reloc *reloc;
list_for_each_entry(reloc, >reloc_list, list) {
if (!mcountsym)
mcountsym = get_mcountsym(reloc);
- if (mcountsym == GELF_R_INFO(reloc->sym->idx, reloc->type) &&
!is_fake_mcount(reloc)) {
+ if (mcountsym == reloc->sym && !is_fake_mcount(reloc)) {
uint_t const addend =
_w(reloc->offset - recval + mcount_adjust);
mrelp->r_offset = _w(offbase
@@ -342,7 +342,7 @@ static int nop_mcount(struct section * const rels,
+ (void *)ehdr);
struct reloc *reloc;
Elf_Shdr const *const shdr = [rels->sh.sh_info];
- unsigned mcountsym = 0;
+ struct symbol *mcountsym = NULL;
int once = 0;
list_for_each_entry(reloc, >reloc_list, list) {
@@ -351,7 +351,7 @@ static int nop_mcount(struct section * const rels,
if (!mcountsym)
mcountsym = get_mcountsym(reloc);
- if (mcountsym == GELF_R_INFO(reloc->sym->idx, reloc->type) &&
!is_fake_mcount(reloc)) {
+ if (mcountsym == reloc->sym && !is_fake_mcount(reloc)) {
if (make_nop) {
ret = make_nop((void *)ehdr,
_w(shdr->sh_offset) + reloc->offset);
if (ret < 0)
--
2.20.1
[RFC][PATCH v5 49/51] objtool: mcount: Remove relocation size check
Rather than use the size of the relocations check the section
header type directly to see if the mcount relocations should
be rel or rela relocations.
Signed-off-by: Matt Helsley
---
tools/objtool/elf.c| 4 ++--
tools/objtool/elf.h| 2 +-
tools/objtool/mcount.c | 15 +--
3 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/tools/objtool/elf.c b/tools/objtool/elf.c
index 733e10d4a574..4948df31bba0 100644
--- a/tools/objtool/elf.c
+++ b/tools/objtool/elf.c
@@ -642,8 +642,8 @@ static int read_relocs(struct elf *elf)
sec->base->reloc = sec;
sec->mcountable = relocs_mcountable(sec);
- if (sec->mcountable && !elf->mcount_rel_entsize)
- elf->mcount_rel_entsize = sec->sh.sh_entsize;
+ if (sec->mcountable)
+ elf->mcount_r_addends = (sec->sh.sh_type == SHT_RELA);
nr_reloc = 0;
for (i = 0; i < sec->sh.sh_size / sec->sh.sh_entsize; i++) {
diff --git a/tools/objtool/elf.h b/tools/objtool/elf.h
index 8ece1ca79cca..f298e327af01 100644
--- a/tools/objtool/elf.h
+++ b/tools/objtool/elf.h
@@ -87,8 +87,8 @@ struct elf {
Elf *elf;
GElf_Ehdr ehdr;
int fd;
- size_t mcount_rel_entsize;
bool changed;
+ bool mcount_r_addends;
char *name;
struct list_head sections;
DECLARE_HASHTABLE(symbol_hash, ELF_HASH_BITS);
diff --git a/tools/objtool/mcount.c b/tools/objtool/mcount.c
index 9527924af56b..084bbc02de0c 100644
--- a/tools/objtool/mcount.c
+++ b/tools/objtool/mcount.c
@@ -368,22 +368,17 @@ static void fill_mcount_locs(GElf_Sxword r_offset,
GElf_Addr **rbuf,
}
/* Overall supervision for Elf32 ET_REL file. */
-static int do_mcount(unsigned const reltype, size_t rela_size)
+static int do_mcount(unsigned const reltype)
{
- GElf_Sxword r_offset = 0;
-
struct section *sec, *mlocs, *mrels;
const char * const mc_name = "__mcount_loc";
-
- const unsigned int rel_entsize = lf->mcount_rel_entsize;
+ GElf_Sxword r_offset = 0;
int result = -1;
- bool is_rela;
+ const bool is_rela = lf->mcount_r_addends;
if (find_section_by_name(lf, "__mcount_loc") != NULL)
return 0;
- is_rela = (rela_size == rel_entsize);
-
/* add section: __mcount_loc */
mlocs = elf_create_section(lf, mc_name, sizeof(GElf_Addr), 0);
if (!mlocs)
@@ -562,7 +557,7 @@ static int do_file(char const *const fname)
is_fake_mcount = MIPS_is_fake_mcount;
}
loc_size = 4;
- rc = do_mcount(reltype, sizeof(Elf32_Rela));
+ rc = do_mcount(reltype);
break;
case ELFCLASS64: {
if (lf->ehdr.e_ehsize != sizeof(Elf64_Ehdr)
@@ -580,7 +575,7 @@ static int do_file(char const *const fname)
is_fake_mcount = MIPS_is_fake_mcount;
}
loc_size = 8;
- rc = do_mcount(reltype, sizeof(Elf64_Rela));
+ rc = do_mcount(reltype);
break;
}
} /* end switch */
--
2.20.1
[RFC][PATCH v5 45/51] objtool: mcount: Move mcount section test to objtool ELF
In preparation for removing this first pass by mcount move
the test for whether a section is mcountable into objtool's
ELF read code, much like we did with the symbol name. A
subsequent patch will eliminate the tot_relsize() function
and thereby reduce the number of passes through the ELF
data.
Signed-off-by: Matt Helsley
---
tools/objtool/elf.c| 16
tools/objtool/elf.h| 2 +-
tools/objtool/mcount.c | 36 +++-
3 files changed, 28 insertions(+), 26 deletions(-)
diff --git a/tools/objtool/elf.c b/tools/objtool/elf.c
index 666cbc01c332..dffdc3264a25 100644
--- a/tools/objtool/elf.c
+++ b/tools/objtool/elf.c
@@ -308,6 +308,20 @@ struct reloc *find_reloc_by_dest(const struct elf *elf,
struct section *sec, uns
return find_reloc_by_dest_range(elf, sec, offset, 1);
}
+/* Names of the sections that could contain calls to mcount. */
+static int is_mcounted_section_name(char const *const txtname)
+{
+ return strncmp(".text", txtname, 5) == 0 ||
+ strcmp(".init.text", txtname) == 0 ||
+ strcmp(".ref.text", txtname) == 0 ||
+ strcmp(".sched.text",txtname) == 0 ||
+ strcmp(".spinlock.text", txtname) == 0 ||
+ strcmp(".irqentry.text", txtname) == 0 ||
+ strcmp(".softirqentry.text", txtname) == 0 ||
+ strcmp(".kprobes.text", txtname) == 0 ||
+ strcmp(".cpuidle.text", txtname) == 0;
+}
+
static int read_sections(struct elf *elf)
{
Elf_Scn *s = NULL;
@@ -370,6 +384,8 @@ static int read_sections(struct elf *elf)
}
sec->len = sec->sh.sh_size;
+ sec->mcounted = is_mcounted_section_name(sec->name);
+
list_add_tail(>list, >sections);
elf_hash_add(elf->section_hash, >hash, sec->idx);
elf_hash_add(elf->section_name_hash, >name_hash,
str_hash(sec->name));
diff --git a/tools/objtool/elf.h b/tools/objtool/elf.h
index f0b02824f9d3..db207e93a1e6 100644
--- a/tools/objtool/elf.h
+++ b/tools/objtool/elf.h
@@ -39,7 +39,7 @@ struct section {
char *name;
int idx;
unsigned int len;
- bool changed, text, rodata, noinstr;
+ bool changed, text, rodata, noinstr, mcounted;
};
enum symbol_class {
diff --git a/tools/objtool/mcount.c b/tools/objtool/mcount.c
index 7d7843f7cd44..a75d918a9fa5 100644
--- a/tools/objtool/mcount.c
+++ b/tools/objtool/mcount.c
@@ -144,20 +144,6 @@ static int make_nop_arm64(struct section *txts, size_t
const offset)
return elf_write_insn(lf, txts, offset, 4, ideal_nop);
}
-/* Names of the sections that could contain calls to mcount. */
-static int is_mcounted_section_name(char const *const txtname)
-{
- return strncmp(".text", txtname, 5) == 0 ||
- strcmp(".init.text", txtname) == 0 ||
- strcmp(".ref.text", txtname) == 0 ||
- strcmp(".sched.text",txtname) == 0 ||
- strcmp(".spinlock.text", txtname) == 0 ||
- strcmp(".irqentry.text", txtname) == 0 ||
- strcmp(".softirqentry.text", txtname) == 0 ||
- strcmp(".kprobes.text", txtname) == 0 ||
- strcmp(".cpuidle.text", txtname) == 0;
-}
-
/*
* MIPS mcount long call has 2 _mcount symbols, only the position of the 1st
* _mcount symbol is needed for dynamic function tracer, with it, to disable
@@ -288,7 +274,7 @@ static int nop_mcount(struct section * const rels,
return 0;
}
-static char const *has_rel_mcount(const struct section * const rels)
+static struct section const *has_rel_mcount(const struct section * const rels)
{
const struct section *txts;
if (rels->sh.sh_type != SHT_REL && rels->sh.sh_type != SHT_RELA)
@@ -297,17 +283,17 @@ static char const *has_rel_mcount(const struct section *
const rels)
if ((txts->sh.sh_type != SHT_PROGBITS) ||
!(txts->sh.sh_flags & SHF_EXECINSTR))
return NULL;
- return txts->name;
+ return txts;
}
static void tot_relsize(unsigned int *rel_entsize)
{
const struct section *sec;
- char const *txtname;
+ const struct section *txts;
list_for_each_entry(sec, >sections, list) {
- txtname = has_rel_mcount(sec);
- if (!(txtname && is_mcounted_section_name(txtname)))
+ txts = has_rel_mcount(sec);
+ if (!(txts && txts->mcounted))
continue;
*rel_entsize = sec->sh.sh_entsize;
}
@@ -441,25 +427,25 @@ static int do_mcount(unsigned const reltype, size_t
rela_size)
[RFC][PATCH v5 14/51] objtool: mcount: Move get_mcountsym
Now that it's been stripped of using the old recordmcount ELF
wrapper get_mcountsym() is ready to be promoted out of the
double-included wrapper header.
Signed-off-by: Matt Helsley
---
tools/objtool/recordmcount.c | 16
tools/objtool/recordmcount.h | 19 ---
2 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/tools/objtool/recordmcount.c b/tools/objtool/recordmcount.c
index dafa6dd10d04..d5f7c06afd57 100644
--- a/tools/objtool/recordmcount.c
+++ b/tools/objtool/recordmcount.c
@@ -422,6 +422,22 @@ static int is_mcounted_section_name(char const *const
txtname)
strcmp(".cpuidle.text", txtname) == 0;
}
+static struct symbol *get_mcountsym(struct reloc *reloc)
+{
+ struct symbol *sym = reloc->sym;
+ char const *symname = sym->name;
+ char const *mcount = gpfx == '_' ? "_mcount" : "mcount";
+ char const *fentry = "__fentry__";
+
+ if (symname[0] == '.')
+ ++symname; /* ppc64 hack */
+ if (strcmp(mcount, symname) == 0 ||
+ (altmcount && strcmp(altmcount, symname) == 0) ||
+ (strcmp(fentry, symname) == 0))
+ return sym;
+ return NULL;
+}
+
static const unsigned int missing_sym = (unsigned int)-1;
/* 32 bit and 64 bit are very similar */
diff --git a/tools/objtool/recordmcount.h b/tools/objtool/recordmcount.h
index 6ac120aa45af..210899819261 100644
--- a/tools/objtool/recordmcount.h
+++ b/tools/objtool/recordmcount.h
@@ -27,7 +27,6 @@
#undef find_section_sym_index
#undef has_rel_mcount
#undef tot_relsize
-#undef get_mcountsym
#undef get_shnum
#undef set_shnum
#undef get_shstrndx
@@ -56,7 +55,6 @@
# define set_shnum set_shnum64
# define get_shstrndx get_shstrndx64
# define do_func do64
-# define get_mcountsym get_mcountsym_64
# define is_fake_mcountis_fake_mcount64
# define fn_is_fake_mcount fn_is_fake_mcount64
# define MIPS_is_fake_mcount MIPS64_is_fake_mcount
@@ -84,7 +82,6 @@
# define set_shnum set_shnum32
# define get_shstrndx get_shstrndx32
# define do_func do32
-# define get_mcountsym get_mcountsym_32
# define is_fake_mcountis_fake_mcount32
# define fn_is_fake_mcount fn_is_fake_mcount32
# define MIPS_is_fake_mcount MIPS32_is_fake_mcount
@@ -271,22 +268,6 @@ static int append_func(Elf_Ehdr *const ehdr,
return elf_write(lf);
}
-static struct symbol *get_mcountsym(struct reloc *reloc)
-{
- struct symbol *sym = reloc->sym;
- char const *symname = sym->name;
- char const *mcount = gpfx == '_' ? "_mcount" : "mcount";
- char const *fentry = "__fentry__";
-
- if (symname[0] == '.')
- ++symname; /* ppc64 hack */
- if (strcmp(mcount, symname) == 0 ||
- (altmcount && strcmp(altmcount, symname) == 0) ||
- (strcmp(fentry, symname) == 0))
- return sym;
- return NULL;
-}
-
/*
* Look at the relocations in order to find the calls to mcount.
* Accumulate the section offsets that are found, and their relocation info,
--
2.20.1
[RFC][PATCH v5 09/51] objtool: mcount: Use libelf for section header names
Rather than passing in the string table contents as a parameter,
pass in the section index of the string table and rely on libelf
string table accessor functions to look up section names.
Note that modifying the string table with libelf will come later
so append_func() is unchanged.
Signed-off-by: Matt Helsley
---
tools/objtool/elf.c | 3 +-
tools/objtool/elf.h | 1 +
tools/objtool/recordmcount.c | 2 +-
tools/objtool/recordmcount.h | 89 ++--
4 files changed, 37 insertions(+), 58 deletions(-)
diff --git a/tools/objtool/elf.c b/tools/objtool/elf.c
index 6812cf74be9a..17e39b3a1719 100644
--- a/tools/objtool/elf.c
+++ b/tools/objtool/elf.c
@@ -185,8 +185,7 @@ struct section *find_section_by_name(const struct elf *elf,
const char *name)
return NULL;
}
-static struct section *find_section_by_index(struct elf *elf,
-unsigned int idx)
+struct section *find_section_by_index(const struct elf *elf, unsigned int idx)
{
struct section *sec;
diff --git a/tools/objtool/elf.h b/tools/objtool/elf.h
index 6cc80a075166..60eb44661658 100644
--- a/tools/objtool/elf.h
+++ b/tools/objtool/elf.h
@@ -131,6 +131,7 @@ int elf_write(struct elf *elf);
void elf_close(struct elf *elf);
struct section *find_section_by_name(const struct elf *elf, const char *name);
+struct section *find_section_by_index(const struct elf *elf, unsigned int idx);
struct symbol *find_func_by_offset(struct section *sec, unsigned long offset);
struct symbol *find_symbol_by_offset(struct section *sec, unsigned long
offset);
struct symbol *find_symbol_by_name(const struct elf *elf, const char *name);
diff --git a/tools/objtool/recordmcount.c b/tools/objtool/recordmcount.c
index 9941683b3f60..f20582ac99e2 100644
--- a/tools/objtool/recordmcount.c
+++ b/tools/objtool/recordmcount.c
@@ -177,7 +177,7 @@ static void *mmap_file(char const *fname)
file_updated = 0;
sb.st_size = 0;
- lf = elf_open_read(fname, O_RDONLY);
+ lf = elf_open_read(fname, O_RDWR);
if (!lf) {
perror(fname);
return NULL;
diff --git a/tools/objtool/recordmcount.h b/tools/objtool/recordmcount.h
index 53abfd49a537..30f8913aa841 100644
--- a/tools/objtool/recordmcount.h
+++ b/tools/objtool/recordmcount.h
@@ -25,7 +25,6 @@
#undef sift_rel_mcount
#undef nop_mcount
#undef find_secsym_ndx
-#undef __has_rel_mcount
#undef has_rel_mcount
#undef tot_relsize
#undef get_mcountsym
@@ -60,7 +59,6 @@
# define sift_rel_mcount sift64_rel_mcount
# define nop_mcountnop_mcount_64
# define find_secsym_ndx find64_secsym_ndx
-# define __has_rel_mcount __has64_rel_mcount
# define has_rel_mcounthas64_rel_mcount
# define tot_relsize tot64_relsize
# define find_symtab find_symtab64
@@ -98,7 +96,6 @@
# define sift_rel_mcount sift32_rel_mcount
# define nop_mcountnop_mcount_32
# define find_secsym_ndx find32_secsym_ndx
-# define __has_rel_mcount __has32_rel_mcount
# define has_rel_mcounthas32_rel_mcount
# define tot_relsize tot32_relsize
# define find_symtab find_symtab32
@@ -276,6 +273,7 @@ static int append_func(Elf_Ehdr *const ehdr,
shstr->sh_size = _w(t);
shstr->sh_offset = _w(sb.st_size);
+
t += sb.st_size;
t += (_align & -t); /* word-byte align */
new_e_shoff = t;
@@ -340,7 +338,7 @@ static int append_func(Elf_Ehdr *const ehdr,
return -1;
if (uwrite(ehdr, sizeof(*ehdr)) < 0)
return -1;
- return 0;
+ return elf_write(lf);
}
static unsigned get_mcountsym(Elf_Sym const *const sym0,
@@ -365,7 +363,7 @@ static unsigned get_mcountsym(Elf_Sym const *const sym0,
return mcountsym;
}
-static void get_sym_str_and_relp(GElf_Shdr const *const relhdr,
+static void get_sym_str_and_relp(const struct section * const rels,
Elf_Ehdr const *const ehdr,
Elf_Sym const **sym0,
char const **str0,
@@ -373,10 +371,10 @@ static void get_sym_str_and_relp(GElf_Shdr const *const
relhdr,
{
Elf_Shdr *const shdr0 = (Elf_Shdr *)(_w(ehdr->e_shoff)
+ (void *)ehdr);
- unsigned const symsec_sh_link = relhdr->sh_link;
+ unsigned const symsec_sh_link = rels->sh.sh_link;
Elf_Shdr const *const symsec = [symsec_sh_link];
Elf_Shdr const *const strsec = [w(symsec->sh_link)];
- Elf_Rel const *const rel0 = (Elf_Rel const *)(relhdr->sh_offset
+ Elf_Rel const *const rel0 = (Elf_Rel const *)(rels->sh.sh_offset
+ (void *)ehdr);
*sym0 = (Elf_Sym const *)(_w(symsec->sh_offset)
@@ -396,7 +394,7 @@ static void get_sym_str_and_relp(GElf_Shdr const *const
relhdr,
static uin
[RFC][PATCH v5 38/51] objtool: mcount: mcount symbol name simplification
Remove gpfx -- the recognized prefix for the mcount symbol
-- and just recognize any of the prefixes. This allows us
to further substitute the various strings directly into the
code rather than using variables.
Signed-off-by: Matt Helsley
---
tools/objtool/mcount.c | 19 ---
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/tools/objtool/mcount.c b/tools/objtool/mcount.c
index 7e621769c488..4d6596a031bf 100644
--- a/tools/objtool/mcount.c
+++ b/tools/objtool/mcount.c
@@ -43,7 +43,6 @@
#define R_ARM_THM_CALL 10
-static char gpfx; /* prefix for global symbol name (sometimes '_') */
extern int warn_on_notrace_sect; /* warn when section has mcount not being
recorded */
static struct elf *lf;
@@ -166,14 +165,16 @@ static struct symbol *get_mcount_sym(struct reloc *reloc)
{
struct symbol *sym = reloc->sym;
char const *symname = sym->name;
- char const *mcount = gpfx == '_' ? "_mcount" : "mcount";
- char const *fentry = "__fentry__";
if (symname[0] == '.')
- ++symname; /* ppc64 hack */
- if (strcmp(mcount, symname) == 0 ||
+ symname++; /* ppc64 hack */
+
+ if (symname[0] == '_')
+ symname++;
+
+ if (strcmp("mcount", symname) == 0 ||
(strcmp("__gnu_mcount_nc", symname) == 0) ||
- (strcmp(fentry, symname) == 0))
+ (strcmp("_fentry__", symname) == 0))
return sym;
return NULL;
}
@@ -550,7 +551,6 @@ static int do_file(char const *const fname)
goto out;
}
- gpfx = '_';
switch (lf->ehdr.e_machine) {
default:
fprintf(stderr, "unrecognized e_machine %u %s\n",
@@ -562,14 +562,12 @@ static int do_file(char const *const fname)
make_nop = make_nop_x86;
ideal_nop = ideal_nop5_x86_32;
mcount_adjust = -1;
- gpfx = 0;
break;
case EM_ARM:
reltype = R_ARM_ABS32;
make_nop = make_nop_arm;
rel_type_nop = R_ARM_NONE;
is_fake_mcount = arm_is_fake_mcount;
- gpfx = 0;
break;
case EM_AARCH64:
reltype = R_AARCH64_ABS64;
@@ -582,7 +580,7 @@ static int do_file(char const *const fname)
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_SH: reltype = R_SH_DIR32; break;
case EM_SPARCV9: reltype = R_SPARC_64; break;
case EM_X86_64:
make_nop = make_nop_x86;
@@ -590,7 +588,6 @@ static int do_file(char const *const fname)
reltype = R_X86_64_64;
rel_type_nop = R_X86_64_NONE;
mcount_adjust = -1;
- gpfx = 0;
break;
} /* end switch */
--
2.20.1
[RFC][PATCH v5 51/51] objtool: mcount: Remove stale description
The comments at the top no longer reflect how we process the ELF contents. More helpful comments are inline with the code so we don't need the top comments either. Signed-off-by: Matt Helsley --- tools/objtool/mcount.c | 13 - 1 file changed, 13 deletions(-) diff --git a/tools/objtool/mcount.c b/tools/objtool/mcount.c index a74625aed09b..fa99bd2e9195 100644 --- a/tools/objtool/mcount.c +++ b/tools/objtool/mcount.c @@ -8,19 +8,6 @@ * Copyright 2010 Steven Rostedt , Red Hat Inc. */ -/* - * Strategy: alter the .o file in-place. - * - * Append a new STRTAB that has the new section names, followed by a new array - * ElfXX_Shdr[] that has the new section headers, followed by the section - * contents for __mcount_loc and its relocations. The old shstrtab strings, - * and the old ElfXX_Shdr[] array, remain as "garbage" (commonly, a couple - * kilobytes.) Subsequent processing by /bin/ld (or the kernel module loader) - * will ignore the garbage regions, because they are not designated by the - * new .e_shoff nor the new ElfXX_Shdr[]. [In order to remove the garbage, - * then use "ld -r" to create a new file that omits the garbage.] - */ - #include #include #include -- 2.20.1
[RFC][PATCH v5 35/51] objtool: mcount: Remove endian wrappers
Now that they're no longer used we can remove these endian
wrappers.
Signed-off-by: Matt Helsley
---
tools/objtool/recordmcount.c | 63
1 file changed, 63 deletions(-)
diff --git a/tools/objtool/recordmcount.c b/tools/objtool/recordmcount.c
index 7f4d18e83e24..ff52697613b1 100644
--- a/tools/objtool/recordmcount.c
+++ b/tools/objtool/recordmcount.c
@@ -149,53 +149,6 @@ static int make_nop_arm64(struct section *txts, size_t
const offset)
return 0;
}
-/* w8rev, w8nat, ...: Handle endianness. */
-
-static uint64_t w8rev(uint64_t const x)
-{
- return ((0xff & (x >> (0 * 8))) << (7 * 8))
- | ((0xff & (x >> (1 * 8))) << (6 * 8))
- | ((0xff & (x >> (2 * 8))) << (5 * 8))
- | ((0xff & (x >> (3 * 8))) << (4 * 8))
- | ((0xff & (x >> (4 * 8))) << (3 * 8))
- | ((0xff & (x >> (5 * 8))) << (2 * 8))
- | ((0xff & (x >> (6 * 8))) << (1 * 8))
- | ((0xff & (x >> (7 * 8))) << (0 * 8));
-}
-
-static uint32_t w4rev(uint32_t const x)
-{
- return ((0xff & (x >> (0 * 8))) << (3 * 8))
- | ((0xff & (x >> (1 * 8))) << (2 * 8))
- | ((0xff & (x >> (2 * 8))) << (1 * 8))
- | ((0xff & (x >> (3 * 8))) << (0 * 8));
-}
-
-static uint32_t w2rev(uint16_t const x)
-{
- return ((0xff & (x >> (0 * 8))) << (1 * 8))
- | ((0xff & (x >> (1 * 8))) << (0 * 8));
-}
-
-static uint64_t w8nat(uint64_t const x)
-{
- return x;
-}
-
-static uint32_t w4nat(uint32_t const x)
-{
- return x;
-}
-
-static uint32_t w2nat(uint16_t const x)
-{
- return x;
-}
-
-static uint64_t (*w8)(uint64_t);
-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)
{
@@ -571,22 +524,12 @@ static int do_file(char const *const fname)
goto out;
}
- w = w4nat;
- w2 = w2nat;
- w8 = w8nat;
switch (lf->ehdr.e_ident[EI_DATA]) {
- static unsigned int const endian = 1;
default:
fprintf(stderr, "unrecognized ELF data encoding %d: %s\n",
lf->ehdr.e_ident[EI_DATA], fname);
goto out;
case ELFDATA2LSB:
- if (*(unsigned char const *) != 1) {
- /* objtool is big endian, file.o is little endian. */
- w = w4rev;
- w2 = w2rev;
- w8 = w8rev;
- }
ideal_nop4_arm = ideal_nop4_arm_le;
bl_mcount_arm = bl_mcount_arm_le;
push_arm = push_arm_le;
@@ -594,12 +537,6 @@ static int do_file(char const *const fname)
push_bl_mcount_thumb = push_bl_mcount_thumb_le;
break;
case ELFDATA2MSB:
- if (*(unsigned char const *) != 0) {
- /* objtool is little endian, file.o is big endian. */
- w = w4rev;
- w2 = w2rev;
- w8 = w8rev;
- }
ideal_nop4_arm = ideal_nop4_arm_be;
bl_mcount_arm = bl_mcount_arm_be;
push_arm = push_arm_be;
--
2.20.1
[RFC][PATCH v5 46/51] objtool: mcount: Flag mcount relocation sections
Move the check for relocations sections that apply to
mcountable text sections into objtool's ELF code.
Signed-off-by: Matt Helsley
---
tools/objtool/elf.c| 13 +
tools/objtool/elf.h| 2 +-
tools/objtool/mcount.c | 36
3 files changed, 30 insertions(+), 21 deletions(-)
diff --git a/tools/objtool/elf.c b/tools/objtool/elf.c
index dffdc3264a25..3708f85fe36d 100644
--- a/tools/objtool/elf.c
+++ b/tools/objtool/elf.c
@@ -385,6 +385,7 @@ static int read_sections(struct elf *elf)
sec->len = sec->sh.sh_size;
sec->mcounted = is_mcounted_section_name(sec->name);
+ sec->relocs_mcountable = false;
list_add_tail(>list, >sections);
elf_hash_add(elf->section_hash, >hash, sec->idx);
@@ -609,6 +610,17 @@ static int read_rela_reloc(struct section *sec, int i,
struct reloc *reloc, unsi
return 0;
}
+static bool relocs_mcountable(const struct section * const rels)
+{
+ const struct section *txts;
+
+ txts = rels->base;
+ if ((txts->sh.sh_type != SHT_PROGBITS) ||
+ !(txts->sh.sh_flags & SHF_EXECINSTR))
+ return false;
+ return true;
+}
+
static int read_relocs(struct elf *elf)
{
struct section *sec;
@@ -630,6 +642,7 @@ static int read_relocs(struct elf *elf)
}
sec->base->reloc = sec;
+ sec->relocs_mcountable = relocs_mcountable(sec);
nr_reloc = 0;
for (i = 0; i < sec->sh.sh_size / sec->sh.sh_entsize; i++) {
diff --git a/tools/objtool/elf.h b/tools/objtool/elf.h
index db207e93a1e6..92d3e68abf59 100644
--- a/tools/objtool/elf.h
+++ b/tools/objtool/elf.h
@@ -39,7 +39,7 @@ struct section {
char *name;
int idx;
unsigned int len;
- bool changed, text, rodata, noinstr, mcounted;
+ bool changed, text, rodata, noinstr, mcounted, relocs_mcountable;
};
enum symbol_class {
diff --git a/tools/objtool/mcount.c b/tools/objtool/mcount.c
index a75d918a9fa5..9cd52beed871 100644
--- a/tools/objtool/mcount.c
+++ b/tools/objtool/mcount.c
@@ -274,28 +274,13 @@ static int nop_mcount(struct section * const rels,
return 0;
}
-static struct section const *has_rel_mcount(const struct section * const rels)
-{
- const struct section *txts;
- if (rels->sh.sh_type != SHT_REL && rels->sh.sh_type != SHT_RELA)
- return NULL;
- txts = find_section_by_index(lf, rels->sh.sh_info);
- if ((txts->sh.sh_type != SHT_PROGBITS) ||
- !(txts->sh.sh_flags & SHF_EXECINSTR))
- return NULL;
- return txts;
-}
-
static void tot_relsize(unsigned int *rel_entsize)
{
const struct section *sec;
- const struct section *txts;
list_for_each_entry(sec, >sections, list) {
- txts = has_rel_mcount(sec);
- if (!(txts && txts->mcounted))
- continue;
- *rel_entsize = sec->sh.sh_entsize;
+ if (sec->relocs_mcountable)
+ *rel_entsize = sec->sh.sh_entsize;
}
}
@@ -429,8 +414,19 @@ static int do_mcount(unsigned const reltype, size_t
rela_size)
list_for_each_entry(sec, >sections, list) {
struct section const *txts;
- txts = has_rel_mcount(sec);
- if (txts && txts->mcounted) {
+ /* Find relocation sections.. */
+ if (sec->sh.sh_type != SHT_REL &&
+ sec->sh.sh_type != SHT_RELA)
+ continue;
+ /* Which may relocate mcount calls.. */
+ if (!sec->relocs_mcountable)
+ continue;
+ txts = sec->base;
+ if (!txts)
+ continue;
+
+ if (txts->mcounted) {
+ /* In mcountable text sections */
unsigned long recval = 0;
unsigned int recsym;
@@ -440,7 +436,7 @@ static int do_mcount(unsigned const reltype, size_t
rela_size)
sift_rel_mcount(_offset, sec, mrels, mlocs,
recsym, recval, reltype, is_rela);
- } else if (txts && (warn_on_notrace_sect || make_nop)) {
+ } else if (warn_on_notrace_sect || make_nop) {
/*
* This section is ignored by ftrace, but still
* has mcount calls. Convert them to nops now.
--
2.20.1
[RFC][PATCH v5 43/51] objtool: check: Use class to recognize kcov calls
Suggested-by: Peter Zijlstra
Signed-off-by: Matt Helsley
---
tools/objtool/check.c | 3 +--
tools/objtool/elf.c | 7 +++
tools/objtool/elf.h | 1 +
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/tools/objtool/check.c b/tools/objtool/check.c
index 78375908acda..d08714b878c5 100644
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@ -771,8 +771,7 @@ static int add_call_destinations(struct objtool_file *file)
* so they need a little help, NOP out any KCOV calls from
noinstr
* text.
*/
- if (insn->sec->noinstr &&
- !strncmp(insn->call_dest->name, "__sanitizer_cov_", 16)) {
+ if (insn->sec->noinstr && insn->call_dest->class == SYM_KCOV) {
if (reloc) {
reloc->type = R_NONE;
elf_write_reloc(file->elf, reloc);
diff --git a/tools/objtool/elf.c b/tools/objtool/elf.c
index d55d8fef11b4..666cbc01c332 100644
--- a/tools/objtool/elf.c
+++ b/tools/objtool/elf.c
@@ -402,6 +402,11 @@ static bool is_mcount_sym(const char *name)
return false;
}
+static bool is_kcov_symbol(const char *name)
+{
+ return !strncmp(name, "__sanitize_cov_", 16);
+}
+
static int read_symbols(struct elf *elf)
{
struct section *symtab, *symtab_shndx, *sec;
@@ -473,6 +478,8 @@ static int read_symbols(struct elf *elf)
if (is_mcount_sym(sym->name))
sym->class = SYM_MCOUNT;
+ else if (is_kcov_symbol(sym->name))
+ sym->class = SYM_KCOV;
sym->offset = sym->sym.st_value;
sym->len = sym->sym.st_size;
diff --git a/tools/objtool/elf.h b/tools/objtool/elf.h
index 13935edaff54..f0b02824f9d3 100644
--- a/tools/objtool/elf.h
+++ b/tools/objtool/elf.h
@@ -45,6 +45,7 @@ struct section {
enum symbol_class {
SYM_REGULAR = 0,
SYM_MCOUNT = 1,
+ SYM_KCOV = 2,
};
struct symbol {
--
2.20.1
[RFC][PATCH v5 33/51] objtool: mcount: Remove wrapper for ELF relocation type
Remove the last uses of the Elf_Rela wrapper by passing the
size of the relocations we're dealing with as a parameter.
Signed-off-by: Matt Helsley
---
tools/objtool/recordmcount.c | 4 ++--
tools/objtool/recordmcount.h | 7 ++-
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/tools/objtool/recordmcount.c b/tools/objtool/recordmcount.c
index b9f15fc1f40e..6db035252b6c 100644
--- a/tools/objtool/recordmcount.c
+++ b/tools/objtool/recordmcount.c
@@ -575,7 +575,7 @@ static int do_file(char const *const fname)
is_fake_mcount = MIPS_is_fake_mcount;
}
loc_size = 4;
- rc = do32(reltype);
+ rc = do32(reltype, sizeof(Elf32_Rela));
break;
case ELFCLASS64: {
if (lf->ehdr.e_ehsize != sizeof(Elf64_Ehdr)
@@ -593,7 +593,7 @@ static int do_file(char const *const fname)
is_fake_mcount = MIPS_is_fake_mcount;
}
loc_size = 8;
- rc = do64(reltype);
+ rc = do64(reltype, sizeof(Elf64_Rela));
break;
}
} /* end switch */
diff --git a/tools/objtool/recordmcount.h b/tools/objtool/recordmcount.h
index 2dd303d51b78..07fc93917736 100644
--- a/tools/objtool/recordmcount.h
+++ b/tools/objtool/recordmcount.h
@@ -18,18 +18,15 @@
* Copyright 2010 Steven Rostedt , Red Hat Inc.
*/
#undef do_func
-#undef Elf_Rela
#ifdef RECORD_MCOUNT_64
# define do_func do64
-# define Elf_Rela Elf64_Rela
#else
# define do_func do32
-# define Elf_Rela Elf32_Rela
#endif
/* Overall supervision for Elf32 ET_REL file. */
-static int do_func(unsigned const reltype)
+static int do_func(unsigned const reltype, size_t rela_size)
{
/* Upper bound on space: assume all relevant relocs are for mcount. */
unsigned totrelsz;
@@ -68,7 +65,7 @@ static int do_func(unsigned const reltype)
return -1;
}
- is_rela = (sizeof(Elf_Rela) == rel_entsize);
+ is_rela = (rela_size == rel_entsize);
/* add section: __mcount_loc */
mlocs = elf_create_section(lf, mc_name, sizeof(*mloc0), 0);
--
2.20.1
[RFC][PATCH v5 42/51] objtool: mcount: Move mcount symbol name testing
Move the test for mcount symbols into the ELF code itself
and set a class on indicator on the symbol. This simplifies
mcount a little and tests the symbols names near where they're
first touched so should be cache-hot and may also help us
reduce the number of passes through the ELF contents needed
for individual subcommands. Finally, if we manage to combine
subcommands into a single exec of objtool the number of
passes through the ELF data could be even further reduced.
Suggested-by: Peter Zijlstra
Signed-off-by: Matt Helsley
---
tools/objtool/elf.c| 18 ++
tools/objtool/elf.h| 6 ++
tools/objtool/mcount.c | 31 +++
3 files changed, 27 insertions(+), 28 deletions(-)
diff --git a/tools/objtool/elf.c b/tools/objtool/elf.c
index 8dcdea8020a5..d55d8fef11b4 100644
--- a/tools/objtool/elf.c
+++ b/tools/objtool/elf.c
@@ -387,6 +387,21 @@ static int read_sections(struct elf *elf)
return 0;
}
+static bool is_mcount_sym(const char *name)
+{
+ if (name[0] == '.')
+ name++; /* ppc64 hack */
+
+ if (name[0] == '_')
+ name++;
+
+ if (strcmp("mcount", name) == 0 ||
+ (strcmp("__gnu_mcount_nc", name) == 0) ||
+ (strcmp("_fentry__", name) == 0))
+ return true;
+ return false;
+}
+
static int read_symbols(struct elf *elf)
{
struct section *symtab, *symtab_shndx, *sec;
@@ -456,6 +471,9 @@ static int read_symbols(struct elf *elf)
} else
sym->sec = find_section_by_index(elf, 0);
+ if (is_mcount_sym(sym->name))
+ sym->class = SYM_MCOUNT;
+
sym->offset = sym->sym.st_value;
sym->len = sym->sym.st_size;
diff --git a/tools/objtool/elf.h b/tools/objtool/elf.h
index 09fa0d085341..13935edaff54 100644
--- a/tools/objtool/elf.h
+++ b/tools/objtool/elf.h
@@ -42,6 +42,11 @@ struct section {
bool changed, text, rodata, noinstr;
};
+enum symbol_class {
+ SYM_REGULAR = 0,
+ SYM_MCOUNT = 1,
+};
+
struct symbol {
struct list_head list;
struct rb_node node;
@@ -55,6 +60,7 @@ struct symbol {
unsigned long offset;
unsigned int len;
struct symbol *pfunc, *cfunc, *alias;
+ enum symbol_class class;
bool uaccess_safe;
};
diff --git a/tools/objtool/mcount.c b/tools/objtool/mcount.c
index 029e6e72c972..7fbde6ce6eb8 100644
--- a/tools/objtool/mcount.c
+++ b/tools/objtool/mcount.c
@@ -152,24 +152,6 @@ static int is_mcounted_section_name(char const *const
txtname)
strcmp(".cpuidle.text", txtname) == 0;
}
-static struct symbol *get_mcount_sym(struct reloc *reloc)
-{
- struct symbol *sym = reloc->sym;
- char const *symname = sym->name;
-
- if (symname[0] == '.')
- symname++; /* ppc64 hack */
-
- if (symname[0] == '_')
- symname++;
-
- if (strcmp("mcount", symname) == 0 ||
- (strcmp("__gnu_mcount_nc", symname) == 0) ||
- (strcmp("_fentry__", symname) == 0))
- return sym;
- return NULL;
-}
-
/*
* MIPS mcount long call has 2 _mcount symbols, only the position of the 1st
* _mcount symbol is needed for dynamic function tracer, with it, to disable
@@ -266,16 +248,13 @@ static int nop_mcount(struct section * const rels,
{
struct reloc *reloc;
struct section *txts = find_section_by_index(lf, rels->sh.sh_info);
- struct symbol *mcount_sym = NULL;
int once = 0;
list_for_each_entry(reloc, >reloc_list, list) {
int ret = -1;
- if (!mcount_sym)
- mcount_sym = get_mcount_sym(reloc);
-
- if (mcount_sym == reloc->sym && !is_fake_mcount(reloc)) {
+ if (reloc->sym->class == SYM_MCOUNT &&
+ !is_fake_mcount(reloc)) {
if (make_nop) {
ret = make_nop(txts, reloc->offset);
if (ret < 0)
@@ -355,16 +334,12 @@ static void sift_rel_mcount(GElf_Addr **mlocpp,
{
GElf_Rel *mrelp = *mrelpp;
GElf_Rela *mrelap = *mrelpp;
- struct symbol *mcount_sym = NULL;
struct reloc *reloc;
list_for_each_entry(reloc, >reloc_list, list) {
unsigned long addend;
- if (!mcount_sym)
- mcount_sym = get_mcount_sym(reloc);
-
- if (mcount_sym != reloc->sym || is_fake_mcount(reloc))
+ if (reloc->sym->class == SYM_MCOUNT || is_fake_mcount(reloc))
continue;
addend = reloc->offset - recval + mcount_adjust;
--
2.20.1
[RFC][PATCH v5 34/51] objtool: mcount: Remove wrapper double-include trick
We no longer need to double-include the recordmcount.h wrapper
All of the types and functions that rely on them have been converted
to using objtool's ELF code. This moves the remaining function to
recordmcount.c and changes the function name to something slightly
more descriptive while dropping the wrapped naming.
Signed-off-by: Matt Helsley
---
tools/objtool/recordmcount.c | 113 --
tools/objtool/recordmcount.h | 132 ---
2 files changed, 107 insertions(+), 138 deletions(-)
delete mode 100644 tools/objtool/recordmcount.h
diff --git a/tools/objtool/recordmcount.c b/tools/objtool/recordmcount.c
index 6db035252b6c..7f4d18e83e24 100644
--- a/tools/objtool/recordmcount.c
+++ b/tools/objtool/recordmcount.c
@@ -442,10 +442,111 @@ static void sift_rel_mcount(GElf_Addr **mlocpp,
*mrelpp = is_rela ? (void *)mrelap : (void *)mrelp;
}
-/* 32 bit and 64 bit are very similar */
-#include "recordmcount.h"
-#define RECORD_MCOUNT_64
-#include "recordmcount.h"
+/* Overall supervision for Elf32 ET_REL file. */
+static int do_mcount(unsigned const reltype, size_t rela_size)
+{
+ /* Upper bound on space: assume all relevant relocs are for mcount. */
+ unsigned totrelsz;
+
+ void *mrel0;
+ void *mrelp;
+
+ GElf_Addr *mloc0;
+ GElf_Addr *mlocp;
+ GElf_Sxword r_offset = 0;
+
+ struct section *sec, *mlocs, *mrels;
+ const char * const mc_name = "__mcount_loc";
+
+ unsigned int rel_entsize = 0;
+ int result = -1;
+ bool is_rela;
+
+ if (find_section_by_name(lf, "__mcount_loc") != NULL)
+ return 0;
+
+ totrelsz = tot_relsize(_entsize);
+ if (totrelsz == 0)
+ return 0;
+
+ mrel0 = malloc(totrelsz);
+ mrelp = mrel0;
+ if (!mrel0)
+ return -1;
+
+ /* 2*sizeof(address) <= sizeof(Elf_Rel) */
+ mloc0 = malloc(totrelsz>>1);
+ mlocp = mloc0;
+ if (!mloc0) {
+ free(mrel0);
+ return -1;
+ }
+
+ is_rela = (rela_size == rel_entsize);
+
+ /* add section: __mcount_loc */
+ mlocs = elf_create_section(lf, mc_name, sizeof(*mloc0), 0);
+ if (!mlocs)
+ goto out;
+ mlocs->sh.sh_link = 0;
+ mlocs->sh.sh_info = 0;
+ mlocs->sh.sh_addralign = 8;
+ mlocs->data->d_buf = mloc0;
+ mlocs->data->d_type = ELF_T_ADDR; /* elf_xlatetof() conversion */
+
+ /* add section .rel[a]__mcount_loc */
+ mrels = elf_create_reloc_section(lf, mlocs,
+is_rela ? SHT_RELA : SHT_REL);
+ if (!mrels)
+ goto out;
+ mrels->sh.sh_flags = 0; /* clear SHF_INFO_LINK */
+ mrels->data->d_buf = mrel0;
+
+ list_for_each_entry(sec, >sections, list) {
+ char const *txtname;
+
+ txtname = has_rel_mcount(sec);
+ if (txtname && is_mcounted_section_name(txtname)) {
+ unsigned long recval = 0;
+ unsigned int recsym;
+
+ if (find_section_sym_index(sec->sh.sh_info,
+ txtname, , ))
+ goto out;
+
+ sift_rel_mcount(, _offset, , sec,
+ recsym, recval, reltype, is_rela);
+ } else if (txtname && (warn_on_notrace_sect || make_nop)) {
+ /*
+* This section is ignored by ftrace, but still
+* has mcount calls. Convert them to nops now.
+*/
+ if (nop_mcount(sec, txtname) < 0)
+ goto out;
+ }
+ }
+
+ if (mloc0 != mlocp) {
+ /* Update the section size and Elf_Data size */
+ mlocs->sh.sh_size = (void *)mlocp - (void *)mloc0;
+ mlocs->len = mlocs->sh.sh_size;
+ mlocs->data->d_size = mlocs->len;
+ elf_flagdata(mlocs->data, ELF_C_SET, ELF_F_DIRTY);
+
+ mrels->sh.sh_size = mrelp - mrel0;
+ mrels->len = mrels->sh.sh_size;
+ mrels->data->d_size = mrels->len;
+ elf_flagdata(mrels->data, ELF_C_SET, ELF_F_DIRTY);
+
+ /* overwrite the ELF file */
+ result = elf_write(lf);
+ } else
+ result = 0;
+out:
+ free(mrel0);
+ free(mloc0);
+ return result;
+}
static int arm_is_fake_mcount(struct reloc const *rp)
{
@@ -575,7 +676,7 @@ static int do_file(char const *const fname)
is_fake_mcount = MIPS_is_fake_mcount;
}
loc_size = 4;
- rc = do32(reltype, sizeof(Elf32_Rela));
+
[RFC][PATCH v5 40/51] objtool: mcount: const-ify ARM instruction patterns
Let the compiler know we won't be modifying the instruction
patterns we use to determine how to turn ARM instruction(s)
into nops, and the nop instruction(s) we'll put in their
place.
Also, while we're at it, convert to unsigned char because the
next patch will need that as well.
Signed-off-by: Matt Helsley
---
tools/objtool/mcount.c | 42 +-
1 file changed, 21 insertions(+), 21 deletions(-)
diff --git a/tools/objtool/mcount.c b/tools/objtool/mcount.c
index 5c59df0df97b..629eb7222ef3 100644
--- a/tools/objtool/mcount.c
+++ b/tools/objtool/mcount.c
@@ -47,10 +47,10 @@ extern int warn_on_notrace_sect; /* warn when section has
mcount not being recor
static struct elf *lf;
-static const unsigned char ip_relative_call_x86[5] = { 0xe8, 0x00, 0x00, 0x00,
0x00 };
-static const unsigned char ideal_nop5_x86_64[5] = { 0x0f, 0x1f, 0x44, 0x00,
0x00 };
-static const unsigned char ideal_nop5_x86_32[5] = { 0x3e, 0x8d, 0x74, 0x26,
0x00 };
-static const unsigned char *ideal_nop;
+static const char ip_relative_call_x86[5] = { 0xe8, 0x00, 0x00, 0x00, 0x00 };
+static const char ideal_nop5_x86_64[5] = { 0x0f, 0x1f, 0x44, 0x00, 0x00 };
+static const char ideal_nop5_x86_32[5] = { 0x3e, 0x8d, 0x74, 0x26, 0x00 };
+static const char *ideal_nop;
static char rel_type_nop;
@@ -58,7 +58,7 @@ static int (*make_nop)(struct section *, size_t const offset);
static int make_nop_x86(struct section *txts, size_t const offset)
{
- unsigned char *op = txts->data->d_buf + offset - 1;
+ char *op = txts->data->d_buf + offset - 1;
if (offset < 1)
return -1;
@@ -71,25 +71,25 @@ static int make_nop_x86(struct section *txts, size_t const
offset)
return 0;
}
-static unsigned char ideal_nop4_arm_le[4] = { 0x00, 0x00, 0xa0, 0xe1 }; /* mov
r0, r0 */
-static unsigned char ideal_nop4_arm_be[4] = { 0xe1, 0xa0, 0x00, 0x00 }; /* mov
r0, r0 */
-static unsigned char *ideal_nop4_arm;
+static const char ideal_nop4_arm_le[4] = { 0x00, 0x00, 0xa0, 0xe1 }; /* mov
r0, r0 */
+static const char ideal_nop4_arm_be[4] = { 0xe1, 0xa0, 0x00, 0x00 }; /* mov
r0, r0 */
+static const char *ideal_nop4_arm;
-static unsigned char bl_mcount_arm_le[4] = { 0xfe, 0xff, 0xff, 0xeb }; /* bl */
-static unsigned char bl_mcount_arm_be[4] = { 0xeb, 0xff, 0xff, 0xfe }; /* bl */
-static unsigned char *bl_mcount_arm;
+static const char bl_mcount_arm_le[4] = { 0xfe, 0xff, 0xff, 0xeb }; /* bl */
+static const char bl_mcount_arm_be[4] = { 0xeb, 0xff, 0xff, 0xfe }; /* bl */
+static const char *bl_mcount_arm;
-static unsigned char push_arm_le[4] = { 0x04, 0xe0, 0x2d, 0xe5 }; /* push {lr}
*/
-static unsigned char push_arm_be[4] = { 0xe5, 0x2d, 0xe0, 0x04 }; /* push {lr}
*/
-static unsigned char *push_arm;
+static const char push_arm_le[4] = { 0x04, 0xe0, 0x2d, 0xe5 }; /* push {lr} */
+static const char push_arm_be[4] = { 0xe5, 0x2d, 0xe0, 0x04 }; /* push {lr} */
+static const char *push_arm;
-static unsigned char ideal_nop2_thumb_le[2] = { 0x00, 0xbf }; /* nop */
-static unsigned char ideal_nop2_thumb_be[2] = { 0xbf, 0x00 }; /* nop */
-static unsigned char *ideal_nop2_thumb;
+static const char ideal_nop2_thumb_le[2] = { 0x00, 0xbf }; /* nop */
+static const char ideal_nop2_thumb_be[2] = { 0xbf, 0x00 }; /* nop */
+static const char *ideal_nop2_thumb;
-static unsigned char push_bl_mcount_thumb_le[6] = { 0x00, 0xb5, 0xff, 0xf7,
0xfe, 0xff }; /* push {lr}, bl */
-static unsigned char push_bl_mcount_thumb_be[6] = { 0xb5, 0x00, 0xf7, 0xff,
0xff, 0xfe }; /* push {lr}, bl */
-static unsigned char *push_bl_mcount_thumb;
+static const char push_bl_mcount_thumb_le[6] = { 0x00, 0xb5, 0xff, 0xf7, 0xfe,
0xff }; /* push {lr}, bl */
+static const char push_bl_mcount_thumb_be[6] = { 0xb5, 0x00, 0xf7, 0xff, 0xff,
0xfe }; /* push {lr}, bl */
+static const char *push_bl_mcount_thumb;
static int make_nop_arm(struct section *txts, size_t const offset)
{
@@ -124,7 +124,7 @@ static int make_nop_arm(struct section *txts, size_t const
offset)
return 0;
}
-static unsigned char ideal_nop4_arm64[4] = {0x1f, 0x20, 0x03, 0xd5};
+static const char ideal_nop4_arm64[4] = {0x1f, 0x20, 0x03, 0xd5};
static int make_nop_arm64(struct section *txts, size_t const offset)
{
uint32_t *ptr;
--
2.20.1
[RFC][PATCH v5 31/51] objtool: mcount: Use objtool relocation section
Now that we add an initially-empty relocation section and share
the libelf data buffer from the beginning, we can safely use
objtools elf_create_reloc_section() function to simplify the
code further -- use the anticipated base section name, avoid
the need to set sh_info, etc. The only remaining difference
between this and the old recordmcount code is we didn't set
SHF_INFO_LINK so we clear the sh_flags as before.
Signed-off-by: Matt Helsley
---
tools/objtool/recordmcount.h | 18 +-
1 file changed, 5 insertions(+), 13 deletions(-)
diff --git a/tools/objtool/recordmcount.h b/tools/objtool/recordmcount.h
index 1d11dfc40d09..fc6346a7eaf5 100644
--- a/tools/objtool/recordmcount.h
+++ b/tools/objtool/recordmcount.h
@@ -92,7 +92,7 @@ static int do_func(unsigned const reltype)
GElf_Sxword r_offset = 0;
struct section *sec, *mlocs, *mrels;
- const char *mc_name;
+ const char * const mc_name = "__mcount_loc";
unsigned int rel_entsize = 0;
int result = -1;
@@ -119,12 +119,9 @@ static int do_func(unsigned const reltype)
}
is_rela = (sizeof(Elf_Rela) == rel_entsize);
- mc_name = is_rela
- ? ".rela__mcount_loc"
- : ".rel__mcount_loc";
/* add section: __mcount_loc */
- mlocs = elf_create_section(lf, mc_name + (is_rela ? 1 : 0) +
strlen(".rel"), sizeof(*mloc0), 0);
+ mlocs = elf_create_section(lf, mc_name, sizeof(*mloc0), 0);
if (!mlocs)
goto out;
mlocs->sh.sh_link = 0;
@@ -134,17 +131,12 @@ static int do_func(unsigned const reltype)
mlocs->data->d_type = ELF_T_ADDR; /* elf_xlatetof() conversion */
/* add section .rel[a]__mcount_loc */
- mrels = elf_create_section(lf, mc_name, rel_entsize, 0);
+ mrels = elf_create_reloc_section(lf, mlocs,
+is_rela ? SHT_RELA : SHT_REL);
if (!mrels)
goto out;
- /* Like elf_create_rela_section() without the name bits */
- mrels->sh.sh_type = is_rela ? SHT_RELA : SHT_REL;
- mrels->sh.sh_flags = 0; /* clear SHF_ALLOC */
- mrels->sh.sh_link = find_section_by_name(lf, ".symtab")->idx;
- mrels->sh.sh_info = mlocs->idx;
- mrels->sh.sh_addralign = 8;
+ mrels->sh.sh_flags = 0; /* clear SHF_INFO_LINK */
mrels->data->d_buf = mrel0;
- mrels->data->d_type = is_rela ? ELF_T_RELA : ELF_T_REL; /*
elf_xlatetof() conversion */
list_for_each_entry(sec, >sections, list) {
char const *txtname;
--
2.20.1
[RFC][PATCH v5 48/51] objtool: mcount: Eliminate first pass
Determine the size of the mcount relocations in objtool's
ELF reading code. This reduces the number of passes we make
through the list of sections (which can become large due to
things like -ffunction-sections).
Signed-off-by: Matt Helsley
---
tools/objtool/elf.c| 2 ++
tools/objtool/elf.h| 1 +
tools/objtool/mcount.c | 16 +---
3 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/tools/objtool/elf.c b/tools/objtool/elf.c
index 12bd889a62ba..733e10d4a574 100644
--- a/tools/objtool/elf.c
+++ b/tools/objtool/elf.c
@@ -642,6 +642,8 @@ static int read_relocs(struct elf *elf)
sec->base->reloc = sec;
sec->mcountable = relocs_mcountable(sec);
+ if (sec->mcountable && !elf->mcount_rel_entsize)
+ elf->mcount_rel_entsize = sec->sh.sh_entsize;
nr_reloc = 0;
for (i = 0; i < sec->sh.sh_size / sec->sh.sh_entsize; i++) {
diff --git a/tools/objtool/elf.h b/tools/objtool/elf.h
index fb10f470d1a4..8ece1ca79cca 100644
--- a/tools/objtool/elf.h
+++ b/tools/objtool/elf.h
@@ -87,6 +87,7 @@ struct elf {
Elf *elf;
GElf_Ehdr ehdr;
int fd;
+ size_t mcount_rel_entsize;
bool changed;
char *name;
struct list_head sections;
diff --git a/tools/objtool/mcount.c b/tools/objtool/mcount.c
index 80daf0e17eab..9527924af56b 100644
--- a/tools/objtool/mcount.c
+++ b/tools/objtool/mcount.c
@@ -274,19 +274,6 @@ static int nop_mcount(struct section * const rels,
return 0;
}
-static void tot_relsize(unsigned int *rel_entsize)
-{
- const struct section *sec;
-
- list_for_each_entry(sec, >sections, list) {
- if (sec->sh.sh_type != SHT_REL &&
- sec->sh.sh_type != SHT_RELA)
- continue;
- if (sec->mcountable)
- *rel_entsize = sec->sh.sh_entsize;
- }
-}
-
/* zero or a small negative offset added to get the start of the call
* instruction
*/
@@ -388,14 +375,13 @@ static int do_mcount(unsigned const reltype, size_t
rela_size)
struct section *sec, *mlocs, *mrels;
const char * const mc_name = "__mcount_loc";
- unsigned int rel_entsize = 0;
+ const unsigned int rel_entsize = lf->mcount_rel_entsize;
int result = -1;
bool is_rela;
if (find_section_by_name(lf, "__mcount_loc") != NULL)
return 0;
- tot_relsize(_entsize);
is_rela = (rela_size == rel_entsize);
/* add section: __mcount_loc */
--
2.20.1
[RFC][PATCH v5 25/51] objtool: mcount: Use ELF header from objtool
The ELF header is the very first structure in an ELF file.
Rather than cast it from the file mapping we use the ELF
header extracted via objtool's ELF code.
This is the last usage of the open-coded mapping of the ELF
file which we will remove in a later step.
Signed-off-by: Matt Helsley
---
tools/objtool/recordmcount.c | 37 +---
1 file changed, 17 insertions(+), 20 deletions(-)
diff --git a/tools/objtool/recordmcount.c b/tools/objtool/recordmcount.c
index aa35173de3d9..f8699e52e7e5 100644
--- a/tools/objtool/recordmcount.c
+++ b/tools/objtool/recordmcount.c
@@ -525,21 +525,19 @@ static void MIPS64_r_info(Elf64_Rel *const rp, unsigned
sym, unsigned type)
static int do_file(char const *const fname)
{
unsigned int reltype = 0;
- Elf32_Ehdr *ehdr;
int rc = -1;
- ehdr = mmap_file(fname);
- if (!ehdr)
+ if (!mmap_file(fname))
goto out;
w = w4nat;
w2 = w2nat;
w8 = w8nat;
- switch (ehdr->e_ident[EI_DATA]) {
+ switch (lf->ehdr.e_ident[EI_DATA]) {
static unsigned int const endian = 1;
default:
fprintf(stderr, "unrecognized ELF data encoding %d: %s\n",
- ehdr->e_ident[EI_DATA], fname);
+ lf->ehdr.e_ident[EI_DATA], fname);
goto out;
case ELFDATA2LSB:
if (*(unsigned char const *) != 1) {
@@ -568,18 +566,18 @@ 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, lf->ehdr.e_ident, SELFMAG) != 0 ||
+ lf->ehdr.e_type != ET_REL ||
+ lf->ehdr.e_ident[EI_VERSION] != EV_CURRENT) {
fprintf(stderr, "unrecognized ET_REL file %s\n", fname);
goto out;
}
gpfx = '_';
- switch (w2(ehdr->e_machine)) {
+ switch (lf->ehdr.e_machine) {
default:
fprintf(stderr, "unrecognized e_machine %u %s\n",
- w2(ehdr->e_machine), fname);
+ lf->ehdr.e_machine, fname);
goto out;
case EM_386:
reltype = R_386_32;
@@ -620,37 +618,36 @@ static int do_file(char const *const fname)
break;
} /* end switch */
- switch (ehdr->e_ident[EI_CLASS]) {
+ switch (lf->ehdr.e_ident[EI_CLASS]) {
default:
fprintf(stderr, "unrecognized ELF class %d %s\n",
- ehdr->e_ident[EI_CLASS], fname);
+ lf->ehdr.e_ident[EI_CLASS], fname);
goto out;
case ELFCLASS32:
- if (w2(ehdr->e_ehsize) != sizeof(Elf32_Ehdr)
- || w2(ehdr->e_shentsize) != sizeof(Elf32_Shdr)) {
+ if (lf->ehdr.e_ehsize != sizeof(Elf32_Ehdr)
+ || lf->ehdr.e_shentsize != sizeof(Elf32_Shdr)) {
fprintf(stderr,
"unrecognized ET_REL file: %s\n", fname);
goto out;
}
- if (w2(ehdr->e_machine) == EM_MIPS) {
+ if (lf->ehdr.e_machine == EM_MIPS) {
reltype = R_MIPS_32;
is_fake_mcount = MIPS_is_fake_mcount;
}
rc = do32(reltype);
break;
case ELFCLASS64: {
- Elf64_Ehdr *const ghdr = (Elf64_Ehdr *)ehdr;
- if (w2(ghdr->e_ehsize) != sizeof(Elf64_Ehdr)
- || w2(ghdr->e_shentsize) != sizeof(Elf64_Shdr)) {
+ if (lf->ehdr.e_ehsize != sizeof(Elf64_Ehdr)
+ || lf->ehdr.e_shentsize != sizeof(Elf64_Shdr)) {
fprintf(stderr,
"unrecognized ET_REL file: %s\n", fname);
goto out;
}
- if (w2(ghdr->e_machine) == EM_S390) {
+ if (lf->ehdr.e_machine == EM_S390) {
reltype = R_390_64;
mcount_adjust_64 = -14;
}
- if (w2(ghdr->e_machine) == EM_MIPS) {
+ if (lf->ehdr.e_machine == EM_MIPS) {
reltype = R_MIPS_64;
Elf64_r_info = MIPS64_r_info;
is_fake_mcount = MIPS_is_fake_mcount;
--
2.20.1
[RFC][PATCH v5 41/51] objtool: mcount: Convert nop writes to elf_write_insn()
objtool's elf_write_insn() does extra checking when writing to
an instruction so use that rather than a plain memcpy().
Signed-off-by: Matt Helsley
---
tools/objtool/mcount.c | 10 --
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/tools/objtool/mcount.c b/tools/objtool/mcount.c
index 629eb7222ef3..029e6e72c972 100644
--- a/tools/objtool/mcount.c
+++ b/tools/objtool/mcount.c
@@ -66,9 +66,7 @@ static int make_nop_x86(struct section *txts, size_t const
offset)
if (memcmp(op, ip_relative_call_x86, 5) != 0)
return -1;
- /* convert to nop */
- memcpy(op, ideal_nop, 5);
- return 0;
+ return elf_write_insn(lf, txts, offset, 5, ideal_nop);
}
static const char ideal_nop4_arm_le[4] = { 0x00, 0x00, 0xa0, 0xe1 }; /* mov
r0, r0 */
@@ -117,7 +115,8 @@ static int make_nop_arm(struct section *txts, size_t const
offset)
/* Convert to nop */
do {
- memcpy(map + off, ideal_nop, nop_size);
+ if (elf_write_insn(lf, txts, off, nop_size, ideal_nop))
+ return -1;
off += nop_size;
} while (--cnt > 0);
@@ -136,8 +135,7 @@ static int make_nop_arm64(struct section *txts, size_t
const offset)
return -1;
/* Convert to nop */
- memcpy(map + offset, ideal_nop, 4);
- return 0;
+ return elf_write_insn(lf, txts, offset, 4, ideal_nop);
}
/* Names of the sections that could contain calls to mcount. */
--
2.20.1
[RFC][PATCH v5 47/51] objtool: mcount: Merge section mcount flags
One flag is only for relocation sections and the other only
for text (not relocation) sections so we can share the same
flag and test the section type when we need to.
Signed-off-by: Matt Helsley
---
tools/objtool/elf.c| 5 ++---
tools/objtool/elf.h| 2 +-
tools/objtool/mcount.c | 9 ++---
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/tools/objtool/elf.c b/tools/objtool/elf.c
index 3708f85fe36d..12bd889a62ba 100644
--- a/tools/objtool/elf.c
+++ b/tools/objtool/elf.c
@@ -384,8 +384,7 @@ static int read_sections(struct elf *elf)
}
sec->len = sec->sh.sh_size;
- sec->mcounted = is_mcounted_section_name(sec->name);
- sec->relocs_mcountable = false;
+ sec->mcountable = is_mcounted_section_name(sec->name);
list_add_tail(>list, >sections);
elf_hash_add(elf->section_hash, >hash, sec->idx);
@@ -642,7 +641,7 @@ static int read_relocs(struct elf *elf)
}
sec->base->reloc = sec;
- sec->relocs_mcountable = relocs_mcountable(sec);
+ sec->mcountable = relocs_mcountable(sec);
nr_reloc = 0;
for (i = 0; i < sec->sh.sh_size / sec->sh.sh_entsize; i++) {
diff --git a/tools/objtool/elf.h b/tools/objtool/elf.h
index 92d3e68abf59..fb10f470d1a4 100644
--- a/tools/objtool/elf.h
+++ b/tools/objtool/elf.h
@@ -39,7 +39,7 @@ struct section {
char *name;
int idx;
unsigned int len;
- bool changed, text, rodata, noinstr, mcounted, relocs_mcountable;
+ bool changed, text, rodata, noinstr, mcountable;
};
enum symbol_class {
diff --git a/tools/objtool/mcount.c b/tools/objtool/mcount.c
index 9cd52beed871..80daf0e17eab 100644
--- a/tools/objtool/mcount.c
+++ b/tools/objtool/mcount.c
@@ -279,7 +279,10 @@ static void tot_relsize(unsigned int *rel_entsize)
const struct section *sec;
list_for_each_entry(sec, >sections, list) {
- if (sec->relocs_mcountable)
+ if (sec->sh.sh_type != SHT_REL &&
+ sec->sh.sh_type != SHT_RELA)
+ continue;
+ if (sec->mcountable)
*rel_entsize = sec->sh.sh_entsize;
}
}
@@ -419,13 +422,13 @@ static int do_mcount(unsigned const reltype, size_t
rela_size)
sec->sh.sh_type != SHT_RELA)
continue;
/* Which may relocate mcount calls.. */
- if (!sec->relocs_mcountable)
+ if (!sec->mcountable)
continue;
txts = sec->base;
if (!txts)
continue;
- if (txts->mcounted) {
+ if (txts->mcountable) {
/* In mcountable text sections */
unsigned long recval = 0;
unsigned int recsym;
--
2.20.1
[RFC][PATCH v5 32/51] objtool: mcount: Move sift_rel_mcount out of wrapper file
Now that this function no longer uses any of the old recordmcount
wrapper code we can move it out of the wrapper too.
Signed-off-by: Matt Helsley
---
tools/objtool/recordmcount.c | 47 +
tools/objtool/recordmcount.h | 50
2 files changed, 47 insertions(+), 50 deletions(-)
diff --git a/tools/objtool/recordmcount.c b/tools/objtool/recordmcount.c
index 34976f3294ac..b9f15fc1f40e 100644
--- a/tools/objtool/recordmcount.c
+++ b/tools/objtool/recordmcount.c
@@ -395,6 +395,53 @@ static int mcount_adjust = 0;
/* Size of an entry in __mcount_loc; 4 or 8 */
static size_t loc_size;
+/*
+ * Look at the relocations in order to find the calls to mcount.
+ * Accumulate the section offsets that are found, and their relocation info,
+ * onto the end of the existing arrays.
+ */
+static void sift_rel_mcount(GElf_Addr **mlocpp,
+ GElf_Sxword *r_offsetp,
+ void **const mrelpp,
+ const struct section * const rels,
+ unsigned const recsym_index,
+ unsigned long const recval,
+ unsigned const reltype,
+ bool is_rela)
+{
+ GElf_Rel *mrelp = *mrelpp;
+ GElf_Rela *mrelap = *mrelpp;
+ struct symbol *mcount_sym = NULL;
+ struct reloc *reloc;
+
+ list_for_each_entry(reloc, >reloc_list, list) {
+ unsigned long addend;
+
+ if (!mcount_sym)
+ mcount_sym = get_mcount_sym(reloc);
+
+ if (mcount_sym != reloc->sym || is_fake_mcount(reloc))
+ continue;
+
+ addend = reloc->offset - recval + mcount_adjust;
+ if (is_rela) {
+ mrelap->r_offset = *r_offsetp;
+ mrelap->r_info = GELF_R_INFO(recsym_index, reltype);
+ mrelap->r_addend = addend;
+ mrelap++;
+ **mlocpp = 0;
+ } else {
+ mrelp->r_offset = *r_offsetp;
+ mrelp->r_info = GELF_R_INFO(recsym_index, reltype);
+ mrelp++;
+ **mlocpp = addend;
+ }
+ (*mlocpp)++;
+ *r_offsetp += loc_size;
+ }
+ *mrelpp = is_rela ? (void *)mrelap : (void *)mrelp;
+}
+
/* 32 bit and 64 bit are very similar */
#include "recordmcount.h"
#define RECORD_MCOUNT_64
diff --git a/tools/objtool/recordmcount.h b/tools/objtool/recordmcount.h
index fc6346a7eaf5..2dd303d51b78 100644
--- a/tools/objtool/recordmcount.h
+++ b/tools/objtool/recordmcount.h
@@ -17,67 +17,17 @@
* This conversion to macros was done by:
* Copyright 2010 Steven Rostedt , Red Hat Inc.
*/
-#undef sift_rel_mcount
#undef do_func
#undef Elf_Rela
#ifdef RECORD_MCOUNT_64
-# define sift_rel_mcount sift64_rel_mcount
# define do_func do64
# define Elf_Rela Elf64_Rela
#else
-# define sift_rel_mcount sift32_rel_mcount
# define do_func do32
# define Elf_Rela Elf32_Rela
#endif
-/*
- * Look at the relocations in order to find the calls to mcount.
- * Accumulate the section offsets that are found, and their relocation info,
- * onto the end of the existing arrays.
- */
-static void sift_rel_mcount(GElf_Addr **mlocpp,
- GElf_Sxword *r_offsetp,
- void **const mrelpp,
- const struct section * const rels,
- unsigned const recsym_index,
- unsigned long const recval,
- unsigned const reltype,
- bool is_rela)
-{
- GElf_Rel *mrelp = *mrelpp;
- GElf_Rela *mrelap = *mrelpp;
- struct symbol *mcount_sym = NULL;
- struct reloc *reloc;
-
- list_for_each_entry(reloc, >reloc_list, list) {
- unsigned long addend;
-
- if (!mcount_sym)
- mcount_sym = get_mcount_sym(reloc);
-
- if (mcount_sym != reloc->sym || is_fake_mcount(reloc))
- continue;
-
- addend = reloc->offset - recval + mcount_adjust;
- if (is_rela) {
- mrelap->r_offset = *r_offsetp;
- mrelap->r_info = GELF_R_INFO(recsym_index, reltype);
- mrelap->r_addend = addend;
- mrelap++;
- **mlocpp = 0;
- } else {
- mrelp->r_offset = *r_offsetp;
- mrelp->r_info = GELF_R_INFO(recsym_index, reltype);
- mrelp++;
- **mlocpp = addend;
- }
-
[RFC][PATCH v5 44/51] objtool: mcount: Keep lists locations and relocations
To reduce the need for an initial pass through the sections
we need to keep lists of mcount call locations and suitable
relocations. A subsequent patch will eliminate the need for
the first pass entirely.
Introduce a new list for the locations and reuse objtool's
relocation lists respectively.
Signed-off-by: Matt Helsley
---
tools/objtool/mcount.c | 133 +++--
1 file changed, 75 insertions(+), 58 deletions(-)
diff --git a/tools/objtool/mcount.c b/tools/objtool/mcount.c
index 7fbde6ce6eb8..7d7843f7cd44 100644
--- a/tools/objtool/mcount.c
+++ b/tools/objtool/mcount.c
@@ -43,9 +43,15 @@
#define R_ARM_THM_CALL 10
+struct mcount_loc {
+ struct list_head list;
+ GElf_Addr loc;
+};
+
extern int warn_on_notrace_sect; /* warn when section has mcount not being
recorded */
static struct elf *lf;
+static struct list_head mcount_locs;
static const char ip_relative_call_x86[5] = { 0xe8, 0x00, 0x00, 0x00, 0x00 };
static const char ideal_nop5_x86_64[5] = { 0x0f, 0x1f, 0x44, 0x00, 0x00 };
@@ -294,20 +300,17 @@ static char const *has_rel_mcount(const struct section *
const rels)
return txts->name;
}
-static unsigned tot_relsize(unsigned int *rel_entsize)
+static void tot_relsize(unsigned int *rel_entsize)
{
const struct section *sec;
- unsigned totrelsz = 0;
char const *txtname;
list_for_each_entry(sec, >sections, list) {
txtname = has_rel_mcount(sec);
if (!(txtname && is_mcounted_section_name(txtname)))
continue;
- totrelsz += sec->sh.sh_size;
*rel_entsize = sec->sh.sh_entsize;
}
- return totrelsz;
}
/* zero or a small negative offset added to get the start of the call
@@ -323,55 +326,89 @@ static size_t loc_size;
* Accumulate the section offsets that are found, and their relocation info,
* onto the end of the existing arrays.
*/
-static void sift_rel_mcount(GElf_Addr **mlocpp,
- GElf_Sxword *r_offsetp,
- void **const mrelpp,
+static void sift_rel_mcount(GElf_Sxword *r_offsetp,
const struct section * const rels,
+ struct section *mc_relocs,
+ struct section *mc_locs,
unsigned const recsym_index,
unsigned long const recval,
unsigned const reltype,
bool is_rela)
{
- GElf_Rel *mrelp = *mrelpp;
- GElf_Rela *mrelap = *mrelpp;
struct reloc *reloc;
list_for_each_entry(reloc, >reloc_list, list) {
unsigned long addend;
+ struct mcount_loc *mc_loc;
+ struct reloc *mc_reloc;
+
+ if (reloc->sym->class != SYM_MCOUNT || is_fake_mcount(reloc))
+ continue;
- if (reloc->sym->class == SYM_MCOUNT || is_fake_mcount(reloc))
+ mc_loc = malloc(sizeof(*mc_loc));
+ if (!mc_loc) {
+ perror("malloc");
continue;
+ }
+ mc_reloc = malloc(sizeof(*mc_reloc));
+ if (!mc_reloc) {
+ perror("malloc");
+ free(mc_loc);
+ continue;
+ }
+ memset(mc_reloc, 0, sizeof(*mc_reloc));
+ memset(mc_loc, 0, sizeof(*mc_loc));
+ mc_reloc->sec = mc_relocs;
addend = reloc->offset - recval + mcount_adjust;
if (is_rela) {
- mrelap->r_offset = *r_offsetp;
- mrelap->r_info = GELF_R_INFO(recsym_index, reltype);
- mrelap->r_addend = addend;
- mrelap++;
- **mlocpp = 0;
+ mc_reloc->rela.r_offset = *r_offsetp;
+ mc_reloc->rela.r_info = GELF_R_INFO(recsym_index,
reltype);
+ mc_reloc->rela.r_addend = addend;
+ mc_loc->loc = 0;
} else {
- mrelp->r_offset = *r_offsetp;
- mrelp->r_info = GELF_R_INFO(recsym_index, reltype);
- mrelp++;
- **mlocpp = addend;
+ mc_reloc->rel.r_offset = *r_offsetp;
+ mc_reloc->rel.r_info = GELF_R_INFO(recsym_index,
reltype);
+ mc_loc->loc = addend;
}
- (*mlocpp)++;
+ mc_reloc->offset = *r_offsetp;
+ mc_reloc->type = reltype;
+ mc_reloc->sec = mc_locs;
+ elf_add_reloc(lf, mc_reloc);
+
+ list_add_tail(_loc->list,
[RFC][PATCH v5 36/51] objtool: mcount: Rename to mcount.c
Now that we've converted recordmcount to a subcommand of objtool
rename the .c file in order to follow the convention of the other
objtool subcmds.
Signed-off-by: Matt Helsley
---
tools/objtool/Build| 2 +-
tools/objtool/{recordmcount.c => mcount.c} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
rename tools/objtool/{recordmcount.c => mcount.c} (100%)
diff --git a/tools/objtool/Build b/tools/objtool/Build
index f4f0515d4f91..7815a094c991 100644
--- a/tools/objtool/Build
+++ b/tools/objtool/Build
@@ -7,7 +7,7 @@ objtool-$(SUBCMD_CHECK) += special.o
objtool-$(SUBCMD_ORC) += check.o
objtool-$(SUBCMD_ORC) += orc_gen.o
objtool-$(SUBCMD_ORC) += orc_dump.o
-objtool-$(SUBCMD_MCOUNT) += recordmcount.o
+objtool-$(SUBCMD_MCOUNT) += mcount.o
objtool-y += builtin-check.o
objtool-y += builtin-orc.o
diff --git a/tools/objtool/recordmcount.c b/tools/objtool/mcount.c
similarity index 100%
rename from tools/objtool/recordmcount.c
rename to tools/objtool/mcount.c
--
2.20.1
[RFC][PATCH v5 39/51] objtool: mcount: Verify x86 instruction with memcmp()
Instead of hard-coding what amounts to a memcmp() use memcmp to
determine if the instruction we wish to replace matches what we
expect. This makes the x86 code more like that of, for instance,
ARM.
Signed-off-by: Matt Helsley
---
tools/objtool/mcount.c | 19 ++-
1 file changed, 6 insertions(+), 13 deletions(-)
diff --git a/tools/objtool/mcount.c b/tools/objtool/mcount.c
index 4d6596a031bf..5c59df0df97b 100644
--- a/tools/objtool/mcount.c
+++ b/tools/objtool/mcount.c
@@ -47,9 +47,10 @@ extern int warn_on_notrace_sect; /* warn when section has
mcount not being recor
static struct elf *lf;
-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;
+static const unsigned char ip_relative_call_x86[5] = { 0xe8, 0x00, 0x00, 0x00,
0x00 };
+static const unsigned char ideal_nop5_x86_64[5] = { 0x0f, 0x1f, 0x44, 0x00,
0x00 };
+static const unsigned char ideal_nop5_x86_32[5] = { 0x3e, 0x8d, 0x74, 0x26,
0x00 };
+static const unsigned char *ideal_nop;
static char rel_type_nop;
@@ -57,20 +58,12 @@ static int (*make_nop)(struct section *, size_t const
offset);
static int make_nop_x86(struct section *txts, size_t const offset)
{
- uint32_t *ptr;
- unsigned char *op;
- void *map = txts->data->d_buf;
+ unsigned char *op = txts->data->d_buf + offset - 1;
if (offset < 1)
return -1;
- /* Confirm we have 0xe8 0x0 0x0 0x0 0x0 */
- ptr = map + offset;
- if (*ptr != 0)
- return -1;
-
- op = map + offset - 1;
- if (*op != 0xe8)
+ if (memcmp(op, ip_relative_call_x86, 5) != 0)
return -1;
/* convert to nop */
--
2.20.1
[RFC][PATCH v5 08/51] objtool: mcount: Remove unused fname parameter
The name of the object file being processed is unused in
the wrapper's leaf functions so we no longer need to pass
it as a parameter.
Signed-off-by: Matt Helsley
---
tools/objtool/recordmcount.c | 4 ++--
tools/objtool/recordmcount.h | 19 ---
2 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/tools/objtool/recordmcount.c b/tools/objtool/recordmcount.c
index f585bf7f45f5..9941683b3f60 100644
--- a/tools/objtool/recordmcount.c
+++ b/tools/objtool/recordmcount.c
@@ -586,7 +586,7 @@ static int do_file(char const *const fname)
reltype = R_MIPS_32;
is_fake_mcount32 = MIPS32_is_fake_mcount;
}
- if (do32(ehdr, fname, reltype) < 0)
+ if (do32(ehdr, reltype) < 0)
goto out;
break;
case ELFCLASS64: {
@@ -607,7 +607,7 @@ static int do_file(char const *const fname)
Elf64_r_info = MIPS64_r_info;
is_fake_mcount64 = MIPS64_is_fake_mcount;
}
- if (do64(ghdr, fname, reltype) < 0)
+ if (do64(ghdr, reltype) < 0)
goto out;
break;
}
diff --git a/tools/objtool/recordmcount.h b/tools/objtool/recordmcount.h
index 4bd61c9d1fd5..53abfd49a537 100644
--- a/tools/objtool/recordmcount.h
+++ b/tools/objtool/recordmcount.h
@@ -548,8 +548,7 @@ static int find_secsym_ndx(unsigned const txtndx,
/* Evade ISO C restriction: no declaration after statement in has_rel_mcount.
*/
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)
+char const *const shstrtab)
{
/* .sh_info depends on .sh_type == SHT_REL[,A] */
Elf_Shdr const *const txthdr = [relhdr->sh_info];
@@ -563,25 +562,23 @@ static char const * __has_rel_mcount(GElf_Shdr const
*const relhdr, /* reltype *
static char const *has_rel_mcount(GElf_Shdr const *const relhdr,
Elf_Shdr const *const shdr0,
- char const *const shstrtab,
- char const *const fname)
+ char const *const shstrtab)
{
if (relhdr->sh_type != SHT_REL && relhdr->sh_type != SHT_RELA)
return NULL;
- return __has_rel_mcount(relhdr, shdr0, shstrtab, fname);
+ return __has_rel_mcount(relhdr, shdr0, shstrtab);
}
static unsigned tot_relsize(Elf_Shdr const *const shdr0,
- const char *const shstrtab,
- const char *const fname)
+ const char *const shstrtab)
{
struct section *sec;
unsigned totrelsz = 0;
char const *txtname;
list_for_each_entry(sec, >sections, list) {
- txtname = has_rel_mcount(>sh, shdr0, shstrtab, fname);
+ txtname = has_rel_mcount(>sh, shdr0, shstrtab);
if (txtname && is_mcounted_section_name(txtname))
totrelsz += sec->sh.sh_size;
}
@@ -589,7 +586,7 @@ 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,
+static int do_func(Elf_Ehdr *const ehdr,
unsigned const reltype)
{
Elf_Shdr *const shdr0 = (Elf_Shdr *)(_w(ehdr->e_shoff)
@@ -622,7 +619,7 @@ static int do_func(Elf_Ehdr *const ehdr, char const *const
fname,
if (find_section_by_name(lf, "__mcount_loc") != NULL)
return 0;
- totrelsz = tot_relsize(shdr0, shstrtab, fname);
+ totrelsz = tot_relsize(shdr0, shstrtab);
if (totrelsz == 0)
return 0;
mrel0 = umalloc(totrelsz);
@@ -645,7 +642,7 @@ static int do_func(Elf_Ehdr *const ehdr, char const *const
fname,
relhdr = >sh;
txtname = has_rel_mcount(relhdr, shdr0,
- shstrtab, fname);
+ shstrtab);
if (txtname && is_mcounted_section_name(txtname)) {
unsigned int recsym;
uint_t recval = 0;
--
2.20.1
[RFC][PATCH v5 20/51] objtool: mcount: Use objtool ELF to write
Rather than modify the pseudo-mapping of the ELF file directly,
which is the recordmcount way of operating, use the objtool
section list and generic ELF functions to modify the ELF file.
This eliminates a bunch of code -- the ulseek() and uwrite()
functions -- because it's used to patch the ELF data. Instead
we rely on objtool's ELF code to handle updating the ELF file.
This means a bunch of the odd bits in append_func() also go
away since they did things like update the ELF header, add
to the section table, and append the new section names to the
string table -- all handled by objtool's ELF code.
Since we no longer use the get/set_shnum() functions to
determine the next section to allocate and set how many new
sections there are we can also eliminate those two functions.
One unusual part, with respect to objtool is the way we handle
writing nops. Objtool is not designed to modify the an ELF
text section directly (or at least I could not find and example
to base this work on). So we break layering to access the
"data" of the text section via the section's "data buffer".
This is still cleaner -- we can now pass in the section struct
and offset as separate parameters.
Note that this patch does not move the associated parts out
of the wrapper file. We postpone that cleanup for later so that
it's easier to see the changes to the functions rather than
obscuring them with the move.
Signed-off-by: Matt Helsley
---
tools/objtool/recordmcount.c | 161 -
tools/objtool/recordmcount.h | 167 ---
2 files changed, 53 insertions(+), 275 deletions(-)
diff --git a/tools/objtool/recordmcount.c b/tools/objtool/recordmcount.c
index 2225479157e5..c015091a8a8c 100644
--- a/tools/objtool/recordmcount.c
+++ b/tools/objtool/recordmcount.c
@@ -52,24 +52,9 @@ static struct stat sb; /* Remember .st_size, etc. */
static const char *altmcount; /* alternate mcount symbol name */
extern int warn_on_notrace_sect; /* warn when section has mcount not being
recorded */
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 */
static struct elf *lf;
-/* Per-file resource cleanup when multiple files. */
-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)
@@ -82,72 +67,11 @@ static void mmap_cleanup(void)
lf = NULL;
}
-/* ulseek, uwrite, ...: Check return value for errors. */
-
-static off_t ulseek(off_t const offset, int const whence)
-{
- switch (whence) {
- case SEEK_SET:
- file_ptr = file_map + offset;
- break;
- case SEEK_CUR:
- file_ptr += offset;
- break;
- case SEEK_END:
- file_ptr = file_map + (sb.st_size - offset);
- break;
- }
- if (file_ptr < file_map) {
- fprintf(stderr, "lseek: seek before file\n");
- return -1;
- }
- return file_ptr - file_map;
-}
-
-static ssize_t uwrite(void const *const buf, size_t const count)
-{
- size_t cnt = count;
- off_t idx = 0;
-
- file_updated = 1;
-
- if (file_ptr + count >= file_end) {
- off_t aoffset = (file_ptr + count) - file_end;
-
- if (aoffset > file_append_size) {
- file_append = realloc(file_append, aoffset);
- file_append_size = aoffset;
- }
- if (!file_append) {
- perror("write");
- file_append_cleanup();
- mmap_cleanup();
- return -1;
- }
- if (file_ptr < file_end) {
- cnt = file_end - file_ptr;
- } else {
- cnt = 0;
- idx = aoffset - count;
- }
- }
-
- if (cnt)
- memcpy(file_ptr, buf, cnt);
-
- if (cnt < count)
- memcpy(file_append + idx, buf + cnt, count - cnt);
-
- file_ptr += count;
- return count;
-}
-
static void * umalloc(size_t size)
{
void *const addr = malloc(size);
if (addr == 0) {
fprintf(stderr, "malloc failed: %zu bytes\n", size);
- file_append_cleanup();
mmap_cleanup();
return NULL;
}
@@ -173,8 +97,6 @@ static void *mmap_file(char const *fname)
fd_map = -1;
mmap_failed = 1;
f
[RFC][PATCH v5 22/51] objtool: mcount: Move has_rel_mcount() and tot_relsize()
The has_rel_mcount() and tot_relsize() helpers are no longer
dependent on the ELF wrapper so we can move them.
Signed-off-by: Matt Helsley
---
tools/objtool/recordmcount.c | 26 ++
tools/objtool/recordmcount.h | 33 -
2 files changed, 26 insertions(+), 33 deletions(-)
diff --git a/tools/objtool/recordmcount.c b/tools/objtool/recordmcount.c
index fae0b15d0632..918e47217379 100644
--- a/tools/objtool/recordmcount.c
+++ b/tools/objtool/recordmcount.c
@@ -446,6 +446,32 @@ static int nop_mcount(struct section * const rels,
return 0;
}
+static char const *has_rel_mcount(const struct section * const rels)
+{
+ const struct section *txts;
+ if (rels->sh.sh_type != SHT_REL && rels->sh.sh_type != SHT_RELA)
+ return NULL;
+ txts = find_section_by_index(lf, rels->sh.sh_info);
+ if ((txts->sh.sh_type != SHT_PROGBITS) ||
+ !(txts->sh.sh_flags & SHF_EXECINSTR))
+ return NULL;
+ return txts->name;
+}
+
+static unsigned tot_relsize(void)
+{
+ const struct section *sec;
+ unsigned totrelsz = 0;
+ char const *txtname;
+
+ list_for_each_entry(sec, >sections, list) {
+ txtname = has_rel_mcount(sec);
+ if (txtname && is_mcounted_section_name(txtname))
+ totrelsz += sec->sh.sh_size;
+ }
+ return totrelsz;
+}
+
/* 32 bit and 64 bit are very similar */
#include "recordmcount.h"
#define RECORD_MCOUNT_64
diff --git a/tools/objtool/recordmcount.h b/tools/objtool/recordmcount.h
index 25028c61da2b..2733f7fde51d 100644
--- a/tools/objtool/recordmcount.h
+++ b/tools/objtool/recordmcount.h
@@ -20,8 +20,6 @@
#undef append_func
#undef mcount_adjust
#undef sift_rel_mcount
-#undef has_rel_mcount
-#undef tot_relsize
#undef do_func
#undef Elf_Shdr
#undef Elf_Rel
@@ -36,8 +34,6 @@
#ifdef RECORD_MCOUNT_64
# define append_func append64
# define sift_rel_mcount sift64_rel_mcount
-# define has_rel_mcounthas64_rel_mcount
-# define tot_relsize tot64_relsize
# define do_func do64
# define mcount_adjust mcount_adjust_64
# define Elf_Rel Elf64_Rel
@@ -51,8 +47,6 @@
#else
# define append_func append32
# define sift_rel_mcount sift32_rel_mcount
-# define has_rel_mcounthas32_rel_mcount
-# define tot_relsize tot32_relsize
# define do_func do32
# define mcount_adjust mcount_adjust_32
# define Elf_Rel Elf32_Rel
@@ -165,33 +159,6 @@ static uint_t *sift_rel_mcount(uint_t *mlocp,
return mlocp;
}
-static char const *has_rel_mcount(const struct section * const rels)
-{
- const struct section *txts;
- if (rels->sh.sh_type != SHT_REL && rels->sh.sh_type != SHT_RELA)
- return NULL;
- txts = find_section_by_index(lf, rels->sh.sh_info);
- if ((txts->sh.sh_type != SHT_PROGBITS) ||
- !(txts->sh.sh_flags & SHF_EXECINSTR))
- return NULL;
- return txts->name;
-}
-
-
-static unsigned tot_relsize(void)
-{
- const struct section *sec;
- unsigned totrelsz = 0;
- char const *txtname;
-
- list_for_each_entry(sec, >sections, list) {
- txtname = has_rel_mcount(sec);
- if (txtname && is_mcounted_section_name(txtname))
- totrelsz += sec->sh.sh_size;
- }
- return totrelsz;
-}
-
/* Overall supervision for Elf32 ET_REL file. */
static int do_func(unsigned const reltype)
{
--
2.20.1
[RFC][PATCH v5 21/51] objtool: mcount: Move nop_mcount()
The nop_mcount() function overwrites mcount calls that should be
ignored with no-ops. This operation varies by architecture and
wordsize so we retain the function pointers used to implement
the fundamental operation while nop_mcount() itself is responsible
for walking the relocations, determining if they should be turned
into no-ops, then calling the arch-specific code. Since none of
these use the recordmcount ELF wrappers anymore we can move it out
of the wrapper.
Signed-off-by: Matt Helsley
---
tools/objtool/recordmcount.c | 47 +
tools/objtool/recordmcount.h | 50
2 files changed, 47 insertions(+), 50 deletions(-)
diff --git a/tools/objtool/recordmcount.c b/tools/objtool/recordmcount.c
index c015091a8a8c..fae0b15d0632 100644
--- a/tools/objtool/recordmcount.c
+++ b/tools/objtool/recordmcount.c
@@ -399,6 +399,53 @@ static int find_section_sym_index(unsigned const txtndx,
return missing_sym;
}
+/*
+ * Read the relocation table again, but this time its called on sections
+ * that are not going to be traced. The mcount calls here will be converted
+ * into nops.
+ */
+static int nop_mcount(struct section * const rels,
+ const char *const txtname)
+{
+ struct reloc *reloc;
+ struct section *txts = find_section_by_index(lf, rels->sh.sh_info);
+ struct symbol *mcountsym = NULL;
+ int once = 0;
+
+ list_for_each_entry(reloc, >reloc_list, list) {
+ int ret = -1;
+
+ if (!mcountsym)
+ mcountsym = get_mcountsym(reloc);
+
+ if (mcountsym == reloc->sym && !is_fake_mcount(reloc)) {
+ if (make_nop) {
+ ret = make_nop(txts, reloc->offset);
+ if (ret < 0)
+ return -1;
+ }
+ if (warn_on_notrace_sect && !once) {
+ printf("Section %s has mcount callers being
ignored\n",
+ txtname);
+ once = 1;
+ /* just warn? */
+ if (!make_nop)
+ return 0;
+ }
+ }
+
+ /*
+* If we successfully removed the mcount, mark the relocation
+* as a nop (don't do anything with it).
+*/
+ if (!ret) {
+ reloc->type = rel_type_nop;
+ rels->changed = true;
+ }
+ }
+ return 0;
+}
+
/* 32 bit and 64 bit are very similar */
#include "recordmcount.h"
#define RECORD_MCOUNT_64
diff --git a/tools/objtool/recordmcount.h b/tools/objtool/recordmcount.h
index 1f14c64ed484..25028c61da2b 100644
--- a/tools/objtool/recordmcount.h
+++ b/tools/objtool/recordmcount.h
@@ -20,7 +20,6 @@
#undef append_func
#undef mcount_adjust
#undef sift_rel_mcount
-#undef nop_mcount
#undef has_rel_mcount
#undef tot_relsize
#undef do_func
@@ -37,7 +36,6 @@
#ifdef RECORD_MCOUNT_64
# define append_func append64
# define sift_rel_mcount sift64_rel_mcount
-# define nop_mcountnop_mcount_64
# define has_rel_mcounthas64_rel_mcount
# define tot_relsize tot64_relsize
# define do_func do64
@@ -53,7 +51,6 @@
#else
# define append_func append32
# define sift_rel_mcount sift32_rel_mcount
-# define nop_mcountnop_mcount_32
# define has_rel_mcounthas32_rel_mcount
# define tot_relsize tot32_relsize
# define do_func do32
@@ -168,53 +165,6 @@ static uint_t *sift_rel_mcount(uint_t *mlocp,
return mlocp;
}
-/*
- * Read the relocation table again, but this time its called on sections
- * that are not going to be traced. The mcount calls here will be converted
- * into nops.
- */
-static int nop_mcount(struct section * const rels,
- const char *const txtname)
-{
- struct reloc *reloc;
- struct section *txts = find_section_by_index(lf, rels->sh.sh_info);
- struct symbol *mcountsym = NULL;
- int once = 0;
-
- list_for_each_entry(reloc, >reloc_list, list) {
- int ret = -1;
-
- if (!mcountsym)
- mcountsym = get_mcountsym(reloc);
-
- if (mcountsym == reloc->sym && !is_fake_mcount(reloc)) {
- if (make_nop) {
- ret = make_nop(txts, reloc->offset);
- if (ret < 0)
- return -1;
- }
- if (warn_on_notrace_sect && !once) {
- printf("Se
[RFC][PATCH v5 15/51] objtool: mcount: Replace MIPS offset types
Replace MIPS is_fake_mcount code using Elf_Addr with
unsigned long for the offsets. This is consistent with the way
that objtool more generally treats offsets and removes the
last use of the Elf_Addr wrapper.
Signed-off-by: Matt Helsley
---
tools/objtool/recordmcount.h | 9 +++--
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/tools/objtool/recordmcount.h b/tools/objtool/recordmcount.h
index 210899819261..dde2ec054e51 100644
--- a/tools/objtool/recordmcount.h
+++ b/tools/objtool/recordmcount.h
@@ -31,7 +31,6 @@
#undef set_shnum
#undef get_shstrndx
#undef do_func
-#undef Elf_Addr
#undef Elf_Ehdr
#undef Elf_Shdr
#undef Elf_Rel
@@ -59,7 +58,6 @@
# define fn_is_fake_mcount fn_is_fake_mcount64
# define MIPS_is_fake_mcount MIPS64_is_fake_mcount
# define mcount_adjust mcount_adjust_64
-# define Elf_Addr Elf64_Addr
# define Elf_Ehdr Elf64_Ehdr
# define Elf_Shdr Elf64_Shdr
# define Elf_Rel Elf64_Rel
@@ -86,7 +84,6 @@
# define fn_is_fake_mcount fn_is_fake_mcount32
# define MIPS_is_fake_mcount MIPS32_is_fake_mcount
# define mcount_adjust mcount_adjust_32
-# define Elf_Addr Elf32_Addr
# define Elf_Ehdr Elf32_Ehdr
# define Elf_Shdr Elf32_Shdr
# define Elf_Rel Elf32_Rel
@@ -138,11 +135,11 @@ static int mcount_adjust = 0;
static int MIPS_is_fake_mcount(struct reloc const *reloc)
{
- static Elf_Addr old_r_offset = ~(Elf_Addr)0;
- Elf_Addr current_r_offset = reloc->offset;
+ static unsigned long old_r_offset = ~0UL;
+ unsigned long current_r_offset = reloc->offset;
int is_fake;
- is_fake = (old_r_offset != ~(Elf_Addr)0) &&
+ is_fake = (old_r_offset != ~0UL) &&
(current_r_offset - old_r_offset == MIPS_FAKEMCOUNT_OFFSET);
old_r_offset = current_r_offset;
--
2.20.1
[RFC][PATCH v5 23/51] objtool: mcount: Move relocation entry size detection
Move where we detect the size of relocation entries we wish to
use into the first loop over the sections. This will allow us
to allocate the mcount location and relocation sections before
the next loop that collects them.
Signed-off-by: Matt Helsley
---
tools/objtool/recordmcount.c | 8 +---
tools/objtool/recordmcount.h | 5 ++---
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/tools/objtool/recordmcount.c b/tools/objtool/recordmcount.c
index 918e47217379..29f299e5bb52 100644
--- a/tools/objtool/recordmcount.c
+++ b/tools/objtool/recordmcount.c
@@ -458,7 +458,7 @@ static char const *has_rel_mcount(const struct section *
const rels)
return txts->name;
}
-static unsigned tot_relsize(void)
+static unsigned tot_relsize(unsigned int *rel_entsize)
{
const struct section *sec;
unsigned totrelsz = 0;
@@ -466,8 +466,10 @@ static unsigned tot_relsize(void)
list_for_each_entry(sec, >sections, list) {
txtname = has_rel_mcount(sec);
- if (txtname && is_mcounted_section_name(txtname))
- totrelsz += sec->sh.sh_size;
+ if (!(txtname && is_mcounted_section_name(txtname)))
+ continue;
+ totrelsz += sec->sh.sh_size;
+ *rel_entsize = sec->sh.sh_entsize;
}
return totrelsz;
}
diff --git a/tools/objtool/recordmcount.h b/tools/objtool/recordmcount.h
index 2733f7fde51d..5ca488f3471c 100644
--- a/tools/objtool/recordmcount.h
+++ b/tools/objtool/recordmcount.h
@@ -171,7 +171,7 @@ static int do_func(unsigned const reltype)
uint_t * mloc0;
uint_t * mlocp;
- unsigned rel_entsize = 0;
+ unsigned int rel_entsize = 0;
unsigned symsec_sh_link = 0;
struct section *sec;
@@ -181,7 +181,7 @@ static int do_func(unsigned const reltype)
if (find_section_by_name(lf, "__mcount_loc") != NULL)
return 0;
- totrelsz = tot_relsize();
+ totrelsz = tot_relsize(_entsize);
if (totrelsz == 0)
return 0;
mrel0 = umalloc(totrelsz);
@@ -211,7 +211,6 @@ static int do_func(unsigned const reltype)
if (result)
goto out;
- rel_entsize = sec->sh.sh_entsize;
mlocp = sift_rel_mcount(mlocp,
(void *)mlocp - (void *)mloc0, ,
sec, recsym, (uint_t)recval, reltype);
--
2.20.1
[RFC][PATCH v5 24/51] objtool: mcount: Only keep ELF file size
Since we're no longer writing to the ELF file mapping and we're
not appending to it we don't need to keep more information from the
stat structure. At the same time we can give the smaller global
variable a better name.
Signed-off-by: Matt Helsley
---
tools/objtool/recordmcount.c | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/tools/objtool/recordmcount.c b/tools/objtool/recordmcount.c
index 29f299e5bb52..aa35173de3d9 100644
--- a/tools/objtool/recordmcount.c
+++ b/tools/objtool/recordmcount.c
@@ -48,17 +48,17 @@
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 const char *altmcount; /* alternate mcount symbol name */
extern int warn_on_notrace_sect; /* warn when section has mcount not being
recorded */
static void *file_map; /* pointer of the mapped file */
+static size_t file_map_size; /* original ELF file size */
static struct elf *lf;
static void mmap_cleanup(void)
{
if (!mmap_failed)
- munmap(file_map, sb.st_size);
+ munmap(file_map, file_map_size);
else
free(file_map);
file_map = NULL;
@@ -93,11 +93,13 @@ static void * umalloc(size_t size)
*/
static void *mmap_file(char const *fname)
{
+ struct stat sb;
+
/* Avoid problems if early cleanup() */
fd_map = -1;
mmap_failed = 1;
file_map = NULL;
- sb.st_size = 0;
+ file_map_size = 0;
lf = elf_open_read(fname, O_RDWR);
if (!lf) {
@@ -129,6 +131,7 @@ static void *mmap_file(char const *fname)
}
} else
mmap_failed = 0;
+ file_map_size = sb.st_size;
out:
fd_map = -1;
--
2.20.1
[RFC][PATCH v5 17/51] objtool: mcount: Stop using ehdr in find_section_sym_index
We can use the objtool GElf_Ehdr structure to access ehdr here.
This makes the function completely independent of the old
recordmcount ELF wrapper. The next step will be to promote it
to the C file.
Signed-off-by: Matt Helsley
---
tools/objtool/recordmcount.h | 13 ++---
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/tools/objtool/recordmcount.h b/tools/objtool/recordmcount.h
index 941f96e4f74b..cf420f9f64b0 100644
--- a/tools/objtool/recordmcount.h
+++ b/tools/objtool/recordmcount.h
@@ -225,7 +225,7 @@ static uint_t *sift_rel_mcount(uint_t *mlocp,
Elf_Rel **const mrelpp,
const struct section * const rels,
unsigned const recsym_index,
- uint_t const recval,
+ unsigned long const recval,
unsigned const reltype)
{
uint_t *const mloc0 = mlocp;
@@ -319,9 +319,8 @@ static int nop_mcount(struct section * const rels,
*/
static int find_section_sym_index(unsigned const txtndx,
char const *const txtname,
- uint_t *const recvalp,
- unsigned int *sym_index,
- Elf_Ehdr const *const ehdr)
+ unsigned long *const recvalp,
+ unsigned int *sym_index)
{
struct symbol *sym;
struct section *txts = find_section_by_index(lf, txtndx);
@@ -336,7 +335,7 @@ static int find_section_sym_index(unsigned const txtndx,
/* avoid symbols with weak binding */
if ((sym->bind == STB_LOCAL) || (sym->bind == STB_GLOBAL)) {
/* function symbols on ARM have quirks, avoid them */
- if (w2(ehdr->e_machine) == EM_ARM
+ if (lf->ehdr.e_machine == EM_ARM
&& sym->type == STT_FUNC)
continue;
@@ -424,12 +423,12 @@ static int do_func(Elf_Ehdr *const ehdr,
txtname = has_rel_mcount(sec);
if (txtname && is_mcounted_section_name(txtname)) {
+ unsigned long recval = 0;
unsigned int recsym;
- uint_t recval = 0;
symsec_sh_link = sec->sh.sh_link;
result = find_section_sym_index(sec->sh.sh_info,
- txtname, , ,
ehdr);
+ txtname, , );
if (result)
goto out;
--
2.20.1
[RFC][PATCH v5 18/51] objtool: mcount: Move find_section_sym_index()
This function is no longer dependent upon the old recordmcount
ELF wrapper code -- it doesn't use the wrapper's Elf_* types nor
does it call wrapped functions. Move it into the C file.
Signed-off-by: Matt Helsley
---
tools/objtool/recordmcount.c | 42
tools/objtool/recordmcount.h | 47 +---
2 files changed, 43 insertions(+), 46 deletions(-)
diff --git a/tools/objtool/recordmcount.c b/tools/objtool/recordmcount.c
index 24b019b82795..2225479157e5 100644
--- a/tools/objtool/recordmcount.c
+++ b/tools/objtool/recordmcount.c
@@ -482,6 +482,48 @@ static int (*is_fake_mcount)(struct reloc const *reloc) =
fn_is_fake_mcount;
static const unsigned int missing_sym = (unsigned int)-1;
+/*
+ * Find a symbol in the given section, to be used as the base for relocating
+ * the table of offsets of calls to mcount. A local or global symbol suffices,
+ * but avoid a Weak symbol because it may be overridden; the change in value
+ * would invalidate the relocations of the offsets of the calls to mcount.
+ * Often the found symbol will be the unnamed local symbol generated by
+ * GNU 'as' for the start of each section. For example:
+ *Num:Value Size TypeBind Vis Ndx Name
+ * 2: 0 SECTION LOCAL DEFAULT1
+ */
+static int find_section_sym_index(unsigned const txtndx,
+ char const *const txtname,
+ unsigned long *const recvalp,
+ unsigned int *sym_index)
+{
+ struct symbol *sym;
+ struct section *txts = find_section_by_index(lf, txtndx);
+
+ if (!txts) {
+ fprintf(stderr, "Cannot find section %u: %s.\n",
+ txtndx, txtname);
+ return missing_sym;
+ }
+
+ list_for_each_entry(sym, >symbol_list, list) {
+ /* avoid symbols with weak binding */
+ if ((sym->bind == STB_LOCAL) || (sym->bind == STB_GLOBAL)) {
+ /* function symbols on ARM have quirks, avoid them */
+ if (lf->ehdr.e_machine == EM_ARM
+ && sym->type == STT_FUNC)
+ continue;
+
+ *recvalp = sym->sym.st_value;
+ *sym_index = sym->idx;
+ return 0;
+ }
+ }
+ fprintf(stderr, "Cannot find symbol for section %u: %s.\n",
+ txtndx, txtname);
+ return missing_sym;
+}
+
/* 32 bit and 64 bit are very similar */
#include "recordmcount.h"
#define RECORD_MCOUNT_64
diff --git a/tools/objtool/recordmcount.h b/tools/objtool/recordmcount.h
index cf420f9f64b0..eed592954f37 100644
--- a/tools/objtool/recordmcount.h
+++ b/tools/objtool/recordmcount.h
@@ -21,7 +21,6 @@
#undef mcount_adjust
#undef sift_rel_mcount
#undef nop_mcount
-#undef find_section_sym_index
#undef has_rel_mcount
#undef tot_relsize
#undef get_shnum
@@ -44,7 +43,6 @@
# define append_func append64
# define sift_rel_mcount sift64_rel_mcount
# define nop_mcountnop_mcount_64
-# define find_section_sym_indexfind64_section_sym_index
# define has_rel_mcounthas64_rel_mcount
# define tot_relsize tot64_relsize
# define get_shnum get_shnum64
@@ -67,7 +65,6 @@
# define append_func append32
# define sift_rel_mcount sift32_rel_mcount
# define nop_mcountnop_mcount_32
-# define find_section_sym_indexfind32_section_sym_index
# define has_rel_mcounthas32_rel_mcount
# define tot_relsize tot32_relsize
# define get_shnum get_shnum32
@@ -307,48 +304,6 @@ static int nop_mcount(struct section * const rels,
return 0;
}
-/*
- * Find a symbol in the given section, to be used as the base for relocating
- * the table of offsets of calls to mcount. A local or global symbol suffices,
- * but avoid a Weak symbol because it may be overridden; the change in value
- * would invalidate the relocations of the offsets of the calls to mcount.
- * Often the found symbol will be the unnamed local symbol generated by
- * GNU 'as' for the start of each section. For example:
- *Num:Value Size TypeBind Vis Ndx Name
- * 2: 0 SECTION LOCAL DEFAULT1
- */
-static int find_section_sym_index(unsigned const txtndx,
- char const *const txtname,
- unsigned long *const recvalp,
- unsigned int *sym_index)
-{
- struct symbol *sym;
- struct section *txts = find_section_by_index(lf, txtndx);
-
- if (!txts) {
- fprintf(stderr, "Cannot find section %u: %s.\n",
- txtndx, txtname);
- return missing_sym;
- }
-
- li
[RFC][PATCH v5 11/51] objtool: mcount: Use symbol structs to find mcount relocations
Rather than open coding symbol name lookups in get_sym_and_*()
we rename the structure and use objtool's lookup function to
get the symbol name for a relocation. We also change the name
of the function to better reflect its purpose.
Signed-off-by: Matt Helsley
---
tools/objtool/elf.c | 2 +-
tools/objtool/elf.h | 1 +
tools/objtool/recordmcount.h | 54 ++--
3 files changed, 17 insertions(+), 40 deletions(-)
diff --git a/tools/objtool/elf.c b/tools/objtool/elf.c
index 17e39b3a1719..8dcdea8020a5 100644
--- a/tools/objtool/elf.c
+++ b/tools/objtool/elf.c
@@ -196,7 +196,7 @@ struct section *find_section_by_index(const struct elf
*elf, unsigned int idx)
return NULL;
}
-static struct symbol *find_symbol_by_index(struct elf *elf, unsigned int idx)
+struct symbol *find_symbol_by_index(const struct elf *elf, unsigned int idx)
{
struct symbol *sym;
diff --git a/tools/objtool/elf.h b/tools/objtool/elf.h
index 60eb44661658..09fa0d085341 100644
--- a/tools/objtool/elf.h
+++ b/tools/objtool/elf.h
@@ -135,6 +135,7 @@ struct section *find_section_by_index(const struct elf
*elf, unsigned int idx);
struct symbol *find_func_by_offset(struct section *sec, unsigned long offset);
struct symbol *find_symbol_by_offset(struct section *sec, unsigned long
offset);
struct symbol *find_symbol_by_name(const struct elf *elf, const char *name);
+struct symbol *find_symbol_by_index(const struct elf *elf, unsigned int idx);
struct symbol *find_symbol_containing(const struct section *sec, unsigned long
offset);
struct reloc *find_reloc_by_dest(const struct elf *elf, struct section *sec,
unsigned long offset);
struct reloc *find_reloc_by_dest_range(const struct elf *elf, struct section
*sec,
diff --git a/tools/objtool/recordmcount.h b/tools/objtool/recordmcount.h
index b10f7fcd33c3..3dae878f11a8 100644
--- a/tools/objtool/recordmcount.h
+++ b/tools/objtool/recordmcount.h
@@ -31,7 +31,7 @@
#undef get_shnum
#undef set_shnum
#undef get_shstrndx
-#undef get_sym_str_and_relp
+#undef get_relp
#undef do_func
#undef Elf_Addr
#undef Elf_Ehdr
@@ -62,7 +62,7 @@
# define get_shnum get_shnum64
# define set_shnum set_shnum64
# define get_shstrndx get_shstrndx64
-# define get_sym_str_and_relp get_sym_str_and_relp_64
+# define get_relp get_relp_64
# define do_func do64
# define get_mcountsym get_mcountsym_64
# define is_fake_mcountis_fake_mcount64
@@ -97,7 +97,7 @@
# define get_shnum get_shnum32
# define set_shnum set_shnum32
# define get_shstrndx get_shstrndx32
-# define get_sym_str_and_relp get_sym_str_and_relp_32
+# define get_relp get_relp_32
# define do_func do32
# define get_mcountsym get_mcountsym_32
# define is_fake_mcountis_fake_mcount32
@@ -298,15 +298,10 @@ static int append_func(Elf_Ehdr *const ehdr,
return elf_write(lf);
}
-static unsigned get_mcountsym(Elf_Sym const *const sym0,
- Elf_Rel const *relp,
- char const *const str0)
+static unsigned get_mcountsym(Elf_Rel const *relp)
{
- unsigned mcountsym = 0;
-
- Elf_Sym const *const symp =
- [Elf_r_sym(relp)];
- char const *symname = [w(symp->st_name)];
+ struct symbol *sym = find_symbol_by_index(lf, Elf_r_sym(relp));
+ char const *symname = sym->name;
char const *mcount = gpfx == '_' ? "_mcount" : "mcount";
char const *fentry = "__fentry__";
@@ -315,31 +310,16 @@ static unsigned get_mcountsym(Elf_Sym const *const sym0,
if (strcmp(mcount, symname) == 0 ||
(altmcount && strcmp(altmcount, symname) == 0) ||
(strcmp(fentry, symname) == 0))
- mcountsym = Elf_r_sym(relp);
-
- return mcountsym;
+ return Elf_r_sym(relp);
+ return 0;
}
-static void get_sym_str_and_relp(const struct section * const rels,
-Elf_Ehdr const *const ehdr,
-Elf_Sym const **sym0,
-char const **str0,
-Elf_Rel const **relp)
+static void get_relp(const struct section * const rels,
+ Elf_Ehdr const *const ehdr,
+ Elf_Rel const **relp)
{
- Elf_Shdr *const shdr0 = (Elf_Shdr *)(_w(ehdr->e_shoff)
- + (void *)ehdr);
- unsigned const symsec_sh_link = rels->sh.sh_link;
- Elf_Shdr const *const symsec = [symsec_sh_link];
- Elf_Shdr const *const strsec = [w(symsec->sh_link)];
Elf_Rel const *const rel0 = (Elf_Rel const *)(rels->sh.sh_offset
+ (void *)ehdr);
-
- *sym0 = (Elf_Sym const *)(_w(symsec->sh_offset)
- + (void *)e
[RFC][PATCH v5 05/51] objtool: recordmcount: Search for __mcount_loc before walking the sections
recordmcount 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.
Signed-off-by: Matt Helsley
---
tools/objtool/recordmcount.c | 4
tools/objtool/recordmcount.h | 17 +++--
2 files changed, 3 insertions(+), 18 deletions(-)
diff --git a/tools/objtool/recordmcount.c b/tools/objtool/recordmcount.c
index b2c606eb269b..f585bf7f45f5 100644
--- a/tools/objtool/recordmcount.c
+++ b/tools/objtool/recordmcount.c
@@ -208,8 +208,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;
@@ -424,8 +422,6 @@ static int is_mcounted_section_name(char const *const
txtname)
strcmp(".cpuidle.text", txtname) == 0;
}
-static char const *already_has_rel_mcount = "success"; /* our work here is
done! */
-
/* 32 bit and 64 bit are very similar */
#include "recordmcount.h"
#define RECORD_MCOUNT_64
diff --git a/tools/objtool/recordmcount.h b/tools/objtool/recordmcount.h
index f9b19524da11..a96ffcef515a 100644
--- a/tools/objtool/recordmcount.h
+++ b/tools/objtool/recordmcount.h
@@ -554,11 +554,6 @@ static char const * __has_rel_mcount(Elf_Shdr const *const
relhdr, /* reltype */
Elf_Shdr const *const txthdr = [w(relhdr->sh_info)];
char const *const txtname = [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;
@@ -587,10 +582,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);
}
@@ -628,6 +619,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;
@@ -649,11 +643,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)) {
unsigned int recsym;
uint_t recval = 0;
--
2.20.1
[RFC][PATCH v5 06/51] objtool: recordmcount: Convert do_func() relhdrs
Use 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 modify the ELF
file -- it only changes the way we walk the ELF sections and do
lookups to find the relocations.
Signed-off-by: Matt Helsley
---
tools/objtool/recordmcount.h | 61 +++-
1 file changed, 32 insertions(+), 29 deletions(-)
diff --git a/tools/objtool/recordmcount.h b/tools/objtool/recordmcount.h
index a96ffcef515a..b46e855d32bf 100644
--- a/tools/objtool/recordmcount.h
+++ b/tools/objtool/recordmcount.h
@@ -364,7 +364,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,
@@ -372,10 +372,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 = [symsec_sh_link];
Elf_Shdr const *const strsec = [w(symsec->sh_link)];
- Elf_Rel const *const rel0 = (Elf_Rel const *)(_w(relhdr->sh_offset)
+ Elf_Rel const *const rel0 = (Elf_Rel const *)(relhdr->sh_offset
+ (void *)ehdr);
*sym0 = (Elf_Sym const *)(_w(symsec->sh_offset)
@@ -395,9 +395,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)
{
@@ -406,8 +406,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;
@@ -423,7 +423,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;
@@ -443,7 +443,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)
{
@@ -452,9 +452,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 = [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 = [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;
@@ -545,13 +545,13 @@ static int 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 co
[RFC][PATCH v5 01/51] objtool: Factor out reasons to build objtool
Currently the reasons to build and run objtool are:
Stack validation (objtool subcmds: orc + check)
Orc data generation (objtool subcmds: orc)
Code analysis (objtool subcmds: check)
Since the reasons are varied and the stack validation step is
skipped with a warning if libelf is missing, the logic of
Kconfig and the Makefiles is somewhat messy and will only get
messier the more subcommands objtool supports. In preparation
for adding new subcommands, break up the current configurations
such as CONFIG_STACK_VALIDATION, CONFIG_UNWINDER_ORC, etc.
so that we translate them into the objtool subcommands that we
need to build into objtool and whether the objtool pass is
optional (SKIP_STACK_VALIDATION=1).
This allows us to greatly simplify the objtool Makefile so
that the arch-dependence of the subcommands can be encoded in
the usual place, arch/Kconfig, rather than a bunch of
per-supported-arch ifdef blocks in tools/objtool/Makefile.
Signed-off-by: Matt Helsley
---
Makefile | 15 ---
arch/Kconfig | 23 +++
arch/x86/Kconfig.debug | 1 +
lib/Kconfig.debug | 1 +
tools/objtool/Makefile | 5 +++--
5 files changed, 36 insertions(+), 9 deletions(-)
diff --git a/Makefile b/Makefile
index ae5d8220f431..cf731709ebe7 100644
--- a/Makefile
+++ b/Makefile
@@ -1051,18 +1051,19 @@ mod_sign_cmd = true
endif
export mod_sign_cmd
+ifdef CONFIG_OBJTOOL_SUBCMDS
HOST_LIBELF_LIBS = $(shell pkg-config libelf --libs 2>/dev/null || echo -lelf)
-
-ifdef CONFIG_STACK_VALIDATION
- has_libelf := $(call try-run,\
+has_libelf := $(call try-run,\
echo "int main() {}" | $(HOSTCC) -xc -o /dev/null
$(HOST_LIBELF_LIBS) -,1,0)
- ifeq ($(has_libelf),1)
-objtool_target := tools/objtool FORCE
- else
+ifeq ($(has_libelf),1)
+ objtool_target := tools/objtool FORCE
+else
+ ifdef CONFIG_STACK_VALIDATION
SKIP_STACK_VALIDATION := 1
export SKIP_STACK_VALIDATION
endif
-endif
+endif # has_libelf
+endif # CONFIG_OBJTOOL_SUBCMDS
PHONY += prepare0
diff --git a/arch/Kconfig b/arch/Kconfig
index 8cc35dc556c7..4919412031eb 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -767,6 +767,29 @@ config HAVE_STACK_VALIDATION
Architecture supports the 'objtool check' host tool command, which
performs compile-time stack metadata validation.
+config OBJTOOL_SUBCMD_CHECK
+ bool
+ select OBJTOOL_SUBCMDS
+ help
+ Run the 'objtool check' host tool command, which
+ performs compile-time stack metadata validation.
+
+config OBJTOOL_SUBCMD_ORC
+ bool
+ select OBJTOOL_SUBCMDS
+ help
+ Run the 'objtool orc' host tool command, which collects information
+ enabling reliable runtime kernel stack traces.
+
+config OBJTOOL_SUBCMDS
+ bool
+ default n
+ help
+ Other configurations require running objtool host tool commands.
+ For example, stack validation is available on the architecture
+ (HAVE_STACK_VALIDATION=y) and has been enabled (STACK_VALIDATION=y)
+ which selects OBJTOOL_SUBCMD_CHECK and OBJTOOL_SUBCMDS
+
config HAVE_RELIABLE_STACKTRACE
bool
help
diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
index 0dd319e6e5b4..4f2d596505c1 100644
--- a/arch/x86/Kconfig.debug
+++ b/arch/x86/Kconfig.debug
@@ -241,6 +241,7 @@ config UNWINDER_ORC
bool "ORC unwinder"
depends on X86_64
select STACK_VALIDATION
+ select OBJTOOL_SUBCMD_ORC
help
This option enables the ORC (Oops Rewind Capability) unwinder for
unwinding kernel stack traces. It uses a custom data format which is
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index d74ac0fd6b2d..e38e6cb22aa5 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -386,6 +386,7 @@ config FRAME_POINTER
config STACK_VALIDATION
bool "Compile-time stack metadata validation"
depends on HAVE_STACK_VALIDATION
+ select OBJTOOL_SUBCMD_CHECK
default n
help
Add compile-time checks to validate stack metadata, including frame
diff --git a/tools/objtool/Makefile b/tools/objtool/Makefile
index 7770edcda3a0..aa0c6d3d2d46 100644
--- a/tools/objtool/Makefile
+++ b/tools/objtool/Makefile
@@ -1,6 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
include ../scripts/Makefile.include
include ../scripts/Makefile.arch
+include $(OUTPUT)/../../include/config/auto.conf
# always use the host compiler
ifneq ($(LLVM),)
@@ -47,8 +48,8 @@ CFLAGS += $(if $(elfshdr),,-DLIBELF_USE_DEPRECATED)
AWK = awk
-SUBCMD_CHECK := n
-SUBCMD_ORC := n
+SUBCMD_CHECK := $(CONFIG_OBJTOOL_SUBCMD_CHECK)
+SUBCMD_ORC := $(CONFIG_OBJTOOL_SUBCMD_ORC)
ifeq ($(SRCARCH),x86)
SUBCMD_CHECK := y
--
2.20.1
[RFC][PATCH v5 00/51] objtool: Make recordmcount a subcommand
rnel.org/lkml/20190802134712.2d8cc...@gandalf.local.home/
[6] https://lore.kernel.org/lkml/cover.1586468801.git.mhels...@vmware.com/
Matt Helsley (51):
objtool: Factor out reasons to build objtool
objtool: Prepare to merge recordmcount
objtool: Make recordmcount into mcount 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
objtool: mcount: Move nhdr into find_symtab()
objtool: mcount: Remove unused fname parameter
objtool: mcount: Use libelf for section header names
objtool: mcount: Walk objtool Elf structs in find_secsym_ndx
objtool: mcount: Use symbol structs to find mcount relocations
objtool: mcount: Walk relocation lists
objtool: mcount: Return symbol from mcountsym
objtool: mcount: Move get_mcountsym
objtool: mcount: Replace MIPS offset types
objtool: mcount: Move is_fake_mcount()
objtool: mcount: Stop using ehdr in find_section_sym_index
objtool: mcount: Move find_section_sym_index()
objtool: mcount: Restrict using ehdr in append_func()
objtool: mcount: Use objtool ELF to write
objtool: mcount: Move nop_mcount()
objtool: mcount: Move has_rel_mcount() and tot_relsize()
objtool: mcount: Move relocation entry size detection
objtool: mcount: Only keep ELF file size
objtool: mcount: Use ELF header from objtool
objtool: mcount: Remove unused file mapping
objtool: mcount: Reduce usage of _size wrapper
objtool: mcount: Move mcount_adjust out of wrapper
objtool: mcount: Pre-allocate new ELF sections
objtool: mcount: Generic location and relocation table types
objtool: mcount: Use objtool relocation section
objtool: mcount: Move sift_rel_mcount out of wrapper file
objtool: mcount: Remove wrapper for ELF relocation type
objtool: mcount: Remove wrapper double-include trick
objtool: mcount: Remove endian wrappers
objtool: mcount: Rename to mcount.c
objtool: mcount: Simplify mcount name matching
objtool: mcount: mcount symbol name simplification
objtool: mcount: Verify x86 instruction with memcmp()
objtool: mcount: const-ify ARM instruction patterns
objtool: mcount: Convert nop writes to elf_write_insn()
objtool: mcount: Move mcount symbol name testing
objtool: check: Use class to recognize kcov calls
objtool: mcount: Keep lists locations and relocations
objtool: mcount: Move mcount section test to objtool ELF
objtool: mcount: Flag mcount relocation sections
objtool: mcount: Merge section mcount flags
objtool: mcount: Eliminate first pass
objtool: mcount: Remove relocation size check
objtool: mcount: Remove useless lookup
objtool: mcount: Remove stale description
Documentation/dontdiff | 2 +-
Documentation/trace/ftrace-design.rst | 4 +-
Documentation/trace/ftrace.rst | 6 +-
Makefile | 39 +-
arch/Kconfig | 23 +
arch/arm64/include/asm/ftrace.h| 2 +-
arch/x86/Kconfig.debug | 1 +
arch/x86/include/asm/ftrace.h | 2 +-
kernel/trace/Kconfig | 9 +-
lib/Kconfig.debug | 1 +
scripts/.gitignore | 1 -
scripts/Makefile | 1 -
scripts/Makefile.build | 22 +-
scripts/recordmcount.c | 663
scripts/recordmcount.h | 692 -
scripts/sorttable.h| 2 +-
tools/objtool/.gitignore | 1 +
tools/objtool/Build| 2 +
tools/objtool/Makefile | 14 +-
tools/objtool/builtin-mcount.c | 50 ++
tools/objtool/builtin.h| 1 +
tools/objtool/check.c | 3 +-
tools/objtool/elf.c| 60 +-
tools/objtool/elf.h| 12 +-
tools/objtool/mcount.c | 596 ++
tools/objtool/objtool.c| 1 +
tools/objtool/objtool.h| 1 +
{scripts => tools/objtool}/recordmcount.pl | 0
tools/objtool/weak.c | 5 +
29 files changed, 806 insertions(+), 1410 deletions(-)
delete mode 100644 scripts/recordmcount.c
delete mode 100644 scripts/recordmcount.h
create mode 100644 tools/objtool/builtin-mcount.c
create mode 100644 tools/objtool/mcount.c
rename {scripts => tools/objtool}/recordmcount.pl (100%)
base-commit: 14bda4e5293ed9722f1dc39b543024e37707d6c6
prerequisite-patch-id: b9f6483185e4e80fccbb6ec7276bf61ce0329472
prerequisite-patch-id: 6d3fec64974cdce64fec35141ff71f0532cb8c82
prerequisite-patch-id: b71e084f3d2adeb4d05e4327183b75b388a20e6d
prerequisite-patch-id: 261f5d8102f4ecee86df2eb93be6a29495702717
prerequisite-patch-id: 64fa3e2f92e5dfd1b64289b4118288b6d2a25a67
pr
Re: [RFC][PATCH v4 18/32] objtool: mcount: Move nop_mcount()
On Fri, Jun 12, 2020 at 06:05:34PM +0200, Peter Zijlstra wrote:
> On Fri, Jun 12, 2020 at 03:26:57PM +0200, Peter Zijlstra wrote:
> > On Tue, Jun 02, 2020 at 12:50:11PM -0700, Matt Helsley wrote:
> > > +static int nop_mcount(struct section * const rels,
> > > + const char *const txtname)
> > > +{
> > > + struct reloc *reloc;
> > > + struct section *txts = find_section_by_index(lf, rels->sh.sh_info);
> > > + unsigned mcountsym = 0;
> > > + int once = 0;
> > > +
> > > + list_for_each_entry(reloc, >reloc_list, list) {
> > > + int ret = -1;
> > > +
> > > + if (!mcountsym)
> > > + mcountsym = get_mcountsym(reloc);
> > > +
> > > + if (mcountsym == GELF_R_INFO(reloc->sym->idx, reloc->type) &&
> > > !is_fake_mcount(reloc)) {
> >
> > This makes no sense to me; why not have mcountsym be a 'struct symbol
> > *' and have get_mcountsym() return one of those.
> >
> > if (reloc->sym == mcountsym && ... )
> >
> > is much nicer, no?
(this is already incorporated in my unposted revisions but...)
>
> On top of that, I suppose we can do something like the below.
>
> Then you can simply write:
>
> if (reloc->sym->class == SYM_MCOUNT && ..)
This looks like a good way to move towards a "single pass" through the ELF data
for mcount.
What order do you want to see this patch go in? Before this series (i.e. perhaps
just a kcov SYM_ class to start)? Early or late in this series? After?
Right now I'm thinking of putting this on the end of my series because
I'm focusing on converting recordmcount in the series and this isn't
strictly necessary but is definitely nicer.
>
> ---
>
> diff --git a/kernel/locking/Makefile b/kernel/locking/Makefile
> index 45452facff3b..94e4b8fcf9c1 100644
> --- a/kernel/locking/Makefile
> +++ b/kernel/locking/Makefile
> @@ -1,7 +1,7 @@
> # SPDX-License-Identifier: GPL-2.0
> # Any varying coverage in these files is non-deterministic
> # and is generally not a function of system call inputs.
> -KCOV_INSTRUMENT := n
> +# KCOV_INSTRUMENT:= n
>
> obj-y += mutex.o semaphore.o rwsem.o percpu-rwsem.o
>
> diff --git a/tools/objtool/elf.c b/tools/objtool/elf.c
> index 432417a83902..133c0c285be6 100644
> --- a/tools/objtool/elf.c
> +++ b/tools/objtool/elf.c
> @@ -341,6 +341,24 @@ static int read_sections(struct elf *elf)
> return 0;
> }
>
> +static bool is_mcount_symbol(const char *name)
> +{
> + if (name[0] == '.')
> + name++;
> +
> + if (name[0] == '_')
> + name++;
> +
> + return !strcmp(name, "mcount", 6) ||
Looks like you intended this to be a strncmp() but I don't see a reason to
use strncmp(). Am I missing something?
> +!strcmp(name, "_fentry__") ||
> +!strcmp(name, "_gnu_mcount_nc");
> +}
This mashes all of the arch-specific mcount name checks together. I
don't see a problem with that because I doubt there will be a collision
with other functions. Just to be careful I looked through the Clang and
GCC sources, though I only dug through the history of Clang's output --
GCC's history with respect to mcount symbol names across architectures is
much harder to trace so I only looked at the current sources.
(the rest looks good)
Cheers,
-Matt Helsley
[tip: objtool/core] objtool: Rename rela to reloc
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: f1974222634010486c1692e843af0ab11304dd2c
Gitweb:
https://git.kernel.org/tip/f1974222634010486c1692e843af0ab11304dd2c
Author:Matt Helsley
AuthorDate:Fri, 29 May 2020 14:01:13 -07:00
Committer: Josh Poimboeuf
CommitterDate: Mon, 01 Jun 2020 09:40:58 -05:00
objtool: Rename rela to reloc
Before supporting additional relocation types rename the relevant
types and functions from "rela" to "reloc". This work be done with
the following regex:
sed -e 's/struct rela/struct reloc/g' \
-e 's/\([_\*]\)rela\(s\{0,1\}\)/\1reloc\2/g' \
-e 's/tmprela\(s\{0,1\}\)/tmpreloc\1/g' \
-e 's/relasec/relocsec/g' \
-e 's/rela_list/reloc_list/g' \
-e 's/rela_hash/reloc_hash/g' \
-e 's/add_rela/add_reloc/g' \
-e 's/rela->/reloc->/g' \
-e '/rela[,\.]/{ s/\([^\.>]\)rela\([\.,]\)/\1reloc\2/g ; }' \
-e 's/rela =/reloc =/g' \
-e 's/relas =/relocs =/g' \
-e 's/relas\[/relocs[/g' \
-e 's/relaname =/relocname =/g' \
-e 's/= rela\;/= reloc\;/g' \
-e 's/= relas\;/= relocs\;/g' \
-e 's/= relaname\;/= relocname\;/g' \
-e 's/, rela)/, reloc)/g' \
-e 's/\([ @]\)rela\([ "]\)/\1reloc\2/g' \
-e 's/ rela$/ reloc/g' \
-e 's/, relaname/, relocname/g' \
-e 's/sec->rela/sec->reloc/g' \
-e 's/(\(!\{0,1\}\)rela/(\1reloc/g' \
-i \
arch.h \
arch/x86/decode.c \
check.c \
check.h \
elf.c \
elf.h \
orc_gen.c \
special.c
Notable exceptions which complicate the regex include gelf_*
library calls and standard/expected section names which still use
"rela" because they encode the type of relocation expected. Also, keep
"rela" in the struct because it encodes a specific type of relocation
we currently expect.
It will eventually turn into a member of an anonymous union when a
susequent patch adds implicit addend, or "rel", relocation support.
Signed-off-by: Matt Helsley
Signed-off-by: Josh Poimboeuf
---
tools/objtool/arch.h| 2 +-
tools/objtool/arch/x86/decode.c | 2 +-
tools/objtool/check.c | 196 +++
tools/objtool/check.h | 2 +-
tools/objtool/elf.c | 138 +++---
tools/objtool/elf.h | 22 +--
tools/objtool/orc_gen.c | 46 +++
tools/objtool/special.c | 28 ++--
8 files changed, 218 insertions(+), 218 deletions(-)
diff --git a/tools/objtool/arch.h b/tools/objtool/arch.h
index eda15a5..d0969a9 100644
--- a/tools/objtool/arch.h
+++ b/tools/objtool/arch.h
@@ -82,6 +82,6 @@ bool arch_callee_saved_reg(unsigned char reg);
unsigned long arch_jump_destination(struct instruction *insn);
-unsigned long arch_dest_rela_offset(int addend);
+unsigned long arch_dest_reloc_offset(int addend);
#endif /* _ARCH_H */
diff --git a/tools/objtool/arch/x86/decode.c b/tools/objtool/arch/x86/decode.c
index 4b504fc..fe83d4c 100644
--- a/tools/objtool/arch/x86/decode.c
+++ b/tools/objtool/arch/x86/decode.c
@@ -67,7 +67,7 @@ bool arch_callee_saved_reg(unsigned char reg)
}
}
-unsigned long arch_dest_rela_offset(int addend)
+unsigned long arch_dest_reloc_offset(int addend)
{
return addend + 4;
}
diff --git a/tools/objtool/check.c b/tools/objtool/check.c
index 63d65a7..28ce311 100644
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@ -352,7 +352,7 @@ static struct instruction *find_last_insn(struct
objtool_file *file,
static int add_dead_ends(struct objtool_file *file)
{
struct section *sec;
- struct rela *rela;
+ struct reloc *reloc;
struct instruction *insn;
/*
@@ -370,24 +370,24 @@ static int add_dead_ends(struct objtool_file *file)
if (!sec)
goto reachable;
- list_for_each_entry(rela, >rela_list, list) {
- if (rela->sym->type != STT_SECTION) {
+ list_for_each_entry(reloc, >reloc_list, list) {
+ if (reloc->sym->type != STT_SECTION) {
WARN("unexpected relocation symbol type in %s",
sec->name);
return -1;
}
- insn = find_insn(file, rela->sym->sec, rela->addend);
+ insn = find_insn(file, reloc->sym->sec, reloc->addend);
if (insn)
insn = list_prev_entry(insn, list);
- else if (rela->addend == rela->sym->sec->len) {
- insn = find_last_insn(file, rela->sym->sec);
+ else if (reloc->addend == reloc->sym->sec->len) {
+ insn = find_last_insn(file, reloc->sym->sec);
if (!insn) {
WARN("can't find unreachable insn
[tip: objtool/core] objtool: Add support for relocations without addends
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: fb414783b65c880606fbc1463e6849f017e60d46
Gitweb:
https://git.kernel.org/tip/fb414783b65c880606fbc1463e6849f017e60d46
Author:Matt Helsley
AuthorDate:Fri, 29 May 2020 14:01:14 -07:00
Committer: Josh Poimboeuf
CommitterDate: Tue, 02 Jun 2020 15:37:04 -05:00
objtool: Add support for relocations without addends
Currently objtool only collects information about relocations with
addends. In recordmcount, which we are about to merge into objtool,
some supported architectures do not use rela relocations.
Signed-off-by: Matt Helsley
Reviewed-by: Julien Thierry
Reviewed-by: Kamalesh Babulal
Signed-off-by: Josh Poimboeuf
---
tools/objtool/elf.c | 145 ++-
tools/objtool/elf.h | 7 +-
tools/objtool/orc_gen.c | 2 +-
3 files changed, 134 insertions(+), 20 deletions(-)
diff --git a/tools/objtool/elf.c b/tools/objtool/elf.c
index 3160931..95d86bc 100644
--- a/tools/objtool/elf.c
+++ b/tools/objtool/elf.c
@@ -496,6 +496,32 @@ void elf_add_reloc(struct elf *elf, struct reloc *reloc)
elf_hash_add(elf->reloc_hash, >hash, reloc_hash(reloc));
}
+static int read_rel_reloc(struct section *sec, int i, struct reloc *reloc,
unsigned int *symndx)
+{
+ if (!gelf_getrel(sec->data, i, >rel)) {
+ WARN_ELF("gelf_getrel");
+ return -1;
+ }
+ reloc->type = GELF_R_TYPE(reloc->rel.r_info);
+ reloc->addend = 0;
+ reloc->offset = reloc->rel.r_offset;
+ *symndx = GELF_R_SYM(reloc->rel.r_info);
+ return 0;
+}
+
+static int read_rela_reloc(struct section *sec, int i, struct reloc *reloc,
unsigned int *symndx)
+{
+ if (!gelf_getrela(sec->data, i, >rela)) {
+ WARN_ELF("gelf_getrela");
+ return -1;
+ }
+ reloc->type = GELF_R_TYPE(reloc->rela.r_info);
+ reloc->addend = reloc->rela.r_addend;
+ reloc->offset = reloc->rela.r_offset;
+ *symndx = GELF_R_SYM(reloc->rela.r_info);
+ return 0;
+}
+
static int read_relocs(struct elf *elf)
{
struct section *sec;
@@ -505,7 +531,8 @@ static int read_relocs(struct elf *elf)
unsigned long nr_reloc, max_reloc = 0, tot_reloc = 0;
list_for_each_entry(sec, >sections, list) {
- if (sec->sh.sh_type != SHT_RELA)
+ if ((sec->sh.sh_type != SHT_RELA) &&
+ (sec->sh.sh_type != SHT_REL))
continue;
sec->base = find_section_by_index(elf, sec->sh.sh_info);
@@ -525,16 +552,17 @@ static int read_relocs(struct elf *elf)
return -1;
}
memset(reloc, 0, sizeof(*reloc));
-
- if (!gelf_getrela(sec->data, i, >rela)) {
- WARN_ELF("gelf_getrela");
- return -1;
+ switch (sec->sh.sh_type) {
+ case SHT_REL:
+ if (read_rel_reloc(sec, i, reloc, ))
+ return -1;
+ break;
+ case SHT_RELA:
+ if (read_rela_reloc(sec, i, reloc, ))
+ return -1;
+ break;
+ default: return -1;
}
-
- reloc->type = GELF_R_TYPE(reloc->rela.r_info);
- reloc->addend = reloc->rela.r_addend;
- reloc->offset = reloc->rela.r_offset;
- symndx = GELF_R_SYM(reloc->rela.r_info);
reloc->sym = find_symbol_by_index(elf, symndx);
reloc->sec = sec;
if (!reloc->sym) {
@@ -722,7 +750,37 @@ struct section *elf_create_section(struct elf *elf, const
char *name,
return sec;
}
-struct section *elf_create_reloc_section(struct elf *elf, struct section *base)
+static struct section *elf_create_rel_reloc_section(struct elf *elf, struct
section *base)
+{
+ char *relocname;
+ struct section *sec;
+
+ relocname = malloc(strlen(base->name) + strlen(".rel") + 1);
+ if (!relocname) {
+ perror("malloc");
+ return NULL;
+ }
+ strcpy(relocname, ".rel");
+ strcat(relocname, base->name);
+
+ sec = elf_create_section(elf, relocname, sizeof(GElf_Rel), 0);
+ free(relocname);
+ if (!sec)
+ return NULL;
+
+ base->reloc = sec;
+ sec->base = base;
+
+ sec->sh.sh_type = SHT_REL;
+ sec->sh.sh_addralign = 8;
+ sec->sh.sh_link =
Re: [RFC][PATCH 2/3] objtool: Provide elf_write_{insn,reloc}()
On Tue, Jun 16, 2020 at 11:12:53AM +0200, Peter Zijlstra wrote:
> On Fri, Jun 12, 2020 at 04:30:36PM +0200, Peter Zijlstra wrote:
> > +int elf_write_insn(struct elf *elf, struct section *sec,
> > + unsigned long offset, unsigned int len,
> > + const char *insn)
> > +{
> > + Elf_Data *data = sec->data;
> > +
> > + if (data->d_type != ELF_T_BYTE || data->d_off) {
> > + WARN("write to unexpected data for section: %s", sec->name);
> > + return -1;
> > + }
> > +
> > + memcpy(data->d_buf + offset, insn, len);
> > + elf_flagdata(data, ELF_C_SET, ELF_F_DIRTY);
> > +
> > + sec->changed = true;
> > + elf->changed = true;
> > +
> > + return 0;
> > +}
> > +
> > +int elf_write_reloc(struct elf *elf, struct reloc *reloc)
> > +{
> > + struct section *sec = reloc->sec;
> > +
> > + if (sec->sh.sh_type == SHT_REL) {
> > + reloc->rel.r_info = GELF_R_INFO(reloc->sym->idx, reloc->type);
> > + reloc->rel.r_offset = reloc->offset;
> > +
> > + if (!gelf_update_rel(sec->data, reloc->idx, >rel)) {
> > + WARN_ELF("gelf_update_rel");
> > + return -1;
> > + }
> > + } else {
> > + reloc->rela.r_info = GELF_R_INFO(reloc->sym->idx, reloc->type);
> > + reloc->rela.r_addend = reloc->addend;
> > + reloc->rela.r_offset = reloc->offset;
> > +
> > + if (!gelf_update_rela(sec->data, reloc->idx, >rela)) {
> > + WARN_ELF("gelf_update_rela");
> > + return -1;
> > + }
> > + }
> > +
> > + sec->changed = true;
> > + elf->changed = true;
> > +
> > + return 0;
> > +}
>
> Doing the change Matt asked for #1, I realized that sec->changed is only
> required if we need to rewrite the section header, neither of these two
> changes requires that, they already mark the elf data dirty so
> elf_update() DTRT.
This is really useful information.
As long as you're adding the elf->changed flag it might make sense to add this
as a comment in the struct section definition or even rename sec->changed
to reflect this (e.g. sec->shdr_changed).
Cheers,
-Matt Helsley
Re: [RFC][PATCH 1/3] objtool: Clean up elf_write() condition
On Fri, Jun 12, 2020 at 04:30:35PM +0200, Peter Zijlstra wrote:
> With there being multiple ways to change the ELF data, let's more
> concisely track modification.
>
> Signed-off-by: Peter Zijlstra (Intel)
Would it make sense to set the relocation section's "changed" flag in
addition to the elf struct's changed flag in elf_rebuild_reloc_section()?
Right now I think the code is assuming that it's a newly created section
but it would be more defensive to set it during a rebuild too I think.
Otherwise looks good to me.
> ---
> tools/objtool/check.c |2 ++
> tools/objtool/elf.c |8 +++-
> tools/objtool/elf.h |3 ++-
> 3 files changed, 11 insertions(+), 2 deletions(-)
>
> --- a/tools/objtool/check.c
> +++ b/tools/objtool/check.c
> @@ -2779,7 +2779,9 @@ int check(const char *_objname, bool orc
> ret = create_orc_sections();
> if (ret < 0)
> goto out;
> + }
>
> + if (file.elf->changed) {
> ret = elf_write(file.elf);
> if (ret < 0)
> goto out;
> --- a/tools/objtool/elf.c
> +++ b/tools/objtool/elf.c
> @@ -746,6 +746,8 @@ struct section *elf_create_section(struc
> elf_hash_add(elf->section_hash, >hash, sec->idx);
> elf_hash_add(elf->section_name_hash, >name_hash,
> str_hash(sec->name));
>
> + elf->changed = true;
> +
> return sec;
> }
>
> @@ -862,7 +864,7 @@ int elf_rebuild_reloc_section(struct sec
> return elf_rebuild_rela_section(sec, nr);
> }
>
> -int elf_write(const struct elf *elf)
> +int elf_write(struct elf *elf)
> {
> struct section *sec;
> Elf_Scn *s;
> @@ -879,6 +881,8 @@ int elf_write(const struct elf *elf)
> WARN_ELF("gelf_update_shdr");
> return -1;
> }
> +
> + sec->changed = false;
> }
> }
>
> @@ -891,6 +895,8 @@ int elf_write(const struct elf *elf)
> return -1;
> }
>
> + elf->changed = false;
> +
> return 0;
> }
>
> --- a/tools/objtool/elf.h
> +++ b/tools/objtool/elf.h
> @@ -79,6 +79,7 @@ struct elf {
> Elf *elf;
> GElf_Ehdr ehdr;
> int fd;
> + bool changed;
> char *name;
> struct list_head sections;
> DECLARE_HASHTABLE(symbol_hash, ELF_HASH_BITS);
> @@ -121,7 +122,7 @@ struct elf *elf_open_read(const char *na
> struct section *elf_create_section(struct elf *elf, const char *name, size_t
> entsize, int nr);
> struct section *elf_create_reloc_section(struct elf *elf, struct section
> *base, int reltype);
> void elf_add_reloc(struct elf *elf, struct reloc *reloc);
> -int elf_write(const struct elf *elf);
> +int elf_write(struct elf *elf);
> void elf_close(struct elf *elf);
>
> struct section *find_section_by_name(const struct elf *elf, const char
> *name);
>
>
Re: [RFC][PATCH 0/3] objtool: KCOV vs noinstr
On Fri, Jun 12, 2020 at 04:30:34PM +0200, Peter Zijlstra wrote: > Hi All, > > These patches go on top of objtool/core, although possibly we need them > earlier. > > In order to solve the KCOV-vs-noinstr situation, we need objtool to rewrite > calls to __sanitizer_cov_*() into NOPs, similar to what recordmcount does. > > I'm hoping the pending objtool-recordmcount patches can also reuse some of > this. This sounds great to me -- I'll have a look through your series and will try rebasing my work on this. Cheers, -Matt Helsley
Re: [RFC][PATCH v4 18/32] objtool: mcount: Move nop_mcount()
On Fri, Jun 12, 2020 at 03:26:56PM +0200, Peter Zijlstra wrote:
> On Tue, Jun 02, 2020 at 12:50:11PM -0700, Matt Helsley wrote:
> > +static int nop_mcount(struct section * const rels,
> > + const char *const txtname)
> > +{
> > + struct reloc *reloc;
> > + struct section *txts = find_section_by_index(lf, rels->sh.sh_info);
> > + unsigned mcountsym = 0;
> > + int once = 0;
> > +
> > + list_for_each_entry(reloc, >reloc_list, list) {
> > + int ret = -1;
> > +
> > + if (!mcountsym)
> > + mcountsym = get_mcountsym(reloc);
> > +
> > + if (mcountsym == GELF_R_INFO(reloc->sym->idx, reloc->type) &&
> > !is_fake_mcount(reloc)) {
>
> This makes no sense to me; why not have mcountsym be a 'struct symbol
> *' and have get_mcountsym() return one of those.
>
> if (reloc->sym == mcountsym && ... )
>
> is much nicer, no?
Indeed! I'll change it from returning an unsigned long to struct symbol *
before I
move it out of the wrapper code.
>
> > + if (make_nop) {
> > + ret = make_nop(txts, reloc->offset);
> > + if (ret < 0)
> > + return -1;
> > + }
> > + if (warn_on_notrace_sect && !once) {
> > + printf("Section %s has mcount callers being
> > ignored\n",
> > + txtname);
> > + once = 1;
> > + /* just warn? */
> > + if (!make_nop)
> > + return 0;
> > + }
> > + }
> > +
> > + /*
> > +* If we successfully removed the mcount, mark the relocation
> > +* as a nop (don't do anything with it).
> > +*/
> > + if (!ret) {
> > + reloc->type = rel_type_nop;
> > + rels->changed = true;
>
> I have an elf_write_rela(), I'll make sure to Cc you.
Thanks! I might also make use of your patch to rewrite instructions. We
need a way to turn certain prologue instructions into nops. Would it be
more widely useful to move that functionality out of mcount and into
the objtool ELF/per-arch code or do you think it's better inside the
mcount subcommand code?
Cheers,
-Matt
Re: [PATCH] capabilities: Introduce CAP_RESTORE
; Cleaning up...
>
> For the clone3() based approach:
> $ cat clone3_set_tid.c
> #define _GNU_SOURCE
> #include
> #include
> #include
> #include
> #include
> #include
> #include
> #include
> #include
>
> #define ptr_to_u64(ptr) ((__u64)((uintptr_t)(ptr)))
>
> int main(int argc, char *argv[])
> {
> struct clone_args c_args = { };
> pid_t pid, new_pid;
>
> if (argc != 2)
> return 1;
>
> pid = atoi(argv[1]);
> c_args.set_tid = ptr_to_u64();
> c_args.set_tid_size = 1;
>
> printf("Forking...\n");
> new_pid = syscall(__NR_clone3, _args, sizeof(c_args));
(Note: I'm going to call the capability CAP_RESTORE but I think this
applies regardless of whether the permissions stay with CAP_SYS_ADMIN..)
I haven't fully reviewed the discussion of the security consequences but
my sense is this would require retaining CAP_RESTORE down the entire tree
of processes being restored so each parent could call clone3() with the
correct pid value for its child(ren).
Ideally you would drop CAP_RESTORE sooner -- preferrably only one
process would need it. I think you could do that by changing what you pass
down; instead of passing down a capability and a pid number, pass down a
special "reservation" pidfd:
1. Have CAP_RESTORE enable opening a pidfd with the desired pid as a
reservation for the pid (i.e. can't use it to signal, wait, ...
perhaps these return -EBUSY, -EAGAIN or something...).
2. Only one process needs CAP_RESTORE -- it can drop CAP_RESTORE after
reserving all of the pids but before kicking off the clone3() calls
to recreate all of the tasks.
3. Pass the pidfd down the tree of restoring processes. Note how the
set of specific pids to be created is limited at this point --
the software cannot be tricked into recreating processes other pids
using a capability, CAP_RESTORE, it doesn't have. You might even set a
flag on the pidfd which closes the pidfd in the sender when it's passed
over a socket so that only the appropriate processes retain the pidfd.
4. The parent can then pass the *reserved* pidfd into clone3(). The
reserved pidfd seamlessly turns into a pidfd reference to the child if
clone3() succeeds. If it fails the eservation is still consumed -- a
given pidfd reserved for clone3() can only be passed to clone3() and
succeed once.
Perhaps this scheme could concentrate the need for CAP_SYS_ADMIN
to one process so maybe it would obviate the need for CAP_RESTORE.
That said, perhaps there's something that prevents implementing such
a pidfd or perhaps I have misunderstood what CRIU is doing and this
pidfd idea isn't workable.
Cheers,
-Matt Helsley
Re: [RFC][PATCH v4 02/32] objtool: Make recordmcount into mcount subcmd
On Tue, Jun 09, 2020 at 02:52:07PM -0400, Steven Rostedt wrote: > On Tue, 9 Jun 2020 11:39:51 -0700 > Matt Helsley wrote: > > > > > +ifeq ($(SRCARCH),sparc) > > > > + SUBCMD_MCOUNT := y > > > > > > Is there some arch for which MCOUNT is not supported? If not you could > > > just > > > have MCOUNT default to 'y' and avoid adding all those tests (or maybe > > > reduce > > > the numbers and set to 'n' only for arches not supporting it). > > > > Yes, there are some which it does not support. For those architectures > > we keep recordmcount.pl around. > > > > It occured to me that with your suggestion to use more CONFIG_ variables > > we could eliminate this pattern and replace it with these pseudo-patches: > > > > +++ b/kernel/trace/Kconfig > > > > +config OBJTOOL_SUBCMD_MCOUNT > > + bool > > + depends on HAVE_C_RECORDMCOUNT > > + select OBJTOOL_SUBCMDS > > + help > > + Record mcount call locations using objtool > > > > and then change the Makefiles to use the CONFIG_ variables > > rather than have one ifeq block per arch: > > > > +++ b/tools/objtool/Makefile > > > > +SUBCMD_MCOUNT := $(CONFIG_OBJTOOL_SUBCMD_MCOUNT) > > If you can make this work, this is definitely the way to go. I think I can so I'll give it a go! Cheers, -Matt Helsley
Re: [RFC][PATCH v4 02/32] objtool: Make recordmcount into mcount subcmd
On Tue, Jun 09, 2020 at 10:00:59AM +0100, Julien Thierry wrote: > Hi Matt, > > On 6/2/20 8:49 PM, Matt Helsley wrote: > > Rather than a standalone executable merge recordmcount as a sub command > > of objtool. This is a small step towards cleaning up recordmcount and > > eventually sharing 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. > > > > Signed-off-by: Matt Helsley > > --- ... > > diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig > > index 743647005f64..ae74647b06fa 100644 > > --- a/kernel/trace/Kconfig > > +++ b/kernel/trace/Kconfig > > @@ -59,7 +59,7 @@ config HAVE_NOP_MCOUNT > > config HAVE_C_RECORDMCOUNT > > bool > > help > > - C version of recordmcount available? > > + C version of objtool mcount available? > > The "C version" doesn't make much sense here. "Objtool mcount available?" or > "mcount subcommand of objtool available?" perhaps? Agreed, "C version" is nonsense at this point. Looking at the other HAVE_* help messages in that Kconfig suggests: Arch supports objtool mcount subcommand So I've changed it to that. > > diff --git a/tools/objtool/Makefile b/tools/objtool/Makefile > > index 285474a77fe9..ffef73f7f47e 100644 > > --- a/tools/objtool/Makefile > > +++ b/tools/objtool/Makefile > > @@ -31,12 +31,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,13 +49,47 @@ AWK = awk > > SUBCMD_CHECK := n > > SUBCMD_ORC := n > > +SUBCMD_MCOUNT := n > > ifeq ($(SRCARCH),x86) > > SUBCMD_CHECK := y > > SUBCMD_ORC := y > > + SUBCMD_MCOUNT := y > > +endif > > + > > +ifeq ($(SRCARCH),arm) > > + SUBCMD_MCOUNT := y > > +endif > > + > > +ifeq ($(SRCARCH),arm64) > > + SUBCMD_MCOUNT := y > > +endif > > + > > +ifeq ($(SRCARCH),ia64) > > + SUBCMD_MCOUNT := y > > +endif > > + > > +ifeq ($(SRCARCH),mips) > > + SUBCMD_MCOUNT := y > > +endif > > + > > +ifeq ($(SRCARCH),powerpc) > > + SUBCMD_MCOUNT := y > > +endif > > + > > +ifeq ($(SRCARCH),s390) > > + SUBCMD_MCOUNT := y > > +endif > > + > > +ifeq ($(SRCARCH),sh) > > + SUBCMD_MCOUNT := y > > +endif > > + > > +ifeq ($(SRCARCH),sparc) > > + SUBCMD_MCOUNT := y > > Is there some arch for which MCOUNT is not supported? If not you could just > have MCOUNT default to 'y' and avoid adding all those tests (or maybe reduce > the numbers and set to 'n' only for arches not supporting it). Yes, there are some which it does not support. For those architectures we keep recordmcount.pl around. It occured to me that with your suggestion to use more CONFIG_ variables we could eliminate this pattern and replace it with these pseudo-patches: +++ b/kernel/trace/Kconfig +config OBJTOOL_SUBCMD_MCOUNT + bool + depends on HAVE_C_RECORDMCOUNT + select OBJTOOL_SUBCMDS + help + Record mcount call locations using objtool and then change the Makefiles to use the CONFIG_ variables rather than have one ifeq block per arch: +++ b/tools/objtool/Makefile +SUBCMD_MCOUNT := $(CONFIG_OBJTOOL_SUBCMD_MCOUNT) Does this seem like a good use of CONFIG_ variables or is it going too far? I haven't changed to this pattern just yet -- I'm hoping you and Josh or Peter might weigh in with your
Re: [RFC][PATCH v4 27/32] objtool: mcount: Generic location and relocation table types
On Tue, Jun 09, 2020 at 12:11:55PM +0530, Kamalesh Babulal wrote:
> On 6/3/20 1:20 AM, Matt Helsley wrote:
> > Rather than building the exact ELF section data we need and
> > avoiding libelf's conversion step, use more GElf types
> > and then libelf's elfxx_xlatetof() functions to convert
> > the mcount locations (GElf_Addr) and associated relocations.
> >
> > This converts sift_rel_mcount() so that it doesn't use the
> > recordmcount wrapper. The next patch will move it out of the
> > wrapper.
> >
> > Signed-off-by: Matt Helsley
> > ---
> > tools/objtool/recordmcount.c | 44 +++--
> > tools/objtool/recordmcount.h | 120 ++-
> > 2 files changed, 59 insertions(+), 105 deletions(-)
> >
> > diff --git a/tools/objtool/recordmcount.c b/tools/objtool/recordmcount.c
> > index 06a8f8ddefa7..ef3c360a3db9 100644
> > --- a/tools/objtool/recordmcount.c
> > +++ b/tools/objtool/recordmcount.c
>
> [...]
>
> > -static uint_t *sift_rel_mcount(uint_t *mlocp,
> > - unsigned const offbase,
> > - Elf_Rel **const mrelpp,
> > +static void sift_rel_mcount(GElf_Addr **mlocpp,
> > + GElf_Sxword *r_offsetp,
> > + void **const mrelpp,
> >const struct section * const rels,
> >unsigned const recsym_index,
> >unsigned long const recval,
> > - unsigned const reltype)
> > + unsigned const reltype,
> > + bool is_rela)
> > {
> > - uint_t *const mloc0 = mlocp;
> > - Elf_Rel *mrelp = *mrelpp;
> > - unsigned int rel_entsize = rels->sh.sh_entsize;
> > - unsigned mcountsym = 0;
> > + GElf_Rel *mrelp = *mrelpp;
> > + GElf_Rela *mrelap = *mrelpp;
> > + unsigned int mcount_sym_info = 0;
> > struct reloc *reloc;
> >
> > list_for_each_entry(reloc, >reloc_list, list) {
> > - if (!mcountsym)
> > - mcountsym = get_mcountsym(reloc);
> > -
> > - if (mcountsym == GELF_R_INFO(reloc->sym->idx, reloc->type) &&
> > !is_fake_mcount(reloc)) {
> > - uint_t const addend =
> > - _w(reloc->offset - recval + mcount_adjust);
> > - mrelp->r_offset = _w(offbase
> > - + ((void *)mlocp - (void *)mloc0));
> > - Elf_r_info(mrelp, recsym_index, reltype);
> > - if (rel_entsize == sizeof(Elf_Rela)) {
> > - ((Elf_Rela *)mrelp)->r_addend = addend;
> > - *mlocp++ = 0;
> > - } else
> > - *mlocp++ = addend;
> > -
> > - mrelp = (Elf_Rel *)(rel_entsize + (void *)mrelp);
> > + unsigned long addend;
> > +
> > + if (!mcount_sym_info)
> > + mcount_sym_info = get_mcount_sym_info(reloc);
> > +
> > + if (mcount_sym_info != GELF_R_INFO(reloc->sym->idx,
> > reloc->type) || is_fake_mcount(reloc))
> > + continue;
>
> Hi Matt,
>
> I was trying out the patch series on ppc64le and found that __mcount_loc
> and .rela__mcount_loc section pairs do not get generated.
>
> # readelf -S fs/proc/cmdline.o|grep mcount
> #
>
> Debugged the cause to get_mcountsym()'s return type. It returns reloc
> type from GELF_R_INFO() and expects Elf64_Xword a.k.a unsigned long
> to be the return type but get_mcountsym() returns unsigned int on 64-bit.
>
> On power the _mcount is of relocation type R_PPC64_REL24 (info 0x17000a),
> using unsigned int truncates the value to 0xa and fails the above check.
> Using below fix, that converts mcount_sym_info to use unsigned long, generates
> the __mcount_loc section pairs.
>
> --- a/tools/objtool/mcount.c
> +++ b/tools/objtool/mcount.c
> @@ -163,7 +163,7 @@ static int is_mcounted_section_name(char const *const
> txtname)
> strcmp(".cpuidle.text", txtname) == 0;
> }
>
> -static unsigned int get_mcount_sym_info(struct reloc *reloc)
> +static unsigned long get_mcount_sym_info(struct reloc *reloc)
> {
> struct symbol *sym = reloc->sym;
> char const *symname = sym->name;
> @@ -274,7 +274,7 @@ static int nop_mcount(struct section * const rels,
> {
> struct reloc *reloc;
> struct section *txts =
Re: [RFC][PATCH v4 01/32] objtool: Prepare to merge recordmcount
On Tue, Jun 09, 2020 at 09:54:33AM +0100, Julien Thierry wrote:
> Hi Matt,
>
> On 6/2/20 8:49 PM, Matt Helsley wrote:
> > 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
> > diff --git a/Makefile b/Makefile
> > index 04f5662ae61a..d353a0a65a71 100644
> > --- a/Makefile
> > +++ b/Makefile
> > @@ -844,6 +844,7 @@ ifdef CONFIG_DYNAMIC_FTRACE
> > ifdef CONFIG_HAVE_C_RECORDMCOUNT
> > BUILD_C_RECORDMCOUNT := y
> > export BUILD_C_RECORDMCOUNT
> > + objtool_target := tools/objtool FORCE
> > endif
> > endif
> > endif
> > @@ -1023,10 +1024,10 @@ endif
> > export mod_sign_cmd
> > HOST_LIBELF_LIBS = $(shell pkg-config libelf --libs 2>/dev/null || echo
> > -lelf)
> > +has_libelf := $(call try-run,\
> > + echo "int main() {}" | $(HOSTCC) -xc -o /dev/null
> > $(HOST_LIBELF_LIBS) -,1,0)
>
> Maybe there could be some build dependency, e.g. CONFIG_OBJTOOL_SUBCMDS that
> sets the "objtool_target" and "has_libelf" when selected.
>
> Then the CONFIG_UNWINDER_ORC, RECORD_MCOUNT and STACK_VALIDATION would just
> had to select that config option.
That might save a good amount of control flow in the Makefiles.
We could take it one step further and have specific CONFIG_OBJTOOL_
which might help us remove the per-architecture control-flow in
the multi-arch subcmd support found in tools/objtool/Makefile.
What do folks think of that -- too far?
>
> > ifdef CONFIG_STACK_VALIDATION
> > - has_libelf := $(call try-run,\
> > - echo "int main() {}" | $(HOSTCC) -xc -o /dev/null
> > $(HOST_LIBELF_LIBS) -,1,0)
> > ifeq ($(has_libelf),1)
> > objtool_target := tools/objtool FORCE
> > else
> > @@ -1163,13 +1164,15 @@ uapi-asm-generic:
> > PHONY += prepare-objtool
> > prepare-objtool: $(objtool_target)
> > -ifeq ($(SKIP_STACK_VALIDATION),1)
> > -ifdef CONFIG_UNWINDER_ORC
> > +ifneq ($(has_libelf),1)
> > + ifdef CONFIG_UNWINDER_ORC
> > @echo "error: Cannot generate ORC metadata for CONFIG_UNWINDER_ORC=y,
> > please install libelf-dev, libelf-devel or elfutils-libelf-devel" >&2
> > @false
> > -else
> > + else
> > +ifeq ($(SKIP_STACK_VALIDATION),1)
> > @echo "warning: Cannot use CONFIG_STACK_VALIDATION=y, please install
> > libelf-dev, libelf-devel or elfutils-libelf-devel" >&2
>
>
> I think this would be more readable without the else branch:
>
> ifneq ($(has_libelf),1)
> ifdef
>
Note: error not warn
> endif
> ifdef
>
> endif
> <...>
> endif
I think the next patch, which makes recordmcount a subcmd, makes it a
little clearer what the pattern is because it adds another ifdef block
in the way you suggest.
As for the else around the SKIP_STACK_VALIDATION check -- it is special
in a couple ways -- at least as best I can tell.
It's not a CONFIG_* -- it actually breaks the normal pattern with
CONFIG_* in that..
It's about a judgement call that it's OK to merely warn and skip the
stack validation rather than produce an error. The other, CONFIG_*
blocks produce errors.
These two reasons are why I think it makes sense to keep the logic
distinct with the "else".
Cheers,
-Matt Helsley
Re: [PATCH v2 2/4] objtool: Move orc outside of check
On Mon, Jun 08, 2020 at 08:12:01AM +0100, Julien Thierry wrote: > Now that the objtool_file can be obtained outside of the check function, > orc generation builtin no longer requires check to explicitly call its > orc related functions. > > Signed-off-by: Julien Thierry Reviewed-by: Matt Helsley > --- > tools/objtool/builtin-check.c | 2 +- > tools/objtool/builtin-orc.c | 18 +- > tools/objtool/check.c | 16 +--- > tools/objtool/objtool.h | 2 +- > tools/objtool/weak.c | 2 +- > 5 files changed, 21 insertions(+), 19 deletions(-)
Re: [PATCH v2 1/4] objtool: Move object file loading out of check
On Mon, Jun 08, 2020 at 08:12:00AM +0100, Julien Thierry wrote: > Structure objtool_file can be used by different subcommands. In fact > it already is, by check and orc. > > Provide a function that allows to initialize objtool_file, that builtin > can call, without relying on check to do the correct setup for them and > explicitly hand the objtool_file to them. > > Signed-off-by: Julien Thierry Reviewed-by: Matt Helsley > --- > tools/objtool/builtin-check.c | 7 ++- > tools/objtool/builtin-orc.c | 8 +++- > tools/objtool/check.c | 37 +++ > tools/objtool/objtool.c | 29 +++ > tools/objtool/objtool.h | 4 +++- > tools/objtool/weak.c | 4 +--- > 6 files changed, 57 insertions(+), 32 deletions(-)
[RFC][PATCH v4 29/32] objtool: mcount: Remove wrapper for ELF relocation type
Remove the last use of the Elf_Rela wrapper by passing the
size of the relocations we're dealing with as a parameter.
Signed-off-by: Matt Helsley
---
tools/objtool/recordmcount.c | 4 ++--
tools/objtool/recordmcount.h | 7 ++-
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/tools/objtool/recordmcount.c b/tools/objtool/recordmcount.c
index 601be2504666..096507829b0c 100644
--- a/tools/objtool/recordmcount.c
+++ b/tools/objtool/recordmcount.c
@@ -574,7 +574,7 @@ static int do_file(char const *const fname)
is_fake_mcount = MIPS_is_fake_mcount;
}
loc_size = 4;
- rc = do32(reltype);
+ rc = do32(reltype, sizeof(Elf32_Rela));
break;
case ELFCLASS64: {
if (lf->ehdr.e_ehsize != sizeof(Elf64_Ehdr)
@@ -592,7 +592,7 @@ static int do_file(char const *const fname)
is_fake_mcount = MIPS_is_fake_mcount;
}
loc_size = 8;
- rc = do64(reltype);
+ rc = do64(reltype, sizeof(Elf64_Rela));
break;
}
} /* end switch */
diff --git a/tools/objtool/recordmcount.h b/tools/objtool/recordmcount.h
index f12189331e27..50104d52d9bf 100644
--- a/tools/objtool/recordmcount.h
+++ b/tools/objtool/recordmcount.h
@@ -18,19 +18,16 @@
* Copyright 2010 Steven Rostedt , Red Hat Inc.
*/
#undef do_func
-#undef Elf_Rela
#ifdef RECORD_MCOUNT_64
# define do_func do64
-# define Elf_Rela Elf64_Rela
#else
# define do_func do32
-# define Elf_Rela Elf32_Rela
#endif
/* Overall supervision for Elf32 ET_REL file. */
-static int do_func(unsigned const reltype)
+static int do_func(unsigned const reltype, size_t rela_size)
{
/* Upper bound on space: assume all relevant relocs are for mcount. */
unsigned totrelsz;
@@ -71,7 +68,7 @@ static int do_func(unsigned const reltype)
return -1;
}
- is_rela = (sizeof(Elf_Rela) == rel_entsize);
+ is_rela = (rela_size == rel_entsize);
mc_name = is_rela
? ".rela__mcount_loc"
: ".rel__mcount_loc";
--
2.20.1
[RFC][PATCH v4 04/32] objtool: recordmcount: Search for __mcount_loc before walking the sections
recordmcount 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.
Signed-off-by: Matt Helsley
---
tools/objtool/recordmcount.c | 4
tools/objtool/recordmcount.h | 17 +++--
2 files changed, 3 insertions(+), 18 deletions(-)
diff --git a/tools/objtool/recordmcount.c b/tools/objtool/recordmcount.c
index b2c606eb269b..f585bf7f45f5 100644
--- a/tools/objtool/recordmcount.c
+++ b/tools/objtool/recordmcount.c
@@ -208,8 +208,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;
@@ -424,8 +422,6 @@ static int is_mcounted_section_name(char const *const
txtname)
strcmp(".cpuidle.text", txtname) == 0;
}
-static char const *already_has_rel_mcount = "success"; /* our work here is
done! */
-
/* 32 bit and 64 bit are very similar */
#include "recordmcount.h"
#define RECORD_MCOUNT_64
diff --git a/tools/objtool/recordmcount.h b/tools/objtool/recordmcount.h
index 74eab03e31d4..1a848b8104c8 100644
--- a/tools/objtool/recordmcount.h
+++ b/tools/objtool/recordmcount.h
@@ -473,11 +473,6 @@ static char const * __has_rel_mcount(Elf_Shdr const *const
relhdr, /* reltype */
Elf_Shdr const *const txthdr = [w(relhdr->sh_info)];
char const *const txtname = [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;
@@ -506,10 +501,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);
}
@@ -545,6 +536,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;
@@ -564,11 +558,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)) {
unsigned int recsym;
uint_t recval = 0;
--
2.20.1
[RFC][PATCH v4 02/32] objtool: Make recordmcount into mcount subcmd
Rather than a standalone executable merge recordmcount as a sub command of objtool. This is a small step towards cleaning up recordmcount and eventually sharing 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. Signed-off-by: Matt Helsley --- Documentation/dontdiff | 2 +- Documentation/trace/ftrace.rst | 6 ++-- Makefile| 9 -- arch/arm64/include/asm/ftrace.h | 2 +- arch/x86/include/asm/ftrace.h | 2 +- kernel/trace/Kconfig| 2 +- scripts/Makefile.build | 19 +++-- scripts/sorttable.h | 2 +- tools/objtool/Build | 4 +-- tools/objtool/Makefile | 48 +++ tools/objtool/builtin-mcount.c | 50 + tools/objtool/builtin.h | 2 ++ tools/objtool/objtool.c | 1 + tools/objtool/objtool.h | 1 + tools/objtool/recordmcount.c| 36 +++- tools/objtool/weak.c| 5 16 files changed, 131 insertions(+), 60 deletions(-) create mode 100644 tools/objtool/builtin-mcount.c diff --git a/Documentation/dontdiff b/Documentation/dontdiff index 72fc2e9e2b63..d7e0ec691e02 100644 --- a/Documentation/dontdiff +++ b/Documentation/dontdiff @@ -211,7 +211,7 @@ r420_reg_safe.h r600_reg_safe.h randomize_layout_hash.h randomize_layout_seed.h -recordmcount +objtool relocs rlim_names.h rn50_reg_safe.h diff --git a/Documentation/trace/ftrace.rst b/Documentation/trace/ftrace.rst index 9adefcc3c7a8..6b9fc7cad543 100644 --- a/Documentation/trace/ftrace.rst +++ b/Documentation/trace/ftrace.rst @@ -2684,8 +2684,8 @@ every kernel function, produced by the -pg switch in gcc), starts of pointing to a simple return. (Enabling FTRACE will include the -pg switch in the compiling of the kernel.) -At compile time every C file object is run through the -recordmcount program (located in the tools/objtool directory). This +At compile time every C file object is run through objtool's +mcount subcommand (located in the tools/objtool directory). This program will parse the ELF headers in the C object to find all the locations in the .text section that call mcount. Starting with gcc version 4.6, the -mfentry has been added for x86, which @@ -2699,7 +2699,7 @@ can be traced. A section called "__mcount_loc" is created that holds references to all the mcount/fentry call sites in the .text section. -The recordmcount program re-links this section back into the +Running "objtool mcount" re-links this section back into the original object. The final linking stage of the kernel will add all these references into a single table. diff --git a/Makefile b/Makefile index d353a0a65a71..99a4d8c61bdb 100644 --- a/Makefile +++ b/Makefile @@ -842,12 +842,12 @@ 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 objtool_target := tools/objtool FORCE endif endif -endif +endif # CONFIG_FUNCTION_TRACER # We trigger additional mismatches with less inlining ifdef CONFIG_DEBUG_SECTION_MISMATCH @@ -1168,6 +1168,9 @@ ifneq ($(has_libelf),1) ifdef CONFIG_UNWINDER_ORC @echo "error: Cannot generate ORC metadata for CONFIG_UNWINDER_ORC=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel" >&2 @false + else ifdef USE_OBJTOOL_MCOUNT + @echo "error: Cannot generate tracing metadata for CONFIG_DYNAMIC_FTRACE, please install libelf-dev, libelf-devel or elfutils-libelf-devel" >&2 + @false else ifeq ($(SKIP_STACK_VALIDATION),1) @echo "warning: Cannot use CONFIG_STACK_VALIDATION=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel" >&2 diff --git a/arch/arm64/include/asm/ftrace.h b/arch/arm64/include/asm/ftrace.h index 91fa4baa1a93..5fd71bf592d5 100644 --- a/arch/arm64/include/asm/ftrace.h +++ b/arch/arm64/include/asm/ft
[RFC][PATCH v4 28/32] objtool: mcount: Move sift_rel_mcount out of wrapper file
Now that this function no longer uses any of the old recordmcount
wrapper code we can move it out of the wrapper too.
Signed-off-by: Matt Helsley
---
tools/objtool/recordmcount.c | 47 +
tools/objtool/recordmcount.h | 50
2 files changed, 47 insertions(+), 50 deletions(-)
diff --git a/tools/objtool/recordmcount.c b/tools/objtool/recordmcount.c
index ef3c360a3db9..601be2504666 100644
--- a/tools/objtool/recordmcount.c
+++ b/tools/objtool/recordmcount.c
@@ -394,6 +394,53 @@ static int mcount_adjust = 0;
/* Size of an entry in __mcount_loc; 4 or 8 */
static size_t loc_size;
+/*
+ * Look at the relocations in order to find the calls to mcount.
+ * Accumulate the section offsets that are found, and their relocation info,
+ * onto the end of the existing arrays.
+ */
+static void sift_rel_mcount(GElf_Addr **mlocpp,
+ GElf_Sxword *r_offsetp,
+ void **const mrelpp,
+ const struct section * const rels,
+ unsigned const recsym_index,
+ unsigned long const recval,
+ unsigned const reltype,
+ bool is_rela)
+{
+ GElf_Rel *mrelp = *mrelpp;
+ GElf_Rela *mrelap = *mrelpp;
+ unsigned int mcount_sym_info = 0;
+ struct reloc *reloc;
+
+ list_for_each_entry(reloc, >reloc_list, list) {
+ unsigned long addend;
+
+ if (!mcount_sym_info)
+ mcount_sym_info = get_mcount_sym_info(reloc);
+
+ if (mcount_sym_info != GELF_R_INFO(reloc->sym->idx,
reloc->type) || is_fake_mcount(reloc))
+ continue;
+
+ addend = reloc->offset - recval + mcount_adjust;
+ if (is_rela) {
+ mrelap->r_offset = *r_offsetp;
+ mrelap->r_info = GELF_R_INFO(recsym_index, reltype);
+ mrelap->r_addend = addend;
+ mrelap++;
+ **mlocpp = 0;
+ } else {
+ mrelp->r_offset = *r_offsetp;
+ mrelp->r_info = GELF_R_INFO(recsym_index, reltype);
+ mrelp++;
+ **mlocpp = addend;
+ }
+ (*mlocpp)++;
+ r_offsetp += loc_size;
+ }
+ *mrelpp = is_rela ? (void *)mrelap : (void *)mrelp;
+}
+
/* 32 bit and 64 bit are very similar */
#include "recordmcount.h"
#define RECORD_MCOUNT_64
diff --git a/tools/objtool/recordmcount.h b/tools/objtool/recordmcount.h
index b58f0cc58f76..f12189331e27 100644
--- a/tools/objtool/recordmcount.h
+++ b/tools/objtool/recordmcount.h
@@ -17,67 +17,17 @@
* This conversion to macros was done by:
* Copyright 2010 Steven Rostedt , Red Hat Inc.
*/
-#undef sift_rel_mcount
#undef do_func
#undef Elf_Rela
#ifdef RECORD_MCOUNT_64
-# define sift_rel_mcount sift64_rel_mcount
# define do_func do64
# define Elf_Rela Elf64_Rela
#else
-# define sift_rel_mcount sift32_rel_mcount
# define do_func do32
# define Elf_Rela Elf32_Rela
#endif
-/*
- * Look at the relocations in order to find the calls to mcount.
- * Accumulate the section offsets that are found, and their relocation info,
- * onto the end of the existing arrays.
- */
-static void sift_rel_mcount(GElf_Addr **mlocpp,
- GElf_Sxword *r_offsetp,
- void **const mrelpp,
- const struct section * const rels,
- unsigned const recsym_index,
- unsigned long const recval,
- unsigned const reltype,
- bool is_rela)
-{
- GElf_Rel *mrelp = *mrelpp;
- GElf_Rela *mrelap = *mrelpp;
- unsigned int mcount_sym_info = 0;
- struct reloc *reloc;
-
- list_for_each_entry(reloc, >reloc_list, list) {
- unsigned long addend;
-
- if (!mcount_sym_info)
- mcount_sym_info = get_mcount_sym_info(reloc);
-
- if (mcount_sym_info != GELF_R_INFO(reloc->sym->idx,
reloc->type) || is_fake_mcount(reloc))
- continue;
-
- addend = reloc->offset - recval + mcount_adjust;
- if (is_rela) {
- mrelap->r_offset = *r_offsetp;
- mrelap->r_info = GELF_R_INFO(recsym_index, reltype);
- mrelap->r_addend = addend;
- mrelap++;
- **mlocpp = 0;
- } else {
- mrelp->r_offset = *r_offsetp;
- mrelp->r_info = GELF_R_INFO(recsym_index, reltype);
-
[RFC][PATCH v4 32/32] objtool: mcount: Rename
Now that we've converted recordmcount to a subcommand of objtool
rename the .c file in order to follow the convention of the other
objtool subcmds.
Signed-off-by: Matt Helsley
---
tools/objtool/Build| 2 +-
tools/objtool/{recordmcount.c => mcount.c} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
rename tools/objtool/{recordmcount.c => mcount.c} (100%)
diff --git a/tools/objtool/Build b/tools/objtool/Build
index f4f0515d4f91..7815a094c991 100644
--- a/tools/objtool/Build
+++ b/tools/objtool/Build
@@ -7,7 +7,7 @@ objtool-$(SUBCMD_CHECK) += special.o
objtool-$(SUBCMD_ORC) += check.o
objtool-$(SUBCMD_ORC) += orc_gen.o
objtool-$(SUBCMD_ORC) += orc_dump.o
-objtool-$(SUBCMD_MCOUNT) += recordmcount.o
+objtool-$(SUBCMD_MCOUNT) += mcount.o
objtool-y += builtin-check.o
objtool-y += builtin-orc.o
diff --git a/tools/objtool/recordmcount.c b/tools/objtool/mcount.c
similarity index 100%
rename from tools/objtool/recordmcount.c
rename to tools/objtool/mcount.c
--
2.20.1
[RFC][PATCH v4 31/32] objtool: mcount: Remove endian wrappers
Now that they're no longer used we can remove these endian
wrappers.
Signed-off-by: Matt Helsley
---
tools/objtool/recordmcount.c | 63
1 file changed, 63 deletions(-)
diff --git a/tools/objtool/recordmcount.c b/tools/objtool/recordmcount.c
index 6980c0a8bdc3..aa2f6a64bff0 100644
--- a/tools/objtool/recordmcount.c
+++ b/tools/objtool/recordmcount.c
@@ -149,53 +149,6 @@ static int make_nop_arm64(struct section *txts, size_t
const offset)
return 0;
}
-/* w8rev, w8nat, ...: Handle endianness. */
-
-static uint64_t w8rev(uint64_t const x)
-{
- return ((0xff & (x >> (0 * 8))) << (7 * 8))
- | ((0xff & (x >> (1 * 8))) << (6 * 8))
- | ((0xff & (x >> (2 * 8))) << (5 * 8))
- | ((0xff & (x >> (3 * 8))) << (4 * 8))
- | ((0xff & (x >> (4 * 8))) << (3 * 8))
- | ((0xff & (x >> (5 * 8))) << (2 * 8))
- | ((0xff & (x >> (6 * 8))) << (1 * 8))
- | ((0xff & (x >> (7 * 8))) << (0 * 8));
-}
-
-static uint32_t w4rev(uint32_t const x)
-{
- return ((0xff & (x >> (0 * 8))) << (3 * 8))
- | ((0xff & (x >> (1 * 8))) << (2 * 8))
- | ((0xff & (x >> (2 * 8))) << (1 * 8))
- | ((0xff & (x >> (3 * 8))) << (0 * 8));
-}
-
-static uint32_t w2rev(uint16_t const x)
-{
- return ((0xff & (x >> (0 * 8))) << (1 * 8))
- | ((0xff & (x >> (1 * 8))) << (0 * 8));
-}
-
-static uint64_t w8nat(uint64_t const x)
-{
- return x;
-}
-
-static uint32_t w4nat(uint32_t const x)
-{
- return x;
-}
-
-static uint32_t w2nat(uint16_t const x)
-{
- return x;
-}
-
-static uint64_t (*w8)(uint64_t);
-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)
{
@@ -579,22 +532,12 @@ static int do_file(char const *const fname)
goto out;
}
- w = w4nat;
- w2 = w2nat;
- w8 = w8nat;
switch (lf->ehdr.e_ident[EI_DATA]) {
- static unsigned int const endian = 1;
default:
fprintf(stderr, "unrecognized ELF data encoding %d: %s\n",
lf->ehdr.e_ident[EI_DATA], fname);
goto out;
case ELFDATA2LSB:
- if (*(unsigned char const *) != 1) {
- /* objtool is big endian, file.o is little endian. */
- w = w4rev;
- w2 = w2rev;
- w8 = w8rev;
- }
ideal_nop4_arm = ideal_nop4_arm_le;
bl_mcount_arm = bl_mcount_arm_le;
push_arm = push_arm_le;
@@ -602,12 +545,6 @@ static int do_file(char const *const fname)
push_bl_mcount_thumb = push_bl_mcount_thumb_le;
break;
case ELFDATA2MSB:
- if (*(unsigned char const *) != 0) {
- /* objtool is little endian, file.o is big endian. */
- w = w4rev;
- w2 = w2rev;
- w8 = w8rev;
- }
ideal_nop4_arm = ideal_nop4_arm_be;
bl_mcount_arm = bl_mcount_arm_be;
push_arm = push_arm_be;
--
2.20.1
[RFC][PATCH v4 27/32] objtool: mcount: Generic location and relocation table types
Rather than building the exact ELF section data we need and
avoiding libelf's conversion step, use more GElf types
and then libelf's elfxx_xlatetof() functions to convert
the mcount locations (GElf_Addr) and associated relocations.
This converts sift_rel_mcount() so that it doesn't use the
recordmcount wrapper. The next patch will move it out of the
wrapper.
Signed-off-by: Matt Helsley
---
tools/objtool/recordmcount.c | 44 +++--
tools/objtool/recordmcount.h | 120 ++-
2 files changed, 59 insertions(+), 105 deletions(-)
diff --git a/tools/objtool/recordmcount.c b/tools/objtool/recordmcount.c
index 06a8f8ddefa7..ef3c360a3db9 100644
--- a/tools/objtool/recordmcount.c
+++ b/tools/objtool/recordmcount.c
@@ -210,7 +210,7 @@ static int is_mcounted_section_name(char const *const
txtname)
strcmp(".cpuidle.text", txtname) == 0;
}
-static unsigned get_mcountsym(struct reloc *reloc)
+static unsigned int get_mcount_sym_info(struct reloc *reloc)
{
struct symbol *sym = reloc->sym;
char const *symname = sym->name;
@@ -321,16 +321,16 @@ static int nop_mcount(struct section * const rels,
{
struct reloc *reloc;
struct section *txts = find_section_by_index(lf, rels->sh.sh_info);
- unsigned mcountsym = 0;
+ unsigned int mcount_sym_info = 0;
int once = 0;
list_for_each_entry(reloc, >reloc_list, list) {
int ret = -1;
- if (!mcountsym)
- mcountsym = get_mcountsym(reloc);
+ if (!mcount_sym_info)
+ mcount_sym_info = get_mcount_sym_info(reloc);
- if (mcountsym == GELF_R_INFO(reloc->sym->idx, reloc->type) &&
!is_fake_mcount(reloc)) {
+ if (mcount_sym_info == GELF_R_INFO(reloc->sym->idx,
reloc->type) && !is_fake_mcount(reloc)) {
if (make_nop) {
ret = make_nop(txts, reloc->offset);
if (ret < 0)
@@ -391,6 +391,9 @@ static unsigned tot_relsize(unsigned int *rel_entsize)
*/
static int mcount_adjust = 0;
+/* Size of an entry in __mcount_loc; 4 or 8 */
+static size_t loc_size;
+
/* 32 bit and 64 bit are very similar */
#include "recordmcount.h"
#define RECORD_MCOUNT_64
@@ -408,34 +411,6 @@ static int arm_is_fake_mcount(struct reloc const *rp)
return 1;
}
-/* 64-bit EM_MIPS has weird ELF64_Rela.r_info.
- *
http://techpubs.sgi.com/library/manuals/4000/007-4658-001/pdf/007-4658-001.pdf
- * We interpret Table 29 Relocation Operation (Elf64_Rel, Elf64_Rela) [p.40]
- * to imply the order of the members; the spec does not say so.
- * typedef unsigned char Elf64_Byte;
- * fails on MIPS64 because their already has it!
- */
-
-typedef uint8_t myElf64_Byte; /* Type for a 8-bit quantity. */
-
-union mips_r_info {
- Elf64_Xword r_info;
- struct {
- Elf64_Word r_sym; /* Symbol index. */
- myElf64_Byte r_ssym;/* Special symbol. */
- myElf64_Byte r_type3; /* Third relocation. */
- myElf64_Byte r_type2; /* Second relocation. */
- myElf64_Byte r_type;/* First relocation. */
- } r_mips;
-};
-
-static void MIPS64_r_info(Elf64_Rel *const rp, unsigned sym, unsigned type)
-{
- rp->r_info = ((union mips_r_info){
- .r_mips = { .r_sym = w(sym), .r_type = type }
- }).r_info;
-}
-
static int do_file(char const *const fname)
{
unsigned int reltype = 0;
@@ -551,6 +526,7 @@ static int do_file(char const *const fname)
reltype = R_MIPS_32;
is_fake_mcount = MIPS_is_fake_mcount;
}
+ loc_size = 4;
rc = do32(reltype);
break;
case ELFCLASS64: {
@@ -566,9 +542,9 @@ static int do_file(char const *const fname)
}
if (lf->ehdr.e_machine == EM_MIPS) {
reltype = R_MIPS_64;
- Elf64_r_info = MIPS64_r_info;
is_fake_mcount = MIPS_is_fake_mcount;
}
+ loc_size = 8;
rc = do64(reltype);
break;
}
diff --git a/tools/objtool/recordmcount.h b/tools/objtool/recordmcount.h
index de31ff003032..b58f0cc58f76 100644
--- a/tools/objtool/recordmcount.h
+++ b/tools/objtool/recordmcount.h
@@ -19,86 +19,63 @@
*/
#undef sift_rel_mcount
#undef do_func
-#undef Elf_Shdr
-#undef Elf_Rel
#undef Elf_Rela
-#undef ELF_R_INFO
-#undef Elf_r_info
-#undef fn_ELF_R_INFO
-#undef uint_t
-#undef _w
-#undef _size
#ifdef RECORD_MCOUNT_64
# define sift_rel_mcount sift64_rel_mcount
# define do_func do64
-# define Elf_Rel Elf64_Rel
# define Elf_Rela
[RFC][PATCH v4 06/32] objtool: mcount: Remove unused fname parameter
The name of the object file being processed is unused in
the wrapper's leaf functions so we no longer need to pass
it as a parameter.
Signed-off-by: Matt Helsley
---
tools/objtool/recordmcount.c | 4 ++--
tools/objtool/recordmcount.h | 19 ---
2 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/tools/objtool/recordmcount.c b/tools/objtool/recordmcount.c
index f585bf7f45f5..9941683b3f60 100644
--- a/tools/objtool/recordmcount.c
+++ b/tools/objtool/recordmcount.c
@@ -586,7 +586,7 @@ static int do_file(char const *const fname)
reltype = R_MIPS_32;
is_fake_mcount32 = MIPS32_is_fake_mcount;
}
- if (do32(ehdr, fname, reltype) < 0)
+ if (do32(ehdr, reltype) < 0)
goto out;
break;
case ELFCLASS64: {
@@ -607,7 +607,7 @@ static int do_file(char const *const fname)
Elf64_r_info = MIPS64_r_info;
is_fake_mcount64 = MIPS64_is_fake_mcount;
}
- if (do64(ghdr, fname, reltype) < 0)
+ if (do64(ghdr, reltype) < 0)
goto out;
break;
}
diff --git a/tools/objtool/recordmcount.h b/tools/objtool/recordmcount.h
index 3c4807dca3d0..3250a461895d 100644
--- a/tools/objtool/recordmcount.h
+++ b/tools/objtool/recordmcount.h
@@ -466,8 +466,7 @@ static int find_secsym_ndx(unsigned const txtndx,
/* Evade ISO C restriction: no declaration after statement in has_rel_mcount.
*/
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)
+char const *const shstrtab)
{
/* .sh_info depends on .sh_type == SHT_REL[,A] */
Elf_Shdr const *const txthdr = [relhdr->sh_info];
@@ -481,25 +480,23 @@ static char const * __has_rel_mcount(GElf_Shdr const
*const relhdr, /* reltype *
static char const *has_rel_mcount(GElf_Shdr const *const relhdr,
Elf_Shdr const *const shdr0,
- char const *const shstrtab,
- char const *const fname)
+ char const *const shstrtab)
{
if (relhdr->sh_type != SHT_REL && relhdr->sh_type != SHT_RELA)
return NULL;
- return __has_rel_mcount(relhdr, shdr0, shstrtab, fname);
+ return __has_rel_mcount(relhdr, shdr0, shstrtab);
}
static unsigned tot_relsize(Elf_Shdr const *const shdr0,
- const char *const shstrtab,
- const char *const fname)
+ const char *const shstrtab)
{
struct section *sec;
unsigned totrelsz = 0;
char const *txtname;
list_for_each_entry(sec, >sections, list) {
- txtname = has_rel_mcount(>sh, shdr0, shstrtab, fname);
+ txtname = has_rel_mcount(>sh, shdr0, shstrtab);
if (txtname && is_mcounted_section_name(txtname))
totrelsz += sec->sh.sh_size;
}
@@ -508,7 +505,7 @@ 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,
+static int do_func(Elf_Ehdr *const ehdr,
unsigned const reltype)
{
Elf_Shdr *const shdr0 = (Elf_Shdr *)(_w(ehdr->e_shoff)
@@ -538,7 +535,7 @@ static int do_func(Elf_Ehdr *const ehdr, char const *const
fname,
if (find_section_by_name(lf, "__mcount_loc") != NULL)
return 0;
- totrelsz = tot_relsize(shdr0, shstrtab, fname);
+ totrelsz = tot_relsize(shdr0, shstrtab);
if (totrelsz == 0)
return 0;
mrel0 = umalloc(totrelsz);
@@ -559,7 +556,7 @@ static int do_func(Elf_Ehdr *const ehdr, char const *const
fname,
relhdr = >sh;
txtname = has_rel_mcount(relhdr, shdr0,
- shstrtab, fname);
+ shstrtab);
if (txtname && is_mcounted_section_name(txtname)) {
unsigned int recsym;
uint_t recval = 0;
--
2.20.1
[RFC][PATCH v4 08/32] objtool: mcount: Walk objtool Elf structs in find_secsym_ndx
Rather than using indices into raw ELF32/64 tables mapped for the
wrapper, use the objtool functions to find the a suitable symbol
in the given text section.
Also take advantage of this commit to rename the function to
something that reads more easily.
Signed-off-by: Matt Helsley
---
tools/objtool/recordmcount.c | 2 ++
tools/objtool/recordmcount.h | 42
2 files changed, 21 insertions(+), 23 deletions(-)
diff --git a/tools/objtool/recordmcount.c b/tools/objtool/recordmcount.c
index f20582ac99e2..843027a46e1b 100644
--- a/tools/objtool/recordmcount.c
+++ b/tools/objtool/recordmcount.c
@@ -422,6 +422,8 @@ static int is_mcounted_section_name(char const *const
txtname)
strcmp(".cpuidle.text", txtname) == 0;
}
+static const unsigned int missing_sym = (unsigned int)-1;
+
/* 32 bit and 64 bit are very similar */
#include "recordmcount.h"
#define RECORD_MCOUNT_64
diff --git a/tools/objtool/recordmcount.h b/tools/objtool/recordmcount.h
index b487308992ce..dba1c385106f 100644
--- a/tools/objtool/recordmcount.h
+++ b/tools/objtool/recordmcount.h
@@ -24,7 +24,7 @@
#undef mcount_adjust
#undef sift_rel_mcount
#undef nop_mcount
-#undef find_secsym_ndx
+#undef find_section_sym_index
#undef has_rel_mcount
#undef tot_relsize
#undef get_mcountsym
@@ -53,7 +53,7 @@
# define append_func append64
# define sift_rel_mcount sift64_rel_mcount
# define nop_mcountnop_mcount_64
-# define find_secsym_ndx find64_secsym_ndx
+# define find_section_sym_indexfind64_section_sym_index
# define has_rel_mcounthas64_rel_mcount
# define tot_relsize tot64_relsize
# define get_sym_str_and_relp get_sym_str_and_relp_64
@@ -85,7 +85,7 @@
# define append_func append32
# define sift_rel_mcount sift32_rel_mcount
# define nop_mcountnop_mcount_32
-# define find_secsym_ndx find32_secsym_ndx
+# define find_section_sym_indexfind32_section_sym_index
# define has_rel_mcounthas32_rel_mcount
# define tot_relsize tot32_relsize
# define get_sym_str_and_relp get_sym_str_and_relp_32
@@ -427,38 +427,36 @@ static int nop_mcount(const struct section * const rels,
*Num:Value Size TypeBind Vis Ndx Name
* 2: 0 SECTION LOCAL DEFAULT1
*/
-static int find_secsym_ndx(unsigned const txtndx,
+static int find_section_sym_index(unsigned const txtndx,
char const *const txtname,
uint_t *const recvalp,
unsigned int *sym_index,
- Elf_Shdr const *const symhdr,
Elf_Ehdr const *const ehdr)
{
- Elf_Sym const *const sym0 = (Elf_Sym const *)(_w(symhdr->sh_offset)
- + (void *)ehdr);
- unsigned const nsym = _w(symhdr->sh_size) / _w(symhdr->sh_entsize);
- Elf_Sym const *symp;
- unsigned t;
+ struct symbol *sym;
+ struct section *txts = find_section_by_index(lf, txtndx);
- for (symp = sym0, t = nsym; t; --t, ++symp) {
- unsigned int const st_bind = ELF_ST_BIND(symp->st_info);
+ if (!txts) {
+ fprintf(stderr, "Cannot find section %u: %s.\n",
+ txtndx, txtname);
+ return missing_sym;
+ }
- if (txtndx == w2(symp->st_shndx)
- /* avoid STB_WEAK */
- && (STB_LOCAL == st_bind || STB_GLOBAL == st_bind)) {
+ list_for_each_entry(sym, >symbol_list, list) {
+ if ((sym->bind == STB_LOCAL) || (sym->bind == STB_GLOBAL)) {
/* function symbols on ARM have quirks, avoid them */
if (w2(ehdr->e_machine) == EM_ARM
- && ELF_ST_TYPE(symp->st_info) == STT_FUNC)
+ && sym->type == STT_FUNC)
continue;
- *recvalp = _w(symp->st_value);
- *sym_index = symp - sym0;
+ *recvalp = sym->sym.st_value;
+ *sym_index = sym->idx;
return 0;
}
}
fprintf(stderr, "Cannot find symbol for section %u: %s.\n",
txtndx, txtname);
- return -1;
+ return missing_sym;
}
static char const *has_rel_mcount(const struct section * const rels)
@@ -540,10 +538,8 @@ static int do_func(Elf_Ehdr *const ehdr,
uint_t recval = 0;
symsec_sh_link = sec->sh.sh_link;
- result = find_secsym_ndx(sec->sh.sh_info, txtname,
- , ,
- [symsec_sh_link],
-
[RFC][PATCH v4 13/32] objtool: mcount: Move is_fake_mcount()
Promote the now-bit-independent is_fake_mcount() out of the old
recordmcount ELF wrapper.
Signed-off-by: Matt Helsley
---
tools/objtool/recordmcount.c | 48 +++---
tools/objtool/recordmcount.h | 50
2 files changed, 45 insertions(+), 53 deletions(-)
diff --git a/tools/objtool/recordmcount.c b/tools/objtool/recordmcount.c
index f72d313a2b51..24090f36d26d 100644
--- a/tools/objtool/recordmcount.c
+++ b/tools/objtool/recordmcount.c
@@ -438,6 +438,48 @@ static unsigned get_mcountsym(struct reloc *reloc)
return 0;
}
+/*
+ * MIPS mcount long call has 2 _mcount symbols, only the position of the 1st
+ * _mcount symbol is needed for dynamic function tracer, with it, to disable
+ * tracing(ftrace_make_nop), the instruction in the position is replaced with
+ * the "b label" instruction, to enable tracing(ftrace_make_call), replace the
+ * instruction back. So, here, we set the 2nd one as fake and filter it.
+ *
+ * c: 3c03lui v1,0x0 <-->b label
+ * c: R_MIPS_HI16 _mcount
+ * c: R_MIPS_NONE *ABS*
+ * c: R_MIPS_NONE *ABS*
+ * 10: 6463daddiu v1,v1,0
+ * 10: R_MIPS_LO16 _mcount
+ * 10: R_MIPS_NONE *ABS*
+ * 10: R_MIPS_NONE *ABS*
+ * 14: 03e0082dmoveat,ra
+ * 18: 0060f809jalrv1
+ * label:
+ */
+#define MIPS_FAKEMCOUNT_OFFSET 4
+
+static int MIPS_is_fake_mcount(struct reloc const *reloc)
+{
+ static unsigned long old_r_offset = ~0UL;
+ unsigned long current_r_offset = reloc->offset;
+ int is_fake;
+
+ is_fake = (old_r_offset != ~0UL) &&
+ (current_r_offset - old_r_offset == MIPS_FAKEMCOUNT_OFFSET);
+ old_r_offset = current_r_offset;
+
+ return is_fake;
+}
+
+/* Functions and pointers that do_file() may override for specific e_machine.
*/
+static int fn_is_fake_mcount(struct reloc const *reloc)
+{
+ return 0;
+}
+
+static int (*is_fake_mcount)(struct reloc const *reloc) = fn_is_fake_mcount;
+
static const unsigned int missing_sym = (unsigned int)-1;
/* 32 bit and 64 bit are very similar */
@@ -557,7 +599,7 @@ static int do_file(char const *const fname)
altmcount = "__gnu_mcount_nc";
make_nop = make_nop_arm;
rel_type_nop = R_ARM_NONE;
- is_fake_mcount32 = arm_is_fake_mcount;
+ is_fake_mcount = arm_is_fake_mcount;
gpfx = 0;
break;
case EM_AARCH64:
@@ -597,7 +639,7 @@ static int do_file(char const *const fname)
}
if (w2(ehdr->e_machine) == EM_MIPS) {
reltype = R_MIPS_32;
- is_fake_mcount32 = MIPS32_is_fake_mcount;
+ is_fake_mcount = MIPS_is_fake_mcount;
}
if (do32(ehdr, reltype) < 0)
goto out;
@@ -617,7 +659,7 @@ static int do_file(char const *const fname)
if (w2(ghdr->e_machine) == EM_MIPS) {
reltype = R_MIPS_64;
Elf64_r_info = MIPS64_r_info;
- is_fake_mcount64 = MIPS64_is_fake_mcount;
+ is_fake_mcount = MIPS_is_fake_mcount;
}
if (do64(ghdr, reltype) < 0)
goto out;
diff --git a/tools/objtool/recordmcount.h b/tools/objtool/recordmcount.h
index 1a39f7acac11..65386938693b 100644
--- a/tools/objtool/recordmcount.h
+++ b/tools/objtool/recordmcount.h
@@ -18,9 +18,6 @@
* Copyright 2010 Steven Rostedt , Red Hat Inc.
*/
#undef append_func
-#undef is_fake_mcount
-#undef fn_is_fake_mcount
-#undef MIPS_is_fake_mcount
#undef mcount_adjust
#undef sift_rel_mcount
#undef nop_mcount
@@ -48,9 +45,6 @@
# define has_rel_mcounthas64_rel_mcount
# define tot_relsize tot64_relsize
# define do_func do64
-# define is_fake_mcountis_fake_mcount64
-# define fn_is_fake_mcount fn_is_fake_mcount64
-# define MIPS_is_fake_mcount MIPS64_is_fake_mcount
# define mcount_adjust mcount_adjust_64
# define Elf_Ehdr Elf64_Ehdr
# define Elf_Shdr Elf64_Shdr
@@ -71,9 +65,6 @@
# define has_rel_mcounthas32_rel_mcount
# define tot_relsize tot32_relsize
# define do_func do32
-# define is_fake_mcountis_fake_mcount32
-# define fn_is_fake_mcount fn_is_fake_mcount32
-# define MIPS_is_fake_mcount MIPS32_is_fake_mcount
# define mcount_adjust mcount_adjust_32
# define Elf_Ehdr Elf32_Ehdr
# define Elf_Shdr Elf32_Shdr
@@ -88,13 +79,6 @@
# define _size 4
#endif
-/* Functions and pointers that do_file() may override for specific e_machine.
*/
-static int fn_is_fake_mcount(struct reloc
[RFC][PATCH v4 05/32] objtool: recordmcount: Convert do_func() relhdrs
Use 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 modify the ELF
file -- it only changes the way we walk the ELF sections and do
lookups to find the relocations.
Signed-off-by: Matt Helsley
---
tools/objtool/recordmcount.h | 62 +++-
1 file changed, 32 insertions(+), 30 deletions(-)
diff --git a/tools/objtool/recordmcount.h b/tools/objtool/recordmcount.h
index 1a848b8104c8..3c4807dca3d0 100644
--- a/tools/objtool/recordmcount.h
+++ b/tools/objtool/recordmcount.h
@@ -285,7 +285,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,
@@ -293,10 +293,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 = [symsec_sh_link];
Elf_Shdr const *const strsec = [w(symsec->sh_link)];
- Elf_Rel const *const rel0 = (Elf_Rel const *)(_w(relhdr->sh_offset)
+ Elf_Rel const *const rel0 = (Elf_Rel const *)(relhdr->sh_offset
+ (void *)ehdr);
*sym0 = (Elf_Sym const *)(_w(symsec->sh_offset)
@@ -316,9 +316,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)
{
@@ -327,8 +327,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;
@@ -344,7 +344,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;
@@ -364,7 +364,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)
{
@@ -373,9 +373,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 = [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 = [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;
@@ -464,13 +464,13 @@ static int 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 co
[RFC][PATCH v4 18/32] objtool: mcount: Move nop_mcount()
The nop_mcount() function overwrites mcount calls that should be
ignored with no-ops. This operation varies by architecture and
wordsize so we retain the function pointers used to implement
the fundamental operation while nop_mcount() itself is responsible
for walking the relocations, determining if they should be turned
into no-ops, then calling the arch-specific code. Since none of
these use the recordmcount ELF wrappers anymore we can move it out
of the wrapper.
Signed-off-by: Matt Helsley
---
tools/objtool/recordmcount.c | 47 +
tools/objtool/recordmcount.h | 50
2 files changed, 47 insertions(+), 50 deletions(-)
diff --git a/tools/objtool/recordmcount.c b/tools/objtool/recordmcount.c
index 89762908290e..88998a505859 100644
--- a/tools/objtool/recordmcount.c
+++ b/tools/objtool/recordmcount.c
@@ -398,6 +398,53 @@ static int find_section_sym_index(unsigned const txtndx,
return missing_sym;
}
+/*
+ * Read the relocation table again, but this time its called on sections
+ * that are not going to be traced. The mcount calls here will be converted
+ * into nops.
+ */
+static int nop_mcount(struct section * const rels,
+ const char *const txtname)
+{
+ struct reloc *reloc;
+ struct section *txts = find_section_by_index(lf, rels->sh.sh_info);
+ unsigned mcountsym = 0;
+ int once = 0;
+
+ list_for_each_entry(reloc, >reloc_list, list) {
+ int ret = -1;
+
+ if (!mcountsym)
+ mcountsym = get_mcountsym(reloc);
+
+ if (mcountsym == GELF_R_INFO(reloc->sym->idx, reloc->type) &&
!is_fake_mcount(reloc)) {
+ if (make_nop) {
+ ret = make_nop(txts, reloc->offset);
+ if (ret < 0)
+ return -1;
+ }
+ if (warn_on_notrace_sect && !once) {
+ printf("Section %s has mcount callers being
ignored\n",
+ txtname);
+ once = 1;
+ /* just warn? */
+ if (!make_nop)
+ return 0;
+ }
+ }
+
+ /*
+* If we successfully removed the mcount, mark the relocation
+* as a nop (don't do anything with it).
+*/
+ if (!ret) {
+ reloc->type = rel_type_nop;
+ rels->changed = true;
+ }
+ }
+ return 0;
+}
+
/* 32 bit and 64 bit are very similar */
#include "recordmcount.h"
#define RECORD_MCOUNT_64
diff --git a/tools/objtool/recordmcount.h b/tools/objtool/recordmcount.h
index 6754bde0bacc..e033b600bd61 100644
--- a/tools/objtool/recordmcount.h
+++ b/tools/objtool/recordmcount.h
@@ -20,7 +20,6 @@
#undef append_func
#undef mcount_adjust
#undef sift_rel_mcount
-#undef nop_mcount
#undef has_rel_mcount
#undef tot_relsize
#undef do_func
@@ -37,7 +36,6 @@
#ifdef RECORD_MCOUNT_64
# define append_func append64
# define sift_rel_mcount sift64_rel_mcount
-# define nop_mcountnop_mcount_64
# define has_rel_mcounthas64_rel_mcount
# define tot_relsize tot64_relsize
# define do_func do64
@@ -53,7 +51,6 @@
#else
# define append_func append32
# define sift_rel_mcount sift32_rel_mcount
-# define nop_mcountnop_mcount_32
# define has_rel_mcounthas32_rel_mcount
# define tot_relsize tot32_relsize
# define do_func do32
@@ -171,53 +168,6 @@ static uint_t *sift_rel_mcount(uint_t *mlocp,
return mlocp;
}
-/*
- * Read the relocation table again, but this time its called on sections
- * that are not going to be traced. The mcount calls here will be converted
- * into nops.
- */
-static int nop_mcount(struct section * const rels,
- const char *const txtname)
-{
- struct reloc *reloc;
- struct section *txts = find_section_by_index(lf, rels->sh.sh_info);
- unsigned mcountsym = 0;
- int once = 0;
-
- list_for_each_entry(reloc, >reloc_list, list) {
- int ret = -1;
-
- if (!mcountsym)
- mcountsym = get_mcountsym(reloc);
-
- if (mcountsym == GELF_R_INFO(reloc->sym->idx, reloc->type) &&
!is_fake_mcount(reloc)) {
- if (make_nop) {
- ret = make_nop(txts, reloc->offset);
- if (ret < 0)
- return -1;
- }
- if (warn_on_notrace_sect &&
[RFC][PATCH v4 12/32] objtool: mcount: Replace MIPS offset types
Replace MIPS is_fake_mcount code using Elf_Addr with
unsigned long for the offsets. This is consistent with the way
that objtool more generally treats offsets and removes the
last use of the Elf_Addr wrapper.
Signed-off-by: Matt Helsley
---
tools/objtool/recordmcount.h | 9 +++--
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/tools/objtool/recordmcount.h b/tools/objtool/recordmcount.h
index a3fb62e88450..1a39f7acac11 100644
--- a/tools/objtool/recordmcount.h
+++ b/tools/objtool/recordmcount.h
@@ -28,7 +28,6 @@
#undef has_rel_mcount
#undef tot_relsize
#undef do_func
-#undef Elf_Addr
#undef Elf_Ehdr
#undef Elf_Shdr
#undef Elf_Rel
@@ -53,7 +52,6 @@
# define fn_is_fake_mcount fn_is_fake_mcount64
# define MIPS_is_fake_mcount MIPS64_is_fake_mcount
# define mcount_adjust mcount_adjust_64
-# define Elf_Addr Elf64_Addr
# define Elf_Ehdr Elf64_Ehdr
# define Elf_Shdr Elf64_Shdr
# define Elf_Rel Elf64_Rel
@@ -77,7 +75,6 @@
# define fn_is_fake_mcount fn_is_fake_mcount32
# define MIPS_is_fake_mcount MIPS32_is_fake_mcount
# define mcount_adjust mcount_adjust_32
-# define Elf_Addr Elf32_Addr
# define Elf_Ehdr Elf32_Ehdr
# define Elf_Shdr Elf32_Shdr
# define Elf_Rel Elf32_Rel
@@ -129,11 +126,11 @@ static int mcount_adjust = 0;
static int MIPS_is_fake_mcount(struct reloc const *reloc)
{
- static Elf_Addr old_r_offset = ~(Elf_Addr)0;
- Elf_Addr current_r_offset = reloc->offset;
+ static unsigned long old_r_offset = ~0UL;
+ unsigned long current_r_offset = reloc->offset;
int is_fake;
- is_fake = (old_r_offset != ~(Elf_Addr)0) &&
+ is_fake = (old_r_offset != ~0UL) &&
(current_r_offset - old_r_offset == MIPS_FAKEMCOUNT_OFFSET);
old_r_offset = current_r_offset;
--
2.20.1
[RFC][PATCH v4 17/32] objtool: mcount: Use objtool ELF to write
Rather than modify the pseudo-mapping of the ELF file directly,
which is the recordmcount way of operating, use the objtool
section list and generic ELF functions to modify the ELF file.
This eliminates a bunch of code -- the ulseek() and uwrite()
functions -- because it's used to patch the ELF data. Instead
we rely on objtool's ELF code to handle updating the ELF file.
This means a bunch of the odd bits in append_func() also go
away since they did things like update the ELF header, add
to the section table, and append the new section names to the
string table -- all handled by objtool's ELF code.
One unusual part, with respect to objtool is the way we handle
writing nops. Objtool is not designed to modify the an ELF
text section directly (or at least I could not find and example
to base this work on). So we break layering to access the
"data" of the text section via the section's "data buffer".
This is still cleaner -- we can now pass in the section struct
and offset as separate parameters.
Note that this patch does not move the associated parts out
of the wrapper file. We postpone that cleanup for later so that
it's easier to see the changes to the functions rather than
obscuring them with the move.
Signed-off-by: Matt Helsley
---
tools/objtool/recordmcount.c | 161 ---
tools/objtool/recordmcount.h | 132 +---
2 files changed, 55 insertions(+), 238 deletions(-)
diff --git a/tools/objtool/recordmcount.c b/tools/objtool/recordmcount.c
index 6150af8d67ce..89762908290e 100644
--- a/tools/objtool/recordmcount.c
+++ b/tools/objtool/recordmcount.c
@@ -52,24 +52,9 @@ static struct stat sb; /* Remember .st_size, etc. */
static const char *altmcount; /* alternate mcount symbol name */
extern int warn_on_notrace_sect; /* warn when section has mcount not being
recorded */
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 */
static struct elf *lf;
-/* Per-file resource cleanup when multiple files. */
-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)
@@ -82,72 +67,11 @@ static void mmap_cleanup(void)
lf = NULL;
}
-/* ulseek, uwrite, ...: Check return value for errors. */
-
-static off_t ulseek(off_t const offset, int const whence)
-{
- switch (whence) {
- case SEEK_SET:
- file_ptr = file_map + offset;
- break;
- case SEEK_CUR:
- file_ptr += offset;
- break;
- case SEEK_END:
- file_ptr = file_map + (sb.st_size - offset);
- break;
- }
- if (file_ptr < file_map) {
- fprintf(stderr, "lseek: seek before file\n");
- return -1;
- }
- return file_ptr - file_map;
-}
-
-static ssize_t uwrite(void const *const buf, size_t const count)
-{
- size_t cnt = count;
- off_t idx = 0;
-
- file_updated = 1;
-
- if (file_ptr + count >= file_end) {
- off_t aoffset = (file_ptr + count) - file_end;
-
- if (aoffset > file_append_size) {
- file_append = realloc(file_append, aoffset);
- file_append_size = aoffset;
- }
- if (!file_append) {
- perror("write");
- file_append_cleanup();
- mmap_cleanup();
- return -1;
- }
- if (file_ptr < file_end) {
- cnt = file_end - file_ptr;
- } else {
- cnt = 0;
- idx = aoffset - count;
- }
- }
-
- if (cnt)
- memcpy(file_ptr, buf, cnt);
-
- if (cnt < count)
- memcpy(file_append + idx, buf + cnt, count - cnt);
-
- file_ptr += count;
- return count;
-}
-
static void * umalloc(size_t size)
{
void *const addr = malloc(size);
if (addr == 0) {
fprintf(stderr, "malloc failed: %zu bytes\n", size);
- file_append_cleanup();
mmap_cleanup();
return NULL;
}
@@ -173,8 +97,6 @@ static void *mmap_file(char const *fname)
fd_map = -1;
mmap_failed = 1;
file_map = NULL;
- file_ptr = NULL;
- file_updated = 0;
sb.st_size = 0;
lf = elf_open_read(fname, O_RDWR);
@@ -210,8 +132,6 @@ static void *mmap_file
[RFC][PATCH v4 21/32] objtool: mcount: Only keep ELF file size
Since we're no longer writing to the ELF file mapping and we're
not appending to it we don't need to keep more information from the
stat structure. At the same time we can give the smaller global
variable a better name.
Signed-off-by: Matt Helsley
---
tools/objtool/recordmcount.c | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/tools/objtool/recordmcount.c b/tools/objtool/recordmcount.c
index 6feb4e6b4113..85e95e1ea6f6 100644
--- a/tools/objtool/recordmcount.c
+++ b/tools/objtool/recordmcount.c
@@ -48,17 +48,17 @@
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 const char *altmcount; /* alternate mcount symbol name */
extern int warn_on_notrace_sect; /* warn when section has mcount not being
recorded */
static void *file_map; /* pointer of the mapped file */
+static size_t file_map_size; /* original ELF file size */
static struct elf *lf;
static void mmap_cleanup(void)
{
if (!mmap_failed)
- munmap(file_map, sb.st_size);
+ munmap(file_map, file_map_size);
else
free(file_map);
file_map = NULL;
@@ -93,11 +93,13 @@ static void * umalloc(size_t size)
*/
static void *mmap_file(char const *fname)
{
+ struct stat sb;
+
/* Avoid problems if early cleanup() */
fd_map = -1;
mmap_failed = 1;
file_map = NULL;
- sb.st_size = 0;
+ file_map_size = 0;
lf = elf_open_read(fname, O_RDWR);
if (!lf) {
@@ -129,6 +131,7 @@ static void *mmap_file(char const *fname)
}
} else
mmap_failed = 0;
+ file_map_size = sb.st_size;
out:
fd_map = -1;
--
2.20.1
[RFC][PATCH v4 10/32] objtool: mcount: Walk relocation lists
Rather than walk the section tables using the old recordmcount mapping
of the ELF file, walk the section list provided by objtool's ELF code.
This removes the last use of of the Elf_r_sym wrapper so we remove
that too.
Signed-off-by: Matt Helsley
---
tools/objtool/recordmcount.c | 10 +---
tools/objtool/recordmcount.h | 103 +--
2 files changed, 28 insertions(+), 85 deletions(-)
diff --git a/tools/objtool/recordmcount.c b/tools/objtool/recordmcount.c
index 843027a46e1b..dafa6dd10d04 100644
--- a/tools/objtool/recordmcount.c
+++ b/tools/objtool/recordmcount.c
@@ -429,9 +429,9 @@ static const unsigned int missing_sym = (unsigned int)-1;
#define RECORD_MCOUNT_64
#include "recordmcount.h"
-static int arm_is_fake_mcount(Elf32_Rel const *rp)
+static int arm_is_fake_mcount(struct reloc const *rp)
{
- switch (ELF32_R_TYPE(w(rp->r_info))) {
+ switch (rp->type) {
case R_ARM_THM_CALL:
case R_ARM_CALL:
case R_ARM_PC24:
@@ -462,11 +462,6 @@ union mips_r_info {
} r_mips;
};
-static uint64_t MIPS64_r_sym(Elf64_Rel const *rp)
-{
- return w(((union mips_r_info){ .r_info = rp->r_info }).r_mips.r_sym);
-}
-
static void MIPS64_r_info(Elf64_Rel *const rp, unsigned sym, unsigned type)
{
rp->r_info = ((union mips_r_info){
@@ -605,7 +600,6 @@ static int do_file(char const *const fname)
}
if (w2(ghdr->e_machine) == EM_MIPS) {
reltype = R_MIPS_64;
- Elf64_r_sym = MIPS64_r_sym;
Elf64_r_info = MIPS64_r_info;
is_fake_mcount64 = MIPS64_is_fake_mcount;
}
diff --git a/tools/objtool/recordmcount.h b/tools/objtool/recordmcount.h
index d49da1e32315..cbf66b63ff82 100644
--- a/tools/objtool/recordmcount.h
+++ b/tools/objtool/recordmcount.h
@@ -28,21 +28,14 @@
#undef has_rel_mcount
#undef tot_relsize
#undef get_mcountsym
-#undef get_relp
#undef do_func
#undef Elf_Addr
#undef Elf_Ehdr
#undef Elf_Shdr
#undef Elf_Rel
#undef Elf_Rela
-#undef Elf_Sym
-#undef ELF_R_SYM
-#undef Elf_r_sym
#undef ELF_R_INFO
#undef Elf_r_info
-#undef ELF_ST_BIND
-#undef ELF_ST_TYPE
-#undef fn_ELF_R_SYM
#undef fn_ELF_R_INFO
#undef uint_t
#undef _w
@@ -56,7 +49,6 @@
# define find_section_sym_indexfind64_section_sym_index
# define has_rel_mcounthas64_rel_mcount
# define tot_relsize tot64_relsize
-# define get_relp get_relp_64
# define do_func do64
# define get_mcountsym get_mcountsym_64
# define is_fake_mcountis_fake_mcount64
@@ -68,14 +60,8 @@
# define Elf_Shdr Elf64_Shdr
# define Elf_Rel Elf64_Rel
# define Elf_Rela Elf64_Rela
-# define Elf_Sym Elf64_Sym
-# define ELF_R_SYM ELF64_R_SYM
-# define Elf_r_sym Elf64_r_sym
# define ELF_R_INFOELF64_R_INFO
# define Elf_r_infoElf64_r_info
-# define ELF_ST_BIND ELF64_ST_BIND
-# define ELF_ST_TYPE ELF64_ST_TYPE
-# define fn_ELF_R_SYM fn_ELF64_R_SYM
# define fn_ELF_R_INFO fn_ELF64_R_INFO
# define uint_tuint64_t
# define _ww8
@@ -88,7 +74,6 @@
# define find_section_sym_indexfind32_section_sym_index
# define has_rel_mcounthas32_rel_mcount
# define tot_relsize tot32_relsize
-# define get_relp get_relp_32
# define do_func do32
# define get_mcountsym get_mcountsym_32
# define is_fake_mcountis_fake_mcount32
@@ -100,14 +85,8 @@
# define Elf_Shdr Elf32_Shdr
# define Elf_Rel Elf32_Rel
# define Elf_Rela Elf32_Rela
-# define Elf_Sym Elf32_Sym
-# define ELF_R_SYM ELF32_R_SYM
-# define Elf_r_sym Elf32_r_sym
# define ELF_R_INFOELF32_R_INFO
# define Elf_r_infoElf32_r_info
-# define ELF_ST_BIND ELF32_ST_BIND
-# define ELF_ST_TYPE ELF32_ST_TYPE
-# define fn_ELF_R_SYM fn_ELF32_R_SYM
# define fn_ELF_R_INFO fn_ELF32_R_INFO
# define uint_tuint32_t
# define _ww
@@ -116,17 +95,11 @@
#endif
/* Functions and pointers that do_file() may override for specific e_machine.
*/
-static int fn_is_fake_mcount(Elf_Rel const *rp)
+static int fn_is_fake_mcount(struct reloc const *reloc)
{
return 0;
}
-static int (*is_fake_mcount)(Elf_Rel const *rp) = fn_is_fake_mcount;
-
-static uint_t fn_ELF_R_SYM(Elf_Rel const *rp)
-{
- return ELF_R_SYM(_w(rp->r_info));
-}
-static uint_t (*Elf_r_sym)(Elf_Rel const *rp) = fn_ELF_R_SYM;
+static int (*is_fake_mcount)(struct reloc const *reloc) = fn_is_fake_mcount;
static void fn_ELF_R_INFO(Elf_Rel *const rp, unsigned sym, unsigned type)
{
@@ -157,10 +130,10 @@ static int mcou
[RFC][PATCH v4 23/32] objtool: mcount: Remove unused file mapping
The ELF data is now accessed completely through objtool's
ELF code. We can remove the mapping of the original ELF
file and propagate elf_open_read(), elf_close(), and malloc()
up in place of mmap_file(), mmap_cleanup(), and umalloc()
respectively. This also eliminates the last use of the
umalloc() wrapper, reduces the number of global
variables, and limits the use of globals to:
The struct elf for the file we're working on. This
saves passing it to nearly every function as a parameter.
Variables set depending on the ELF file endian, wordsize,
and arch so that the appropriate relocation structures,
offset sizes, architecture quirks, and nop encodings will
be used.
One command-line option
Note that we're still using the recordmcount wrapper to change
variable sizes and structure definitions we use to build the
mcount relocation data and call instruction offsets.
Signed-off-by: Matt Helsley
---
tools/objtool/recordmcount.c | 99 +++-
tools/objtool/recordmcount.h | 4 +-
2 files changed, 9 insertions(+), 94 deletions(-)
diff --git a/tools/objtool/recordmcount.c b/tools/objtool/recordmcount.c
index bfed27f53f75..5ec44c9f2884 100644
--- a/tools/objtool/recordmcount.c
+++ b/tools/objtool/recordmcount.c
@@ -41,104 +41,14 @@
#define R_AARCH64_ABS64257
#endif
-#define R_ARM_PC24 1
#define R_ARM_THM_CALL 10
-#define R_ARM_CALL 28
-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 const char *altmcount; /* alternate mcount symbol name */
extern int warn_on_notrace_sect; /* warn when section has mcount not being
recorded */
-static void *file_map; /* pointer of the mapped file */
-static size_t file_map_size; /* original ELF file size */
static struct elf *lf;
-static void mmap_cleanup(void)
-{
- if (!mmap_failed)
- munmap(file_map, file_map_size);
- else
- free(file_map);
- file_map = NULL;
- if (lf)
- elf_close(lf);
- lf = NULL;
-}
-
-static void * umalloc(size_t size)
-{
- void *const addr = malloc(size);
- if (addr == 0) {
- fprintf(stderr, "malloc failed: %zu bytes\n", size);
- 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)
-{
- struct stat sb;
-
- /* Avoid problems if early cleanup() */
- fd_map = -1;
- mmap_failed = 1;
- file_map = NULL;
- file_map_size = 0;
-
- lf = elf_open_read(fname, O_RDWR);
- if (!lf) {
- perror(fname);
- return NULL;
- }
- fd_map = lf->fd;
- if (fstat(fd_map, ) < 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);
- mmap_cleanup();
- goto out;
- }
- } else
- mmap_failed = 0;
- file_map_size = sb.st_size;
-out:
- fd_map = -1;
-
- 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;
@@ -525,8 +435,11 @@ static int do_file(char const *const fname)
unsigned int reltype = 0;
int rc = -1;
- if (!mmap_file(fname))
+ lf = elf_open_read(fname, O_RDWR);
+ if (!lf) {
+
[RFC][PATCH v4 19/32] objtool: mcount: Move has_rel_mcount() and tot_relsize()
The has_rel_mcount() and tot_relsize() helpers are no longer
dependent on the ELF wrapper so we can move them.
Signed-off-by: Matt Helsley
---
tools/objtool/recordmcount.c | 25 +
tools/objtool/recordmcount.h | 33 -
2 files changed, 25 insertions(+), 33 deletions(-)
diff --git a/tools/objtool/recordmcount.c b/tools/objtool/recordmcount.c
index 88998a505859..248e49033538 100644
--- a/tools/objtool/recordmcount.c
+++ b/tools/objtool/recordmcount.c
@@ -445,6 +445,31 @@ static int nop_mcount(struct section * const rels,
return 0;
}
+static char const *has_rel_mcount(const struct section * const rels)
+{
+ const struct section *txts;
+ if (rels->sh.sh_type != SHT_REL && rels->sh.sh_type != SHT_RELA)
+ return NULL;
+ txts = find_section_by_index(lf, rels->sh.sh_info);
+ if ((txts->sh.sh_type != SHT_PROGBITS) ||
+ !(txts->sh.sh_flags & SHF_EXECINSTR))
+ return NULL;
+ return txts->name;
+}
+
+static unsigned tot_relsize(void)
+{
+ const struct section *sec;
+ unsigned totrelsz = 0;
+ char const *txtname;
+
+ list_for_each_entry(sec, >sections, list) {
+ txtname = has_rel_mcount(sec);
+ if (txtname && is_mcounted_section_name(txtname))
+ totrelsz += sec->sh.sh_size;
+ }
+ return totrelsz;
+}
/* 32 bit and 64 bit are very similar */
#include "recordmcount.h"
#define RECORD_MCOUNT_64
diff --git a/tools/objtool/recordmcount.h b/tools/objtool/recordmcount.h
index e033b600bd61..f8d3e81c0129 100644
--- a/tools/objtool/recordmcount.h
+++ b/tools/objtool/recordmcount.h
@@ -20,8 +20,6 @@
#undef append_func
#undef mcount_adjust
#undef sift_rel_mcount
-#undef has_rel_mcount
-#undef tot_relsize
#undef do_func
#undef Elf_Shdr
#undef Elf_Rel
@@ -36,8 +34,6 @@
#ifdef RECORD_MCOUNT_64
# define append_func append64
# define sift_rel_mcount sift64_rel_mcount
-# define has_rel_mcounthas64_rel_mcount
-# define tot_relsize tot64_relsize
# define do_func do64
# define mcount_adjust mcount_adjust_64
# define Elf_Rel Elf64_Rel
@@ -51,8 +47,6 @@
#else
# define append_func append32
# define sift_rel_mcount sift32_rel_mcount
-# define has_rel_mcounthas32_rel_mcount
-# define tot_relsize tot32_relsize
# define do_func do32
# define mcount_adjust mcount_adjust_32
# define Elf_Rel Elf32_Rel
@@ -168,33 +162,6 @@ static uint_t *sift_rel_mcount(uint_t *mlocp,
return mlocp;
}
-static char const *has_rel_mcount(const struct section * const rels)
-{
- const struct section *txts;
- if (rels->sh.sh_type != SHT_REL && rels->sh.sh_type != SHT_RELA)
- return NULL;
- txts = find_section_by_index(lf, rels->sh.sh_info);
- if ((txts->sh.sh_type != SHT_PROGBITS) ||
- !(txts->sh.sh_flags & SHF_EXECINSTR))
- return NULL;
- return txts->name;
-}
-
-
-static unsigned tot_relsize(void)
-{
- const struct section *sec;
- unsigned totrelsz = 0;
- char const *txtname;
-
- list_for_each_entry(sec, >sections, list) {
- txtname = has_rel_mcount(sec);
- if (txtname && is_mcounted_section_name(txtname))
- totrelsz += sec->sh.sh_size;
- }
- return totrelsz;
-}
-
/* Overall supervision for Elf32 ET_REL file. */
static int do_func(unsigned const reltype)
--
2.20.1
[RFC][PATCH v4 09/32] objtool: mcount: Use symbol structs to find mcount relocations
Rather than open coding symbol name lookups in get_sym_and_*()
we rename the structure and use objtool's lookup function to
get the symbol name for a relocation. We also change the name
of the function to better reflect its purpose.
Signed-off-by: Matt Helsley
---
tools/objtool/elf.c | 2 +-
tools/objtool/elf.h | 1 +
tools/objtool/recordmcount.h | 54 ++--
3 files changed, 17 insertions(+), 40 deletions(-)
diff --git a/tools/objtool/elf.c b/tools/objtool/elf.c
index 2e8f5f90e264..107f89660e45 100644
--- a/tools/objtool/elf.c
+++ b/tools/objtool/elf.c
@@ -149,7 +149,7 @@ struct section *find_section_by_index(const struct elf
*elf, unsigned int idx)
return NULL;
}
-static struct symbol *find_symbol_by_index(struct elf *elf, unsigned int idx)
+struct symbol *find_symbol_by_index(const struct elf *elf, unsigned int idx)
{
struct symbol *sym;
diff --git a/tools/objtool/elf.h b/tools/objtool/elf.h
index ae82479a8259..235719730392 100644
--- a/tools/objtool/elf.h
+++ b/tools/objtool/elf.h
@@ -129,6 +129,7 @@ struct section *find_section_by_index(const struct elf
*elf, unsigned int idx);
struct symbol *find_func_by_offset(struct section *sec, unsigned long offset);
struct symbol *find_symbol_by_offset(struct section *sec, unsigned long
offset);
struct symbol *find_symbol_by_name(const struct elf *elf, const char *name);
+struct symbol *find_symbol_by_index(const struct elf *elf, unsigned int idx);
struct symbol *find_symbol_containing(const struct section *sec, unsigned long
offset);
struct reloc *find_reloc_by_dest(const struct elf *elf, struct section *sec,
unsigned long offset);
struct reloc *find_reloc_by_dest_range(const struct elf *elf, struct section
*sec,
diff --git a/tools/objtool/recordmcount.h b/tools/objtool/recordmcount.h
index dba1c385106f..d49da1e32315 100644
--- a/tools/objtool/recordmcount.h
+++ b/tools/objtool/recordmcount.h
@@ -28,7 +28,7 @@
#undef has_rel_mcount
#undef tot_relsize
#undef get_mcountsym
-#undef get_sym_str_and_relp
+#undef get_relp
#undef do_func
#undef Elf_Addr
#undef Elf_Ehdr
@@ -56,7 +56,7 @@
# define find_section_sym_indexfind64_section_sym_index
# define has_rel_mcounthas64_rel_mcount
# define tot_relsize tot64_relsize
-# define get_sym_str_and_relp get_sym_str_and_relp_64
+# define get_relp get_relp_64
# define do_func do64
# define get_mcountsym get_mcountsym_64
# define is_fake_mcountis_fake_mcount64
@@ -88,7 +88,7 @@
# define find_section_sym_indexfind32_section_sym_index
# define has_rel_mcounthas32_rel_mcount
# define tot_relsize tot32_relsize
-# define get_sym_str_and_relp get_sym_str_and_relp_32
+# define get_relp get_relp_32
# define do_func do32
# define get_mcountsym get_mcountsym_32
# define is_fake_mcountis_fake_mcount32
@@ -261,15 +261,10 @@ static int append_func(Elf_Ehdr *const ehdr,
return elf_write(lf);
}
-static unsigned get_mcountsym(Elf_Sym const *const sym0,
- Elf_Rel const *relp,
- char const *const str0)
+static unsigned get_mcountsym(Elf_Rel const *relp)
{
- unsigned mcountsym = 0;
-
- Elf_Sym const *const symp =
- [Elf_r_sym(relp)];
- char const *symname = [w(symp->st_name)];
+ struct symbol *sym = find_symbol_by_index(lf, Elf_r_sym(relp));
+ char const *symname = sym->name;
char const *mcount = gpfx == '_' ? "_mcount" : "mcount";
char const *fentry = "__fentry__";
@@ -278,31 +273,16 @@ static unsigned get_mcountsym(Elf_Sym const *const sym0,
if (strcmp(mcount, symname) == 0 ||
(altmcount && strcmp(altmcount, symname) == 0) ||
(strcmp(fentry, symname) == 0))
- mcountsym = Elf_r_sym(relp);
-
- return mcountsym;
+ return Elf_r_sym(relp);
+ return 0;
}
-static void get_sym_str_and_relp(const struct section * const rels,
-Elf_Ehdr const *const ehdr,
-Elf_Sym const **sym0,
-char const **str0,
-Elf_Rel const **relp)
+static void get_relp(const struct section * const rels,
+ Elf_Ehdr const *const ehdr,
+ Elf_Rel const **relp)
{
- Elf_Shdr *const shdr0 = (Elf_Shdr *)(_w(ehdr->e_shoff)
- + (void *)ehdr);
- unsigned const symsec_sh_link = rels->sh.sh_link;
- Elf_Shdr const *const symsec = [symsec_sh_link];
- Elf_Shdr const *const strsec = [w(symsec->sh_link)];
Elf_Rel const *const rel0 = (Elf_Rel const *)(rels->sh.sh_offset
+ (void *)ehdr);
-
- *sym0 = (Elf_Sym const *)(_w(symsec->
[RFC][PATCH v4 24/32] objtool: mcount: Reduce usage of _size wrapper
Use a new loc_size parameter to append_func() rather than
use the wrapper's _size macro directly.
Signed-off-by: Matt Helsley
---
tools/objtool/recordmcount.h | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/tools/objtool/recordmcount.h b/tools/objtool/recordmcount.h
index e1be7243742b..e2de71f99566 100644
--- a/tools/objtool/recordmcount.h
+++ b/tools/objtool/recordmcount.h
@@ -72,6 +72,7 @@ static int append_func(uint_t const *const mloc0,
uint_t const *const mlocp,
Elf_Rel const *const mrel0,
Elf_Rel const *const mrelp,
+ unsigned int const loc_size,
unsigned int const rel_entsize,
unsigned int const symsec_sh_link)
{
@@ -83,14 +84,14 @@ static int append_func(uint_t const *const mloc0,
unsigned const old_shnum = lf->ehdr.e_shnum;
/* add section: __mcount_loc */
- sec = elf_create_section(lf, mc_name + (sizeof(Elf_Rela) ==
rel_entsize) + strlen(".rel"), _size, mlocp - mloc0);
+ sec = elf_create_section(lf, mc_name + (sizeof(Elf_Rela) ==
rel_entsize) + strlen(".rel"), loc_size, mlocp - mloc0);
if (!sec)
return -1;
// created sec->sh.sh_size = (void *)mlocp - (void *)mloc0;
sec->sh.sh_link = 0;/* TODO objtool uses this? */
sec->sh.sh_info = 0;/* TODO objtool uses this? */
- sec->sh.sh_addralign = _size;
+ sec->sh.sh_addralign = loc_size;
// created sec->sh.sh_entsize = _size;
// assert sec->data->d_size == (void *)mlocp - (void *)mloc0
@@ -109,7 +110,7 @@ static int append_func(uint_t const *const mloc0,
sec->sh.sh_flags = 0;
sec->sh.sh_link = find_section_by_name(lf, ".symtab")->idx;
sec->sh.sh_info = old_shnum;
- sec->sh.sh_addralign = _size;
+ sec->sh.sh_addralign = loc_size;
// assert sec->data->d_size == (void *)mrelp - (void *)mrel0
memcpy(sec->data->d_buf, mrel0, sec->data->d_size);
@@ -231,7 +232,7 @@ static int do_func(unsigned const reltype)
}
if (!result && mloc0 != mlocp)
result = append_func(mloc0, mlocp, mrel0, mrelp,
-rel_entsize, symsec_sh_link);
+_size, rel_entsize, symsec_sh_link);
out:
free(mrel0);
free(mloc0);
--
2.20.1
[RFC][PATCH v4 25/32] objtool: mcount: Move mcount_adjust out of wrapper
The mcount_adjust variable defines how many bytes to move back
from the relocation address in order to be able to get to the
start of the function call instruction(s) needed to turn it
into a no-op. The values are very small and signed so we don't
need to worry about changing the size of the variable's type
inside the wrapper -- we can just use a regular int.
Signed-off-by: Matt Helsley
---
tools/objtool/recordmcount.c | 12 +---
tools/objtool/recordmcount.h | 5 -
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/tools/objtool/recordmcount.c b/tools/objtool/recordmcount.c
index 5ec44c9f2884..06a8f8ddefa7 100644
--- a/tools/objtool/recordmcount.c
+++ b/tools/objtool/recordmcount.c
@@ -385,6 +385,12 @@ static unsigned tot_relsize(unsigned int *rel_entsize)
}
return totrelsz;
}
+
+/* zero or a small negative offset added to get the start of the call
+ * instruction
+ */
+static int mcount_adjust = 0;
+
/* 32 bit and 64 bit are very similar */
#include "recordmcount.h"
#define RECORD_MCOUNT_64
@@ -495,7 +501,7 @@ static int do_file(char const *const fname)
rel_type_nop = R_386_NONE;
make_nop = make_nop_x86;
ideal_nop = ideal_nop5_x86_32;
- mcount_adjust_32 = -1;
+ mcount_adjust = -1;
gpfx = 0;
break;
case EM_ARM:
@@ -524,7 +530,7 @@ static int do_file(char const *const fname)
ideal_nop = ideal_nop5_x86_64;
reltype = R_X86_64_64;
rel_type_nop = R_X86_64_NONE;
- mcount_adjust_64 = -1;
+ mcount_adjust = -1;
gpfx = 0;
break;
} /* end switch */
@@ -556,7 +562,7 @@ static int do_file(char const *const fname)
}
if (lf->ehdr.e_machine == EM_S390) {
reltype = R_390_64;
- mcount_adjust_64 = -14;
+ mcount_adjust = -14;
}
if (lf->ehdr.e_machine == EM_MIPS) {
reltype = R_MIPS_64;
diff --git a/tools/objtool/recordmcount.h b/tools/objtool/recordmcount.h
index e2de71f99566..853c4006a34f 100644
--- a/tools/objtool/recordmcount.h
+++ b/tools/objtool/recordmcount.h
@@ -18,7 +18,6 @@
* Copyright 2010 Steven Rostedt , Red Hat Inc.
*/
#undef append_func
-#undef mcount_adjust
#undef sift_rel_mcount
#undef do_func
#undef Elf_Shdr
@@ -35,7 +34,6 @@
# define append_func append64
# define sift_rel_mcount sift64_rel_mcount
# define do_func do64
-# define mcount_adjust mcount_adjust_64
# define Elf_Rel Elf64_Rel
# define Elf_Rela Elf64_Rela
# define ELF_R_INFOELF64_R_INFO
@@ -48,7 +46,6 @@
# define append_func append32
# define sift_rel_mcount sift32_rel_mcount
# define do_func do32
-# define mcount_adjust mcount_adjust_32
# define Elf_Rel Elf32_Rel
# define Elf_Rela Elf32_Rela
# define ELF_R_INFOELF32_R_INFO
@@ -65,8 +62,6 @@ static void fn_ELF_R_INFO(Elf_Rel *const rp, unsigned sym,
unsigned type)
}
static void (*Elf_r_info)(Elf_Rel *const rp, unsigned sym, unsigned type) =
fn_ELF_R_INFO;
-static int mcount_adjust = 0;
-
/* Append the new __mcount_loc and its relocations. */
static int append_func(uint_t const *const mloc0,
uint_t const *const mlocp,
--
2.20.1
[RFC][PATCH v4 15/32] objtool: mcount: Move find_section_sym_index()
This function is no longer dependent upon the old recordmcount
ELF wrapper code -- it doesn't use the wrapper's Elf_* types nor
does it call wrapped functions. Move it into the C file.
Signed-off-by: Matt Helsley
---
tools/objtool/recordmcount.c | 41
tools/objtool/recordmcount.h | 46 +---
2 files changed, 42 insertions(+), 45 deletions(-)
diff --git a/tools/objtool/recordmcount.c b/tools/objtool/recordmcount.c
index 24090f36d26d..6150af8d67ce 100644
--- a/tools/objtool/recordmcount.c
+++ b/tools/objtool/recordmcount.c
@@ -482,6 +482,47 @@ static int (*is_fake_mcount)(struct reloc const *reloc) =
fn_is_fake_mcount;
static const unsigned int missing_sym = (unsigned int)-1;
+/*
+ * Find a symbol in the given section, to be used as the base for relocating
+ * the table of offsets of calls to mcount. A local or global symbol suffices,
+ * but avoid a Weak symbol because it may be overridden; the change in value
+ * would invalidate the relocations of the offsets of the calls to mcount.
+ * Often the found symbol will be the unnamed local symbol generated by
+ * GNU 'as' for the start of each section. For example:
+ *Num:Value Size TypeBind Vis Ndx Name
+ * 2: 0 SECTION LOCAL DEFAULT1
+ */
+static int find_section_sym_index(unsigned const txtndx,
+ char const *const txtname,
+ unsigned long *const recvalp,
+ unsigned int *sym_index)
+{
+ struct symbol *sym;
+ struct section *txts = find_section_by_index(lf, txtndx);
+
+ if (!txts) {
+ fprintf(stderr, "Cannot find section %u: %s.\n",
+ txtndx, txtname);
+ return missing_sym;
+ }
+
+ list_for_each_entry(sym, >symbol_list, list) {
+ if ((sym->bind == STB_LOCAL) || (sym->bind == STB_GLOBAL)) {
+ /* function symbols on ARM have quirks, avoid them */
+ if (lf->ehdr.e_machine == EM_ARM
+ && sym->type == STT_FUNC)
+ continue;
+
+ *recvalp = sym->sym.st_value;
+ *sym_index = sym->idx;
+ return 0;
+ }
+ }
+ fprintf(stderr, "Cannot find symbol for section %u: %s.\n",
+ txtndx, txtname);
+ return missing_sym;
+}
+
/* 32 bit and 64 bit are very similar */
#include "recordmcount.h"
#define RECORD_MCOUNT_64
diff --git a/tools/objtool/recordmcount.h b/tools/objtool/recordmcount.h
index c7ce6345089d..98cf9eea6074 100644
--- a/tools/objtool/recordmcount.h
+++ b/tools/objtool/recordmcount.h
@@ -21,7 +21,6 @@
#undef mcount_adjust
#undef sift_rel_mcount
#undef nop_mcount
-#undef find_section_sym_index
#undef has_rel_mcount
#undef tot_relsize
#undef do_func
@@ -41,7 +40,6 @@
# define append_func append64
# define sift_rel_mcount sift64_rel_mcount
# define nop_mcountnop_mcount_64
-# define find_section_sym_indexfind64_section_sym_index
# define has_rel_mcounthas64_rel_mcount
# define tot_relsize tot64_relsize
# define do_func do64
@@ -61,7 +59,6 @@
# define append_func append32
# define sift_rel_mcount sift32_rel_mcount
# define nop_mcountnop_mcount_32
-# define find_section_sym_indexfind32_section_sym_index
# define has_rel_mcounthas32_rel_mcount
# define tot_relsize tot32_relsize
# define do_func do32
@@ -270,47 +267,6 @@ static int nop_mcount(struct section * const rels,
return 0;
}
-/*
- * Find a symbol in the given section, to be used as the base for relocating
- * the table of offsets of calls to mcount. A local or global symbol suffices,
- * but avoid a Weak symbol because it may be overridden; the change in value
- * would invalidate the relocations of the offsets of the calls to mcount.
- * Often the found symbol will be the unnamed local symbol generated by
- * GNU 'as' for the start of each section. For example:
- *Num:Value Size TypeBind Vis Ndx Name
- * 2: 0 SECTION LOCAL DEFAULT1
- */
-static int find_section_sym_index(unsigned const txtndx,
- char const *const txtname,
- unsigned long *const recvalp,
- unsigned int *sym_index)
-{
- struct symbol *sym;
- struct section *txts = find_section_by_index(lf, txtndx);
-
- if (!txts) {
- fprintf(stderr, "Cannot find section %u: %s.\n",
- txtndx, txtname);
- return missing_sym;
- }
-
- list_for_each_entry(sym, >symbol_list, list) {
[RFC][PATCH v4 20/32] objtool: mcount: Move relocation entry size detection
Move where we detect the size of relocation entries we wish to
use into the first loop over the sections. This will allow us
to allocate the mcount location and relocation sections before
the next loop that collects them.
Signed-off-by: Matt Helsley
---
tools/objtool/recordmcount.c | 8 +---
tools/objtool/recordmcount.h | 5 ++---
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/tools/objtool/recordmcount.c b/tools/objtool/recordmcount.c
index 248e49033538..6feb4e6b4113 100644
--- a/tools/objtool/recordmcount.c
+++ b/tools/objtool/recordmcount.c
@@ -457,7 +457,7 @@ static char const *has_rel_mcount(const struct section *
const rels)
return txts->name;
}
-static unsigned tot_relsize(void)
+static unsigned tot_relsize(unsigned int *rel_entsize)
{
const struct section *sec;
unsigned totrelsz = 0;
@@ -465,8 +465,10 @@ static unsigned tot_relsize(void)
list_for_each_entry(sec, >sections, list) {
txtname = has_rel_mcount(sec);
- if (txtname && is_mcounted_section_name(txtname))
- totrelsz += sec->sh.sh_size;
+ if (!(txtname && is_mcounted_section_name(txtname)))
+ continue;
+ totrelsz += sec->sh.sh_size;
+ *rel_entsize = sec->sh.sh_entsize;
}
return totrelsz;
}
diff --git a/tools/objtool/recordmcount.h b/tools/objtool/recordmcount.h
index f8d3e81c0129..352d2042be35 100644
--- a/tools/objtool/recordmcount.h
+++ b/tools/objtool/recordmcount.h
@@ -175,7 +175,7 @@ static int do_func(unsigned const reltype)
uint_t * mloc0;
uint_t * mlocp;
- unsigned rel_entsize = 0;
+ unsigned int rel_entsize = 0;
unsigned symsec_sh_link = 0;
struct section *sec;
@@ -185,7 +185,7 @@ static int do_func(unsigned const reltype)
if (find_section_by_name(lf, "__mcount_loc") != NULL)
return 0;
- totrelsz = tot_relsize();
+ totrelsz = tot_relsize(_entsize);
if (totrelsz == 0)
return 0;
mrel0 = umalloc(totrelsz);
@@ -215,7 +215,6 @@ static int do_func(unsigned const reltype)
if (result)
goto out;
- rel_entsize = sec->sh.sh_entsize;
mlocp = sift_rel_mcount(mlocp,
(void *)mlocp - (void *)mloc0, ,
sec, recsym, (uint_t)recval, reltype);
--
2.20.1
[RFC][PATCH v4 14/32] objtool: mcount: Stop using ehdr in find_section_sym_index
We can use the objtool GElf_Ehdr structure to access ehdr here.
This makes the function completely independent of the old
recordmcount ELF wrapper. The next step will be to promote it
to the C file.
Signed-off-by: Matt Helsley
---
tools/objtool/recordmcount.h | 13 ++---
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/tools/objtool/recordmcount.h b/tools/objtool/recordmcount.h
index 65386938693b..c7ce6345089d 100644
--- a/tools/objtool/recordmcount.h
+++ b/tools/objtool/recordmcount.h
@@ -188,7 +188,7 @@ static uint_t *sift_rel_mcount(uint_t *mlocp,
Elf_Rel **const mrelpp,
const struct section * const rels,
unsigned const recsym_index,
- uint_t const recval,
+ unsigned long const recval,
unsigned const reltype)
{
uint_t *const mloc0 = mlocp;
@@ -282,9 +282,8 @@ static int nop_mcount(struct section * const rels,
*/
static int find_section_sym_index(unsigned const txtndx,
char const *const txtname,
- uint_t *const recvalp,
- unsigned int *sym_index,
- Elf_Ehdr const *const ehdr)
+ unsigned long *const recvalp,
+ unsigned int *sym_index)
{
struct symbol *sym;
struct section *txts = find_section_by_index(lf, txtndx);
@@ -298,7 +297,7 @@ static int find_section_sym_index(unsigned const txtndx,
list_for_each_entry(sym, >symbol_list, list) {
if ((sym->bind == STB_LOCAL) || (sym->bind == STB_GLOBAL)) {
/* function symbols on ARM have quirks, avoid them */
- if (w2(ehdr->e_machine) == EM_ARM
+ if (lf->ehdr.e_machine == EM_ARM
&& sym->type == STT_FUNC)
continue;
@@ -387,12 +386,12 @@ static int do_func(Elf_Ehdr *const ehdr,
txtname = has_rel_mcount(sec);
if (txtname && is_mcounted_section_name(txtname)) {
+ unsigned long recval = 0;
unsigned int recsym;
- uint_t recval = 0;
symsec_sh_link = sec->sh.sh_link;
result = find_section_sym_index(sec->sh.sh_info,
- txtname, , ,
ehdr);
+ txtname, , );
if (result)
goto out;
--
2.20.1
[RFC][PATCH v4 11/32] objtool: mcount: Move get_mcountsym
Now that it's been stripped of using the old recordmcount ELF
wrapper get_mcountsym() is ready to be promoted out of the
double-included wrapper header.
Signed-off-by: Matt Helsley
---
tools/objtool/recordmcount.c | 16
tools/objtool/recordmcount.h | 19 ---
2 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/tools/objtool/recordmcount.c b/tools/objtool/recordmcount.c
index dafa6dd10d04..f72d313a2b51 100644
--- a/tools/objtool/recordmcount.c
+++ b/tools/objtool/recordmcount.c
@@ -422,6 +422,22 @@ static int is_mcounted_section_name(char const *const
txtname)
strcmp(".cpuidle.text", txtname) == 0;
}
+static unsigned get_mcountsym(struct reloc *reloc)
+{
+ struct symbol *sym = reloc->sym;
+ char const *symname = sym->name;
+ char const *mcount = gpfx == '_' ? "_mcount" : "mcount";
+ char const *fentry = "__fentry__";
+
+ if (symname[0] == '.')
+ ++symname; /* ppc64 hack */
+ if (strcmp(mcount, symname) == 0 ||
+ (altmcount && strcmp(altmcount, symname) == 0) ||
+ (strcmp(fentry, symname) == 0))
+ return GELF_R_INFO(reloc->sym->idx, reloc->type);
+ return 0;
+}
+
static const unsigned int missing_sym = (unsigned int)-1;
/* 32 bit and 64 bit are very similar */
diff --git a/tools/objtool/recordmcount.h b/tools/objtool/recordmcount.h
index cbf66b63ff82..a3fb62e88450 100644
--- a/tools/objtool/recordmcount.h
+++ b/tools/objtool/recordmcount.h
@@ -27,7 +27,6 @@
#undef find_section_sym_index
#undef has_rel_mcount
#undef tot_relsize
-#undef get_mcountsym
#undef do_func
#undef Elf_Addr
#undef Elf_Ehdr
@@ -50,7 +49,6 @@
# define has_rel_mcounthas64_rel_mcount
# define tot_relsize tot64_relsize
# define do_func do64
-# define get_mcountsym get_mcountsym_64
# define is_fake_mcountis_fake_mcount64
# define fn_is_fake_mcount fn_is_fake_mcount64
# define MIPS_is_fake_mcount MIPS64_is_fake_mcount
@@ -75,7 +73,6 @@
# define has_rel_mcounthas32_rel_mcount
# define tot_relsize tot32_relsize
# define do_func do32
-# define get_mcountsym get_mcountsym_32
# define is_fake_mcountis_fake_mcount32
# define fn_is_fake_mcount fn_is_fake_mcount32
# define MIPS_is_fake_mcount MIPS32_is_fake_mcount
@@ -234,22 +231,6 @@ static int append_func(Elf_Ehdr *const ehdr,
return elf_write(lf);
}
-static unsigned get_mcountsym(struct reloc *reloc)
-{
- struct symbol *sym = reloc->sym;
- char const *symname = sym->name;
- char const *mcount = gpfx == '_' ? "_mcount" : "mcount";
- char const *fentry = "__fentry__";
-
- if (symname[0] == '.')
- ++symname; /* ppc64 hack */
- if (strcmp(mcount, symname) == 0 ||
- (altmcount && strcmp(altmcount, symname) == 0) ||
- (strcmp(fentry, symname) == 0))
- return GELF_R_INFO(reloc->sym->idx, reloc->type);
- return 0;
-}
-
/*
* Look at the relocations in order to find the calls to mcount.
* Accumulate the section offsets that are found, and their relocation info,
--
2.20.1
[RFC][PATCH v4 16/32] objtool: mcount: Restrict using ehdr in append_func()
Use the ehdr parameter to append_func() to write the
ELF file's header but use the objtool ELF header data
as the basis for making changes. The makes it clearer
when we can switch from using the old recordmcount
wrapper to write the ELF file because ehdr will only
be passed on to uwrite() calls and those will get
replaced later.
Signed-off-by: Matt Helsley
---
tools/objtool/recordmcount.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/objtool/recordmcount.h b/tools/objtool/recordmcount.h
index 98cf9eea6074..7ebc617fb3a6 100644
--- a/tools/objtool/recordmcount.h
+++ b/tools/objtool/recordmcount.h
@@ -99,8 +99,8 @@ static int append_func(Elf_Ehdr *const ehdr,
char const *mc_name = (sizeof(Elf_Rela) == rel_entsize)
? ".rela__mcount_loc"
: ".rel__mcount_loc";
- unsigned const old_shnum = w2(ehdr->e_shnum);
- uint_t const old_shoff = _w(ehdr->e_shoff);
+ unsigned const old_shnum = lf->ehdr.e_shnum;
+ uint_t const old_shoff = lf->ehdr.e_shoff;
uint_t const old_shstr_sh_size = _w(shstr->sh_size);
uint_t const old_shstr_sh_offset = _w(shstr->sh_offset);
uint_t t = 1 + strlen(mc_name) + _w(shstr->sh_size);
@@ -167,7 +167,7 @@ static int append_func(Elf_Ehdr *const ehdr,
return -1;
ehdr->e_shoff = _w(new_e_shoff);
- ehdr->e_shnum = w2(2 + w2(ehdr->e_shnum)); /* {.rel,}__mcount_loc */
+ ehdr->e_shnum = w2(2 + lf->ehdr.e_shnum); /* {.rel,}__mcount_loc */
if (ulseek(0, SEEK_SET) < 0)
return -1;
if (uwrite(ehdr, sizeof(*ehdr)) < 0)
--
2.20.1
[RFC][PATCH v4 26/32] objtool: mcount: Pre-allocate new ELF sections
Rather than allocating the ELF sections after collecting the
mcount locations and building the relocation entries, create
the empty sections beforehand. This has the benefit of
removing the memcpy() and just using the resulting libgelf
buffers directly.
Signed-off-by: Matt Helsley
---
tools/objtool/recordmcount.h | 122 +++
1 file changed, 52 insertions(+), 70 deletions(-)
diff --git a/tools/objtool/recordmcount.h b/tools/objtool/recordmcount.h
index 853c4006a34f..de31ff003032 100644
--- a/tools/objtool/recordmcount.h
+++ b/tools/objtool/recordmcount.h
@@ -17,7 +17,6 @@
* This conversion to macros was done by:
* Copyright 2010 Steven Rostedt , Red Hat Inc.
*/
-#undef append_func
#undef sift_rel_mcount
#undef do_func
#undef Elf_Shdr
@@ -31,7 +30,6 @@
#undef _size
#ifdef RECORD_MCOUNT_64
-# define append_func append64
# define sift_rel_mcount sift64_rel_mcount
# define do_func do64
# define Elf_Rel Elf64_Rel
@@ -43,7 +41,6 @@
# define _ww8
# define _size 8
#else
-# define append_func append32
# define sift_rel_mcount sift32_rel_mcount
# define do_func do32
# define Elf_Rel Elf32_Rel
@@ -62,60 +59,6 @@ static void fn_ELF_R_INFO(Elf_Rel *const rp, unsigned sym,
unsigned type)
}
static void (*Elf_r_info)(Elf_Rel *const rp, unsigned sym, unsigned type) =
fn_ELF_R_INFO;
-/* Append the new __mcount_loc and its relocations. */
-static int append_func(uint_t const *const mloc0,
- uint_t const *const mlocp,
- Elf_Rel const *const mrel0,
- Elf_Rel const *const mrelp,
- unsigned int const loc_size,
- unsigned int const rel_entsize,
- unsigned int const symsec_sh_link)
-{
- /* Begin constructing output file */
- struct section *sec;
- char const *mc_name = (sizeof(Elf_Rela) == rel_entsize)
- ? ".rela__mcount_loc"
- : ".rel__mcount_loc";
- unsigned const old_shnum = lf->ehdr.e_shnum;
-
- /* add section: __mcount_loc */
- sec = elf_create_section(lf, mc_name + (sizeof(Elf_Rela) ==
rel_entsize) + strlen(".rel"), loc_size, mlocp - mloc0);
- if (!sec)
- return -1;
-
- // created sec->sh.sh_size = (void *)mlocp - (void *)mloc0;
- sec->sh.sh_link = 0;/* TODO objtool uses this? */
- sec->sh.sh_info = 0;/* TODO objtool uses this? */
- sec->sh.sh_addralign = loc_size;
- // created sec->sh.sh_entsize = _size;
-
- // assert sec->data->d_size == (void *)mlocp - (void *)mloc0
- memcpy(sec->data->d_buf, mloc0, sec->data->d_size);
- /* HACK link in Pre-assembled buffer ?
- sec->data->d_buf = mloc0;
- sec->data->d_size = sec->sh.sh_size;*/
-
- /* add section .rel[a]__mcount_loc */
- sec = elf_create_section(lf, mc_name, rel_entsize, mrelp - mrel0);
- if (!sec)
- return -1;
- sec->sh.sh_type = (sizeof(Elf_Rela) == rel_entsize)
- ? SHT_RELA
- : SHT_REL;
- sec->sh.sh_flags = 0;
- sec->sh.sh_link = find_section_by_name(lf, ".symtab")->idx;
- sec->sh.sh_info = old_shnum;
- sec->sh.sh_addralign = loc_size;
-
- // assert sec->data->d_size == (void *)mrelp - (void *)mrel0
- memcpy(sec->data->d_buf, mrel0, sec->data->d_size);
- /* HACK link in Pre-assembled buffer ?
- sec->data->d_buf = mrel0;
- sec->data->d_size = sec->sh.sh_size;*/
-
- return elf_write(lf);
-}
-
/*
* Look at the relocations in order to find the calls to mcount.
* Accumulate the section offsets that are found, and their relocation info,
@@ -172,11 +115,13 @@ static int do_func(unsigned const reltype)
uint_t * mlocp;
unsigned int rel_entsize = 0;
- unsigned symsec_sh_link = 0;
- struct section *sec;
+ struct section *sec, *mlocs, *mrels;
+ unsigned int const old_shnum = lf->ehdr.e_shnum;
- int result = 0;
+ int result = -1;
+ char const *mc_name;
+ bool is_rela;
if (find_section_by_name(lf, "__mcount_loc") != NULL)
return 0;
@@ -184,6 +129,7 @@ static int do_func(unsigned const reltype)
totrelsz = tot_relsize(_entsize);
if (totrelsz == 0)
return 0;
+
mrel0 = malloc(totrelsz);
mrelp = mrel0;
if (!mrel0)
@@ -197,6 +143,32 @@ static int do_func(unsigned const reltype)
return -1;
}
+ is_rela = (sizeof(Elf_Rela) == rel_entsize);
+ mc_name = is_rela
+ ? ".rela__mcount_loc"
+
[RFC][PATCH v4 22/32] objtool: mcount: Use ELF header from objtool
The ELF header is the very first structure in an ELF file.
Rather than cast it from the file mapping we use the ELF
header extracted via objtool's ELF code.
This is the last usage of the open-coded mapping of the ELF
file which we will remove in a later step.
Signed-off-by: Matt Helsley
---
tools/objtool/recordmcount.c | 37 +---
1 file changed, 17 insertions(+), 20 deletions(-)
diff --git a/tools/objtool/recordmcount.c b/tools/objtool/recordmcount.c
index 85e95e1ea6f6..bfed27f53f75 100644
--- a/tools/objtool/recordmcount.c
+++ b/tools/objtool/recordmcount.c
@@ -523,21 +523,19 @@ static void MIPS64_r_info(Elf64_Rel *const rp, unsigned
sym, unsigned type)
static int do_file(char const *const fname)
{
unsigned int reltype = 0;
- Elf32_Ehdr *ehdr;
int rc = -1;
- ehdr = mmap_file(fname);
- if (!ehdr)
+ if (!mmap_file(fname))
goto out;
w = w4nat;
w2 = w2nat;
w8 = w8nat;
- switch (ehdr->e_ident[EI_DATA]) {
+ switch (lf->ehdr.e_ident[EI_DATA]) {
static unsigned int const endian = 1;
default:
fprintf(stderr, "unrecognized ELF data encoding %d: %s\n",
- ehdr->e_ident[EI_DATA], fname);
+ lf->ehdr.e_ident[EI_DATA], fname);
goto out;
case ELFDATA2LSB:
if (*(unsigned char const *) != 1) {
@@ -566,18 +564,18 @@ 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, lf->ehdr.e_ident, SELFMAG) != 0 ||
+ lf->ehdr.e_type != ET_REL ||
+ lf->ehdr.e_ident[EI_VERSION] != EV_CURRENT) {
fprintf(stderr, "unrecognized ET_REL file %s\n", fname);
goto out;
}
gpfx = '_';
- switch (w2(ehdr->e_machine)) {
+ switch (lf->ehdr.e_machine) {
default:
fprintf(stderr, "unrecognized e_machine %u %s\n",
- w2(ehdr->e_machine), fname);
+ lf->ehdr.e_machine, fname);
goto out;
case EM_386:
reltype = R_386_32;
@@ -618,37 +616,36 @@ static int do_file(char const *const fname)
break;
} /* end switch */
- switch (ehdr->e_ident[EI_CLASS]) {
+ switch (lf->ehdr.e_ident[EI_CLASS]) {
default:
fprintf(stderr, "unrecognized ELF class %d %s\n",
- ehdr->e_ident[EI_CLASS], fname);
+ lf->ehdr.e_ident[EI_CLASS], fname);
goto out;
case ELFCLASS32:
- if (w2(ehdr->e_ehsize) != sizeof(Elf32_Ehdr)
- || w2(ehdr->e_shentsize) != sizeof(Elf32_Shdr)) {
+ if (lf->ehdr.e_ehsize != sizeof(Elf32_Ehdr)
+ || lf->ehdr.e_shentsize != sizeof(Elf32_Shdr)) {
fprintf(stderr,
"unrecognized ET_REL file: %s\n", fname);
goto out;
}
- if (w2(ehdr->e_machine) == EM_MIPS) {
+ if (lf->ehdr.e_machine == EM_MIPS) {
reltype = R_MIPS_32;
is_fake_mcount = MIPS_is_fake_mcount;
}
rc = do32(reltype);
break;
case ELFCLASS64: {
- Elf64_Ehdr *const ghdr = (Elf64_Ehdr *)ehdr;
- if (w2(ghdr->e_ehsize) != sizeof(Elf64_Ehdr)
- || w2(ghdr->e_shentsize) != sizeof(Elf64_Shdr)) {
+ if (lf->ehdr.e_ehsize != sizeof(Elf64_Ehdr)
+ || lf->ehdr.e_shentsize != sizeof(Elf64_Shdr)) {
fprintf(stderr,
"unrecognized ET_REL file: %s\n", fname);
goto out;
}
- if (w2(ghdr->e_machine) == EM_S390) {
+ if (lf->ehdr.e_machine == EM_S390) {
reltype = R_390_64;
mcount_adjust_64 = -14;
}
- if (w2(ghdr->e_machine) == EM_MIPS) {
+ if (lf->ehdr.e_machine == EM_MIPS) {
reltype = R_MIPS_64;
Elf64_r_info = MIPS64_r_info;
is_fake_mcount = MIPS_is_fake_mcount;
--
2.20.1
[RFC][PATCH v4 30/32] objtool: mcount: Remove wrapper double-include trick
We no longer need to double-include the recordmcount.h wrapper
All of the types and functions that rely on them have been converted
to using objtool's ELF code. This moves the remaining function to
recordmcount.c and changes the function name to something slightly
more descriptive while dropping the wrapped naming.
Signed-off-by: Matt Helsley
---
tools/objtool/recordmcount.c | 122 --
tools/objtool/recordmcount.h | 142 ---
2 files changed, 116 insertions(+), 148 deletions(-)
delete mode 100644 tools/objtool/recordmcount.h
diff --git a/tools/objtool/recordmcount.c b/tools/objtool/recordmcount.c
index 096507829b0c..6980c0a8bdc3 100644
--- a/tools/objtool/recordmcount.c
+++ b/tools/objtool/recordmcount.c
@@ -441,10 +441,120 @@ static void sift_rel_mcount(GElf_Addr **mlocpp,
*mrelpp = is_rela ? (void *)mrelap : (void *)mrelp;
}
-/* 32 bit and 64 bit are very similar */
-#include "recordmcount.h"
-#define RECORD_MCOUNT_64
-#include "recordmcount.h"
+/* Overall supervision for Elf32 ET_REL file. */
+static int do_mcount(unsigned const reltype, size_t rela_size)
+{
+ /* Upper bound on space: assume all relevant relocs are for mcount. */
+ unsigned totrelsz;
+
+ void *mrel0;
+ void *mrelp;
+
+ GElf_Addr *mloc0;
+ GElf_Addr *mlocp;
+ GElf_Sxword r_offset; /* Used in the added relocations */
+
+ unsigned int rel_entsize = 0;
+
+ struct section *sec, *mlocs, *mrels;
+ unsigned int const old_shnum = lf->ehdr.e_shnum;
+
+ int result = -1;
+ char const *mc_name;
+ bool is_rela;
+
+ if (find_section_by_name(lf, "__mcount_loc") != NULL)
+ return 0;
+
+ totrelsz = tot_relsize(_entsize);
+ if (totrelsz == 0)
+ return 0;
+
+ mrel0 = malloc(totrelsz);
+ mrelp = mrel0;
+ if (!mrel0)
+ return -1;
+
+ /* 2*sizeof(address) <= sizeof(Elf_Rel) */
+ mloc0 = malloc(totrelsz>>1);
+ mlocp = mloc0;
+ if (!mloc0) {
+ free(mrel0);
+ return -1;
+ }
+
+ is_rela = (rela_size == rel_entsize);
+ mc_name = is_rela
+ ? ".rela__mcount_loc"
+ : ".rel__mcount_loc";
+
+ /* add section: __mcount_loc */
+ mlocs = elf_create_section(lf, mc_name + (is_rela ? 1 : 0) +
strlen(".rel"), sizeof(*mloc0), 0);
+ if (!mlocs)
+ goto out;
+
+ mlocs->sh.sh_link = 0;
+ mlocs->sh.sh_info = 0;
+ mlocs->sh.sh_addralign = 8;
+ mlocs->data->d_buf = mloc0;
+ mlocs->data->d_type = ELF_T_ADDR; /* elf_xlatetof() conversion */
+
+ /* add section .rel[a]__mcount_loc */
+ mrels = elf_create_section(lf, mc_name, rel_entsize, 0);
+ if (!mrels)
+ goto out;
+ /* Like elf_create_rela_section() without the name bits */
+ mrels->sh.sh_type = is_rela ? SHT_RELA : SHT_REL;
+ mrels->sh.sh_flags = 0;
+ mrels->sh.sh_link = find_section_by_name(lf, ".symtab")->idx;
+ mrels->sh.sh_info = old_shnum;
+ mrels->sh.sh_addralign = 8;
+ mrels->data->d_buf = mrel0;
+ mrels->data->d_type = is_rela ? ELF_T_RELA : ELF_T_REL; /*
elf_xlatetof() conversion */
+
+ list_for_each_entry(sec, >sections, list) {
+ char const *txtname;
+
+ txtname = has_rel_mcount(sec);
+ if (txtname && is_mcounted_section_name(txtname)) {
+ unsigned long recval = 0;
+ unsigned int recsym;
+
+ if (find_section_sym_index(sec->sh.sh_info,
+ txtname, , ))
+ goto out;
+
+ sift_rel_mcount(, _offset, , sec,
+ recsym, recval, reltype, is_rela);
+ } else if (txtname && (warn_on_notrace_sect || make_nop)) {
+ /*
+* This section is ignored by ftrace, but still
+* has mcount calls. Convert them to nops now.
+*/
+ if (nop_mcount(sec, txtname) < 0)
+ goto out;
+ }
+ }
+
+ if (mloc0 != mlocp) {
+ /* Update the section size and Elf_Data size */
+ mlocs->sh.sh_size = (void *)mlocp - (void *)mloc0;
+ mlocs->len = mlocs->sh.sh_size;
+ mlocs->data->d_size = mlocs->len;
+
+ mrels->sh.sh_size = mrelp - mrel0;
+ mrels->len = mrels->sh.sh_size;
+ mrels->data->d_size = mrels->len;
+
+ /* overwrite the ELF file */
+ re
[RFC][PATCH v4 00/32] objtool: Make recordmcount a subcommand
recordmcount has its own ELF wrapper code and could utilize objtool's ELF code to more-portably handle architecture variations. This series makes recordmcount a subcommand of objtool. It very gradually convert recordmcount to become a subcommand of objtool and then reuses parts of objtool's ELF code. recordmcount maps the file in and collects simple information it needs to append a section to the object file. The only part of the original file it modifies is the address of new section tables -- interestingly enough this resembles RCU in that we don't really trim the old tables so much as unlink them via a critical offset and then rely on future tooling, in this case, to drop the unused bits. Much of the recordmcount ELF code is only reading and walking the data structures to collect the mcount locations it records in a separate area of memory. This means it's safe to mix access to the mapped file with access to the objtool-style linked data structures as we gradually convert it to using only the linked data structures. Once the old ELF code is no longer in use we can drop it and use objtool to take over the task of writing the results without using the RCU-like trick any more. Testing: I've been using scripts to test cross compilation and execution of objtool, and mcount on objects built for x86, ppc64le, arm64, s390, and sparc. I used PowerPC as a sample arch for fixing a bug (see Changes) and confirmed it builds a full zImage with defconfig (CONFIG_DYNAMIC_FTRACE=y). Changes v4: Split out recordmcount cleanups and upstreamed. [ https://lore.kernel.org/lkml/20190802134712.2d8cc...@gandalf.local.home/ ] Split out and iterated on objtool multi-arch support. [ https://lore.kernel.org/lkml/cover.1586468801.git.mhels...@vmware.com/ ] Split out expanded relocation support, renamed types, and functions to reflect expanded relocation support, and posted. [ https://lore.kernel.org/lkml/cover.1590785960.git.mhels...@vmware.com/ ] This set is based on the patches sent upstream and posted above. Adapted to renames by Ingo and Peter: s/elf_open/elf_open_read/ Added weak symbols for mcount subcommand This nicely eliminated the need for the mcount.h header. Added tools/objtool/Makefile per-arch SUBCMD_ blocks for each arch recordmcount / mcount supports. Moved ftrace/mcount/record.h from objtool_dep to recordmcount_dep This keeps the dependencies better organized. Fixed Makefile issue reported for PowerPC and a couple other archs by kbuild test robot. The always-$(BUILD_C_RECORDMCOUNT) line wasn't sufficiently replaced. Added to prepare-objtool target in top level Makefile. Split up dependencies to be independent of CONFIG_STACK_VALIDATION and CONFIG_UNWINDER_ORC since these are x86-specific. Now any arch which uses the C version of recordmcount will build objtool if dynamic tracing is enabled. Added a second rename at the end to be consistent with other objtool subcommands. 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 Matt Helsley (32): objtool: Prepare to merge recordmcount objtool: Make recordmcount into mcount 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 objtool: mcount: Remove unused fname parameter objtool: mcount: Use libelf for section header names objtool: mcount: Walk objtool Elf structs in find_secsym_ndx objtool: mcount: Use symbol structs to find mcount relocations objtool: mcount: Walk relocation lists objtool: mcount: Move get_mcountsym objtool: mcount: Replace MIPS offset types objtool: mcount: Move is_fake_mcount() objtool: mcount: Stop using ehdr in find_section_sym_index objtool: mcount: Move find_section_sym_index() objtool: mcount: Restrict using ehdr in append_func() objtool: mcount: Use objtool ELF to write objtool: mcount: Move nop_mcount() objtool: mcount: Move has_rel_mcount() and tot_relsize() objtool: mcount: Move relocation entry size detection objtool: mcount: Only keep ELF f
[RFC][PATCH v4 03/32] objtool: recordmcount: Start using objtool's elf wrapper
Use 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/objtool data structures and gives
us two separate 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.
Signed-off-by: Matt Helsley
---
tools/objtool/recordmcount.c | 18 +-
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/tools/objtool/recordmcount.c b/tools/objtool/recordmcount.c
index 601e83840085..b2c606eb269b 100644
--- a/tools/objtool/recordmcount.c
+++ b/tools/objtool/recordmcount.c
@@ -33,6 +33,8 @@
#include "objtool.h"
+#include "elf.h"
+
#ifndef EM_AARCH64
#define EM_AARCH64 183
#define R_AARCH64_NONE 0
@@ -57,6 +59,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)
{
@@ -73,6 +77,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. */
@@ -170,11 +177,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_open_read(fname, O_RDONLY);
+ if (!lf) {
perror(fname);
return NULL;
}
+ fd_map = lf->fd;
if (fstat(fd_map, ) < 0) {
perror(fname);
goto out;
@@ -194,14 +202,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;
--
2.20.1
[RFC][PATCH v4 01/32] objtool: Prepare to merge recordmcount
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
---
Documentation/trace/ftrace-design.rst | 4 ++--
Documentation/trace/ftrace.rst | 2 +-
Makefile | 15 +--
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
12 files changed, 33 insertions(+), 17 deletions(-)
rename {scripts => tools/objtool}/recordmcount.c (100%)
rename {scripts => tools/objtool}/recordmcount.h (100%)
rename {scripts => tools/objtool}/recordmcount.pl (100%)
diff --git a/Documentation/trace/ftrace-design.rst
b/Documentation/trace/ftrace-design.rst
index a8e22e0db63c..dea8db5e79d0 100644
--- a/Documentation/trace/ftrace-design.rst
+++ b/Documentation/trace/ftrace-design.rst
@@ -261,7 +261,7 @@ You need very few things to get the syscalls tracing in an
arch.
HAVE_FTRACE_MCOUNT_RECORD
-
-See scripts/recordmcount.pl for more info. Just fill in the arch-specific
+See tools/objtool/recordmcount.pl for more info. Just fill in the
arch-specific
details for how to locate the addresses of mcount call sites via objdump.
This option doesn't make much sense without also implementing dynamic ftrace.
@@ -379,7 +379,7 @@ linux/ftrace.h for the functions::
ftrace_make_call()
The rec->ip value is the address of the mcount call site that was collected
-by the scripts/recordmcount.pl during build time.
+by the tools/objtool/recordmcount.pl during build time.
The last function is used to do runtime patching of the active tracer. This
will be modifying the assembly code at the location of the ftrace_call symbol
diff --git a/Documentation/trace/ftrace.rst b/Documentation/trace/ftrace.rst
index 3b5614b1d1a5..9adefcc3c7a8 100644
--- a/Documentation/trace/ftrace.rst
+++ b/Documentation/trace/ftrace.rst
@@ -2685,7 +2685,7 @@ starts of pointing to a simple return. (Enabling FTRACE
will
include the -pg switch in the compiling of the kernel.)
At compile time every C file object is run through the
-recordmcount program (located in the scripts directory). This
+recordmcount program (located in the tools/objtool directory). This
program will parse the ELF headers in the C object to find all
the locations in the .text section that call mcount. Starting
with gcc version 4.6, the -mfentry has been added for x86, which
diff --git a/Makefile b/Makefile
index 04f5662ae61a..d353a0a65a71 100644
--- a/Makefile
+++ b/Makefile
@@ -844,6 +844,7 @@ ifdef CONFIG_DYNAMIC_FTRACE
ifdef CONFIG_HAVE_C_RECORDMCOUNT
BUILD_C_RECORDMCOUNT := y
export BUILD_C_RECORDMCOUNT
+ objtool_target := tools/objtool FORCE
endif
endif
endif
@@ -1023,10 +1024,10 @@ endif
export mod_sign_cmd
HOST_LIBELF_LIBS = $(shell pkg-config libelf --libs 2>/dev/null || echo -lelf)
+has_libelf := $(call try-run,\
+ echo "int main() {}" | $(HOSTCC) -xc -o /dev/null
$(HOST_LIBELF_LIBS) -,1,0)
ifdef CONFIG_STACK_VALIDATION
- has_libelf := $(call try-run,\
- echo "int main() {}" | $(HOSTCC) -xc -o /dev/null
$(HOST_LIBELF_LIBS) -,1,0)
ifeq ($(has_libelf),1)
objtool_target := tools/objtool FORCE
else
@@ -1163,13 +1164,15 @@ uapi-asm-generic:
PHONY += prepare-objtool
prepare-objtool: $(objtool_target)
-ifeq ($(SKIP_STACK_VALIDATION),1)
-ifdef CONFIG_UNWINDER_ORC
+ifneq ($(has_libelf),1)
+ ifdef CONFIG_UNWINDER_ORC
@echo "error: Cannot generate ORC metadata for CONFIG_UNWINDER_ORC=y,
please install libelf-dev, libelf-devel or elfutils-libelf-devel" >&2
@false
-else
+ else
+ifeq ($(SKIP_STACK_VALIDATION),1)
@echo "warning: Cannot use CONFIG_STACK_VALIDATION=y, please install
libelf-dev, libelf-devel or elfutils-libelf-devel" >&2
-endif
+endif
+ endif
endif
# Generate some files
diff --git a/scripts/.gitignore b/scripts/.gitignore
index 0d1c8e217cd7..dafda6d2c306 100644
--- a/scripts/.gitignore
+++ b/scripts/.gitignore
@@ -2,7 +2,6 @@
bin2c
kallsyms
unifdef
-recordmcount
sorttable
asn1_compiler
extract-cert
diff --git a/scripts/Makefile b/scripts/Makefile
index 95ecf970c74c..d8d81de4f1cb 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -5,7 +5,6 @@
always-$(CONFIG_BUILD_BIN2C) += bin2c
always-$(CONFIG_KALLSYMS) += kallsyms
-always-$(BUILD_C_RECOR
[RFC][PATCH v4 07/32] objtool: mcount: Use libelf for section header names
Rather than passing in the string table contents as a parameter,
pass in the section index of the string table and rely on libelf
string table accessor functions to look up section names.
Note that modifying the string table with libelf will come later
so append_func() is unchanged.
Signed-off-by: Matt Helsley
---
tools/objtool/elf.c | 3 +-
tools/objtool/elf.h | 1 +
tools/objtool/recordmcount.c | 2 +-
tools/objtool/recordmcount.h | 89 ++--
4 files changed, 37 insertions(+), 58 deletions(-)
diff --git a/tools/objtool/elf.c b/tools/objtool/elf.c
index 067e2850a116..2e8f5f90e264 100644
--- a/tools/objtool/elf.c
+++ b/tools/objtool/elf.c
@@ -138,8 +138,7 @@ struct section *find_section_by_name(const struct elf *elf,
const char *name)
return NULL;
}
-static struct section *find_section_by_index(struct elf *elf,
-unsigned int idx)
+struct section *find_section_by_index(const struct elf *elf, unsigned int idx)
{
struct section *sec;
diff --git a/tools/objtool/elf.h b/tools/objtool/elf.h
index 78a2db23b8b6..ae82479a8259 100644
--- a/tools/objtool/elf.h
+++ b/tools/objtool/elf.h
@@ -125,6 +125,7 @@ int elf_write(const struct elf *elf);
void elf_close(struct elf *elf);
struct section *find_section_by_name(const struct elf *elf, const char *name);
+struct section *find_section_by_index(const struct elf *elf, unsigned int idx);
struct symbol *find_func_by_offset(struct section *sec, unsigned long offset);
struct symbol *find_symbol_by_offset(struct section *sec, unsigned long
offset);
struct symbol *find_symbol_by_name(const struct elf *elf, const char *name);
diff --git a/tools/objtool/recordmcount.c b/tools/objtool/recordmcount.c
index 9941683b3f60..f20582ac99e2 100644
--- a/tools/objtool/recordmcount.c
+++ b/tools/objtool/recordmcount.c
@@ -177,7 +177,7 @@ static void *mmap_file(char const *fname)
file_updated = 0;
sb.st_size = 0;
- lf = elf_open_read(fname, O_RDONLY);
+ lf = elf_open_read(fname, O_RDWR);
if (!lf) {
perror(fname);
return NULL;
diff --git a/tools/objtool/recordmcount.h b/tools/objtool/recordmcount.h
index 3250a461895d..b487308992ce 100644
--- a/tools/objtool/recordmcount.h
+++ b/tools/objtool/recordmcount.h
@@ -25,7 +25,6 @@
#undef sift_rel_mcount
#undef nop_mcount
#undef find_secsym_ndx
-#undef __has_rel_mcount
#undef has_rel_mcount
#undef tot_relsize
#undef get_mcountsym
@@ -55,7 +54,6 @@
# define sift_rel_mcount sift64_rel_mcount
# define nop_mcountnop_mcount_64
# define find_secsym_ndx find64_secsym_ndx
-# define __has_rel_mcount __has64_rel_mcount
# define has_rel_mcounthas64_rel_mcount
# define tot_relsize tot64_relsize
# define get_sym_str_and_relp get_sym_str_and_relp_64
@@ -88,7 +86,6 @@
# define sift_rel_mcount sift32_rel_mcount
# define nop_mcountnop_mcount_32
# define find_secsym_ndx find32_secsym_ndx
-# define __has_rel_mcount __has32_rel_mcount
# define has_rel_mcounthas32_rel_mcount
# define tot_relsize tot32_relsize
# define get_sym_str_and_relp get_sym_str_and_relp_32
@@ -197,6 +194,7 @@ static int append_func(Elf_Ehdr *const ehdr,
shstr->sh_size = _w(t);
shstr->sh_offset = _w(sb.st_size);
+
t += sb.st_size;
t += (_align & -t); /* word-byte align */
new_e_shoff = t;
@@ -260,7 +258,7 @@ static int append_func(Elf_Ehdr *const ehdr,
return -1;
if (uwrite(ehdr, sizeof(*ehdr)) < 0)
return -1;
- return 0;
+ return elf_write(lf);
}
static unsigned get_mcountsym(Elf_Sym const *const sym0,
@@ -285,7 +283,7 @@ static unsigned get_mcountsym(Elf_Sym const *const sym0,
return mcountsym;
}
-static void get_sym_str_and_relp(GElf_Shdr const *const relhdr,
+static void get_sym_str_and_relp(const struct section * const rels,
Elf_Ehdr const *const ehdr,
Elf_Sym const **sym0,
char const **str0,
@@ -293,10 +291,10 @@ static void get_sym_str_and_relp(GElf_Shdr const *const
relhdr,
{
Elf_Shdr *const shdr0 = (Elf_Shdr *)(_w(ehdr->e_shoff)
+ (void *)ehdr);
- unsigned const symsec_sh_link = relhdr->sh_link;
+ unsigned const symsec_sh_link = rels->sh.sh_link;
Elf_Shdr const *const symsec = [symsec_sh_link];
Elf_Shdr const *const strsec = [w(symsec->sh_link)];
- Elf_Rel const *const rel0 = (Elf_Rel const *)(relhdr->sh_offset
+ Elf_Rel const *const rel0 = (Elf_Rel const *)(rels->sh.sh_offset
+ (void *)ehdr);
*sym0 = (Elf_Sym const *)(_w(symsec->sh_offset)
@@ -316,7 +314,7 @@ static void get_sym_str_and_relp(GElf_Shdr const *const
relhdr,
static uin
