Commit 34bf9347 authored by Viktor Malik's avatar Viktor Malik Committed by Alexei Starovoitov
Browse files

kallsyms: move module-related functions under correct configs 



Functions for searching module kallsyms should have non-empty
definitions only if CONFIG_MODULES=y and CONFIG_KALLSYMS=y. Until now,
only CONFIG_MODULES check was used for many of these, which may have
caused complilation errors on some configs.

This patch moves all relevant functions under the correct configs.

Fixes: bd5314f8 ("kallsyms, bpf: Move find_kallsyms_symbol_value out of internal header")
Signed-off-by: default avatarViktor Malik <vmalik@redhat.com>
Reported-by: default avatarkernel test robot <lkp@intel.com>
Link: https://lore.kernel.org/oe-kbuild-all/202303181535.RFDCnz3E-lkp@intel.com/
Link: https://lore.kernel.org/r/20230330102001.2183693-1-vmalik@redhat.com


Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent c6ebae4c

include/linux/module.h

+74 −61
Original line number Original line Diff line number Diff line
@@ -608,16 +608,6 @@ static inline bool within_module(unsigned long addr, const struct module *mod) 
/* Search for module by name: must be in a RCU-sched critical section. */

/* Search for module by name: must be in a RCU-sched critical section. */

struct module *find_module(const char *name);

struct module *find_module(const char *name);





/* Returns 0 and fills in value, defined and namebuf, or -ERANGE if

   symnum out of range. */

int module_get_kallsym(unsigned int symnum, unsigned long *value, char *type,

			char *name, char *module_name, int *exported);



/* Look for this name: can be of form module:name. */

unsigned long module_kallsyms_lookup_name(const char *name);



unsigned long find_kallsyms_symbol_value(struct module *mod, const char *name);



extern void __noreturn __module_put_and_kthread_exit(struct module *mod,

extern void __noreturn __module_put_and_kthread_exit(struct module *mod,

			long code);

			long code);

#define module_put_and_kthread_exit(code) __module_put_and_kthread_exit(THIS_MODULE, code)

#define module_put_and_kthread_exit(code) __module_put_and_kthread_exit(THIS_MODULE, code)
@@ -664,17 +654,6 @@ static inline void __module_get(struct module *module) 
/* Dereference module function descriptor */

/* Dereference module function descriptor */

void *dereference_module_function_descriptor(struct module *mod, void *ptr);

void *dereference_module_function_descriptor(struct module *mod, void *ptr);





/* For kallsyms to ask for address resolution.  namebuf should be at

 * least KSYM_NAME_LEN long: a pointer to namebuf is returned if

 * found, otherwise NULL. */

const char *module_address_lookup(unsigned long addr,

			    unsigned long *symbolsize,

			    unsigned long *offset,

			    char **modname, const unsigned char **modbuildid,

			    char *namebuf);

int lookup_module_symbol_name(unsigned long addr, char *symname);

int lookup_module_symbol_attrs(unsigned long addr, unsigned long *size, unsigned long *offset, char *modname, char *name);



int register_module_notifier(struct notifier_block *nb);

int register_module_notifier(struct notifier_block *nb);

int unregister_module_notifier(struct notifier_block *nb);

int unregister_module_notifier(struct notifier_block *nb);
@@ -765,45 +744,6 @@ static inline void module_put(struct module *module) 




#define module_name(mod) "kernel"

#define module_name(mod) "kernel"





/* For kallsyms to ask for address resolution.  NULL means not found. */

static inline const char *module_address_lookup(unsigned long addr,

					  unsigned long *symbolsize,

					  unsigned long *offset,

					  char **modname,

					  const unsigned char **modbuildid,

					  char *namebuf)

{

	return NULL;

}



static inline int lookup_module_symbol_name(unsigned long addr, char *symname)

{

	return -ERANGE;

}



