Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

x86/asm/64: Open-code register save/restore in trace_hardirqs*() thunks

This is a preparatory patch for change in "struct pt_regs"
handling in entry_64.S.

trace_hardirqs*() thunks were (ab)using a part of the
'pt_regs' handling code, namely the SAVE_ARGS/RESTORE_ARGS
macros, to save/restore registers across C function calls.

Since SAVE_ARGS is going to be changed, open-code
register saving/restoring here.

Incidentally, this removes a bit of dead code:
one SAVE_ARGS was used just to emit a CFI annotation,
but it also generated unreachable assembly instructions.

Take a page from thunk_32.S and use push/pop instructions
instead of movq, they are far shorter:
1 or 2 bytes versus 5, and no need for instructions to adjust %rsp:

text data bss dec hex filename
333 40 0 373 175 thunk_64_movq.o
104 40 0 144 90 thunk_64_push_pop.o

[ This is ugly as sin, but we'll fix up the ugliness in the next
patch. I see no point in reordering patches just to avoid an
ugly intermediate state. --Andy ]

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
Signed-off-by: Andy Lutomirski <luto@amacapital.net>
Cc: Alexei Starovoitov <ast@plumgrid.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Will Drewry <wad@chromium.org>
Link: http://lkml.kernel.org/r/1420927210-19738-4-git-send-email-dvlasenk@redhat.com
Link: http://lkml.kernel.org/r/4c979ad604f0f02c5ade3b3da308b53eabd5e198.1424989793.git.luto@amacapital.net
Signed-off-by: Ingo Molnar <mingo@kernel.org>

authored by

Denys Vlasenko and committed by
Ingo Molnar
69e8544c f8e92fb4

+42 -4
+42 -4
arch/x86/lib/thunk_64.S
··· 17 17 CFI_STARTPROC 18 18 19 19 /* this one pushes 9 elems, the next one would be %rIP */ 20 - SAVE_ARGS 20 + pushq_cfi %rdi 21 + CFI_REL_OFFSET rdi, 0 22 + pushq_cfi %rsi 23 + CFI_REL_OFFSET rsi, 0 24 + pushq_cfi %rdx 25 + CFI_REL_OFFSET rdx, 0 26 + pushq_cfi %rcx 27 + CFI_REL_OFFSET rcx, 0 28 + pushq_cfi %rax 29 + CFI_REL_OFFSET rax, 0 30 + pushq_cfi %r8 31 + CFI_REL_OFFSET r8, 0 32 + pushq_cfi %r9 33 + CFI_REL_OFFSET r9, 0 34 + pushq_cfi %r10 35 + CFI_REL_OFFSET r10, 0 36 + pushq_cfi %r11 37 + CFI_REL_OFFSET r11, 0 21 38 22 39 .if \put_ret_addr_in_rdi 40 + /* 9*8(%rsp) is return addr on stack */ 23 41 movq_cfi_restore 9*8, rdi 24 42 .endif 25 43 ··· 63 45 #endif 64 46 #endif 65 47 66 - /* SAVE_ARGS below is used only for the .cfi directives it contains. */ 48 + #if defined(CONFIG_TRACE_IRQFLAGS) \ 49 + || defined(CONFIG_DEBUG_LOCK_ALLOC) \ 50 + || defined(CONFIG_PREEMPT) 67 51 CFI_STARTPROC 68 - SAVE_ARGS 52 + CFI_ADJUST_CFA_OFFSET 9*8 69 53 restore: 70 - RESTORE_ARGS 54 + popq_cfi %r11 55 + CFI_RESTORE r11 56 + popq_cfi %r10 57 + CFI_RESTORE r10 58 + popq_cfi %r9 59 + CFI_RESTORE r9 60 + popq_cfi %r8 61 + CFI_RESTORE r8 62 + popq_cfi %rax 63 + CFI_RESTORE rax 64 + popq_cfi %rcx 65 + CFI_RESTORE rcx 66 + popq_cfi %rdx 67 + CFI_RESTORE rdx 68 + popq_cfi %rsi 69 + CFI_RESTORE rsi 70 + popq_cfi %rdi 71 + CFI_RESTORE rdi 71 72 ret 72 73 CFI_ENDPROC 73 74 _ASM_NOKPROBE(restore) 75 + #endif