ftrace: recordmcount.c updates for MIPS
Ingo,
Please pull the latest tip/perf/mips tree, which can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git
tip/perf/mips
John Reiser (1):
ftrace/MIPS: Add MIPS64 support for C version of recordmcount
Wu Zhangjin (2):
ftrace/MIPS: Add module support for C version of recordmcount ftrace/MIPS: Enable C Version of recordmcount
----
arch/mips/Kconfig | 1 + scripts/recordmcount.c | 44 ++++++++++++++++++++++++ scripts/recordmcount.h | 86 +++++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 126 insertions(+), 5 deletions(-)
PATCH 1/3 ftrace/MIPS: Add MIPS64 support for C version of recordmcount
From: John Reiser <[email protected]>
MIPS64 has 'weird' Elf64_Rel.r_info[1,2], which must be used instead of the generic Elf64_Rel.r_info, otherwise, the C version of recordmcount will not work for "segmentation fault".
Usage of "union mips_r_info" and the functions MIPS64_r_sym() and MIPS64_r_info() written by Maciej W. Rozycki <[email protected]>
----
[1] http://techpubs.sgi.com/library/manuals/4000/007-4658-001/pdf/007-4658-001.pdf
[2] arch/mips/include/asm/module.h
LKML-Reference: <[email protected]>
LKML-Reference: <910dc2d5ae1ed042df4f96815fe4a433078d1c2a.1288176026.git.wuzhangjin@gmail.com>
--- scripts/recordmcount.c | 41 +++++++++++++++++++++++++++++++++++++++++ scripts/recordmcount.h | 34 ++++++++++++++++++++++++++++++---- 2 files changed, 71 insertions(+), 4 deletions(-)
scripts/recordmcount.c +41 -0
@@ -217,6 +217,39 @@ is_mcounted_section_name(char const *const txtname)#define RECORD_MCOUNT_64 #include "recordmcount.h" +/* 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 <elf.h> 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 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 ){ + .r_mips = { .r_sym =w (sym), .r_type = type } + }).r_info; +} +static void do_file (char const *const fname) {
@@ -268,6 +301,7 @@ do_file(char const *const fname)case EM_386 : reltype =R_386_32 ;break ;case EM_ARM : reltype =R_ARM_ABS32 ;break ;case EM_IA_64 : reltype =R_IA64_IMM64 ; gpfx ='_' ;break ; +case EM_MIPS :/* reltype: e_class */ gpfx ='_' ;break ;case EM_PPC : reltype =R_PPC_ADDR32 ; gpfx ='_' ;break ;case EM_PPC64 : reltype =R_PPC64_ADDR64 ; gpfx ='_' ;break ;case EM_S390 :/* reltype: e_class */ gpfx ='_' ;break ;
@@ -291,6 +325,8 @@ do_file(char const *const fname) }if (EM_S390 ==w2 (ehdr->e_machine)) reltype =R_390_32 ; +if (EM_MIPS ==w2 (ehdr->e_machine)) + reltype =R_MIPS_32 ;do32 (ehdr, fname, reltype); }break ;case ELFCLASS64 : {
@@ -303,6 +339,11 @@ do_file(char const *const fname) }if (EM_S390 ==w2 (ghdr->e_machine)) reltype =R_390_64 ; +if (EM_MIPS ==w2 (ghdr->e_machine)) { + reltype =R_MIPS_64 ; + Elf64_r_sym = MIPS64_r_sym; + Elf64_r_info = MIPS64_r_info; + }do64 (ghdr, fname, reltype); }break ; }/* end switch */
scripts/recordmcount.h +30 -4
@@ -31,8 +31,12 @@#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 fn_ELF_R_SYM +#undef fn_ELF_R_INFO#undef uint_t#undef _w#undef _align
@@ -52,8 +56,12 @@# 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_INFO ELF64_R_INFO +# define Elf_r_info Elf64_r_info# define ELF_ST_BIND ELF64_ST_BIND +# define fn_ELF_R_SYM fn_ELF64_R_SYM +# define fn_ELF_R_INFO fn_ELF64_R_INFO# define uint_t uint64_t# define _w w8# define _align 7u
@@ -72,14 +80,32 @@# 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_INFO ELF32_R_INFO +# define Elf_r_info Elf32_r_info# define ELF_ST_BIND ELF32_ST_BIND +# define fn_ELF_R_SYM fn_ELF32_R_SYM +# define fn_ELF_R_INFO fn_ELF32_R_INFO# define uint_t uint32_t# define _w w# define _align 3u# define _size 4#endif +/* Functions and pointers that 64-bit EM_MIPS can override. */ +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 void fn_ELF_R_INFO (Elf_Rel *const rp,unsigned sym,unsigned type) +{ + rp->r_info =ELF_R_INFO (sym, type); +} +static void (*Elf_r_info)(Elf_Rel *const rp,unsigned sym,unsigned type) = fn_ELF_R_INFO; + +/* Append the new shstrtab, Elf_Shdr[], __mcount_loc and its relocations. */ static void append_func(Elf_Ehdr *const ehdr, Elf_Shdr *const shstr,
@@ -197,22 +223,22 @@ static uint_t *sift_rel_mcount(uint_t *mlocp,for (t = nrel; t; --t) {if (!mcountsym) {Elf_Sym const *const symp = - &sym0[ELF_R_SYM (_w (relp->r_info))]; + &sym0[Elf_r_sym (relp)];char const *symname = &str0[w (symp->st_name)];if ('.' == symname[0 ]) ++symname;/* ppc64 hack */ if (0 ==strcmp ((('_' == gpfx) ?"_mcount" :"mcount" ), symname)) - mcountsym =ELF_R_SYM (_w (relp->r_info)); + mcountsym =Elf_r_sym (relp); } -if (mcountsym ==ELF_R_SYM (_w (relp->r_info))) { +if (mcountsym ==Elf_r_sym (relp)) {uint_t const addend =_w (_w (relp->r_offset) - recval); mrelp->r_offset =_w (offbase + ((void *)mlocp - (void *)mloc0)); - mrelp->r_info =_w (ELF_R_INFO (recsym, reltype)); +Elf_r_info (mrelp, recsym, reltype);if (sizeof (Elf_Rela) == rel_entsize) { ((Elf_Rela *)mrelp)->r_addend = addend; *mlocp++ =0 ;
Signature · 1 line
1.7.1
PATCH 2/3 ftrace/MIPS: Add module support for C version of recordmcount
In reply to Steven RostedtFrom: Wu Zhangjin <[email protected]>
Since MIPS modules' address space differs from the core kernel space, to access the _mcount in the core kernel, the kernel functions in modules must use long call (-mlong-calls): load the _mcount address into one register and jump to the address stored by the register:
c: 3c030000 lui v1,0x0 <--------> b label
c: R_MIPS_HI16 _mcount
c: R_MIPS_NONE *ABS*
c: R_MIPS_NONE *ABS*
10: 64630000 daddiu v1,v1,0
10: R_MIPS_LO16 _mcount
10: R_MIPS_NONE *ABS*
10: R_MIPS_NONE *ABS*14: 03e0082d move at,ra
18: 0060f809 jalr v1
label:
In the old Perl version of recordmcount, we only need to record the position of the 1st R_MIPS_HI16 type of _mcount, and later, in ftrace_make_nop(), replace the instruction in this position by a "b label" and in ftrace_make_call(), replace it back.
But, the default C version of recordmcount records all of the _mcount symbols, so, we must filter the 2nd _mcount like the Perl version of recordmcount does.
The C version of recordmcount copes with the symbols before they are linked, So It doesn't know the type of the symbols and therefore can not filter the symbols as the Perl version of recordmcount does. But as we can see above, the 2nd _mcount symbols of the long call alawys follows the 1st _mcount symbol of the same long call, which means the offset from the 1st to the 2nd is fixed, it is 0x10-0xc = 4 here, 4 is the length of the 1st load instruciton, for MIPS has fixed length of instructions, this offset is always 4.
And as we know, the _mcount is inserted into the entry of every kernel function, the offset between the other _mcount's is expected to be always bigger than 4. So, to filter the 2ns _mcount symbol of the long call, we can simply check the offset between two _mcount symbols, If it is 4, then, filter the 2nd _mcount symbol.
To avoid touching too much code, an 'empty' function fn_is_fake_mcount() is added for all of the archs, and the specific archs can override it via chaning the function pointer: is_fake_mcount in do_file() with the e_machine. e.g. This patch adds MIPS_is_fake_mcount() to override the default fn_is_fake_mcount() pointed by is_fake_mcount.
This fn_is_fake_mcount() checks if the _mcount symbol is fake, e.g. the 2nd _mcount symbol of the long call is fake, for there are 2 _mcount symbols mapped to one real mcount call, so, one of them is fake and must be filtered.
This fn_is_fake_mcount() is called in sift_rel_mcount() after finding the _mcount symbols and before adding the _mcount symbol into mrelp, so, it can prevent the fake mcount symbol going into the last __mcount_loc table.
LKML-Reference: <b866f0138224340a132d31861fa3f9300dee30ac.1288176026.git.wuzhangjin@gmail.com>
--- scripts/recordmcount.c | 5 +++- scripts/recordmcount.h | 56 +++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 57 insertions(+), 4 deletions(-)
scripts/recordmcount.c +4 -1
@@ -325,8 +325,10 @@ do_file(char const *const fname) }if (EM_S390 ==w2 (ehdr->e_machine)) reltype =R_390_32 ; -if (EM_MIPS ==w2 (ehdr->e_machine)) +if (EM_MIPS ==w2 (ehdr->e_machine)) { reltype =R_MIPS_32 ; + is_fake_mcount32 = MIPS32_is_fake_mcount; + }do32 (ehdr, fname, reltype); }break ;case ELFCLASS64 : {
@@ -343,6 +345,7 @@ do_file(char const *const fname) reltype =R_MIPS_64 ; Elf64_r_sym = MIPS64_r_sym; Elf64_r_info = MIPS64_r_info; + is_fake_mcount64 = MIPS64_is_fake_mcount; }do64 (ghdr, fname, reltype); }break ;
scripts/recordmcount.h +53 -3
104 lines not on this page · raw message
Signature · 1 line
1.7.1
PATCH 3/3 ftrace/MIPS: Enable C Version of recordmcount
In reply to Steven RostedtFrom: Wu Zhangjin <[email protected]>
Selects HAVE_C_RECORDMCOUNT to use the C version of the recordmcount intead of the old Perl Version of recordmcount.
LKML-Reference: <bb99009a9ac79d3f55a8c8bf1c8bd2bc0e1f160e.1288176026.git.wuzhangjin@gmail.com>
--- arch/mips/Kconfig | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
arch/mips/Kconfig +1 -0
@@ -9,6 +9,7 @@ config MIPS select HAVE_FUNCTION_TRACE_MCOUNT_TEST select HAVE_DYNAMIC_FTRACE select HAVE_FTRACE_MCOUNT_RECORD + select HAVE_C_RECORDMCOUNT select HAVE_FUNCTION_GRAPH_TRACER select HAVE_KPROBES select HAVE_KRETPROBES
Signature · 1 line
1.7.1
Ralf,
Ingo and I were discussing this patch series, and since it is very specific to MIPS, we agreed that it makes more sense going through your tree. it's based off of mainline's commit of:
commit e3e1288e86a07cdeb0aee5860a2dff111c6eff79
Merge: 9ae6d03 964dc25
Author: Linus Torvalds <[email protected]>
Date: Wed Oct 27 19:04:36 2010 -0700
Would you mind pulling from my tree?
Thanks!
-- Steve
Quoted 20 lines · Steven Rostedt
Ingo,
Please pull the latest tip/perf/mips tree, which can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git
tip/perf/mipsJohn Reiser (1):
ftrace/MIPS: Add MIPS64 support for C version of recordmcountWu Zhangjin (2):
ftrace/MIPS: Add module support for C version of recordmcount ftrace/MIPS: Enable C Version of recordmcount----
arch/mips/Kconfig | 1 + scripts/recordmcount.c | 44 ++++++++++++++++++++++++ scripts/recordmcount.h | 86 +++++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 126 insertions(+), 5 deletions(-)