Skip to contentSkip to conversation

x86/head*.S: Make global labels local

PATCH In review Borislav Petkov 3 participants 3 messages May 16, 2015 – May 18, 2015 x86

lore
Share & tools
lore

Borislav Petkov

author maintainer
#0 lore raw

PATCH 1/1 x86/head*.S: Make global labels local

From: Borislav Petkov <[email protected]>

No functionality change:

--- head_64.o.before.asm
+++ head_64.o.after.asm
@@ -1148,7 +1148,7 @@ Disassembly of section .init.text:
0000000000000120 <early_idt_handler>:

    120:	fc                   	cld
    121:	83 3c 24 02          	cmpl   $0x2,(%rsp)
  - 125:	0f 84 9d 00 00 00    	je     1c8 <is_nmi>
  + 125:	0f 84 9d 00 00 00    	je     1c8 <early_idt_handler+0xa8>
    12b:	83 3d 00 00 00 00 02 	cmpl   $0x2,0x0(%rip)        # 132 <early_idt_handler+0x12>
    132:	74 7e                	je     1b2 <early_idt_handler+0x92>
    134:	ff 05 00 00 00 00    	incl   0x0(%rip)        # 13a <early_idt_handler+0x1a>
  @@ -1198,9 +1198,7 @@ Disassembly of section .init.text:
    1bf:	5a                   	pop    %rdx
    1c0:	59                   	pop    %rcx
    1c1:	58                   	pop    %rax
  - 1c2:	ff 0d 00 00 00 00    	decl   0x0(%rip)        # 1c8 <is_nmi>
  -
  -00000000000001c8 <is_nmi>:
  + 1c2:	ff 0d 00 00 00 00    	decl   0x0(%rip)        # 1c8 <early_idt_handler+0xa8>
    1c8:	48 83 c4 10          	add    $0x10,%rsp
    1cc:	48 cf                	iretq

--- head_32.o.before.asm
+++ head_32.o.after.asm
@@ -436,7 +436,7 @@ Disassembly of section .init.text:
0000016c <early_idt_handler>:

    16c:  fc                      cld
    16d:  83 3c 24 02             cmpl   $0x2,(%esp)
  - 171:  74 73                   je     1e6 <is_nmi>
  + 171:  74 73                   je     1e6 <ex_entry+0xc>
    173:  36 83 3d 00 00 00 00    cmpl   $0x2,%ss:0x0
    17a:  02
    17b:  74 5a                   je     1d7 <hlt_loop>
  @@ -483,8 +483,6 @@ Disassembly of section .init.text:
    1dd:  59                      pop    %ecx
    1de:  58                      pop    %eax
    1df:  36 ff 0d 00 00 00 00    decl   %ss:0x0
  -
  -000001e6 <is_nmi>:
    1e6:  83 c4 08                add    $0x8,%esp
    1e9:  cf                      iret
    1ea:  66 90                   xchg   %ax,%ax
---
 arch/x86/kernel/head_32.S | 4 ++--
 arch/x86/kernel/head_64.S | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
arch/x86/kernel/head_32.S +2 -2
index d031bad9e07e..02d257256200 100644
@@ -547,7 +547,7 @@ ENTRY(early_idt_handler)
 	cld
 
 	cmpl $2,(%esp)		# X86_TRAP_NMI
-	je is_nmi		# Ignore NMI
+	je .Lis_nmi		# Ignore NMI
 
 	cmpl $2,%ss:early_recursion_flag
 	je hlt_loop
@@ -600,7 +600,7 @@ ex_entry:
 	pop %ecx
 	pop %eax
 	decl %ss:early_recursion_flag
-is_nmi:
+.Lis_nmi:
 	addl $8,%esp		/* drop vector number and error code */
 	iret
 ENDPROC(early_idt_handler)
arch/x86/kernel/head_64.S +2 -2
index ae6588b301c2..43eafc8afb69 100644
@@ -344,7 +344,7 @@ ENTRY(early_idt_handler)
 	cld
 
 	cmpl $2,(%rsp)		# X86_TRAP_NMI
-	je is_nmi		# Ignore NMI
+	je .Lis_nmi		# Ignore NMI
 
 	cmpl $2,early_recursion_flag(%rip)
 	jz  1f
@@ -409,7 +409,7 @@ ENTRY(early_idt_handler)
 	popq %rcx
 	popq %rax
 	decl early_recursion_flag(%rip)
-is_nmi:
+.Lis_nmi:
 	addq $16,%rsp		# drop vector number and error code
 	INTERRUPT_RETURN
 ENDPROC(early_idt_handler)
Signature · 1 line
2.3.5
#1 lore raw

[tip:x86/apic] x86/asm/head*.S: Change global labels to local

x86/asm/head*.S: Change global labels to local
Commit-ID:  e839004b49c571e20006092cbe9da8f2c95d2e71
Gitweb:     http://git.kernel.org/tip/e839004b49c571e20006092cbe9da8f2c95d2e71
Author:     Borislav Petkov <[email protected]>
AuthorDate: Sat, 16 May 2015 18:17:59 +0200
Committer:  Ingo Molnar <[email protected]>
CommitDate: Sun, 17 May 2015 07:57:53 +0200

x86/asm/head*.S: Change global labels to local

Make the disassembly look less confusing:

