lib/stack: Restrengthen base_address
Subsystems (4)
PATCH 1/1 lib/stack: Restrengthen base_address
commit a1f2b0e1efd5 ("treewide: lib/stack: Make base_address arch specific") made base_address() a weak function in order to allow architectures to override it. Linking for EFI doesn't seem to figure out the right one to use though [anymore?]. It must have worked at one point because the commit calls outs EFI as the motivation. Anyway, just drop the weakness in favor of another HAVE_ define.
--- lib/riscv/asm/stack.h | 1 + lib/riscv/stack.c | 2 +- lib/stack.c | 10 ++++++---- lib/stack.h | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-)
lib/riscv/asm/stack.h +1 -0
@@ -8,5 +8,6 @@#define HAVE_ARCH_BACKTRACE_FRAME #define HAVE_ARCH_BACKTRACE +#define HAVE_ARCH_BASE_ADDRESS #endif
lib/riscv/stack.c +1 -1
@@ -5,7 +5,7 @@#ifdef CONFIG_RELOC extern char ImageBase, _text, _etext; -bool arch_base_address (const void *rebased_addr,unsigned long *addr) +bool base_address (const void *rebased_addr,unsigned long *addr) {unsigned long ra = (unsigned long )rebased_addr;unsigned long base = (unsigned long )&ImageBase;
lib/stack.c +6 -4
@@ -12,9 +12,10 @@#define MAX_DEPTH 20 #ifdef CONFIG_RELOC +#ifndef HAVE_ARCH_BASE_ADDRESS extern char _text, _etext; -bool __attribute__((weak))arch_base_address (const void *rebased_addr,unsigned long *addr) +bool base_address(const void *rebased_addr, unsigned long *addr) { unsigned long ra = (unsigned long)rebased_addr; unsigned long start = (unsigned long)&_text;
@@ -26,8 +27,9 @@ bool __attribute__((weak)) arch_base_address(const void *rebased_addr, unsigned *addr = ra - start; return true; } +#endif #else -bool __attribute__((weak))arch_base_address (const void *rebased_addr,unsigned long *addr) +bool base_address (const void *rebased_addr,unsigned long *addr) { *addr = (unsigned long )rebased_addr;return true;
@@ -45,13 +47,13 @@ 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) { -if (arch_base_address (return_addrs[0 ], &addr)) +if (base_address (return_addrs[0 ], &addr))printf (" @%lx" , addr); i++; }for (; i < depth; i++) { -if (arch_base_address (return_addrs[i], &addr)) +if (base_address (return_addrs[i], &addr))printf (" %lx" , addr); }printf ("\n" );
lib/stack.h +1 -1
@@ -34,6 +34,6 @@ static inline int backtrace_frame(const void *frame, const void **return_addrs, }#endif -bool __attribute__((weak))arch_base_address (const void *rebased_addr,unsigned long *addr); +bool base_address (const void *rebased_addr,unsigned long *addr);#endif
Signature · 1 line
2.46.0
Quoted 6 lines · Andrew Jones
commit
a1f2b0e1efd5("treewide: lib/stack: Makebase_addressarch specific") madebase_address()a weak function in order to allow architectures to override it. Linking for EFI doesn't seem to figure out the right one to use though [anymore?]. It must have worked at one point because the commit calls outs EFI as the motivation. Anyway, just drop the weakness in favor of anotherHAVE_define.
I prefer HAVE_ style than weak so fine by me.
How is the linker not resolving it properly? Some calls still point to weak symbol despite non-weak symbol also existing?
Quoted 50 lines
Signed-off-by Andrew Jones <[email protected]>--- lib/riscv/asm/stack.h | 1 + lib/riscv/stack.c | 2 +- lib/stack.c | 10 ++++++---- lib/stack.h | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-)lib/riscv/asm/stack.h +1
-0@@ -8,5 +8,6 @@#define HAVE_ARCH_BACKTRACE_FRAME #define HAVE_ARCH_BACKTRACE +#define HAVE_ARCH_BASE_ADDRESS #endif lib/riscv/stack.c +1
-1@@ -5,7 +5,7 @@#ifdef CONFIG_RELOC extern char ImageBase, _text, _etext; -bool arch_base_address (const void *rebased_addr,unsigned long *addr) +bool base_address (const void *rebased_addr,unsigned long *addr) {unsigned long ra = (unsigned long )rebased_addr;unsigned long base = (unsigned long )&ImageBase;lib/stack.c +2
-1@@ -12,9 +12,10 @@#define MAX_DEPTH 20 #ifdef CONFIG_RELOC +#ifndef HAVE_ARCH_BASE_ADDRESS extern char _text, _etext; -bool __attribute__((weak))arch_base_address (const void *rebased_addr,unsigned long *addr) +bool base_address(const void *rebased_addr, unsigned long *addr) { unsigned long ra = (unsigned long)rebased_addr; unsigned long start = (unsigned long)&_text;
lib/stack.c bool __attribute__((weak)) arch_base_address(const void *rebased_addr, unsigned · line 35
Quoted 10 lines
lib/stack.c +2
-1@@ -26,8 +27,9 @@ bool __attribute__((weak)) arch_base_address(const void *rebased_addr, unsigned *addr = ra - start; return true; } +#endif #else -bool __attribute__((weak))arch_base_address (const void *rebased_addr,unsigned long *addr) +bool base_address (const void *rebased_addr,unsigned long *addr) { *addr = (unsigned long )rebased_addr;return true;
Shouldn't HAVE_ARCH_BASE_ADDRESS also cover this?
Thanks,
Nick
Quoted 8 lines · Nicholas Piggin
Quoted 6 lines · Andrew Jones
commit
a1f2b0e1efd5("treewide: lib/stack: Makebase_addressarch specific") madebase_address()a weak function in order to allow architectures to override it. Linking for EFI doesn't seem to figure out the right one to use though [anymore?]. It must have worked at one point because the commit calls outs EFI as the motivation. Anyway, just drop the weakness in favor of anotherHAVE_define.
Quoted 4 lines
I prefer
HAVE_style than weak so fine by me.How is the linker not resolving it properly? Some calls still point to weak symbol despite non-weak symbol also existing?
Yeah, I noticed traces stopped working with EFI because it was using the weak version of the function instead of the riscv non-weak version. Since I'm 99% sure it used to work, then I need to find time to try and figure out if it's something that changed in k-u-t that is now confusing the toolchain or a toolchain regression. (It's on the TODO, but there's lots of stuff on the TODO...)
Quoted 56 lines
Quoted 56 lines
Signed-off-by Andrew Jones <[email protected]>--- lib/riscv/asm/stack.h | 1 + lib/riscv/stack.c | 2 +- lib/stack.c | 10 ++++++---- lib/stack.h | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-)lib/riscv/asm/stack.h +1
-0@@ -8,5 +8,6 @@#define HAVE_ARCH_BACKTRACE_FRAME #define HAVE_ARCH_BACKTRACE +#define HAVE_ARCH_BASE_ADDRESS #endif lib/riscv/stack.c +1
-1@@ -5,7 +5,7 @@#ifdef CONFIG_RELOC extern char ImageBase, _text, _etext; -bool arch_base_address (const void *rebased_addr,unsigned long *addr) +bool base_address (const void *rebased_addr,unsigned long *addr) {unsigned long ra = (unsigned long )rebased_addr;unsigned long base = (unsigned long )&ImageBase;lib/stack.c +3
-1@@ -12,9 +12,10 @@#define MAX_DEPTH 20 #ifdef CONFIG_RELOC +#ifndef HAVE_ARCH_BASE_ADDRESS extern char _text, _etext; -bool __attribute__((weak))arch_base_address (const void *rebased_addr,unsigned long *addr) +bool base_address(const void *rebased_addr, unsigned long *addr) { unsigned long ra = (unsigned long)rebased_addr; unsigned long start = (unsigned long)&_text;@@ -26,8 +27,9 @@ bool __attribute__((weak)) arch_base_address(const void *rebased_addr, unsigned *addr = ra - start; return true; } +#endif
Quoted 8 lines
lib/stack.c bool __attribute__((weak)) arch_base_address(const void *rebased_addr, unsigned · line 35
Quoted 6 lines
lib/stack.c +1
-1#else -bool __attribute__((weak))arch_base_address (const void *rebased_addr,unsigned long *addr) +bool base_address (const void *rebased_addr,unsigned long *addr) { *addr = (unsigned long )rebased_addr;return true;Shouldn't
HAVE_ARCH_BASE_ADDRESSalso cover this?
Yes, I suppose that would be the cleanest thing to do. And then in lib/$ARCH/asm/stack.h we should have
#ifdef CONFIG_RELOC
#define HAVE_ARCH_BASE_ADDRESS
#endif
when the arch wants to use the implementation here (which is probably would).
Thanks,
drew