| Message ID | 20230617014930.2070-3-namit@vmware.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | arm64: improve debuggability | expand |
On Sat, Jun 17, 2023 at 01:49:26AM +0000, Nadav Amit wrote: > From: Nadav Amit <namit@vmware.com> > > Making sense from dumped stacks when running EFI tests is very hard due > to the relocation. Fix it by adjusting the address back to the original > address. > > Signed-off-by: Nadav Amit <namit@vmware.com> > --- > lib/stack.c | 31 +++++++++++++++++++++++++++++-- > 1 file changed, 29 insertions(+), 2 deletions(-) > > diff --git a/lib/stack.c b/lib/stack.c > index bdb23fd..c3c7c24 100644 > --- a/lib/stack.c > +++ b/lib/stack.c > @@ -6,13 +6,38 @@ > */ > > #include <libcflat.h> > +#include <stdbool.h> > #include <stack.h> > > #define MAX_DEPTH 20 > > +#ifdef CONFIG_EFI We also relocate when building non-efi arm64 unit tests, so this should be #if defined(CONFIG_EFI) || defined(__aarch64__) Or, we could create a new config, CONFIG_RELOC, which gets set by --enable-efi and --arch=arm64. > +extern char _text, _etext; > + > +static bool base_address(const void *rebased_addr, unsigned long *addr) > +{ > + unsigned long ra = (unsigned long)rebased_addr; > + unsigned long start = (unsigned long)&_text; > + unsigned long end = (unsigned long)&_etext; > + > + if (ra < start || ra >= end) > + return false; > + > + *addr = ra - start; > + return true; > +} > +#else > +static bool base_address(const void *rebased_addr, unsigned long *addr) > +{ > + *addr = (unsigned long)rebased_addr; > + return true; > +} > +#endif > + > static void print_stack(const void **return_addrs, int depth, > bool top_is_return_address) > { > + unsigned long addr; > int i = 0; > > printf("\tSTACK:"); > @@ -20,12 +45,14 @@ static void print_stack(const void **return_addrs, int depth, > /* @addr indicates a non-return address, as expected by the stack > * pretty printer script. */ > if (depth > 0 && !top_is_return_address) { > - printf(" @%lx", (unsigned long) return_addrs[0]); > + if (base_address(return_addrs[0], &addr)) > + printf(" @%lx", addr); > i++; > } > > for (; i < depth; i++) { > - printf(" %lx", (unsigned long) return_addrs[i]); > + if (base_address(return_addrs[i], &addr)) > + printf(" %lx", addr); > } > printf("\n"); > } > -- > 2.34.1 > Thanks, drew
> On Jun 24, 2023, at 3:13 AM, Andrew Jones <andrew.jones@linux.dev> wrote: > > We also relocate when building non-efi arm64 unit tests, so this should be > > #if defined(CONFIG_EFI) || defined(__aarch64__) > > Or, we could create a new config, CONFIG_RELOC, which gets set by > --enable-efi and --arch=arm64. Will do. Thanks.
diff --git a/lib/stack.c b/lib/stack.c index bdb23fd..c3c7c24 100644 --- a/lib/stack.c +++ b/lib/stack.c @@ -6,13 +6,38 @@ */ #include <libcflat.h> +#include <stdbool.h> #include <stack.h> #define MAX_DEPTH 20 +#ifdef CONFIG_EFI +extern char _text, _etext; + +static bool base_address(const void *rebased_addr, unsigned long *addr) +{ + unsigned long ra = (unsigned long)rebased_addr; + unsigned long start = (unsigned long)&_text; + unsigned long end = (unsigned long)&_etext; + + if (ra < start || ra >= end) + return false; + + *addr = ra - start; + return true; +} +#else +static bool base_address(const void *rebased_addr, unsigned long *addr) +{ + *addr = (unsigned long)rebased_addr; + return true; +} +#endif + static void print_stack(const void **return_addrs, int depth, bool top_is_return_address) { + unsigned long addr; int i = 0; printf("\tSTACK:"); @@ -20,12 +45,14 @@ static void print_stack(const void **return_addrs, int depth, /* @addr indicates a non-return address, as expected by the stack * pretty printer script. */ if (depth > 0 && !top_is_return_address) { - printf(" @%lx", (unsigned long) return_addrs[0]); + if (base_address(return_addrs[0], &addr)) + printf(" @%lx", addr); i++; } for (; i < depth; i++) { - printf(" %lx", (unsigned long) return_addrs[i]); + if (base_address(return_addrs[i], &addr)) + printf(" %lx", addr); } printf("\n"); }