Merge branch 'kvm-vmenter' into HEAD

Browse source

Move SPEC_CTRL handling for VMX entirely to vmenter.S, also improving
assembly code reuse between SVM and VMX.

The prototype of __vmx_vcpu_run() and __svm_vcpu_run() becomes
the same, with a set of bit flags for the second argument.
The register allocation also becomes very similar, with %edi/%rdi
pointing to the vmx (resp. svm) argument.

Thanks to this, the code to save and restore SPEC_CTRL values for the
host and guest is the same up to the register names and can be dropped
into a new header arch/x86/kvm/vmenter.h.  APX enablement will also move
common code to load and save registers from VMX and SVM to vmenter.h.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

...

This commit is contained in:

Paolo Bonzini 2026-05-04 04:52:27 -04:00

parent 2be108307e 344ebd21f2

commit fcaf986d10

9 changed files with 213 additions and 239 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

arch/x86/kvm/kvm-asm-offsets.c

View file

23

arch/x86/kvm/svm/svm.c

View file

4

arch/x86/kvm/svm/svm.h

View file

103

arch/x86/kvm/svm/vmenter.S

View file

80

arch/x86/kvm/vmenter.h

View file

9

arch/x86/kvm/vmx/run_flags.h

View file

184

arch/x86/kvm/vmx/vmenter.S

View file

39

arch/x86/kvm/vmx/vmx.c

View file

7

arch/x86/kvm/vmx/vmx.h

View file