Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 414eb44d authored by Martin Schwidefsky's avatar Martin Schwidefsky Committed by Steven Rostedt
Browse files

ftrace/x86: mcount offset calculation 



Do the mcount offset adjustment in the recordmcount.pl/recordmcount.[ch]
at compile time and not in ftrace_call_adjust at run time.

Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent f215efc5

arch/x86/include/asm/ftrace.h

+3 −4
Original line number Diff line number Diff line
@@ -38,11 +38,10 @@ extern void mcount(void); 
static inline unsigned long ftrace_call_adjust(unsigned long addr)

{

	/*

	 * call mcount is "e8 <4 byte offset>"

	 * The addr points to the 4 byte offset and the caller of this

	 * function wants the pointer to e8. Simply subtract one.

	 * addr is the address of the mcount call instruction.

	 * recordmcount does the necessary offset calculation.

	 */

	return addr - 1;

	return addr;

}



#ifdef CONFIG_DYNAMIC_FTRACE

scripts/recordmcount.c

+2 −0
Original line number Diff line number Diff line
@@ -335,6 +335,7 @@ do_file(char const *const fname) 
		reltype = R_386_32;

		make_nop = make_nop_x86;

		ideal_nop = ideal_nop5_x86_32;

		mcount_adjust_32 = -1;

		break;

	case EM_ARM:	 reltype = R_ARM_ABS32;

			 altmcount = "__gnu_mcount_nc";
@@ -350,6 +351,7 @@ do_file(char const *const fname) 
		make_nop = make_nop_x86;

		ideal_nop = ideal_nop5_x86_64;

		reltype = R_X86_64_64;

		mcount_adjust_64 = -1;

		break;

	}  /* end switch */

scripts/recordmcount.pl

+2 −0
Original line number Diff line number Diff line
@@ -223,6 +223,7 @@ if ($arch eq "x86_64") { 
    $mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\smcount([+-]0x[0-9a-zA-Z]+)?\$";

    $type = ".quad";

    $alignment = 8;

    $mcount_adjust = -1;



    # force flags for this arch

    $ld .= " -m elf_x86_64";
@@ -232,6 +233,7 @@ if ($arch eq "x86_64") { 


} elsif ($arch eq "i386") {

    $alignment = 4;

    $mcount_adjust = -1;



    # force flags for this arch

    $ld .= " -m elf_i386";