Commit a124692b authored May 04, 2019 by Cheng Jian Committed by Steven Rostedt (VMware) May 25, 2019

ftrace: Enable trampoline when rec count returns back to one

Custom trampolines can only be enabled if there is only a single ops
attached to it. If there's only a single callback registered to a function,
and the ops has a trampoline registered for it, then we can call the
trampoline directly. This is very useful for improving the performance of
ftrace and livepatch.

If more than one callback is registered to a function, the general
trampoline is used, and the custom trampoline is not restored back to the
direct call even if all the other callbacks were unregistered and we are
back to one callback for the function.

To fix this, set FTRACE_FL_TRAMP flag if rec count is decremented
to one, and the ops that left has a trampoline.

Testing After this patch :

insmod livepatch_unshare_files.ko
cat /sys/kernel/debug/tracing/enabled_functions

	unshare_files (1) R I	tramp: 0xffffffffc0000000(klp_ftrace_handler+0x0/0xa0) ->ftrace_ops_assist_func+0x0/0xf0

echo unshare_files > /sys/kernel/debug/tracing/set_ftrace_filter
echo function > /sys/kernel/debug/tracing/current_tracer
cat /sys/kernel/debug/tracing/enabled_functions

	unshare_files (2) R I ->ftrace_ops_list_func+0x0/0x150

echo nop > /sys/kernel/debug/tracing/current_tracer
cat /sys/kernel/debug/tracing/enabled_functions

	unshare_files (1) R I	tramp: 0xffffffffc0000000(klp_ftrace_handler+0x0/0xa0) ->ftrace_ops_assist_func+0x0/0xf0

Link: http://lkml.kernel.org/r/1556969979-111047-1-git-send-email-cj.chengjian@huawei.com



Signed-off-by: Cheng Jian <cj.chengjian@huawei.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>

parent b6399cc7

kernel/trace/ftrace.c

+15 −13

Original line number	Diff line number	Diff line
		@@ -1622,6 +1622,11 @@ static bool test_rec_ops_needs_regs(struct dyn_ftrace *rec)
		return keep_regs;
		}

		static struct ftrace_ops *
		ftrace_find_tramp_ops_any(struct dyn_ftrace *rec);
		static struct ftrace_ops *
		ftrace_find_tramp_ops_next(struct dyn_ftrace rec, struct ftrace_ops ops);

		static bool __ftrace_hash_rec_update(struct ftrace_ops *ops,
		int filter_hash,
		bool inc)
		@@ -1750,14 +1755,16 @@ static bool __ftrace_hash_rec_update(struct ftrace_ops *ops,
		}

		/*
		* If the rec had TRAMP enabled, then it needs to
		* be cleared. As TRAMP can only be enabled iff
		* there is only a single ops attached to it.
		* In otherwords, always disable it on decrementing.
		* In the future, we may set it if rec count is
		* decremented to one, and the ops that is left
		* has a trampoline.
		*/
		* The TRAMP needs to be set only if rec count
		* is decremented to one, and the ops that is
		* left has a trampoline. As TRAMP can only be
		* enabled if there is only a single ops attached
		* to it.
		*/
		if (ftrace_rec_count(rec) == 1 &&
		ftrace_find_tramp_ops_any(rec))
		rec->flags \|= FTRACE_FL_TRAMP;
		else
		rec->flags &= ~FTRACE_FL_TRAMP;

		/*
		@@ -1951,11 +1958,6 @@ static void print_ip_ins(const char fmt, const unsigned char p)
		printk(KERN_CONT "%s%02x", i ? ":" : "", p[i]);
		}

		static struct ftrace_ops *
		ftrace_find_tramp_ops_any(struct dyn_ftrace *rec);
		static struct ftrace_ops *
		ftrace_find_tramp_ops_next(struct dyn_ftrace rec, struct ftrace_ops ops);

		enum ftrace_bug_type ftrace_bug_type;
		const void *ftrace_expected;

Admin message