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

Commit d2c8c3ea authored by Steven Rostedt's avatar Steven Rostedt Committed by Steven Rostedt
Browse files

ftrace: Remove FTRACE_FL_CONVERTED flag 



Since we disable all function tracer processing if we detect
that a modification of a instruction had failed, we do not need
to track that the record has failed. No more ftrace processing
is allowed, and the FTRACE_FL_CONVERTED flag is pointless.

The FTRACE_FL_CONVERTED flag was used to denote records that were
successfully converted from mcount calls into nops. But if a single
record fails, all of ftrace is disabled.

Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent 45a4a237

include/linux/ftrace.h

+0 −1
Original line number Diff line number Diff line
@@ -150,7 +150,6 @@ enum { 
	FTRACE_FL_FILTER	= (1 << 1),

	FTRACE_FL_ENABLED	= (1 << 2),

	FTRACE_FL_NOTRACE	= (1 << 3),

	FTRACE_FL_CONVERTED	= (1 << 4),

};



struct dyn_ftrace {

kernel/trace/ftrace.c

+4 −8
Original line number Diff line number Diff line
@@ -1087,12 +1087,8 @@ static void ftrace_replace_code(int enable) 
		return;



	do_for_each_ftrace_rec(pg, rec) {

		/*

		 * Skip over free records, records that have

		 * failed and not converted.

		 */

		if (rec->flags & FTRACE_FL_FREE ||

		    !(rec->flags & FTRACE_FL_CONVERTED))

		/* Skip over free records */

		if (rec->flags & FTRACE_FL_FREE)

			continue;



		failed = __ftrace_replace_code(rec, enable);
@@ -1280,10 +1276,10 @@ static int ftrace_update_code(struct module *mod) 
		 */

		if (!ftrace_code_disable(mod, p)) {

			ftrace_free_rec(p);

			continue;

			/* Game over */

			break;

		}



		p->flags |= FTRACE_FL_CONVERTED;

		ftrace_update_cnt++;



		/*