From mboxrd@z Thu Jan 1 00:00:00 1970 From: jpoimboe@redhat.com (Josh Poimboeuf) Date: Tue, 7 May 2019 12:53:42 -0500 Subject: [RFC][PATCH 2/3] x86_64: Allow breakpoints to emulate call functions In-Reply-To: <20190507174400.219947724@goodmis.org> References: <20190507174227.673261270@goodmis.org> <20190507174400.219947724@goodmis.org> Message-ID: <20190507175342.fskdj2qidpao65qi@treble> Content-Type: text/plain; charset="UTF-8" Message-ID: <20190507175342.Aa8sS40DqdlJYCgW_LJIRxmd4GyAjgYza_2Pxz7-Fmo@z> On Tue, May 07, 2019@01:42:29PM -0400, Steven Rostedt wrote: > From: Peter Zijlstra > > In order to allow breakpoints to emulate call functions, they need to push > the return address onto the stack. But because the breakpoint exception > frame is added to the stack when the breakpoint is hit, there's no room to > add the address onto the stack and return to the address of the emulated > called funtion. > > To handle this, copy the exception frame on entry of the breakpoint handler > and have leave a gap that can be used to add a return address to the stack > frame and return from the breakpoint to the emulated called function, > allowing for that called function to return back to the location after the > breakpoint was placed. This part is done by patch 1. > > The helper functions were also added: No longer "also" :-) > int3_emulate_push(): to push the address onto the gap in the stack > int3_emulate_jmp(): changes the location of the regs->ip to return there. > int3_emulate_call(): push the return address and change regs->ip > > Cc: Andy Lutomirski > Cc: Nicolai Stange > Cc: Thomas Gleixner > Cc: Ingo Molnar > Cc: Borislav Petkov > Cc: "H. Peter Anvin" > Cc: the arch/x86 maintainers > Cc: Josh Poimboeuf > Cc: Jiri Kosina > Cc: Miroslav Benes > Cc: Petr Mladek > Cc: Joe Lawrence > Cc: Shuah Khan > Cc: Konrad Rzeszutek Wilk > Cc: Tim Chen > Cc: Sebastian Andrzej Siewior > Cc: Mimi Zohar > Cc: Juergen Gross > Cc: Nick Desaulniers > Cc: Nayna Jain > Cc: Masahiro Yamada > Cc: Joerg Roedel > Cc: "open list:KERNEL SELFTEST FRAMEWORK" > Cc: stable at vger.kernel.org > Fixes: b700e7f03df5 ("livepatch: kernel: add support for live patching") > Signed-off-by: Peter Zijlstra (Intel) > [ Modified to only work for x86_64 ] > Signed-off-by: Steven Rostedt (VMware) > --- > arch/x86/include/asm/text-patching.h | 22 ++++++++++++++++++++++ > 1 file changed, 22 insertions(+) > > diff --git a/arch/x86/include/asm/text-patching.h b/arch/x86/include/asm/text-patching.h > index e85ff65c43c3..455bf9f88233 100644 > --- a/arch/x86/include/asm/text-patching.h > +++ b/arch/x86/include/asm/text-patching.h > @@ -39,4 +39,26 @@ extern int poke_int3_handler(struct pt_regs *regs); > extern void *text_poke_bp(void *addr, const void *opcode, size_t len, void *handler); > extern int after_bootmem; > > +static inline void int3_emulate_jmp(struct pt_regs *regs, unsigned long ip) > +{ > + regs->ip = ip; > +} > + > +#define INT3_INSN_SIZE 1 > +#define CALL_INSN_SIZE 5 > + > +#ifdef CONFIG_X86_64 > +static inline void int3_emulate_push(struct pt_regs *regs, unsigned long val) > +{ > + regs->sp -= sizeof(unsigned long); > + *(unsigned long *)regs->sp = val; > +} How this works isn't really obvious. A comment is probably warranted to explain the fact that the int3 entry code reserved some space on the stack. -- Josh