Commit 1c80c432 authored by Steven Rostedt (Red Hat)'s avatar Steven Rostedt (Red Hat) Committed by Steven Rostedt
Browse files

ftrace: Consolidate some duplicate code for updating ftrace ops 



When ftrace ops modifies the functions that it will trace, the update
to the function mcount callers may need to be modified. Consolidate
the two places that do the checks to see if an update is required
with a wrapper function for those checks.

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

kernel/trace/ftrace.c

+10 −6
Original line number Diff line number Diff line
@@ -3384,6 +3384,12 @@ ftrace_match_addr(struct ftrace_hash *hash, unsigned long ip, int remove) 
	return add_hash_entry(hash, ip);

}



static void ftrace_ops_update_code(struct ftrace_ops *ops)

{

	if (ops->flags & FTRACE_OPS_FL_ENABLED && ftrace_enabled)

		ftrace_run_update_code(FTRACE_UPDATE_CALLS);

}



static int

ftrace_set_hash(struct ftrace_ops *ops, unsigned char *buf, int len,

		unsigned long ip, int remove, int reset, int enable)
@@ -3426,9 +3432,8 @@ ftrace_set_hash(struct ftrace_ops *ops, unsigned char *buf, int len, 


	mutex_lock(&ftrace_lock);

	ret = ftrace_hash_move(ops, enable, orig_hash, hash);

	if (!ret && ops->flags & FTRACE_OPS_FL_ENABLED

	    && ftrace_enabled)

		ftrace_run_update_code(FTRACE_UPDATE_CALLS);

	if (!ret)

		ftrace_ops_update_code(ops);



	mutex_unlock(&ftrace_lock);
@@ -3655,9 +3660,8 @@ int ftrace_regex_release(struct inode *inode, struct file *file) 
		mutex_lock(&ftrace_lock);

		ret = ftrace_hash_move(iter->ops, filter_hash,

				       orig_hash, iter->hash);

		if (!ret && (iter->ops->flags & FTRACE_OPS_FL_ENABLED)

		    && ftrace_enabled)

			ftrace_run_update_code(FTRACE_UPDATE_CALLS);

		if (!ret)

			ftrace_ops_update_code(iter->ops);



		mutex_unlock(&ftrace_lock);

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE