KVM: SVM: A fix and cleanups for VMCB intercepts
Status from this message: Applied to kvm-x86 nested, thanks!
Get series with b4
b4 am [email protected]Versions newest first
Changes in v2 from the cover letter
- Fix the aforementioned bug.
- Split recalc_intercepts() instead of simply renaming it.
- Move the new WARN in nested_vmcb02_recalc_intercepts() to its own patch.
- Use less weird local variables even if they aren't consistent with the existing code...
- ... and then change some names in the existing code to provide consistency.
Patches in v2 Applied
Reviews trailers per patch
5 of 8 patches have a Reviewed-by or Acked-by.
| Patch | Yosry Ahmed |
|---|---|
| 1/8 | R-b |
| 2/8 | R-b |
| 3/8 | |
| 4/8 | R-b |
| 5/8 | |
| 6/8 | |
| 7/8 | R-b |
| 8/8 | R-b |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.
Cover letter [PATCH v2 0/8] KVM: SVM: A fix and cleanups for VMCB intercepts
Fix a likely-benign bug where KVM fails to mark vmcb01 intercepts as dirty after recalculating intercepts while L2 is active, then do a bunch of related cleanup, e.g. to split recalc_intercepts() into nested vs. non-nested functionality.
v2:
- Fix the aforementioned bug.
- Split recalc_intercepts() instead of simply renaming it.
- Move the new WARN in nested_vmcb02_recalc_intercepts() to its own patch.
- Use less weird local variables even if they aren't consistent with the existing code...
- ... and then change some names in the existing code to provide consistency.
v1: https://lkml.kernel.org/r/20260112182022.771276-1-yosry.ahmed%40linux.dev
Sean Christopherson (6):
KVM: SVM: Explicitly mark vmcb01 dirty after modifying VMCB intercepts
KVM: SVM: Separate recalc_intercepts() into nested vs. non-nested
parts
KVM: nSVM: Directly (re)calc vmcb02 intercepts from
nested_vmcb02_prepare_control()
KVM: nSVM: Use intuitive local variables in
nested_vmcb02_recalc_intercepts()
KVM: nSVM: Move vmcb_ctrl_area_cached.bus_lock_rip to svm_nested_state
KVM: nSVM: Capture svm->nested.ctl as vmcb12_ctrl when preparing
vmcb02
Yosry Ahmed (2):
KVM: nSVM: WARN and abort vmcb02 intercepts recalc if vmcb02 isn't
active
KVM: nSVM: Use vmcb12_is_intercept() in
nested_sync_control_from_vmcb02()
arch/x86/kvm/svm/nested.c | 88 +++++++++++++++++++-------------------- arch/x86/kvm/svm/sev.c | 2 +- arch/x86/kvm/svm/svm.c | 6 +-- arch/x86/kvm/svm/svm.h | 28 +++++++++---- 4 files changed, 67 insertions(+), 57 deletions(-)
base-commit: 183bb0ce8c77b0fd1fb25874112bc8751a461e49
Signature · 1 line
2.53.0.345.g96ddfc5eaa-goog