* Denys Vlasenko <[email protected]> wrote:
> Signed-off-by: Denys Vlasenko <[email protected]>
> CC: Linus Torvalds <[email protected]>
> CC: Steven Rostedt <[email protected]>
> CC: Ingo Molnar <[email protected]>
> CC: Borislav Petkov <[email protected]>
> CC: "H. Peter Anvin" <[email protected]>
> CC: Andy Lutomirski <[email protected]>
> CC: Oleg Nesterov <[email protected]>
> CC: Frederic Weisbecker <[email protected]>
> CC: Alexei Starovoitov <[email protected]>
> CC: Will Drewry <[email protected]>
> CC: Kees Cook <[email protected]>
> CC: [email protected]
> CC: [email protected]
> ---
> arch/x86/kernel/entry_64.S | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
> index 65485b3..15261ba 100644
> --- a/arch/x86/kernel/entry_64.S
> +++ b/arch/x86/kernel/entry_64.S
> @@ -429,6 +429,7 @@ return_from_execve:
> 1:
> /* must use IRET code path (pt_regs->cs may have changed) */
> addq $8, %rsp
> + CFI_ADJUST_CFA_OFFSET -8
> ZERO_EXTRA_REGS
> movq %rax,RAX(%rsp)
> jmp int_ret_from_sys_call
So given that this is a pretty common pattern:
triton:~/tip> git grep -A 1 'addq.*%rsp' arch/x86/kernel/entry_64.S
arch/x86/kernel/entry_64.S: addq $8, %rsp
arch/x86/kernel/entry_64.S- CFI_ADJUST_CFA_OFFSET -8
--
arch/x86/kernel/entry_64.S: addq $8, %rsp
arch/x86/kernel/entry_64.S- DEFAULT_FRAME 0
--
arch/x86/kernel/entry_64.S: addq $8, %rsp
arch/x86/kernel/entry_64.S- DEFAULT_FRAME 0
--
arch/x86/kernel/entry_64.S: addq $-0x80,(%rsp) /* Adjust
vector to [-256,-1] range */
arch/x86/kernel/entry_64.S- interrupt do_IRQ
--
arch/x86/kernel/entry_64.S: addq $0x30,%rsp
arch/x86/kernel/entry_64.S- CFI_ADJUST_CFA_OFFSET -0x30
--
arch/x86/kernel/entry_64.S: addq $0x30,%rsp
arch/x86/kernel/entry_64.S- CFI_ADJUST_CFA_OFFSET -0x30
--
arch/x86/kernel/entry_64.S: addq $(6*8), %rsp
arch/x86/kernel/entry_64.S- CFI_ADJUST_CFA_OFFSET -6*8
--
arch/x86/kernel/entry_64.S: addq $(10*8), %rsp
arch/x86/kernel/entry_64.S- CFI_ADJUST_CFA_OFFSET -10*8
it might make sense to introduce addq_cfi, to further hide the dwarf
uglies?
btw., doesn't:
arch/x86/kernel/entry_64.S: addq $-0x80,(%rsp) /* Adjust
vector to [-256,-1] range */
before the do_IRQ() call need a CFI adjustment as well?
Thanks,
Ingo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
