This series removes the place holder __ftrace_invalid_address___ from
the available_filter_functions file.
The first 13 patches clean up the scripts/sorttable.c code. It was
a copy from recordmcount.c which is very hard to maintain. That's
because it uses macro helpers and places the code in a header file
sorttable.h to handle both the 64 bit and 32 bit version of the Elf
structures. It also has _r()/r()/r2() wrappers around accessing the
data which will read the 64 bit or 32 bit version of the data as well
as handle endianess. If the wrong wrapper is used, an invalid value
will result, and this has been a cause for bugs in the past. In fact
the new ORC code doesn't even use it. That's fine because ORC is only
for 64 bit x86 which is the default parsing.
Instead of having a bunch of macros defined and then include the code
twice from a header, the Elf structures are each wrapped in a union.
The union holds the 64 bit and 32 bit version of the needed structure.
To access the values, helper function pointers are used instead of
defining a function. For example, instead of having:
In sorttable.h:
#undef Elf_Ehdr
#undef Elf_Shdr
#ifdef SORTTABLE_64
# define Elf_Ehdr Elf64_Ehdr
# define Elf_Shdr Elf64_Shdr
[..]
# define _r r8
#else
# define Elf_Ehdr Elf32_Ehdr
# define Elf_Shdr Elf32_Shdr
[..]
# define _r r
#endif
[..]
Elf_Shdr *s, *shdr = (Elf_Shdr *)((char *)ehdr + _r(&ehdr->e_shoff));
In sorttable.c:
#include "sorttable.h"
#define SORTTABLE_64
#include "sorttable.h"
Using the Unions we have:
typedef union {
Elf32_Ehdr e32;
Elf64_Ehdr e64;
} Elf_Ehdr;
typedef union {
Elf32_Shdr e32;
Elf64_Shdr e64;
} Elf_Shdr;
[..]
static uint64_t ehdr64_shoff(Elf_Ehdr *ehdr)
{
return r8(&ehdr->e64.e_shoff);
}
static uint64_t ehdr32_shoff(Elf_Ehdr *ehdr)
{
return r(&ehdr->e32.e_shoff);
}
[..]
static uint64_t (*ehdr_shoff)(Elf_Ehdr *ehdr);
[..]
switch (ehdr->e32.e_ident[EI_CLASS]) {
case ELFCLASS32:
[..]
ehdr_shoff = ehdr32_shoff;
[..]
case ELFCLASS65:
[..]
ehdr_shoff = ehdr64_shoff;
[..]
shdr_start = (Elf_Shdr *)((char *)ehdr + ehdr_shoff(ehdr));
The code may be a little more verbose, but the meat of the code is easier to
read, and the conversion functions live in the helper functions to make
it easier to have the fields read the proper way.
This makes the code easier to maintain, and for this purpose easier
to extend. Which is the last patch of the series.
The last patch adds the option "-s <file>" to sorttable.c. Now this code
is called by:
${NM} -S vmlinux > .tmp_vmlinux.nm-sort
${objtree}/scripts/sorttable -s .tmp_vmlinux.nm-sort ${1}
Where the file created by "nm -S" is read, recording the address
and the associated sizes of each function. It then is sorted, and
before sorting the mcount_loc table, it is scanned to make sure
all symbols in the mcounc_loc are within the boundaries of the functions
defined by nm. If they are not, they are zeroed out, as they are most
likely weak functions (I don't know what else they would be).
Then on boot up, when creating the ftrace tables from the mcount_loc
table, it will ignore any function that matches the kaslr_offset()
value. As KASLR will still shift the values even if they are zero.
But by skipping over entries in mcount_loc that match kaslr_offset()
all weak functions are removed from the ftrace table as well as the
available_filter_functions file that is derived from it.
Before:
~# grep __ftrace_invalid_address___
/sys/kernel/tracing/available_filter_functions | wc -l
556
After:
~# grep __ftrace_invalid_address___
/sys/kernel/tracing/available_filter_functions | wc -l
0
Steven Rostedt (14):
scripts/sorttable: Remove unused macro defines
scripts/sorttable: Remove unused write functions
scripts/sorttable: Remove unneeded Elf_Rel
scripts/sorttable: Have the ORC code use the _r() functions to read
scripts/sorttable: Make compare_extable() into two functions
scripts/sorttable: Convert Elf_Ehdr to union
scripts/sorttable: Replace Elf_Shdr Macro with a union
scripts/sorttable: Convert Elf_Sym MACRO over to a union
scripts/sorttable: Add helper functions for Elf_Ehdr
scripts/sorttable: Add helper functions for Elf_Shdr
scripts/sorttable: Add helper functions for Elf_Sym
scripts/sorttable: Use uint64_t for mcount sorting
scripts/sorttable: Move code from sorttable.h into sorttable.c
scripts/sorttable: ftrace: Do not add weak functions to
available_filter_functions
----
kernel/trace/ftrace.c | 14 +
scripts/link-vmlinux.sh | 4 +-
scripts/sorttable.c | 810 ++++++++++++++++++++++++++++++++++++++++++++----
scripts/sorttable.h | 497 -----------------------------
4 files changed, 771 insertions(+), 554 deletions(-)
delete mode 100644 scripts/sorttable.h
