Commit 2889c658 authored by Yuntao Wang's avatar Yuntao Wang Committed by Steven Rostedt (Google)
Browse files

ftrace: Deal with error return code of the ftrace_process_locs() function 

The ftrace_process_locs() function may return -ENOMEM error code, which
should be handled by the callers.

Link: https://lkml.kernel.org/r/20220120065949.1813231-1-ytcoode@gmail.com



Signed-off-by: default avatarYuntao Wang <ytcoode@gmail.com>
Signed-off-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
parent e4931b82

kernel/trace/ftrace.c

+13 −4
Original line number Diff line number Diff line
@@ -6864,11 +6864,16 @@ void ftrace_module_enable(struct module *mod) 


void ftrace_module_init(struct module *mod)

{

	int ret;



	if (ftrace_disabled || !mod->num_ftrace_callsites)

		return;



	ftrace_process_locs(mod, mod->ftrace_callsites,

	ret = ftrace_process_locs(mod, mod->ftrace_callsites,

				  mod->ftrace_callsites + mod->num_ftrace_callsites);

	if (ret)

		pr_warn("ftrace: failed to allocate entries for module '%s' functions\n",

			mod->name);

}



static void save_ftrace_mod_rec(struct ftrace_mod_map *mod_map,
@@ -7201,15 +7206,19 @@ void __init ftrace_init(void) 
	pr_info("ftrace: allocating %ld entries in %ld pages\n",

		count, count / ENTRIES_PER_PAGE + 1);



	last_ftrace_enabled = ftrace_enabled = 1;



	ret = ftrace_process_locs(NULL,

				  __start_mcount_loc,

				  __stop_mcount_loc);

	if (ret) {

		pr_warn("ftrace: failed to allocate entries for functions\n");

		goto failed;

	}



	pr_info("ftrace: allocated %ld pages with %ld groups\n",

		ftrace_number_of_pages, ftrace_number_of_groups);



	last_ftrace_enabled = ftrace_enabled = 1;



	set_ftrace_early_filters();



	return;