Hi Peter, On Fri, Apr 17, 2020 at 12:00:39PM +0200, Peter Zijlstra wrote: > On Thu, Apr 16, 2020 at 09:12:37AM -0700, Sami Tolvanen wrote: > > The graph tracer hooks returns by modifying frame records on the > > (regular) stack, but with SCS the return address is taken from the > > shadow stack, and the value in the frame record has no effect. As we > > don't currently have a mechanism to determine the corresponding slot > > on the shadow stack (and to pass this through the ftrace > > infrastructure), for now let's disable SCS when the graph tracer is > > enabled. > > > > With SCS the return address is taken from the shadow stack and the > > value in the frame record has no effect. The mcount based graph tracer > > hooks returns by modifying frame records on the (regular) stack, and > > thus is not compatible. The patchable-function-entry graph tracer > > used for DYNAMIC_FTRACE_WITH_REGS modifies the LR before it is saved > > to the shadow stack, and is compatible. > > > > Modifying the mcount based graph tracer to work with SCS would require > > a mechanism to determine the corresponding slot on the shadow stack > > (and to pass this through the ftrace infrastructure), and we expect > > that everyone will eventually move to the patchable-function-entry > > based graph tracer anyway, so for now let's disable SCS when the > > mcount-based graph tracer is enabled. > > > > SCS and patchable-function-entry are both supported from LLVM 10.x. > > SCS would actually provide another way to do return hooking. An arguably > much saner model at that. > > The 'normal' way is to (temporary) replace the on-stack return value, > and then replace it back in the return handler. This is because we can't > simply push a fake return on the stack, because that would wreck the > expected stack layout of the regular function. > > But there is nothing that would stop us from pushing an extra entry on > the SCS. It would in fact be a much cleaner solution. The entry hook > sticks an extra entry on the SCS, the function ignores what's on the > normal stack and pops from the SCS, we return to the exit handler, which > in turn pops from the SCS stack at which point we're back to regular. For background: on arm64 we wanted to use DYNAMIC_FTRACE_WITH_REGS since we already have to use that to handle pointer authentication, and didn't want to gain more ways of implementing ftrace. Arguably we should move the dependency into the arm64 Kconfig for ARCH_SUPPORTS_SHADOW_CALL_STACK. > The only 'funny' is that the exit handler itself should not push to the > SCS, or we should frob the return-to-exit-handler such that it lands > after the push. > > > Signed-off-by: Sami Tolvanen <samitolvanen@xxxxxxxxxx> > > Reviewed-by: Kees Cook <keescook@xxxxxxxxxxxx> > > Reviewed-by: Mark Rutland <mark.rutland@xxxxxxx> > > --- > > arch/Kconfig | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/arch/Kconfig b/arch/Kconfig > > index 691a552c2cc3..c53cb9025ad2 100644 > > --- a/arch/Kconfig > > +++ b/arch/Kconfig > > @@ -542,6 +542,7 @@ config ARCH_SUPPORTS_SHADOW_CALL_STACK > > > > config SHADOW_CALL_STACK > > bool "Clang Shadow Call Stack" > > + depends on DYNAMIC_FTRACE_WITH_REGS || !FUNCTION_GRAPH_TRACER > > depends on ARCH_SUPPORTS_SHADOW_CALL_STACK > > help > > This option enables Clang's Shadow Call Stack, which uses a > AFAICT you also need to kill KRETPROBES, which plays similar games. Hmm... how does KREPROBES work? If you can only mess with the return address when probing the first instruction in the function, it'll just work for SCS or pointer authentication, as the LR is used at that instant. If KRETPROBES tries to mess with the return address elsewhere it'd be broken today... > And doesn't BPF also do stuff like this? Can BPF mess with return addresses now!? Thanks, Mark.
