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

Commit 7375dca1 authored by Steven Rostedt (VMware)'s avatar Steven Rostedt (VMware)
Browse files

ftrace: Make enable and update parameters bool when applicable 

The code modification functions have "enable" and "update" variables that
are sometimes "int" but used as "bool". Remove the ambiguity and make them
"bool" when they are only used for true or false values.

Link: http://lkml.kernel.org/r/e1429923d9eda92a3cf5ee9e33c7eacce539781d.1558115654.git.naveen.n.rao@linux.vnet.ibm.com



Reported-by: default avatar"Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com>
Signed-off-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
parent 0c97bf86

include/linux/ftrace.h

+2 −2
Original line number Diff line number Diff line
@@ -427,8 +427,8 @@ struct dyn_ftrace *ftrace_rec_iter_record(struct ftrace_rec_iter *iter); 
	     iter = ftrace_rec_iter_next(iter))





int ftrace_update_record(struct dyn_ftrace *rec, int enable);

int ftrace_test_record(struct dyn_ftrace *rec, int enable);

int ftrace_update_record(struct dyn_ftrace *rec, bool enable);

int ftrace_test_record(struct dyn_ftrace *rec, bool enable);

void ftrace_run_stop_machine(int command);

unsigned long ftrace_location(unsigned long ip);

unsigned long ftrace_location_range(unsigned long start, unsigned long end);

kernel/trace/ftrace.c

+10 −10
Original line number Diff line number Diff line
@@ -1768,7 +1768,7 @@ static bool __ftrace_hash_rec_update(struct ftrace_ops *ops, 
		count++;



		/* Must match FTRACE_UPDATE_CALLS in ftrace_modify_all_code() */

		update |= ftrace_test_record(rec, 1) != FTRACE_UPDATE_IGNORE;

		update |= ftrace_test_record(rec, true) != FTRACE_UPDATE_IGNORE;



		/* Shortcut, if we handled all records, we are done. */

		if (!all && count == hash->count)
@@ -2047,7 +2047,7 @@ void ftrace_bug(int failed, struct dyn_ftrace *rec) 
	}

}



static int ftrace_check_record(struct dyn_ftrace *rec, int enable, int update)

static int ftrace_check_record(struct dyn_ftrace *rec, bool enable, bool update)

{

	unsigned long flag = 0UL;
@@ -2146,28 +2146,28 @@ static int ftrace_check_record(struct dyn_ftrace *rec, int enable, int update) 
/**

 * ftrace_update_record, set a record that now is tracing or not

 * @rec: the record to update

 * @enable: set to 1 if the record is tracing, zero to force disable

 * @enable: set to true if the record is tracing, false to force disable

 *

 * The records that represent all functions that can be traced need

 * to be updated when tracing has been enabled.

 */

int ftrace_update_record(struct dyn_ftrace *rec, int enable)

int ftrace_update_record(struct dyn_ftrace *rec, bool enable)

{

	return ftrace_check_record(rec, enable, 1);

	return ftrace_check_record(rec, enable, true);

}



/**

 * ftrace_test_record, check if the record has been enabled or not

 * @rec: the record to test

 * @enable: set to 1 to check if enabled, 0 if it is disabled

 * @enable: set to true to check if enabled, false if it is disabled

 *

 * The arch code may need to test if a record is already set to

 * tracing to determine how to modify the function code that it

 * represents.

 */

int ftrace_test_record(struct dyn_ftrace *rec, int enable)

int ftrace_test_record(struct dyn_ftrace *rec, bool enable)

{

	return ftrace_check_record(rec, enable, 0);

	return ftrace_check_record(rec, enable, false);

}



static struct ftrace_ops *
@@ -2356,7 +2356,7 @@ unsigned long ftrace_get_addr_curr(struct dyn_ftrace *rec) 
}



static int

__ftrace_replace_code(struct dyn_ftrace *rec, int enable)

__ftrace_replace_code(struct dyn_ftrace *rec, bool enable)

{

	unsigned long ftrace_old_addr;

	unsigned long ftrace_addr;
@@ -2395,7 +2395,7 @@ void __weak ftrace_replace_code(int mod_flags) 
{

	struct dyn_ftrace *rec;

	struct ftrace_page *pg;

	int enable = mod_flags & FTRACE_MODIFY_ENABLE_FL;

	bool enable = mod_flags & FTRACE_MODIFY_ENABLE_FL;

	int schedulable = mod_flags & FTRACE_MODIFY_MAY_SLEEP_FL;

	int failed;