Commit 3e355205 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jessica Yu
Browse files

kallsyms: only build {,module_}kallsyms_on_each_symbol when required 



kallsyms_on_each_symbol and module_kallsyms_on_each_symbol are only used
by the livepatching code, so don't build them if livepatching is not
enabled.

Reviewed-by: default avatarMiroslav Benes <mbenes@suse.cz>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJessica Yu <jeyu@kernel.org>
parent 013c1667

include/linux/kallsyms.h

+4 −13
Original line number Diff line number Diff line
@@ -71,15 +71,14 @@ static inline void *dereference_symbol_descriptor(void *ptr) 
	return ptr;

}



#ifdef CONFIG_KALLSYMS

/* Lookup the address for a symbol. Returns 0 if not found. */

unsigned long kallsyms_lookup_name(const char *name);



/* Call a function on each kallsyms symbol in the core kernel */

int kallsyms_on_each_symbol(int (*fn)(void *, const char *, struct module *,

				      unsigned long),

			    void *data);



#ifdef CONFIG_KALLSYMS

/* Lookup the address for a symbol. Returns 0 if not found. */

unsigned long kallsyms_lookup_name(const char *name);



extern int kallsyms_lookup_size_offset(unsigned long addr,

				  unsigned long *symbolsize,

				  unsigned long *offset);
@@ -108,14 +107,6 @@ static inline unsigned long kallsyms_lookup_name(const char *name) 
	return 0;

}



static inline int kallsyms_on_each_symbol(int (*fn)(void *, const char *,

						    struct module *,

						    unsigned long),

					  void *data)

{

	return 0;

}



static inline int kallsyms_lookup_size_offset(unsigned long addr,

					      unsigned long *symbolsize,

					      unsigned long *offset)

include/linux/module.h

+4 −12
Original line number Diff line number Diff line
@@ -608,10 +608,6 @@ int module_get_kallsym(unsigned int symnum, unsigned long *value, char *type, 
/* Look for this name: can be of form module:name. */

unsigned long module_kallsyms_lookup_name(const char *name);



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

					     struct module *, unsigned long),

				   void *data);



extern void __noreturn __module_put_and_exit(struct module *mod,

			long code);

#define module_put_and_exit(code) __module_put_and_exit(THIS_MODULE, code)
@@ -795,14 +791,6 @@ static inline unsigned long module_kallsyms_lookup_name(const char *name) 
	return 0;

}



static inline int module_kallsyms_on_each_symbol(int (*fn)(void *, const char *,

							   struct module *,

							   unsigned long),

						 void *data)

{

	return 0;

}



static inline int register_module_notifier(struct notifier_block *nb)

{

	/* no events will happen anyway, so this can always succeed */
@@ -891,4 +879,8 @@ static inline bool module_sig_ok(struct module *module) 
}

#endif	/* CONFIG_MODULE_SIG */



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

					     struct module *, unsigned long),

				   void *data);



#endif /* _LINUX_MODULE_H */

kernel/kallsyms.c

+2 −0
Original line number Diff line number Diff line
@@ -177,6 +177,7 @@ unsigned long kallsyms_lookup_name(const char *name) 
	return module_kallsyms_lookup_name(name);

}



#ifdef CONFIG_LIVEPATCH

/*

 * Iterate over all symbols in vmlinux.  For symbols from modules use

 * module_kallsyms_on_each_symbol instead.
@@ -198,6 +199,7 @@ int kallsyms_on_each_symbol(int (*fn)(void *, const char *, struct module *, 
	}

	return 0;

}

#endif /* CONFIG_LIVEPATCH */



static unsigned long get_symbol_pos(unsigned long addr,

				    unsigned long *symbolsize,

kernel/module.c

+2 −0
Original line number Diff line number Diff line
@@ -4488,6 +4488,7 @@ unsigned long module_kallsyms_lookup_name(const char *name) 
	return ret;

}



#ifdef CONFIG_LIVEPATCH

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

					     struct module *, unsigned long),

				   void *data)
@@ -4518,6 +4519,7 @@ int module_kallsyms_on_each_symbol(int (*fn)(void *, const char *, 
	mutex_unlock(&module_mutex);

	return ret;

}

#endif /* CONFIG_LIVEPATCH */

#endif /* CONFIG_KALLSYMS */



/* Maximum number of characters written by module_flags() */