module: kallsyms functions take struct load_info

Simple refactor causes us to lift struct definition to top of file. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

module: kallsyms functions take struct load_info
Simple refactor causes us to lift struct definition to top of file. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Rusty Russell
1 parent d6df72a06e
Showing 1 changed file with 29 additions and 39 deletions Side-by-side Diff
kernel/module.c
@@ -110,6 +110,16 @@
 }
 EXPORT_SYMBOL(unregister_module_notifier);
  
+struct load_info {
+	Elf_Ehdr *hdr;
+	unsigned long len;
+	Elf_Shdr *sechdrs;
+	char *secstrings, *args, *strtab;
+	struct {
+		unsigned int sym, str, mod, vers, info, pcpu;
+	} index;
+};
+
 /* We require a truly strong try_module_get(): 0 means failure due to
    ongoing or failed initialization etc. */
 static inline int strong_try_module_get(struct module *mod)
  
@@ -1909,11 +1919,10 @@
 }
  
 /* As per nm */
-static char elf_type(const Elf_Sym *sym,
-		     Elf_Shdr *sechdrs,
-		     const char *secstrings,
-		     struct module *mod)
+static char elf_type(const Elf_Sym *sym, const struct load_info *info)
 {
+	const Elf_Shdr *sechdrs = info->sechdrs;
+
 	if (ELF_ST_BIND(sym->st_info) == STB_WEAK) {
 		if (ELF_ST_TYPE(sym->st_info) == STT_OBJECT)
 			return 'v';
  
@@ -1943,8 +1952,10 @@
 		else
 			return 'b';
 	}
-	if (strstarts(secstrings + sechdrs[sym->st_shndx].sh_name, ".debug"))
+	if (strstarts(info->secstrings + sechdrs[sym->st_shndx].sh_name,
+		      ".debug")) {
 		return 'n';
+	}
 	return '?';
 }
  
  
  
  
  
  
@@ -2021,35 +2032,30 @@
 	return symoffs;
 }
  
-static void add_kallsyms(struct module *mod,
-			 Elf_Shdr *sechdrs,
-			 unsigned int shnum,
-			 unsigned int symindex,
-			 unsigned int strindex,
+static void add_kallsyms(struct module *mod, struct load_info *info,
 			 unsigned long symoffs,
 			 unsigned long stroffs,
-			 const char *secstrings,
 			 unsigned long *strmap)
 {
 	unsigned int i, ndst;
 	const Elf_Sym *src;
 	Elf_Sym *dst;
 	char *s;
+	Elf_Shdr *symsec = &info->sechdrs[info->index.sym];
  
-	mod->symtab = (void *)sechdrs[symindex].sh_addr;
-	mod->num_symtab = sechdrs[symindex].sh_size / sizeof(Elf_Sym);
-	mod->strtab = (void *)sechdrs[strindex].sh_addr;
+	mod->symtab = (void *)symsec->sh_addr;
+	mod->num_symtab = symsec->sh_size / sizeof(Elf_Sym);
+	mod->strtab = info->strtab;
  
 	/* Set types up while we still have access to sections. */
 	for (i = 0; i < mod->num_symtab; i++)
-		mod->symtab[i].st_info
-			= elf_type(&mod->symtab[i], sechdrs, secstrings, mod);
+		mod->symtab[i].st_info = elf_type(&mod->symtab[i], info);
  
 	mod->core_symtab = dst = mod->module_core + symoffs;
 	src = mod->symtab;
 	*dst = *src;
 	for (ndst = i = 1; i < mod->num_symtab; ++i, ++src) {
-		if (!is_core_symbol(src, sechdrs, shnum))
+		if (!is_core_symbol(src, info->sechdrs, info->hdr->e_shnum))
 			continue;
 		dst[ndst] = *src;
 		dst[ndst].st_name = bitmap_weight(strmap, dst[ndst].st_name);
@@ -2058,7 +2064,7 @@
 	mod->core_num_syms = ndst;
  
 	mod->core_strtab = s = mod->module_core + stroffs;
-	for (*s = 0, i = 1; i < sechdrs[strindex].sh_size; ++i)
+	for (*s = 0, i = 1; i < info->sechdrs[info->index.str].sh_size; ++i)
 		if (test_bit(i, strmap))
 			*++s = mod->strtab[i];
 }
@@ -2075,15 +2081,10 @@
 	return 0;
 }
  
-static inline void add_kallsyms(struct module *mod,
-				Elf_Shdr *sechdrs,
-				unsigned int shnum,
-				unsigned int symindex,
-				unsigned int strindex,
-				unsigned long symoffs,
-				unsigned long stroffs,
-				const char *secstrings,
-				const unsigned long *strmap)
+static void add_kallsyms(struct module *mod, struct load_info *info,
+			 unsigned long symoffs,
+			 unsigned long stroffs,
+			 unsigned long *strmap)
 {
 }
 #endif /* CONFIG_KALLSYMS */
@@ -2148,16 +2149,6 @@
 }
 #endif
  
