Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755776AbZAAAwU (ORCPT ); Wed, 31 Dec 2008 19:52:20 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751836AbZAAAwH (ORCPT ); Wed, 31 Dec 2008 19:52:07 -0500 Received: from ozlabs.org ([203.10.76.45]:55410 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750933AbZAAAwF (ORCPT ); Wed, 31 Dec 2008 19:52:05 -0500 From: Rusty Russell To: Helge Deller Subject: Re: [PATCH] parisc: fix module loading failure of large kernel modules (take 4) Date: Thu, 1 Jan 2009 11:22:00 +1030 User-Agent: KMail/1.10.3 (Linux/2.6.27-9-generic; KDE/4.1.3; i686; ; ) Cc: "linux-parisc" , Linux Kernel Development , Kyle McMartin , Randolph Chung , Linus , Andrew Morton , Sam Ravnborg , John David Anglin References: <4959346E.7060600@gmx.de> <200901010002.41477.rusty@rustcorp.com.au> <495B7E24.9010802@gmx.de> In-Reply-To: <495B7E24.9010802@gmx.de> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200901011122.01109.rusty@rustcorp.com.au> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3747 Lines: 96 On Thursday 01 January 2009 00:43:56 Helge Deller wrote: > Rusty Russell wrote: > > Not quite what I had in mind... let me show you: > > ... > > Otherwise I'd have called it "arch_module_extra_size()". > > This would mean that I can increase the section size in the arch-specific function > by returning a bigger value than sh_size. > This would give me space at the end of the section, but not at the beginning > (which is what I need), as sh_entsize (the offset into memory) will stay the > same as before. Ah, OK. I assumed that extra room at the end was sufficient. So I've taken your previous patch and renamed the function to arch_mod_section_prepend(). If we decide not to kill those bad gcc versions, I'll stick it in some other random file (lib/weak.c? Blech...) BTW, this is very late for this merge window. I would have liked to see this a month ago :( Subject: module: fix module loading failure of large kernel modules for parisc Date: Wed, 31 Dec 2008 12:31:18 +0100 From: Helge Deller When creating the final layout of a kernel module in memory, allow the module loader to reserve some additional memory in front of a given section. This is currently only needed for the parisc port which needs to put the stub entries there to fulfill the 17/22bit PCREL relocations with large kernel modules like xfs. Signed-off-by: Helge Deller Signed-off-by: Rusty Russell (renamed fn) diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h --- a/include/linux/moduleloader.h +++ b/include/linux/moduleloader.h @@ -12,6 +12,9 @@ int module_frob_arch_sections(Elf_Ehdr * Elf_Shdr *sechdrs, char *secstrings, struct module *mod); + +/* Additional bytes needed by arch in front of individual sections */ +unsigned int arch_mod_section_prepend(struct module *mod, unsigned int section); /* Allocator used for allocating struct module, core sections and init sections. Returns NULL on failure. */ diff --git a/kernel/module.c b/kernel/module.c --- a/kernel/module.c +++ b/kernel/module.c @@ -1588,11 +1588,21 @@ static int simplify_symbols(Elf_Shdr *se return ret; } +/* Additional bytes needed by arch in front of individual sections */ +unsigned int __weak arch_mod_section_prepend(struct module *mod, + unsigned int section) +{ + /* default implementation just returns zero */ + return 0; +} + /* Update size with this section: return offset. */ -static long get_offset(unsigned int *size, Elf_Shdr *sechdr) +static long get_offset(struct module *mod, unsigned int *size, + Elf_Shdr *sechdr, unsigned int section) { long ret; + *size += arch_mod_section_prepend(mod, section); ret = ALIGN(*size, sechdr->sh_addralign ?: 1); *size = ret + sechdr->sh_size; return ret; @@ -1632,7 +1642,7 @@ static void layout_sections(struct modul || strncmp(secstrings + s->sh_name, ".init", 5) == 0) continue; - s->sh_entsize = get_offset(&mod->core_size, s); + s->sh_entsize = get_offset(mod, &mod->core_size, s, i); DEBUGP("\t%s\n", secstrings + s->sh_name); } if (m == 0) @@ -1650,7 +1660,7 @@ static void layout_sections(struct modul || strncmp(secstrings + s->sh_name, ".init", 5) != 0) continue; - s->sh_entsize = (get_offset(&mod->init_size, s) + s->sh_entsize = (get_offset(mod, &mod->init_size, s, i) | INIT_OFFSET_MASK); DEBUGP("\t%s\n", secstrings + s->sh_name); } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/