mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Sean Christopherson <seanjc@google.com>
To: Sean Christopherson <seanjc@google.com>,
	Paolo Bonzini <pbonzini@redhat.com>
Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org,
	 Stefan Teodorescu <fane@google.com>,
	Sashiko Bot <sashiko-bot@kernel.org>,
	 syzbot@syzkaller.appspotmail.com, Chris Mason <mason@kernel.org>
Subject: [PATCH v2 0/5] KVM: x86: Fix nested CR3 load bugs
Date: Tue, 17 Nov 2026 13:09:29 -0800	[thread overview]
Message-ID: <20261117210934.7765-1-seanjc@google.com> (raw)

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/20261113170405.473841-1-seanjc@google.com

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
-- 
2.56.1.703.gf848ed807c-goog


             reply	other threads:[~2026-11-17 21:09 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-17 21:09 Sean Christopherson [this message]
2026-11-17 21:09 ` [PATCH v2 1/5] KVM: nSVM: Pre-check current (L2's) CR3 during KVM_SET_NESTED_STATE Sean Christopherson
2026-11-17 21:09 ` [PATCH v2 2/5] KVM: nVMX/nSVM: check unconditionally whether CR3 is valid Sean Christopherson
2026-11-17 21:09 ` [PATCH v2 3/5] KVM: nSVM: Mark CR3 as dirty when loading CR3 on nested transitions Sean Christopherson
2026-11-17 21:09 ` [PATCH v2 4/5] KVM: x86: Consolidate nVMX vs. nSVM logic for loading CR3 on nested xfer Sean Christopherson
2026-11-17 21:09 ` [PATCH v2 5/5] KVM: x86: Initialize MMU+PGD before loading PDPTRs on nested transitions Sean Christopherson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20261117210934.7765-1-seanjc@google.com \
    --to=seanjc@google.com \
    --cc=fane@google.com \
    --cc=kvm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mason@kernel.org \
    --cc=pbonzini@redhat.com \
    --cc=sashiko-bot@kernel.org \
    --cc=syzbot@syzkaller.appspotmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®