-struct load_info {
-	Elf_Ehdr *hdr;
-	unsigned long len;
-	Elf_Shdr *sechdrs;
-	char *secstrings, *args, *strtab;
-	struct {
-		unsigned int sym, str, mod, vers, info, pcpu;
-	} index;
-};
-
 /* Sets info->hdr and info->len. */
 static int copy_and_check(struct load_info *info, const void __user *umod, unsigned long len)
 {
@@ -2623,8 +2614,7 @@
 	percpu_modcopy(mod, (void *)info.sechdrs[info.index.pcpu].sh_addr,
 		       info.sechdrs[info.index.pcpu].sh_size);
  
-	add_kallsyms(mod, info.sechdrs, info.hdr->e_shnum, info.index.sym, info.index.str,
-		     symoffs, stroffs, info.secstrings, strmap);
+	add_kallsyms(mod, &info, symoffs, stroffs, strmap);
 	kfree(strmap);
 	strmap = NULL;
...	...	@@ -110,6 +110,16 @@
110	110	}
111	111	EXPORT_SYMBOL(unregister_module_notifier);
112	112
	113	+struct load_info {
	114	+ Elf_Ehdr *hdr;
	115	+ unsigned long len;
	116	+ Elf_Shdr *sechdrs;
	117	+ char secstrings, args, *strtab;
	118	+ struct {
	119	+ unsigned int sym, str, mod, vers, info, pcpu;
	120	+ } index;
	121	+};
	122	+
113	123	/* We require a truly strong try_module_get(): 0 means failure due to
114	124	ongoing or failed initialization etc. */
115	125	static inline int strong_try_module_get(struct module *mod)
116	126
...	...	@@ -1909,11 +1919,10 @@
1909	1919	}
1910	1920
1911	1921	/* As per nm */
1912		-static char elf_type(const Elf_Sym *sym,
1913		- Elf_Shdr *sechdrs,
1914		- const char *secstrings,
1915		- struct module *mod)
	1922	+static char elf_type(const Elf_Sym sym, const struct load_info info)
