x86/asm: Introduce push/pop macros which generate CFI_REL_OFFSET and CFI_RESTORE

Sequences:

        pushl_cfi %reg
        CFI_REL_OFFSET reg, 0

and:

        popl_cfi %reg
        CFI_RESTORE reg

happen quite often. This patch adds macros which generate them.

No assembly changes (verified with objdump -dr vmlinux.o).

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/1421017655-25561-1-git-send-email-dvlasenk@redhat.com
Link: http://lkml.kernel.org/r/2202eb90f175cf45d1b2d1c64dbb5676a8ad07ad.1424989793.git.luto@amacapital.net
Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 14 insertions, 28 deletions

diff --git a/arch/x86/include/asm/calling.h b/arch/x86/include/asm/calling.h
index 1f1297b46f83..3c711f2ab236 100644
--- a/arch/x86/include/asm/calling.h
+++ b/arch/x86/include/asm/calling.h
@@ -210,37 +210,23 @@ For 32-bit we have the following conventions - kernel is built with
  */
 
         .macro SAVE_ALL
-        pushl_cfi %eax
-        CFI_REL_OFFSET eax, 0
-        pushl_cfi %ebp
-        CFI_REL_OFFSET ebp, 0
-        pushl_cfi %edi
-        CFI_REL_OFFSET edi, 0
-        pushl_cfi %esi
-        CFI_REL_OFFSET esi, 0
-        pushl_cfi %edx
-        CFI_REL_OFFSET edx, 0
-        pushl_cfi %ecx
-        CFI_REL_OFFSET ecx, 0
-        pushl_cfi %ebx
-        CFI_REL_OFFSET ebx, 0
+        pushl_cfi_reg eax
+        pushl_cfi_reg ebp
+        pushl_cfi_reg edi
+        pushl_cfi_reg esi
+        pushl_cfi_reg edx
+        pushl_cfi_reg ecx
+        pushl_cfi_reg ebx
         .endm
 
         .macro RESTORE_ALL
-        popl_cfi %ebx
-        CFI_RESTORE ebx
-        popl_cfi %ecx
-        CFI_RESTORE ecx
-        popl_cfi %edx
-        CFI_RESTORE edx
-        popl_cfi %esi
-        CFI_RESTORE esi
-        popl_cfi %edi
-        CFI_RESTORE edi
-        popl_cfi %ebp
-        CFI_RESTORE ebp
-        popl_cfi %eax
-        CFI_RESTORE eax
+        popl_cfi_reg ebx
+        popl_cfi_reg ecx
+        popl_cfi_reg edx
+        popl_cfi_reg esi
+        popl_cfi_reg edi
+        popl_cfi_reg ebp
+        popl_cfi_reg eax
         .endm
 
 #endif /* CONFIG_X86_64 */