Skip to contentSkip to conversation

KVM: VMX: Improve handle_external_interrupt_irqoff inline assembly

PATCH Superseded Uros Bizjak 2 participants 4 messages May 3, 2020 – May 4, 2020

Subsystems (3)

v4 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

PATCH v4 1/1 KVM: VMX: Improve handle_external_interrupt_irqoff inline assembly

Improve handle_external_interrupt_irqoff inline assembly in several ways:
- use "re" operand constraint instead of "i" and remove unneeded %c operand modifiers and "$" prefixes
- use %rsp instead of _ASM_SP, since we are in CONFIG_X86_64 part
- use $-16 immediate to align %rsp
- remove unneeded use of __ASM_SIZE macro
- define "ss" named operand only for X86_64

The patch introduces no functional changes.

Cc Paolo Bonzini <[email protected]>
Cc Sean Christopherson <[email protected]>
---
 arch/x86/kvm/vmx/vmx.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)
arch/x86/kvm/vmx/vmx.c +8 -6
index c2c6335a998c..56c742effb30 100644
@@ -6283,13 +6283,13 @@ static void handle_external_interrupt_irqoff(struct kvm_vcpu *vcpu)
 
 	asm volatile(
 #ifdef CONFIG_X86_64
-		"mov %%" _ASM_SP ", %[sp]\n\t"
-		"and $0xfffffffffffffff0, %%" _ASM_SP "\n\t"
-		"push $%c[ss]\n\t"
+		"mov %%rsp, %[sp]\n\t"
+		"and $-16, %%rsp\n\t"
+		"push %[ss]\n\t"
 		"push %[sp]\n\t"
 #endif
 		"pushf\n\t"
-		__ASM_SIZE(push) " $%c[cs]\n\t"
+		"push %[cs]\n\t"
 		CALL_NOSPEC
 		:
 #ifdef CONFIG_X86_64
@@ -6298,8 +6298,10 @@ static void handle_external_interrupt_irqoff(struct kvm_vcpu *vcpu)
 		ASM_CALL_CONSTRAINT
 		:
 		[thunk_target]"r"(entry),
-		[ss]"i"(__KERNEL_DS),
-		[cs]"i"(__KERNEL_CS)
+#ifdef CONFIG_X86_64
+		[ss]"re"(__KERNEL_DS),
+#endif
+		[cs]"re"(__KERNEL_CS)
 	);
 
 	kvm_after_interrupt(vcpu);
Signature · 1 line
2.25.4
#1 lore raw
Quoted 9 lines · Uros Bizjak

Improve handle_external_interrupt_irqoff inline assembly in several ways:
- use "re" operand constraint instead of "i" and remove unneeded %c operand modifiers and "$" prefixes
- use %rsp instead of _ASM_SP, since we are in CONFIG_X86_64 part
- use $-16 immediate to align %rsp
- remove unneeded use of __ASM_SIZE macro
- define "ss" named operand only for X86_64

The patch introduces no functional changes.

Hmm, for handcoded assembly I would argue that the switch from "i" to "re" is a functional change of sorts. The switch also needs explicit justification to explain why it's correct/desirable. Maybe make it a separate patch?

Quoted 45 lines
Cc Paolo Bonzini <[email protected]>
Cc Sean Christopherson <[email protected]>
---
 arch/x86/kvm/vmx/vmx.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)
arch/x86/kvm/vmx/vmx.c +8 -6
index c2c6335a998c..56c742effb30 100644
@@ -6283,13 +6283,13 @@ static void handle_external_interrupt_irqoff(struct kvm_vcpu *vcpu)
 
 	asm volatile(
 #ifdef CONFIG_X86_64
-		"mov %%" _ASM_SP ", %[sp]\n\t"
-		"and $0xfffffffffffffff0, %%" _ASM_SP "\n\t"
-		"push $%c[ss]\n\t"
+		"mov %%rsp, %[sp]\n\t"
+		"and $-16, %%rsp\n\t"
+		"push %[ss]\n\t"
 		"push %[sp]\n\t"
 #endif
 		"pushf\n\t"
-		__ASM_SIZE(push) " $%c[cs]\n\t"
+		"push %[cs]\n\t"
 		CALL_NOSPEC
 		:
 #ifdef CONFIG_X86_64
@@ -6298,8 +6298,10 @@ static void handle_external_interrupt_irqoff(struct kvm_vcpu *vcpu)
 		ASM_CALL_CONSTRAINT
 		:
 		[thunk_target]"r"(entry),
-		[ss]"i"(__KERNEL_DS),
-		[cs]"i"(__KERNEL_CS)
+#ifdef CONFIG_X86_64
+		[ss]"re"(__KERNEL_DS),
+#endif
+		[cs]"re"(__KERNEL_CS)
 	);
 
 	kvm_after_interrupt(vcpu);
Signature · 1 line
2.25.4
#2 lore raw
Quoted 10 lines · Sean Christopherson
Quoted 8 lines · Uros Bizjak

Improve handle_external_interrupt_irqoff inline assembly in several ways:
- use "re" operand constraint instead of "i" and remove unneeded %c operand modifiers and "$" prefixes
- use %rsp instead of _ASM_SP, since we are in CONFIG_X86_64 part
- use $-16 immediate to align %rsp
- remove unneeded use of __ASM_SIZE macro
- define "ss" named operand only for X86_64

Quoted 6 lines
Quoted 1 line

The patch introduces no functional changes.

Hmm, for handcoded assembly I would argue that the switch from "i" to "re" is a functional change of sorts. The switch also needs explicit justification to explain why it's correct/desirable. Maybe make it a separate patch?

I think this would be a good idea. So, in this patch the first point should read

"- remove unneeded %c operand modifiers and "$" prefixes"

The add-on patch will then explain that PUSH can only handle signed 32bit immediates and change "i" to "re".

Is this what you had in mind?

Thanks,
Uros.

#3 lore raw
Quoted 19 lines · Uros Bizjak
Quoted 10 lines · Sean Christopherson
Quoted 8 lines · Uros Bizjak

Improve handle_external_interrupt_irqoff inline assembly in several ways:
- use "re" operand constraint instead of "i" and remove unneeded %c operand modifiers and "$" prefixes
- use %rsp instead of _ASM_SP, since we are in CONFIG_X86_64 part
- use $-16 immediate to align %rsp
- remove unneeded use of __ASM_SIZE macro
- define "ss" named operand only for X86_64

Quoted 6 lines
Quoted 1 line

The patch introduces no functional changes.

Hmm, for handcoded assembly I would argue that the switch from "i" to "re" is a functional change of sorts. The switch also needs explicit justification to explain why it's correct/desirable. Maybe make it a separate patch?

Quoted 8 lines

I think this would be a good idea. So, in this patch the first point should read

"- remove unneeded %c operand modifiers and "$" prefixes"

The add-on patch will then explain that PUSH can only handle signed 32bit immediates and change "i" to "re".

Is this what you had in mind?

Yep, exactly.