Re: [PATCH][RFC] 2.6 && module + -g && kernel w/o -g

[Tom Rini]

On Wed, Jan 07, 2004 at 05:30:40PM -0700, Tom Rini wrote:

> Okay, this is what seems to fix the bug that hch found for me.  Does
> this seem right to everyone else?  I'm going to poke at it a bit more
> tomorrow, pending time.
> 
> ===== arch/ppc/kernel/module.c 1.10 vs edited =====
> --- 1.10/arch/ppc/kernel/module.c	Fri Sep 12 09:26:52 2003
> +++ edited//home/trini/work/kernel/testing/linux-2.6/arch/ppc/kernel/module.c	Wed Jan  7 17:07:30 2004
> @@ -87,6 +87,9 @@
>  		if ((strstr(secstrings + sechdrs[i].sh_name, ".init") != 0)
>  		    != is_init)
>  			continue;
> +		/* Skip over debug bits. */
> +		if (strstr(secstrings + sechdrs[i].sh_name, ".debug") != 0)
> +			continue;
>  
>  		if (sechdrs[i].sh_type == SHT_RELA) {
>  			DEBUGP("Found relocations in section %u\n", i);

Okay.  I've been looking at stock 2.6.1 noticed  that the fix for this
issue that Rusty proposed, and that ultimately made it into 2.6.1-rc3
(or so) is not correct.  The problem is that we do:

err = module_frob_arch_sections(hdr, sechdrs, secstrings, mod);
/* Which goes over every .debug section and can take _ages_ on something
 * like ipv6 */
... skip 100 lines ...
.... Checks Rusty / Linus added ...

The following patch fixes the problem for me on PPC32:

--- 1.96/kernel/module.c	Wed Jan  7 22:46:59 2004
+++ edited/kernel/module.c	Wed Jan 14 14:05:12 2004
@@ -1439,6 +1439,13 @@
 			strindex = sechdrs[i].sh_link;
 			strtab = (char *)hdr + sechdrs[strindex].sh_offset;
 		}
+
+		/* If we find any debug RELAs, frob these away now. */
+		if (sechdrs[i].sh_type == SHT_RELA &&
+				(strstr(secstrings+sechdrs[i].sh_name, ".debug")
+				 != 0))
+			sechdrs[i].sh_type = SHT_NULL;
+
 #ifndef CONFIG_MODULE_UNLOAD
 		/* Don't load .exit sections */
 		if (strncmp(secstrings+sechdrs[i].sh_name, ".exit", 5) == 0)

IMHO, this shouldn't be covered under a PPC32 test since at least PPC32,
PPC64 and Alpha have this issue, and I suspect that ia64, parisc, s390
and v850 have the problem as well (based on what their module_arch_frob
bits look to be doing).

-- 
Tom Rini
http://gate.crashing.org/~trini/
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/