static inline int lookup_module_symbol_attrs(unsigned long addr, unsigned long *size, unsigned long *offset, char *modname, char *name)

{

	return -ERANGE;

}



static inline int module_get_kallsym(unsigned int symnum, unsigned long *value,

					char *type, char *name,

					char *module_name, int *exported)

{

	return -ERANGE;

}



static inline unsigned long module_kallsyms_lookup_name(const char *name)

{

	return 0;

}



static inline unsigned long find_kallsyms_symbol_value(struct module *mod,

						       const char *name)

{

	return 0;

}



static inline int register_module_notifier(struct notifier_block *nb)

static inline int register_module_notifier(struct notifier_block *nb)

{

{

	/* no events will happen anyway, so this can always succeed */

	/* no events will happen anyway, so this can always succeed */
@@ -899,7 +839,36 @@ int module_kallsyms_on_each_symbol(const char *modname, 
				   int (*fn)(void *, const char *,

				   int (*fn)(void *, const char *,

					     struct module *, unsigned long),

					     struct module *, unsigned long),

				   void *data);

				   void *data);

#else



/* For kallsyms to ask for address resolution.  namebuf should be at

 * least KSYM_NAME_LEN long: a pointer to namebuf is returned if

 * found, otherwise NULL.

 */

const char *module_address_lookup(unsigned long addr,

				  unsigned long *symbolsize,

				  unsigned long *offset,

				  char **modname, const unsigned char **modbuildid,

				  char *namebuf);

int lookup_module_symbol_name(unsigned long addr, char *symname);

int lookup_module_symbol_attrs(unsigned long addr,

			       unsigned long *size,

			       unsigned long *offset,

			       char *modname,

			       char *name);



/* Returns 0 and fills in value, defined and namebuf, or -ERANGE if

 * symnum out of range.

 */

int module_get_kallsym(unsigned int symnum, unsigned long *value, char *type,

		       char *name, char *module_name, int *exported);



/* Look for this name: can be of form module:name. */

unsigned long module_kallsyms_lookup_name(const char *name);



unsigned long find_kallsyms_symbol_value(struct module *mod, const char *name);



#else	/* CONFIG_MODULES && CONFIG_KALLSYMS */



static inline int module_kallsyms_on_each_symbol(const char *modname,

static inline int module_kallsyms_on_each_symbol(const char *modname,

						 int (*fn)(void *, const char *,

						 int (*fn)(void *, const char *,

						 struct module *, unsigned long),

						 struct module *, unsigned long),
@@ -907,6 +876,50 @@ static inline int module_kallsyms_on_each_symbol(const char *modname, 
{

{

	return -EOPNOTSUPP;

	return -EOPNOTSUPP;

}

}



/* For kallsyms to ask for address resolution.  NULL means not found. */

static inline const char *module_address_lookup(unsigned long addr,

						unsigned long *symbolsize,

						unsigned long *offset,

						char **modname,

						const unsigned char **modbuildid,

						char *namebuf)

{

	return NULL;

}



static inline int lookup_module_symbol_name(unsigned long addr, char *symname)

{

	return -ERANGE;

}



static inline int lookup_module_symbol_attrs(unsigned long addr,

					     unsigned long *size,

					     unsigned long *offset,

					     char *modname,

					     char *name)

{

	return -ERANGE;

}



static inline int module_get_kallsym(unsigned int symnum, unsigned long *value,

				     char *type, char *name,

				     char *module_name, int *exported)

{

	return -ERANGE;

}



static inline unsigned long module_kallsyms_lookup_name(const char *name)

{

	return 0;

}



static inline unsigned long find_kallsyms_symbol_value(struct module *mod,

						       const char *name)

{

	return 0;

}



#endif  /* CONFIG_MODULES && CONFIG_KALLSYMS */

#endif  /* CONFIG_MODULES && CONFIG_KALLSYMS */





#endif /* _LINUX_MODULE_H */
 
#endif /* _LINUX_MODULE_H */