Skip to content

Commit 4447586

Browse files
Steven Rostedtrostedt
authored andcommitted
ftrace: Do not process kernel/trace/ftrace.o with C recordmcount program
The file kernel/trace/ftrace.c references the mcount() call to convert the mcount() callers to nops. But because it references mcount(), the mcount() address is placed in the relocation table. The C version of recordmcount reads the relocation table of all object files, and it will add all references to mcount to the __mcount_loc table that is used to find the places that call mcount() and change the call to a nop. When recordmcount finds the mcount reference in kernel/trace/ftrace.o, it saves that location even though the code is not a call, but references mcount as data. On boot up, when all calls are converted to nops, the code has a safety check to determine what op code it is actually replacing before it replaces it. If that op code at the address does not match, then a warning is printed and the function tracer is disabled. The reference to mcount in ftrace.c, causes this warning to trigger, since the reference is not a call to mcount(). The ftrace.c file is not compiled with the -pg flag, so no calls to mcount() should be expected. This patch simply makes recordmcount.c skip the kernel/trace/ftrace.c file. This was the same solution used by the perl version of recordmcount. Reported-by: Ingo Molnar <mingo@elte.hu> Cc: John Reiser <jreiser@bitwagon.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
1 parent cf4db25 commit 4447586

File tree

1 file changed

+20
-2
lines changed

1 file changed

+20
-2
lines changed

scripts/recordmcount.c

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -313,12 +313,30 @@ do_file(char const *const fname)
313313
int
314314
main(int argc, char const *argv[])
315315
{
316+
const char ftrace[] = "kernel/trace/ftrace.o";
317+
int ftrace_size = sizeof(ftrace) - 1;
316318
int n_error = 0; /* gcc-4.3.0 false positive complaint */
317-
if (argc <= 1)
319+
320+
if (argc <= 1) {
318321
fprintf(stderr, "usage: recordmcount file.o...\n");
319-
else /* Process each file in turn, allowing deep failure. */
322+
return 0;
323+
}
324+
325+
/* Process each file in turn, allowing deep failure. */
320326
for (--argc, ++argv; 0 < argc; --argc, ++argv) {
321327
int const sjval = setjmp(jmpenv);
328+
int len;
329+
330+
/*
331+
* The file kernel/trace/ftrace.o references the mcount
332+
* function but does not call it. Since ftrace.o should
333+
* not be traced anyway, we just skip it.
334+
*/
335+
len = strlen(argv[0]);
336+
if (len >= ftrace_size &&
337+
strcmp(argv[0] + (len - ftrace_size), ftrace) == 0)
338+
continue;
339+
322340
switch (sjval) {
323341
default: {
324342
fprintf(stderr, "internal error: %s\n", argv[0]);

0 commit comments

Comments
 (0)