Skip to contentSkip to conversation

KVM: VMX: Remove unnecessary exception trampoline in vmx_vmenter

PATCH Applied Uros Bizjak 2 participants 2 messages Apr 6, 2020 – Apr 7, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 KVM: VMX: Remove unnecessary exception trampoline in vmx_vmenter

The exception trampoline in .fixup section is not needed, the exception handling code can jump directly to the label in the .text section.

Changes since v1:
- Fix commit message.

---
 arch/x86/kvm/vmx/vmenter.S | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
arch/x86/kvm/vmx/vmenter.S +2 -6
index 81ada2ce99e7..56d701db8734 100644
@@ -58,12 +58,8 @@ SYM_FUNC_START(vmx_vmenter)
 	ret
 4:	ud2
 
-	.pushsection .fixup, "ax"
-5:	jmp 3b
-	.popsection
-
-	_ASM_EXTABLE(1b, 5b)
-	_ASM_EXTABLE(2b, 5b)
+	_ASM_EXTABLE(1b, 3b)
+	_ASM_EXTABLE(2b, 3b)
 
 SYM_FUNC_END(vmx_vmenter)
 
Signature · 1 line
2.25.1
maintainer Applied
#1 lore raw
Quoted 24 lines · Uros Bizjak

The exception trampoline in .fixup section is not needed, the exception handling code can jump directly to the label in the .text section.

Changes since v1:
- Fix commit message.

---
 arch/x86/kvm/vmx/vmenter.S | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
arch/x86/kvm/vmx/vmenter.S +0 -1
index 81ada2ce99e7..56d701db8734 100644
@@ -58,12 +58,8 @@ SYM_FUNC_START(vmx_vmenter)
 	ret
 4:	ud2
 
-	.pushsection .fixup, "ax"

arch/x86/kvm/vmx/vmenter.S SYM_FUNC_START(vmx_vmenter) · line 65

Quoted 10 lines
arch/x86/kvm/vmx/vmenter.S +2 -5
-5:	jmp 3b
-	.popsection
-
-	_ASM_EXTABLE(1b, 5b)
-	_ASM_EXTABLE(2b, 5b)
+	_ASM_EXTABLE(1b, 3b)
+	_ASM_EXTABLE(2b, 3b)
 
 SYM_FUNC_END(vmx_vmenter)
 

Queued, thanks.

Paolo