public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Sean Christopherson <seanjc@google.com>
To: Yosry Ahmed <yosry@kernel.org>
Cc: Yosry Ahmed <yosry.ahmed@linux.dev>,
	Paolo Bonzini <pbonzini@redhat.com>,
	kvm@vger.kernel.org,  linux-kernel@vger.kernel.org,
	Jim Mattson <jmattson@google.com>
Subject: Re: [PATCH v5 25/26] KVM: nSVM: Sanitize control fields copied from VMCB12
Date: Mon, 23 Feb 2026 17:27:54 -0800	[thread overview]
Message-ID: <aZz-muXa7RgSR1Ul@google.com> (raw)
In-Reply-To: <CAO9r8zP1hwzgX3iXDu3TuYQAiqdKrSOw6yuLL+PQFwm=CH0Lug@mail.gmail.com>

On Mon, Feb 23, 2026, Yosry Ahmed wrote:
> > > @@ -499,32 +499,35 @@ void __nested_copy_vmcb_control_to_cache(struct kvm_vcpu *vcpu,
> > >       if (!guest_cpu_cap_has(vcpu, X86_FEATURE_NPT))
> > >               to->misc_ctl &= ~SVM_MISC_ENABLE_NP;
> > >
> > > -     to->iopm_base_pa        = from->iopm_base_pa;
> > > -     to->msrpm_base_pa       = from->msrpm_base_pa;
> > > +     /*
> > > +      * Copy the ASID here because nested_vmcb_check_controls() will check
> > > +      * it.  The ASID could be invalid, or conflict with another VM's ASID ,
> >
> > Spurious space before the command.
> >
> > > +      * so it should never be used directly to run L2.
> > > +      */
> > > +     to->asid = from->asid;
> > > +
> > > +     /* Lower bits of IOPM_BASE_PA and MSRPM_BASE_PA are ignored */
> > > +     to->iopm_base_pa        = from->iopm_base_pa & PAGE_MASK;
> > > +     to->msrpm_base_pa       = from->msrpm_base_pa & PAGE_MASK;
> > >>      to->tsc_offset          = from->tsc_offset;
> > > -     to->tlb_ctl             = from->tlb_ctl;
> >
> > I don't think we should completely drop tlb_ctl.  KVM doesn't do anything with
> > vmcb12's tlb_ctl only because we haven't addressed the TODO list in
> > nested_svm_transition_tlb_flush().  I think I would rather update this code to
> > sanitize the field now, as opposed to waiting until we address that TODO.
> >
> > KVM advertises X86_FEATURE_FLUSHBYASID, so I think we can do the right thing
> > without having to speculate on what the future will bring.
> >
> > Alternatively, we could add a TODO here or update the one in
> > nested_svm_transition_tlb_flush(), but that seems like more overall work than
> > just hardening the code.
> 
> I will drop the ASID change.
> 
> I honestly don't know where to draw the line at this point. Should I
> split sanitizing all different fields into different patches? Or just
> split the tlb_ctl change? What about the I/O and MSR bitmap change?

FWIW, my rule of thumb is that, when writing the changelog, if I find myself
either (a) having to explain mostly unrelated things or (b) generalizing away
details, then I should split the patch.

In this case, I would do:

  1. int_ctl and friends
  2. tlb_cnt (with a changelog explaining why we're keeping it even though it's unused)
  3. ~0xfffull => PAGE_MASK cleanup
  4. ASID comment

Though honestly, I would drop the ASID change.  The comment is misleading and
arguably flat out wrong.  This

  The ASID could be invalid, or conflict with another VM's ASID, so it should
  never be used directly to run L2.

isn't why KVM musn't use the ASID from vmcb12 verbatim, the real reason is that
the ASID space managed by KVM is logical different than the one managed by L1.
I.e. KVM needs to shadow L1's ASID space, for all intents and purposes.  And so
KVM should never use vmcb12's ASID verbatim because it needs to be "translated".

  reply	other threads:[~2026-02-24  1:27 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-02-06 19:08 [PATCH v5 00/26] Nested SVM fixes, cleanups, and hardening Yosry Ahmed
2026-02-06 19:08 ` [PATCH v5 01/26] KVM: nSVM: Avoid clearing VMCB_LBR in vmcb12 Yosry Ahmed
2026-02-06 19:08 ` [PATCH v5 02/26] KVM: SVM: Switch svm_copy_lbrs() to a macro Yosry Ahmed
2026-02-06 19:08 ` [PATCH v5 03/26] KVM: SVM: Add missing save/restore handling of LBR MSRs Yosry Ahmed
2026-02-06 19:08 ` [PATCH v5 04/26] KVM: selftests: Add a test for LBR save/restore (ft. nested) Yosry Ahmed
2026-02-06 19:08 ` [PATCH v5 05/26] KVM: nSVM: Always inject a #GP if mapping VMCB12 fails on nested VMRUN Yosry Ahmed
2026-02-06 19:08 ` [PATCH v5 06/26] KVM: nSVM: Triple fault if mapping VMCB12 fails on nested #VMEXIT Yosry Ahmed
2026-02-24  0:35   ` Sean Christopherson
2026-02-24  0:51     ` Yosry Ahmed
2026-02-24  1:17       ` Sean Christopherson
2026-02-06 19:08 ` [PATCH v5 07/26] KVM: nSVM: Triple fault if restore host CR3 " Yosry Ahmed
2026-02-24  0:38   ` Sean Christopherson
2026-02-06 19:08 ` [PATCH v5 08/26] KVM: nSVM: Drop nested_vmcb_check_{save/control}() wrappers Yosry Ahmed
2026-02-06 19:08 ` [PATCH v5 09/26] KVM: nSVM: Call enter_guest_mode() before switching to VMCB02 Yosry Ahmed
2026-02-21  1:12   ` Sean Christopherson
2026-02-21  1:26     ` Jim Mattson
2026-02-21  9:06     ` Yosry Ahmed
2026-02-06 19:08 ` [PATCH v5 10/26] KVM: nSVM: Make nested_svm_merge_msrpm() return an errno Yosry Ahmed
2026-02-06 19:08 ` [PATCH v5 11/26] KVM: nSVM: Call nested_svm_merge_msrpm() from enter_svm_guest_mode() Yosry Ahmed
2026-02-06 19:08 ` [PATCH v5 12/26] KVM: nSVM: Call nested_svm_init_mmu_context() before switching to VMCB02 Yosry Ahmed
2026-02-06 19:08 ` [PATCH v5 13/26] KVM: nSVM: Refactor minimal #VMEXIT handling out of nested_svm_vmexit() Yosry Ahmed
2026-02-06 19:08 ` [PATCH v5 14/26] KVM: nSVM: Unify handling of VMRUN failures with proper cleanup Yosry Ahmed
2026-02-06 19:08 ` [PATCH v5 15/26] KVM: nSVM: Clear EVENTINJ field in VMCB12 on nested #VMEXIT Yosry Ahmed
2026-02-06 19:08 ` [PATCH v5 16/26] KVM: nSVM: Drop the non-architectural consistency check for NP_ENABLE Yosry Ahmed
2026-02-06 19:08 ` [PATCH v5 17/26] KVM: nSVM: Add missing consistency check for nCR3 validity Yosry Ahmed
2026-02-06 19:08 ` [PATCH v5 18/26] KVM: nSVM: Add missing consistency check for hCR0.PG and NP_ENABLE Yosry Ahmed
2026-02-06 19:08 ` [PATCH v5 19/26] KVM: nSVM: Add missing consistency check for EFER, CR0, CR4, and CS Yosry Ahmed
2026-02-06 19:08 ` [PATCH v5 20/26] KVM: nSVM: Add missing consistency check for event_inj Yosry Ahmed
2026-02-06 19:08 ` [PATCH v5 21/26] KVM: SVM: Rename vmcb->nested_ctl to vmcb->misc_ctl Yosry Ahmed
2026-02-06 19:08 ` [PATCH v5 22/26] KVM: SVM: Rename vmcb->virt_ext to vmcb->misc_ctl2 Yosry Ahmed
2026-02-06 19:08 ` [PATCH v5 23/26] KVM: nSVM: Cache all used fields from VMCB12 Yosry Ahmed
2026-02-06 19:08 ` [PATCH v5 24/26] KVM: nSVM: Restrict mapping VMCB12 on nested VMRUN Yosry Ahmed
2026-02-21  1:24   ` Sean Christopherson
2026-02-06 19:08 ` [PATCH v5 25/26] KVM: nSVM: Sanitize control fields copied from VMCB12 Yosry Ahmed
2026-02-23 23:15   ` Sean Christopherson
2026-02-24  1:02     ` Yosry Ahmed
2026-02-24  1:27       ` Sean Christopherson [this message]
2026-02-06 19:08 ` [PATCH v5 26/26] KVM: nSVM: Only copy SVM_MISC_ENABLE_NP from VMCB01's misc_ctl Yosry Ahmed

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=aZz-muXa7RgSR1Ul@google.com \
    --to=seanjc@google.com \
    --cc=jmattson@google.com \
    --cc=kvm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=pbonzini@redhat.com \
    --cc=yosry.ahmed@linux.dev \
    --cc=yosry@kernel.org \
    /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