-- head_64.o.before.asm
++ head_64.o.after.asm
0000000000000120 <early_idt_handler>:

    120:	fc                   	cld
    121:	83 3c 24 02          	cmpl   $0x2,(%rsp)
  - 125:	0f 84 9d 00 00 00    	je     1c8 <is_nmi>
  + 125:	0f 84 9d 00 00 00    	je     1c8 <early_idt_handler+0xa8>
    12b:	83 3d 00 00 00 00 02 	cmpl   $0x2,0x0(%rip)        # 132 <early_idt_handler+0x12>
    132:	74 7e                	je     1b2 <early_idt_handler+0x92>
    134:	ff 05 00 00 00 00    	incl   0x0(%rip)        # 13a <early_idt_handler+0x1a>
  @@ -1198,9 +1198,7 @@ Disassembly of section .init.text:
    1bf:	5a                   	pop    %rdx
    1c0:	59                   	pop    %rcx
    1c1:	58                   	pop    %rax
  - 1c2:	ff 0d 00 00 00 00    	decl   0x0(%rip)        # 1c8 <is_nmi>
  -
  -00000000000001c8 <is_nmi>:
  + 1c2:	ff 0d 00 00 00 00    	decl   0x0(%rip)        # 1c8 <early_idt_handler+0xa8>
    1c8:	48 83 c4 10          	add    $0x10,%rsp
    1cc:	48 cf                	iretq

-- head_32.o.before.asm
++ head_32.o.after.asm
0000016c <early_idt_handler>:

    16c:  fc                      cld
    16d:  83 3c 24 02             cmpl   $0x2,(%esp)
  - 171:  74 73                   je     1e6 <is_nmi>
  + 171:  74 73                   je     1e6 <ex_entry+0xc>
    173:  36 83 3d 00 00 00 00    cmpl   $0x2,%ss:0x0
    17a:  02
    17b:  74 5a                   je     1d7 <hlt_loop>
  @@ -483,8 +483,6 @@ Disassembly of section .init.text:
    1dd:  59                      pop    %ecx
    1de:  58                      pop    %eax
    1df:  36 ff 0d 00 00 00 00    decl   %ss:0x0
  -
  -000001e6 <is_nmi>:
    1e6:  83 c4 08                add    $0x8,%esp
    1e9:  cf                      iret
    1ea:  66 90                   xchg   %ax,%ax

No functionality change.

Cc Andy Lutomirski <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc Brian Gerst <[email protected]>
Cc Denys Vlasenko <[email protected]>
Cc H. Peter Anvin <[email protected]>
Cc H. Peter Anvin <[email protected]>
Cc Linus Torvalds <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Thomas Gleixner <[email protected]>
---
 arch/x86/kernel/head_32.S | 4 ++--
 arch/x86/kernel/head_64.S | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
arch/x86/kernel/head_32.S +2 -2
index d031bad..02d2572 100644
@@ -547,7 +547,7 @@ ENTRY(early_idt_handler)
 	cld
 
 	cmpl $2,(%esp)		# X86_TRAP_NMI
-	je is_nmi		# Ignore NMI
+	je .Lis_nmi		# Ignore NMI
 
 	cmpl $2,%ss:early_recursion_flag
 	je hlt_loop
@@ -600,7 +600,7 @@ ex_entry:
 	pop %ecx
 	pop %eax
 	decl %ss:early_recursion_flag
-is_nmi:
+.Lis_nmi:
 	addl $8,%esp		/* drop vector number and error code */
 	iret
 ENDPROC(early_idt_handler)
arch/x86/kernel/head_64.S +2 -2
index ae6588b..43eafc8 100644
@@ -344,7 +344,7 @@ ENTRY(early_idt_handler)
 	cld
 
 	cmpl $2,(%rsp)		# X86_TRAP_NMI
-	je is_nmi		# Ignore NMI
+	je .Lis_nmi		# Ignore NMI
 
 	cmpl $2,early_recursion_flag(%rip)
 	jz  1f
@@ -409,7 +409,7 @@ ENTRY(early_idt_handler)
 	popq %rcx
 	popq %rax
 	decl early_recursion_flag(%rip)
-is_nmi:
+.Lis_nmi:
 	addq $16,%rsp		# drop vector number and error code
 	INTERRUPT_RETURN
 ENDPROC(early_idt_handler)
#2 lore raw

Re: [tip:x86/apic] x86/asm/head*.S: Change global labels to local

Quoted 11 lines · tip-bot for Borislav Petkov
Commit-ID:  e839004b49c571e20006092cbe9da8f2c95d2e71
Gitweb:     http://git.kernel.org/tip/e839004b49c571e20006092cbe9da8f2c95d2e71
Author:     Borislav Petkov <[email protected]>
AuthorDate: Sat, 16 May 2015 18:17:59 +0200
Committer:  Ingo Molnar <[email protected]>
CommitDate: Sun, 17 May 2015 07:57:53 +0200

x86/asm/head*.S: Change global labels to local

Make the disassembly look less confusing:

FWIW, the next binutils release will partially fix this issue.

http://lkml.kernel.org/g/CAMe9rOpOuYY0DffAd21VffSpvzvrkPe2pJxpZtEQX=Djpi_Lgw@mail.gmail.com

--Andy