Skip to content

KVM: Move x86 init ops to separate struct

Sean Christopherson kvm kvm-ppc kvmarm linux-arm-kernel linux-mips lkml 3 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest9 patches 15 repliesIn review
  2. v29 patches 1 replySuperseded
  3. v15 patches 3 repliesSuperseded

Changes in v3 from the cover letter

- Rebase to kvm/queue, d55c9d4009c7 ("KVM: nSVM: check for EFER ... "). Conflicts galore, but all mechanical in nature.
- Drop an SVM patch that was obsoleted by kvm/queue.
- Collect an ack. [Marc]

Patches in v3 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/9KVM: Pass kvm_init()'s opaque param to additional arch funcsarch/mips/kvm/mips.c arch/powerpc/kvm/powerpc.c arch/s390/kvm/kvm-s390.c +4 more+26 -161 reply
2/9KVM: x86: Move init-only kvm_x86_ops to separate structarch/x86/include/asm/kvm_host.h arch/x86/kvm/svm.c arch/x86/kvm/vmx/vmx.c +1 more+36 -185 replies
3/9KVM: VMX: Move hardware_setup() definition below vmx_x86_opsarch/x86/kvm/vmx/vmx.c+173 -1731 reply
4/9KVM: VMX: Configure runtime hooks using vmx_x86_opsarch/x86/kvm/vmx/nested.c arch/x86/kvm/vmx/nested.h arch/x86/kvm/vmx/vmx.c+24 -213 replies
5/9KVM: x86: Set kvm_x86_ops only after ->hardware_setup() completesarch/x86/kvm/x86.c+2 -20 replies
6/9KVM: x86: Copy kvm_x86_ops by value to eliminate layer of indirectionarch/x86/include/asm/kvm_host.h arch/x86/kvm/cpuid.c arch/x86/kvm/hyperv.c +12 more+257 -2572 replies
7/9KVM: x86: Drop __exit from kvm_x86_ops' hardware_unsetup()arch/x86/include/asm/kvm_host.h arch/x86/kvm/vmx/vmx.c+2 -21 reply
8/9KVM: VMX: Annotate vmx_x86_ops as __initdataarch/x86/kvm/vmx/vmx.c+1 -11 reply
9/9KVM: SVM: Annotate svm_x86_ops as __initdataarch/x86/kvm/svm.c+1 -11 reply

Reviews trailers per patch

8 of 9 patches have a Reviewed-by or Acked-by.

PatchCornelia HuckMarc ZyngierVitaly KuznetsovPaul Mackerras
1/9R-b T-b A-b A-b
2/9R-b
3/9R-b
4/9R-b
5/9
6/9R-b
7/9R-b
8/9R-b
9/9R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 4 reviewers.

Read the v3 thread

Cover letter [PATCH v3 0/9] KVM: Move x86 init ops to separate struct

The non-x86 part of this series is wholly contained in patch 01. Compared to other recent kvm-wide changes, this one is very straightforward (famous last words).

Like a few other architectures, e.g. PPC, x86 uses a set of global hooks to call back into vendor code on demand. A handlful of the x86 hooks are used only within the scope of kvm_init(). This series moves the init-only hooks to a separate struct, partly to clean up the code a bit, but mainly so that the runtime hooks can be made available only after the x86 vendor has completed its ->hardware_setup(). While working on a different series I spent a fair bit of time scratching my as to why a kvm_x86_ops wasn't working, and eventually realized VMX's callback wasn't "ready" because the vmcs_config hadn't yet been populated.

Due to lack of a cross-compiling setup, the non-x86 changes in patch 01 are untested.

v3:
- Rebase to kvm/queue, d55c9d4009c7 ("KVM: nSVM: check for EFER ... "). Conflicts galore, but all mechanical in nature.
- Drop an SVM patch that was obsoleted by kvm/queue.
- Collect an ack. [Marc]

v2:
- Rebase to kvm/queue, 2c2787938512 ("KVM: selftests: Stop ...")
- Collect tags. [Cornelia]
- Add a patch to make kvm_x86_ops its own instance and copy {vmx,svm}_x86_ops by value, which saves a memory access on every invocation of a kvm_x86_ops hook. [Paolo]
- Add patches to tag {vmx,svm}_x86_ops as __initdata after they're copied by value.

Sean Christopherson (9):
KVM: Pass kvm_init()'s opaque param to additional arch funcs
KVM: x86: Move init-only kvm_x86_ops to separate struct
KVM: VMX: Move hardware_setup() definition below vmx_x86_ops
KVM: VMX: Configure runtime hooks using vmx_x86_ops
KVM: x86: Set kvm_x86_ops only after ->hardware_setup() completes
KVM: x86: Copy kvm_x86_ops by value to eliminate layer of indirection
KVM: x86: Drop __exit from kvm_x86_ops' hardware_unsetup()
KVM: VMX: Annotate vmx_x86_ops as __initdata
KVM: SVM: Annotate svm_x86_ops as __initdata

 arch/mips/kvm/mips.c            |   4 +-
 arch/powerpc/kvm/powerpc.c      |   4 +-
 arch/s390/kvm/kvm-s390.c        |   4 +-
 arch/x86/include/asm/kvm_host.h |  33 +--
 arch/x86/kvm/cpuid.c            |   4 +-
 arch/x86/kvm/hyperv.c           |   8 +-
 arch/x86/kvm/kvm_cache_regs.h   |  10 +-
 arch/x86/kvm/lapic.c            |  30 +--
 arch/x86/kvm/mmu.h              |   8 +-
 arch/x86/kvm/mmu/mmu.c          |  32 +--
 arch/x86/kvm/pmu.c              |  30 +--
 arch/x86/kvm/pmu.h              |   2 +-
 arch/x86/kvm/svm.c              |  19 +-
 arch/x86/kvm/trace.h            |   4 +-
 arch/x86/kvm/vmx/nested.c       |  17 +-
 arch/x86/kvm/vmx/nested.h       |   3 +-
 arch/x86/kvm/vmx/vmx.c          | 371 ++++++++++++++++----------------
 arch/x86/kvm/x86.c              | 370 +++++++++++++++----------------
 arch/x86/kvm/x86.h              |   4 +-
 include/linux/kvm_host.h        |   4 +-
 virt/kvm/arm/arm.c              |   4 +-
 virt/kvm/kvm_main.c             |  18 +-
 22 files changed, 507 insertions(+), 476 deletions(-)
Signature · 1 line
2.24.1