KVM: x86: Fix nested CR3 load bugs
Get series with b4
b4 am [email protected]Versions newest first
- v2 Latest5 patches 0 repliesNew
Changes in v2 from the cover letter
- Pre-check the current CR3 in svm_set_nested_state(). [Sashiko]
- Pull in Paolo's fix. [Sashiko]
- Add patches 3-5.
Patches in v2 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/5 | KVM: nSVM: Pre-check current (L2's) CR3 during KVM_SET_NESTED_STATEarch/ | +4 | 0 replies | |
| 2/5 | KVM: nVMX/nSVM: check unconditionally whether CR3 is validarch/ arch/ | +5 | 0 replies | |
| 3/5 | KVM: nSVM: Mark CR3 as dirty when loading CR3 on nested transitionsarch/ | +1 | 0 replies | |
| 4/5 | KVM: x86: Consolidate nVMX vs. nSVM logic for loading CR3 on nested xferarch/ arch/ arch/ +2 more | +31 | 0 replies | |
| 5/5 | KVM: x86: Initialize MMU+PGD before loading PDPTRs on nested transitionsarch/ | +15 | 0 replies |
Reviews trailers per patch
None of the 5 patches has a Reviewed-by or Acked-by.
| Patch | [email protected] |
|---|---|
| 1/5 | |
| 2/5 | T-b |
| 3/5 | |
| 4/5 | |
| 5/5 |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.
Cover letter [PATCH v2 0/5] KVM: x86: Fix nested CR3 load bugs
Fix a variety of bugs related to KVM's handling of CR3 loads during nested transitions. I originally tried to fix a svm_set_nested_state() bug by forcing the vCPU back into L1 if a late CR3 load fails, but Sashiko rightly hated on that patch because forcing the vCPU from L2=>L1 would still leave vCPU state in a half-baked state.
I finally realized that Paolo's patch to always check CR3 validity is the way to go, svm_set_nested_state() just needs to also pre-check the current CR3 (because userspace could theoretically stuff a then-legal CR3 and then swizzle CPUID to make CR3 illegal).
Patch 5 fixes another related flaw where KVM doesn't initialize the MMU if loading PDPTRs on nested VM-Exit fails. Patches 3-4 are cleanups and prep work to dedup the nSVM vs. nVMX code to avoid copy+paste and confusing code for the final fix.
v2:
- Pre-check the current CR3 in svm_set_nested_state(). [Sashiko]
- Pull in Paolo's fix. [Sashiko]
- Add patches 3-5.
v1: https://lore.kernel.org/all/[email protected]
Paolo Bonzini (1):
KVM: nVMX/nSVM: check unconditionally whether CR3 is valid
Sean Christopherson (4):
KVM: nSVM: Pre-check current (L2's) CR3 during KVM_SET_NESTED_STATE
KVM: nSVM: Mark CR3 as dirty when loading CR3 on nested transitions
KVM: x86: Consolidate nVMX vs. nSVM logic for loading CR3 on nested
xfer
KVM: x86: Initialize MMU+PGD before loading PDPTRs on nested
transitions
arch/x86/kvm/mmu/mmu.c | 2 -- arch/x86/kvm/regs.c | 30 ++++++++++++++++++++++++++++++ arch/x86/kvm/regs.h | 2 ++ arch/x86/kvm/svm/nested.c | 36 ++++++++++-------------------------- arch/x86/kvm/vmx/nested.c | 31 ++++--------------------------- 5 files changed, 46 insertions(+), 55 deletions(-)
base-commit: d21eef2084a9af87ac2a783bc7c2b175ba114e4e
Signature · 1 line
2.56.1.703.gf848ed807c-goog