1916	1923	{
	1924	+ const Elf_Shdr *sechdrs = info->sechdrs;
	1925	+
1917	1926	if (ELF_ST_BIND(sym->st_info) == STB_WEAK) {
1918	1927	if (ELF_ST_TYPE(sym->st_info) == STT_OBJECT)
1919	1928	return 'v';
1920	1929
...	...	@@ -1943,8 +1952,10 @@
1943	1952	else
1944	1953	return 'b';
1945	1954	}
1946		- if (strstarts(secstrings + sechdrs[sym->st_shndx].sh_name, ".debug"))
	1955	+ if (strstarts(info->secstrings + sechdrs[sym->st_shndx].sh_name,
	1956	+ ".debug")) {
1947	1957	return 'n';
	1958	+ }
1948	1959	return '?';
1949	1960	}
1950	1961
1951	1962
1952	1963
1953	1964
1954	1965
1955	1966
...	...	@@ -2021,35 +2032,30 @@
2021	2032	return symoffs;
2022	2033	}
2023	2034
2024		-static void add_kallsyms(struct module *mod,
2025		- Elf_Shdr *sechdrs,
2026		- unsigned int shnum,
2027		- unsigned int symindex,
2028		- unsigned int strindex,
	2035	+static void add_kallsyms(struct module mod, struct load_info info,
2029	2036	unsigned long symoffs,
2030	2037	unsigned long stroffs,
2031		- const char *secstrings,
2032	2038	unsigned long *strmap)
2033	2039	{
2034	2040	unsigned int i, ndst;
2035	2041	const Elf_Sym *src;
2036	2042	Elf_Sym *dst;
2037	2043	char *s;
	2044	+ Elf_Shdr *symsec = &info->sechdrs[info->index.sym];
2038	2045
2039		- mod->symtab = (void *)sechdrs[symindex].sh_addr;
2040		- mod->num_symtab = sechdrs[symindex].sh_size / sizeof(Elf_Sym);
2041		- mod->strtab = (void *)sechdrs[strindex].sh_addr;
	2046	+ mod->symtab = (void *)symsec->sh_addr;
	2047	+ mod->num_symtab = symsec->sh_size / sizeof(Elf_Sym);
	2048	+ mod->strtab = info->strtab;
2042	2049
2043	2050	/* Set types up while we still have access to sections. */
2044	2051	for (i = 0; i < mod->num_symtab; i++)
2045		- mod->symtab[i].st_info
2046		- = elf_type(&mod->symtab[i], sechdrs, secstrings, mod);
	2052	+ mod->symtab[i].st_info = elf_type(&mod->symtab[i], info);
2047	2053
2048	2054	mod->core_symtab = dst = mod->module_core + symoffs;
2049	2055	src = mod->symtab;
2050	2056	dst = src;
2051	2057	for (ndst = i = 1; i < mod->num_symtab; ++i, ++src) {
2052		- if (!is_core_symbol(src, sechdrs, shnum))
	2058	+ if (!is_core_symbol(src, info->sechdrs, info->hdr->e_shnum))
2053	2059	continue;
2054	2060	dst[ndst] = *src;
2055	2061	dst[ndst].st_name = bitmap_weight(strmap, dst[ndst].st_name);
...	...	@@ -2058,7 +2064,7 @@
2058	2064	mod->core_num_syms = ndst;
2059	2065
2060	2066	mod->core_strtab = s = mod->module_core + stroffs;
2061		- for (*s = 0, i = 1; i < sechdrs[strindex].sh_size; ++i)
	2067	+ for (*s = 0, i = 1; i < info->sechdrs[info->index.str].sh_size; ++i)
2062	2068	if (test_bit(i, strmap))
2063	2069	*++s = mod->strtab[i];
2064	2070	}
...	...	@@ -2075,15 +2081,10 @@
2075	2081	return 0;
2076	2082	}
2077	2083
2078		-static inline void add_kallsyms(struct module *mod,
2079		- Elf_Shdr *sechdrs,
2080		- unsigned int shnum,
2081		- unsigned int symindex,
2082		- unsigned int strindex,
2083		- unsigned long symoffs,
2084		- unsigned long stroffs,
2085		- const char *secstrings,
2086		- const unsigned long *strmap)
	2084	+static void add_kallsyms(struct module mod, struct load_info info,
	2085	+ unsigned long symoffs,
	2086	+ unsigned long stroffs,
	2087	+ unsigned long *strmap)
2087	2088	{
2088	2089	}
2089	2090	#endif /* CONFIG_KALLSYMS */
...	...	@@ -2148,16 +2149,6 @@
2148	2149	}
2149	2150	#endif
2150	2151
2151		-struct load_info {
2152		- Elf_Ehdr *hdr;
2153		- unsigned long len;
2154		- Elf_Shdr *sechdrs;
2155		- char secstrings, args, *strtab;
2156		- struct {
2157		- unsigned int sym, str, mod, vers, info, pcpu;
2158		- } index;
2159		-};
2160		-
2161	2152	/* Sets info->hdr and info->len. */
2162	2153	static int copy_and_check(struct load_info info, const void __user umod, unsigned long len)
2163	2154	{
...	...	@@ -2623,8 +2614,7 @@
2623	2614	percpu_modcopy(mod, (void *)info.sechdrs[info.index.pcpu].sh_addr,
2624	2615	info.sechdrs[info.index.pcpu].sh_size);
2625	2616
2626		- add_kallsyms(mod, info.sechdrs, info.hdr->e_shnum, info.index.sym, info.index.str,
2627		- symoffs, stroffs, info.secstrings, strmap);
	2617	+ add_kallsyms(mod, &info, symoffs, stroffs, strmap);
2628	2618	kfree(strmap);
2629	2619	strmap = NULL;
2630	2620