Commit c65f38d9 authored by Jan Beulich's avatar Jan Beulich Committed by Andi Kleen

[PATCH] unwinder: fully support linker generated .eh_frame_hdr section

Now that binutils' ld is able to properly populate .eh_frame_hdr in the
Linux kernel case, here's a patch to add some functionality to the Dwarf2
unwinder to actually be able to make use of this (applies on firstfloor
tree with the previously sent patch to add debug output, but not on plain
2.6.19).
Signed-off-by: default avatarJan Beulich <jbeulich@novell.com>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
parent 6bedb2cc
...@@ -164,7 +164,9 @@ static struct unwind_table *find_table(unsigned long pc) ...@@ -164,7 +164,9 @@ static struct unwind_table *find_table(unsigned long pc)
static unsigned long read_pointer(const u8 **pLoc, static unsigned long read_pointer(const u8 **pLoc,
const void *end, const void *end,
signed ptrType); signed ptrType,
unsigned long text_base,
unsigned long data_base);
static void init_unwind_table(struct unwind_table *table, static void init_unwind_table(struct unwind_table *table,
const char *name, const char *name,
...@@ -189,10 +191,13 @@ static void init_unwind_table(struct unwind_table *table, ...@@ -189,10 +191,13 @@ static void init_unwind_table(struct unwind_table *table,
/* See if the linker provided table looks valid. */ /* See if the linker provided table looks valid. */
if (header_size <= 4 if (header_size <= 4
|| header_start[0] != 1 || header_start[0] != 1
|| (void *)read_pointer(&ptr, end, header_start[1]) != table_start || (void *)read_pointer(&ptr, end, header_start[1], 0, 0)
|| header_start[2] == DW_EH_PE_omit != table_start
|| read_pointer(&ptr, end, header_start[2]) <= 0 || !read_pointer(&ptr, end, header_start[2], 0, 0)
|| header_start[3] == DW_EH_PE_omit) || !read_pointer(&ptr, end, header_start[3], 0,
(unsigned long)header_start)
|| !read_pointer(&ptr, end, header_start[3], 0,
(unsigned long)header_start))
header_start = NULL; header_start = NULL;
table->hdrsz = header_size; table->hdrsz = header_size;
smp_wmb(); smp_wmb();
...@@ -282,7 +287,7 @@ static void __init setup_unwind_table(struct unwind_table *table, ...@@ -282,7 +287,7 @@ static void __init setup_unwind_table(struct unwind_table *table,
ptr = (const u8 *)(fde + 2); ptr = (const u8 *)(fde + 2);
if (!read_pointer(&ptr, if (!read_pointer(&ptr,
(const u8 *)(fde + 1) + *fde, (const u8 *)(fde + 1) + *fde,
ptrType)) ptrType, 0, 0))
return; return;
++n; ++n;
} }
...@@ -317,7 +322,7 @@ static void __init setup_unwind_table(struct unwind_table *table, ...@@ -317,7 +322,7 @@ static void __init setup_unwind_table(struct unwind_table *table,
ptr = (const u8 *)(fde + 2); ptr = (const u8 *)(fde + 2);
header->table[n].start = read_pointer(&ptr, header->table[n].start = read_pointer(&ptr,
(const u8 *)(fde + 1) + *fde, (const u8 *)(fde + 1) + *fde,
fde_pointer_type(cie)); fde_pointer_type(cie), 0, 0);
header->table[n].fde = (unsigned long)fde; header->table[n].fde = (unsigned long)fde;
++n; ++n;
} }
...@@ -500,7 +505,9 @@ static const u32 *cie_for_fde(const u32 *fde, const struct unwind_table *table) ...@@ -500,7 +505,9 @@ static const u32 *cie_for_fde(const u32 *fde, const struct unwind_table *table)
static unsigned long read_pointer(const u8 **pLoc, static unsigned long read_pointer(const u8 **pLoc,
const void *end, const void *end,
signed ptrType) signed ptrType,
unsigned long text_base,
unsigned long data_base)
{ {
unsigned long value = 0; unsigned long value = 0;
union { union {
...@@ -572,6 +579,22 @@ static unsigned long read_pointer(const u8 **pLoc, ...@@ -572,6 +579,22 @@ static unsigned long read_pointer(const u8 **pLoc,
case DW_EH_PE_pcrel: case DW_EH_PE_pcrel:
value += (unsigned long)*pLoc; value += (unsigned long)*pLoc;
break; break;
case DW_EH_PE_textrel:
if (likely(text_base)) {
value += text_base;
break;
}
dprintk(2, "Text-relative encoding %02X (%p,%p), but zero text base.",
ptrType, *pLoc, end);
return 0;
case DW_EH_PE_datarel:
if (likely(data_base)) {
value += data_base;
break;
}
dprintk(2, "Data-relative encoding %02X (%p,%p), but zero data base.",
ptrType, *pLoc, end);
return 0;
default: default:
dprintk(2, "Cannot adjust pointer type %02X (%p,%p).", dprintk(2, "Cannot adjust pointer type %02X (%p,%p).",
ptrType, *pLoc, end); ptrType, *pLoc, end);
...@@ -625,7 +648,8 @@ static signed fde_pointer_type(const u32 *cie) ...@@ -625,7 +648,8 @@ static signed fde_pointer_type(const u32 *cie)
case 'P': { case 'P': {
signed ptrType = *ptr++; signed ptrType = *ptr++;
if (!read_pointer(&ptr, end, ptrType) || ptr > end) if (!read_pointer(&ptr, end, ptrType, 0, 0)
|| ptr > end)
return -1; return -1;
} }
break; break;
...@@ -685,7 +709,8 @@ static int processCFI(const u8 *start, ...@@ -685,7 +709,8 @@ static int processCFI(const u8 *start,
case DW_CFA_nop: case DW_CFA_nop:
break; break;
case DW_CFA_set_loc: case DW_CFA_set_loc:
if ((state->loc = read_pointer(&ptr.p8, end, ptrType)) == 0) state->loc = read_pointer(&ptr.p8, end, ptrType, 0, 0);
if (state->loc == 0)
result = 0; result = 0;
break; break;
case DW_CFA_advance_loc1: case DW_CFA_advance_loc1:
...@@ -854,9 +879,9 @@ int unwind(struct unwind_frame_info *frame) ...@@ -854,9 +879,9 @@ int unwind(struct unwind_frame_info *frame)
ptr = hdr + 4; ptr = hdr + 4;
end = hdr + table->hdrsz; end = hdr + table->hdrsz;
if (tableSize if (tableSize
&& read_pointer(&ptr, end, hdr[1]) && read_pointer(&ptr, end, hdr[1], 0, 0)
== (unsigned long)table->address == (unsigned long)table->address
&& (i = read_pointer(&ptr, end, hdr[2])) > 0 && (i = read_pointer(&ptr, end, hdr[2], 0, 0)) > 0
&& i == (end - ptr) / (2 * tableSize) && i == (end - ptr) / (2 * tableSize)
&& !((end - ptr) % (2 * tableSize))) { && !((end - ptr) % (2 * tableSize))) {
do { do {
...@@ -864,7 +889,8 @@ int unwind(struct unwind_frame_info *frame) ...@@ -864,7 +889,8 @@ int unwind(struct unwind_frame_info *frame)
startLoc = read_pointer(&cur, startLoc = read_pointer(&cur,
cur + tableSize, cur + tableSize,
hdr[3]); hdr[3], 0,
(unsigned long)hdr);
if (pc < startLoc) if (pc < startLoc)
i /= 2; i /= 2;
else { else {
...@@ -875,11 +901,13 @@ int unwind(struct unwind_frame_info *frame) ...@@ -875,11 +901,13 @@ int unwind(struct unwind_frame_info *frame)
if (i == 1 if (i == 1
&& (startLoc = read_pointer(&ptr, && (startLoc = read_pointer(&ptr,
ptr + tableSize, ptr + tableSize,
hdr[3])) != 0 hdr[3], 0,
(unsigned long)hdr)) != 0
&& pc >= startLoc) && pc >= startLoc)
fde = (void *)read_pointer(&ptr, fde = (void *)read_pointer(&ptr,
ptr + tableSize, ptr + tableSize,
hdr[3]); hdr[3], 0,
(unsigned long)hdr);
} }
} }
if(hdr && !fde) if(hdr && !fde)
...@@ -894,13 +922,13 @@ int unwind(struct unwind_frame_info *frame) ...@@ -894,13 +922,13 @@ int unwind(struct unwind_frame_info *frame)
&& (ptrType = fde_pointer_type(cie)) >= 0 && (ptrType = fde_pointer_type(cie)) >= 0
&& read_pointer(&ptr, && read_pointer(&ptr,
(const u8 *)(fde + 1) + *fde, (const u8 *)(fde + 1) + *fde,
ptrType) == startLoc) { ptrType, 0, 0) == startLoc) {
if (!(ptrType & DW_EH_PE_indirect)) if (!(ptrType & DW_EH_PE_indirect))
ptrType &= DW_EH_PE_FORM|DW_EH_PE_signed; ptrType &= DW_EH_PE_FORM|DW_EH_PE_signed;
endLoc = startLoc endLoc = startLoc
+ read_pointer(&ptr, + read_pointer(&ptr,
(const u8 *)(fde + 1) + *fde, (const u8 *)(fde + 1) + *fde,
ptrType); ptrType, 0, 0);
if(pc >= endLoc) if(pc >= endLoc)
fde = NULL; fde = NULL;
} else } else
...@@ -926,7 +954,7 @@ int unwind(struct unwind_frame_info *frame) ...@@ -926,7 +954,7 @@ int unwind(struct unwind_frame_info *frame)
ptr = (const u8 *)(fde + 2); ptr = (const u8 *)(fde + 2);
startLoc = read_pointer(&ptr, startLoc = read_pointer(&ptr,
(const u8 *)(fde + 1) + *fde, (const u8 *)(fde + 1) + *fde,
ptrType); ptrType, 0, 0);
if (!startLoc) if (!startLoc)
continue; continue;
if (!(ptrType & DW_EH_PE_indirect)) if (!(ptrType & DW_EH_PE_indirect))
...@@ -934,7 +962,7 @@ int unwind(struct unwind_frame_info *frame) ...@@ -934,7 +962,7 @@ int unwind(struct unwind_frame_info *frame)
endLoc = startLoc endLoc = startLoc
+ read_pointer(&ptr, + read_pointer(&ptr,
(const u8 *)(fde + 1) + *fde, (const u8 *)(fde + 1) + *fde,
ptrType); ptrType, 0, 0);
if (pc >= startLoc && pc < endLoc) if (pc >= startLoc && pc < endLoc)
break; break;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment