On Mon, Mar 12, 2012 at 10:40:27AM -0700, Laura Abbott wrote:
> Both memset and memzero lack unwinding annoations. If
> an abort occurs trying to access the pointer, the backtrace
> is incomplete. Add unwinding annotations to both functions
> so we can actually get a useful backtrace.
>
> Signed-off-by: Laura Abbott <lauraa@xxxxxxxxxxxxxx>
> ---
> arch/arm/lib/memset.S | 7 +++++--
> arch/arm/lib/memzero.S | 7 +++++--
> 2 files changed, 10 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/lib/memset.S b/arch/arm/lib/memset.S
> index 650d592..4379912 100644
> --- a/arch/arm/lib/memset.S
> +++ b/arch/arm/lib/memset.S
> @@ -11,6 +11,7 @@
> */
> #include <linux/linkage.h>
> #include <asm/assembler.h>
> +#include <asm/unwind.h>
>
> .text
> .align 5
> @@ -29,6 +30,7 @@
> */
>
> ENTRY(memset)
> +UNWIND(.fnstart)
> ands r3, r0, #3 @ 1 unaligned?
> bne 1b @ 1
> /*
> @@ -41,7 +43,7 @@ ENTRY(memset)
> blt 4f
>
> #if ! CALGN(1)+0
> -
> +UNWIND(.save {lr})
> /*
> * We need an extra register for this loop - save the return address and
> * use the LR
> @@ -68,7 +70,7 @@ ENTRY(memset)
> ldr lr, [sp], #4
>
> #else
> -
> +UNWIND(.save {r4, r5, r6, r7, lr})
For functions like this, the unwinding requirements are different
depending on where we are in the function. But the unwinder annotations
don't remember exact instruction locations; only the extent of the
whole unwind block is recorded, along with the sequence (but not
location) of unwinder directives.
As is, the unwinding may be wrong depending on which part of the function
is executing when the fault occurs.
It may be possible to split the function into multiple unwind blocks,
e.g.:
ENTRY(somefunc)
UNWIND(.fnstart)
UNWIND(.save {r4,lr})
stfmd sp!, {r4,lr}
/* check something */
blt _the_other_way
/* maybe carry out our job this way */
ldmfd sp!, {r4,lr}
UNWIND(.fnend)
_the_other_way:
UNWIND(.fnstart)
UNWIND(.save {r4,lr})
UNWIND(.save {r5-r8})
stmfd sp!, {r5-r8} /* !! */
/* carry out our job the other way */
ldmfd sp!, {r5-r8}
ldmfd sp!, {r4,pc} /* !! */
UNWIND(.fnend)
This is still not exactly right (it's hard to be exactly right,
since the unwind tables are not meant for handling asynchronous
unwinding), but unwinding should be correct for the main bits of code
where most time is spent and/or faults are most likely (the "carry out
our job" comments).
You'd have to experiment to see whether the backtracer does something
sensible with unwind tables like this. It might need tweaking to
find the correct function symbol if a fault occurs in the second
unwind block for example ... that perhaps it will already do the
right thing.
Cheers
---Dave
--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
