Commit b10545b6 authored by Masami Hiramatsu (Google)'s avatar Masami Hiramatsu (Google)
Browse files

tracing/kprobes: Fix build error when find_module() is not available 

The kernel test robot reported that the find_module() is not available
if CONFIG_MODULES=n.
Fix this error by hiding find_modules() in #ifdef CONFIG_MODULES with
related rcu locks as try_module_get_by_name().

Link: https://lore.kernel.org/all/172056819167.201571.250053007194508038.stgit@devnote2/



Reported-by: default avatarkernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202407070744.RcLkn8sq-lkp@intel.com/
Closes: https://lore.kernel.org/oe-kbuild-all/202407070917.VVUCBlaS-lkp@intel.com/


Signed-off-by: default avatarMasami Hiramatsu (Google) <mhiramat@kernel.org>
parent 9d861603

kernel/trace/trace_kprobe.c

+19 −6
Original line number Diff line number Diff line
@@ -794,6 +794,24 @@ static int validate_module_probe_symbol(const char *modname, const char *symbol) 
	return 0;

}



#ifdef CONFIG_MODULES

/* Return NULL if the module is not loaded or under unloading. */

static struct module *try_module_get_by_name(const char *name)

{

	struct module *mod;



	rcu_read_lock_sched();

	mod = find_module(name);

	if (mod && !try_module_get(mod))

		mod = NULL;

	rcu_read_unlock_sched();



	return mod;

}

#else

#define try_module_get_by_name(name)	(NULL)

#endif



static int validate_probe_symbol(char *symbol)

{

	struct module *mod = NULL;
@@ -805,12 +823,7 @@ static int validate_probe_symbol(char *symbol) 
		modname = symbol;

		symbol = p + 1;

		*p = '\0';

		/* Return 0 (defer) if the module does not exist yet. */

		rcu_read_lock_sched();

		mod = find_module(modname);

		if (mod && !try_module_get(mod))

			mod = NULL;

		rcu_read_unlock_sched();

		mod = try_module_get_by_name(modname);

		if (!mod)

			goto out;

	}