Patchworkβ Out of order unwind entry warning

login
register
about
Submitter Helge Deller
Date 2009-11-06 23:07:42
Message ID <20091106230742.GA16061@p100.box>
Download mbox | patch
Permalink /patch/58280/
State Accepted
Delegated to: kyle mcmartin
Headers show

Comments

Helge Deller - 2009-11-06 23:07:42
Hi Dave,

* John David Anglin <dave@hiauly1.hia.nrc.ca>:
> > >> Relocation section '.rela.PARISC.unwind' at offset 0x9b8 contains 6 entries:
> > >>    Offset     Info    Type            Sym.Value  Sym. Name + Addend
> > >> 00000000  00000231 R_PARISC_SEGREL32 00000000   .exit.text + 0
> > >> 00000004  00000231 R_PARISC_SEGREL32 00000000   .exit.text + 2c
> > >> 00000010  00000331 R_PARISC_SEGREL32 00000000   .init.text + 0
> > >> 00000014  00000331 R_PARISC_SEGREL32 00000000   .init.text + 44
> > >> 00000020  00000431 R_PARISC_SEGREL32 00000000   .text.crc32c + 0
> > >> 00000024  00000431 R_PARISC_SEGREL32 00000000   .text.crc32c + 6c
> > >
> > > That's exactly what I expected.  There's no overlap.  The module
> > > loader needs to sort the unwind entries after doing the relocations.

You were right here.

> > It's already sorting the entries, 

and I was to some degree wrong :-)

The parisc module loader as written by Randolph was sorting the
unwind entries. But I submitted a wrong patch which replaced the
hand-written sort() by the kernel provided sort() function:
http://patchwork.kernel.org/patch/56528/
Due to a bug in the patch a wrong amount of unwind entries were
calculated and as such the sort() function didn't sorted all unwind entries.

Below is an updated patch. With this one, all your binutils changes
work nicely with 32- and 64-bit kernels and modules.

Kyle, I see you applied my original patch into your "next" tree already:
http://git.kernel.org/?p=linux/kernel/git/kyle/parisc-2.6.git;a=commit;h=b8d46862d910c3be7c28c627204da968c174aa9a

Do you want me to send you a new patch against your "next" tree instead?


> > If we change this, don't we require a binutils update then at the same time from the users?
> 
> Don't think fixing the offsets requires a binutils update.  However, the
> change to using section offsets may have made the problem worse.  The binutils
> update only corrected the issue with overloaded symbols.

Yes, a binutils update will just fix user's "out-of-order-unwind-entry"
warnings.

Thanks!

Helge




PATCH: parisc: use sort() instead of home-made implementation (v2)

Signed-off-by: Helge Deller <deller@gmx.de>


--
To unsubscribe from this list: send the line "unsubscribe linux-parisc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
kyle mcmartin - 2009-11-07 20:11:17
On Sat, Nov 07, 2009 at 12:07:42AM +0100, Helge Deller wrote:
> Kyle, I see you applied my original patch into your "next" tree already:
> http://git.kernel.org/?p=linux/kernel/git/kyle/parisc-2.6.git;a=commit;h=b8d46862d910c3be7c28c627204da968c174aa9a
> 
> Do you want me to send you a new patch against your "next" tree instead?

It's ok, I'll just revert that one and apply this one on top of it.

Punch me if I haven't gotten around to this by Monday.

cheers, Kyle
--
To unsubscribe from this list: send the line "unsubscribe linux-parisc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/arch/parisc/kernel/unwind.c b/arch/parisc/kernel/unwind.c
index 69dad5a..9dbefa8 100644
--- a/arch/parisc/kernel/unwind.c
+++ b/arch/parisc/kernel/unwind.c
@@ -13,6 +13,7 @@ 
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/kallsyms.h>
+#include <linux/sort.h>
 
 #include <asm/uaccess.h>
 #include <asm/assembly.h>
@@ -115,24 +116,18 @@  unwind_table_init(struct unwind_table *table, const char *name,
 	}
 }
 
+static int cmp_unwind_table_entry(const void *a, const void *b)
+{
+	return ((const struct unwind_table_entry *)a)->region_start
+	     - ((const struct unwind_table_entry *)b)->region_start;
+}
+
 static void
 unwind_table_sort(struct unwind_table_entry *start,
 		  struct unwind_table_entry *finish)
 {
-	struct unwind_table_entry el, *p, *q;
-
-	for (p = start + 1; p < finish; ++p) {
-		if (p[0].region_start < p[-1].region_start) {
-			el = *p;
-			q = p;
-			do {
-				q[0] = q[-1];
-				--q;
-			} while (q > start && 
-				 el.region_start < q[-1].region_start);
-			*q = el;
-		}
-	}
+	sort(start, finish - start, sizeof(struct unwind_table_entry),
+	     cmp_unwind_table_entry, NULL);
 }
 
 struct unwind_table *