Skip to contentSkip to conversation

KVM: SVM: Split svm_vcpu_run inline assembly to a separate file.

PATCH New Uros Bizjak 1 participant 1 message Mar 31, 2020

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

PATCH 1/1 KVM: SVM: Split svm_vcpu_run inline assembly to a separate file.

The compiler (GCC) does not like the situation, where there is inline assembly block that clobbers all available machine registers in the middle of the function. This situation can be found in function svm_vcpu_run in file kvm/vmx.c and results in many register spills and fills to/from stack frame.

This patch fixes the issue with the same approach as was done for VMX some time ago. The big inline assembly is moved to a separate assembly .S file, taking into account all ABI requirements.

There are two main benefits of the above approach:

* elimination of several register spills and fills to/from stack frame, and consequently smaller function .text size. The binary size of svm_vcpu_run is lowered from 2019 to 1626 bytes.

* more efficient access to a register save array. Currently, register save array is accessed as:

    7b00:    48 8b 98 28 02 00 00     mov    0x228(%rax),%rbx
    7b07:    48 8b 88 18 02 00 00     mov    0x218(%rax),%rcx
    7b0e:    48 8b 90 20 02 00 00     mov    0x220(%rax),%rdx

and passing ia pointer to a register array as an argument to a function one gets:

  12:    48 8b 48 08              mov    0x8(%rax),%rcx
  16:    48 8b 50 10              mov    0x10(%rax),%rdx
  1a:    48 8b 58 18              mov    0x18(%rax),%rbx

As a result, the total size, considering that the new function size is 229 bytes, gets lowered by 164 bytes.

---
 arch/x86/kvm/Makefile      |   2 +-
 arch/x86/kvm/svm.c         |  92 +--------------------
 arch/x86/kvm/svm_vmenter.S | 162 +++++++++++++++++++++++++++++++++++++
 3 files changed, 166 insertions(+), 90 deletions(-)
 create mode 100644 arch/x86/kvm/svm_vmenter.S
arch/x86/kvm/Makefile +1 -1
index b19ef421084d..30b2c9e8a588 100644
@@ -13,7 +13,7 @@ kvm-y			+= x86.o emulate.o i8259.o irq.o lapic.o \
 			   hyperv.o debugfs.o mmu/mmu.o mmu/page_track.o
 
 kvm-intel-y		+= vmx/vmx.o vmx/vmenter.o vmx/pmu_intel.o vmx/vmcs12.o vmx/evmcs.o vmx/nested.o
-kvm-amd-y		+= svm.o pmu_amd.o
+kvm-amd-y		+= svm.o svm_vmenter.o pmu_amd.o
 
 obj-$(CONFIG_KVM)	+= kvm.o
 obj-$(CONFIG_KVM_INTEL)	+= kvm-intel.o
arch/x86/kvm/svm.c +3 -89

104 lines not on this page · raw message

arch/x86/kvm/svm_vmenter.S new file +162 -0

162 lines not on this page · raw message

Signature · 1 line
2.25.1