RepoMirrors/openwrt
1
0
Fork 0
mirror of git://git.openwrt.org/openwrt/openwrt.git synced 2024-12-28 01:22:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

kernel: fix the mips module relocation patch for 3.19+

Browse Source 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 44590
This commit is contained in:
Felix Fietkau 2015-03-02 04:42:17 +00:00
parent 921bc1cc54
commit 978830466a
2 changed files with 37 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
target/linux/generic/patches-3.19/305-mips_module_reloc.patch
View File

@ -30,7 +30,7 @@
typedef uint8_t Elf64_Byte; /* Type for a 8-bit quantity. */ typedef uint8_t Elf64_Byte; /* Type for a 8-bit quantity. */
--- a/arch/mips/kernel/module.c --- a/arch/mips/kernel/module.c
+++ b/arch/mips/kernel/module.c +++ b/arch/mips/kernel/module.c
@@ -43,14 +43,222 @@ struct mips_hi16 { @@ -43,14 +43,221 @@ struct mips_hi16 {
static LIST_HEAD(dbe_list); static LIST_HEAD(dbe_list);
static DEFINE_SPINLOCK(dbe_lock); static DEFINE_SPINLOCK(dbe_lock);
@ -126,6 +126,10 @@
+ +
+ split_page(page, order); + split_page(page, order);
+ +
+ /* mark all pages except for the last one */
+ for (p = page; p + 1 < page + (size >> PAGE_SHIFT); ++p)
+ set_bit(PG_owner_priv_1, &p->flags);
+
+ for (p = page + (size >> PAGE_SHIFT); p < page + (1 << order); ++p) + for (p = page + (size >> PAGE_SHIFT); p < page + (1 << order); ++p)
+ __free_page(p); + __free_page(p);
+ +
@ -133,16 +137,17 @@
+} +}
+#endif +#endif
+ +
+static void free_phys(void *ptr, unsigned long size) +static void free_phys(void *ptr)
+{ +{
+ struct page *page; + struct page *page;
+ struct page *end; + bool free;
+ +
+ page = virt_to_page(ptr); + page = virt_to_page(ptr);
+ end = page + (PAGE_ALIGN(size) >> PAGE_SHIFT); + do {
+ + free = test_and_clear_bit(PG_owner_priv_1, &page->flags);
+ for (; page < end; ++page)
+ __free_page(page); + __free_page(page);
+ page++;
+ } while (free);
+} +}
+ +
+ +
@ -180,18 +185,12 @@
+} +}
+ +
+/* Free memory returned from module_alloc */ +/* Free memory returned from module_alloc */
+void module_free(struct module *mod, void *module_region) +void module_memfree(void *module_region)
+{ +{
+ if (is_phys_addr(module_region)) { + if (is_phys_addr(module_region))
+ if (mod->module_init == module_region) + free_phys(module_region);
+ free_phys(module_region, mod->init_size); + else
+ else if (mod->module_core == module_region)
+ free_phys(module_region, mod->core_size);
+ else
+ BUG();
+ } else {
+ vfree(module_region); + vfree(module_region);
+ }
+} +}
+ +
+static void *__module_alloc(int size, bool phys) +static void *__module_alloc(int size, bool phys)
@ -254,7 +253,7 @@
int apply_r_mips_none(struct module *me, u32 *location, Elf_Addr v) int apply_r_mips_none(struct module *me, u32 *location, Elf_Addr v)
{ {
@@ -64,8 +272,39 @@ static int apply_r_mips_32_rel(struct mo @@ -64,8 +271,39 @@ static int apply_r_mips_32_rel(struct mo
return 0; return 0;
} }
@ -294,7 +293,7 @@
if (v % 4) { if (v % 4) {
pr_err("module %s: dangerous R_MIPS_26 REL relocation\n", pr_err("module %s: dangerous R_MIPS_26 REL relocation\n",
me->name); me->name);
@@ -73,14 +312,17 @@ static int apply_r_mips_26_rel(struct mo @@ -73,14 +311,17 @@ static int apply_r_mips_26_rel(struct mo
} }
if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) { if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
@ -317,7 +316,7 @@
return 0; return 0;
} }
@@ -287,11 +529,32 @@ int module_finalize(const Elf_Ehdr *hdr, @@ -287,11 +528,32 @@ int module_finalize(const Elf_Ehdr *hdr,
list_add(&me->arch.dbe_list, &dbe_list); list_add(&me->arch.dbe_list, &dbe_list);
spin_unlock_irq(&dbe_lock); spin_unlock_irq(&dbe_lock);
} }

39
target/linux/generic/patches-4.0/305-mips_module_reloc.patch
View File

@ -30,7 +30,7 @@
typedef uint8_t Elf64_Byte; /* Type for a 8-bit quantity. */ typedef uint8_t Elf64_Byte; /* Type for a 8-bit quantity. */
--- a/arch/mips/kernel/module.c --- a/arch/mips/kernel/module.c
+++ b/arch/mips/kernel/module.c +++ b/arch/mips/kernel/module.c
@@ -43,14 +43,222 @@ struct mips_hi16 { @@ -43,14 +43,221 @@ struct mips_hi16 {
static LIST_HEAD(dbe_list); static LIST_HEAD(dbe_list);
static DEFINE_SPINLOCK(dbe_lock); static DEFINE_SPINLOCK(dbe_lock);
@ -126,6 +126,10 @@
+ +
+ split_page(page, order); + split_page(page, order);
+ +
+ /* mark all pages except for the last one */
+ for (p = page; p + 1 < page + (size >> PAGE_SHIFT); ++p)
+ set_bit(PG_owner_priv_1, &p->flags);
+
+ for (p = page + (size >> PAGE_SHIFT); p < page + (1 << order); ++p) + for (p = page + (size >> PAGE_SHIFT); p < page + (1 << order); ++p)
+ __free_page(p); + __free_page(p);
+ +
@ -133,16 +137,17 @@
+} +}
+#endif +#endif
+ +
+static void free_phys(void *ptr, unsigned long size) +static void free_phys(void *ptr)
+{ +{
+ struct page *page; + struct page *page;
+ struct page *end; + bool free;
+ +
+ page = virt_to_page(ptr); + page = virt_to_page(ptr);
+ end = page + (PAGE_ALIGN(size) >> PAGE_SHIFT); + do {
+ + free = test_and_clear_bit(PG_owner_priv_1, &page->flags);
+ for (; page < end; ++page)
+ __free_page(page); + __free_page(page);
+ page++;
+ } while (free);
+} +}
+ +
+ +
@ -150,7 +155,7 @@
{ {
+#ifdef MODULE_START +#ifdef MODULE_START
return __vmalloc_node_range(size, 1, MODULE_START, MODULE_END, return __vmalloc_node_range(size, 1, MODULE_START, MODULE_END,
GFP_KERNEL, PAGE_KERNEL, 0, NUMA_NO_NODE, GFP_KERNEL, PAGE_KERNEL, NUMA_NO_NODE,
__builtin_return_address(0)); __builtin_return_address(0));
+#else +#else
+ void *ptr; + void *ptr;
@ -180,18 +185,12 @@
+} +}
+ +
+/* Free memory returned from module_alloc */ +/* Free memory returned from module_alloc */
+void module_free(struct module *mod, void *module_region) +void module_memfree(void *module_region)
+{ +{
+ if (is_phys_addr(module_region)) { + if (is_phys_addr(module_region))
+ if (mod->module_init == module_region) + free_phys(module_region);
+ free_phys(module_region, mod->init_size); + else
+ else if (mod->module_core == module_region)
+ free_phys(module_region, mod->core_size);
+ else
+ BUG();
+ } else {
+ vfree(module_region); + vfree(module_region);
+ }
+} +}
+ +
+static void *__module_alloc(int size, bool phys) +static void *__module_alloc(int size, bool phys)
@ -254,7 +253,7 @@
int apply_r_mips_none(struct module *me, u32 *location, Elf_Addr v) int apply_r_mips_none(struct module *me, u32 *location, Elf_Addr v)
{ {
@@ -64,8 +272,39 @@ static int apply_r_mips_32_rel(struct mo @@ -64,8 +271,39 @@ static int apply_r_mips_32_rel(struct mo
return 0; return 0;
} }
@ -294,7 +293,7 @@
if (v % 4) { if (v % 4) {
pr_err("module %s: dangerous R_MIPS_26 REL relocation\n", pr_err("module %s: dangerous R_MIPS_26 REL relocation\n",
me->name); me->name);
@@ -73,14 +312,17 @@ static int apply_r_mips_26_rel(struct mo @@ -73,14 +311,17 @@ static int apply_r_mips_26_rel(struct mo
} }
if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) { if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
@ -317,7 +316,7 @@
return 0; return 0;
} }
@@ -287,11 +529,32 @@ int module_finalize(const Elf_Ehdr *hdr, @@ -287,11 +528,32 @@ int module_finalize(const Elf_Ehdr *hdr,
list_add(&me->arch.dbe_list, &dbe_list); list_add(&me->arch.dbe_list, &dbe_list);
spin_unlock_irq(&dbe_lock); spin_unlock_irq(&dbe_lock);
} }