ARM: 9184/1: return_address: disable again for CONFIG_ARM_UNWIND=y
authorArd Biesheuvel <ardb@kernel.org>
Wed, 2 Mar 2022 11:38:18 +0000 (12:38 +0100)
committerRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Mon, 7 Mar 2022 11:43:12 +0000 (11:43 +0000)
commit6845d64d51cf69c096176e34864e161429bcb664
treecaba3211fd106abd933746c1b831158f8f59c6c2
parent81679376470ef4e070d3ab04b578b2eef1013e46
ARM: 9184/1: return_address: disable again for CONFIG_ARM_UNWIND=y

Commit 41918ec82eb6 ("ARM: ftrace: enable the graph tracer with the EABI
unwinder") removed the dummy version of return_address() that was
provided for the CONFIG_ARM_UNWIND=y case, on the assumption that the
removal of the kernel_text_address() call from unwind_frame() in the
preceding patch made it safe to do so.

However, this turns out not to be the case: Corentin reports warnings
about suspicious RCU usage and other strange behavior that seems to
originate in the stack unwinding that occurs in return_address().

Given that the function graph tracer (which is what these changes were
enabling for CONFIG_ARM_UNWIND=y builds) does not appear to care about
this distinction, let's revert return_address() to the old state.

Cc: Corentin Labbe <clabbe.montjoie@gmail.com>
Fixes: 41918ec82eb6 ("ARM: ftrace: enable the graph tracer with the EABI unwinder")
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Reported-by: Corentin Labbe <clabbe.montjoie@gmail.com>
Tested-by: Corentin Labbe <clabbe.montjoie@gmail.com>
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
arch/arm/include/asm/ftrace.h
arch/arm/kernel/Makefile