Kernel KVM virtualization development
 help / color / mirror / Atom feed
From: Marc Zyngier <maz@kernel.org>
To: sashiko-reviews@lists.linux.dev
Cc: kvm@vger.kernel.org, kvmarm@lists.linux.dev,
	"Oliver\ Upton" <oupton@kernel.org>
Subject: Re: [PATCH v2 4/8] KVM: arm64: Correctly handle end of VA space TLBI invalidation
Date: Thu, 06 Aug 2026 12:51:57 +0100	[thread overview]
Message-ID: <868q6jbh5u.wl-maz@kernel.org> (raw)
In-Reply-To: <20260806093030.863F31F000E9@smtp.kernel.org>

On Thu, 06 Aug 2026 10:30:29 +0100,
sashiko-bot@kernel.org wrote:
> 
> Thank you for your contribution! Sashiko AI review found 2 potential issue(s) to consider:
> 
> Pre-existing issues:
> - [High] Range TLBI instructions for Stage-1 TTBR1 addresses silently fail to invalidate VNCR entries because the base address is not sign-extended.
> - [High] The `tlbi_va_s1_to_va` macro and `read_vncr_el2` sign-extend from bit 48, which corrupts 52-bit Virtual Addresses (LVA).
> --
> 
> --- Patch [4]: [PATCH v2 4/8] KVM: arm64: Correctly handle end of VA space TLBI invalidation ---
> commit 0f00ac726029153c77159941056d984a8dc753cf
> Author: Marc Zyngier <maz@kernel.org>
> Subject: KVM: arm64: Correctly handle end of VA space TLBI invalidation
> 
> This commit fixes an issue with TLB invalidation by VA where address rollover
> at the end of the TTBR1 VA space caused invalidations to fail. It introduces
> a common helper, vncr_tlb_intersects(), which uses inclusive end addresses
> to prevent this issue for both VA and IPA invalidations.
> 
> > diff --git a/arch/arm64/kvm/nested.c b/arch/arm64/kvm/nested.c
> > index 939813aebaafa..67cc5b6d80705 100644
> > --- a/arch/arm64/kvm/nested.c
> > +++ b/arch/arm64/kvm/nested.c
> > @@ -1000,6 +1000,20 @@ static void invalidate_vncr(struct vncr_tlb *vt)
> [ ... ]
> > +static bool vncr_tlb_intersects(struct vncr_tlb *vt, u64 addr,
> > +				u64 scope_start, u64 scope_size)
> > +{
> > +	u64 tlb_size, tlb_start, tlb_end, scope_end;
> > +
> > +	tlb_size = ttl_to_size(pgshift_level_to_ttl(vt->wi.pgshift, vt->wr.level));
> > +
> > +	tlb_start = addr & ~(tlb_size - 1);
> > +	tlb_end = tlb_start + tlb_size - 1;
> > +	scope_end = scope_start + scope_size - 1;
> > +
> > +	return !(tlb_end < scope_start || tlb_start > scope_end);
> 
> [Severity: High]
> This is a pre-existing issue, but could this intersection check fail for
> Stage-1 TTBR1 Range TLBIs due to a missing sign extension?
> 
> When a guest issues a Range TLBI for a TTBR1 virtual address,
> decode_range_tlbi() zero-extends the base address:
> 
> arch/arm64/include/asm/kvm_nested.h:decode_range_tlbi() {
>     ...
>     base = (val & GENMASK(36, 0)) << shift;
>     ...
> }
> 
> In compute_s1_tlbi_range(), this is directly assigned to scope->va.
> 
> Since scope->va is passed as scope_start here and is zero-extended (a large
> positive unsigned number), won't it fail to intersect with vt->gva, which
> is sign-extended (a negative number for TTBR1)?

This is patch #6.

> 
> > +}
> > +
> >  /*
> >   * VNCR TLB invalidation occurs from MMU notifiers or TLBI instructions, and
> >   * either can race against a vcpu not being onlined yet (no pseudo-TLB
> [ ... ]
> > @@ -1060,28 +1064,19 @@ static void invalidate_vncr_va(struct kvm *kvm,
> >  	lockdep_assert_held_write(&kvm->mmu_lock);
> >  
> >  	kvm_for_each_vncr_tlb(i, vcpu, vt, kvm) {
> >  		switch (scope->type) {
> >  		case TLBI_ALL:
> >  			break;
> >  
> >  		case TLBI_VA:
> > -			if (va_end <= scope->va ||
> > -			    va_start >= (scope->va + scope->size))
> > +			if (!vncr_tlb_intersects(vt, vt->gva, scope->va, scope->size))
> 
> [Severity: High]
> This isn't a bug introduced by this patch, but does KVM incorrectly truncate
> 52-bit Virtual Addresses (LVA) to 48 bits when constructing these VAs?
> 
> The tlbi_va_s1_to_va() macro and read_vncr_el2() both hardcode a 48-bit sign
> extension:
> 
> arch/arm64/kvm/nested.c:read_vncr_el2() {
>     ...
>     return (u64)sign_extend64(__vcpu_sys_reg(vcpu, VNCR_EL2), 48);
> }
> 
> If a guest uses 52-bit VAs (FEAT_LVA) and places the VNCR page at a TTBR1
> address where bit 48 is 0, wouldn't the upper bits (49-63) be zero-extended
> instead of sign-extended?
> 
> This seems like it would corrupt the VA into a TTBR0 address, and Range TLBIs
> (which preserve bits up to 53 in decode_range_tlbi) would fail to intersect
> with the corrupted 48-bit vt->gva.

That'd be a bug if we had support for LVA. We don't.

	M.

-- 
Without deviation from the norm, progress is not possible.

  reply	other threads:[~2026-08-06 11:51 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-08-06  9:10 [PATCH v2 0/8] KVM: arm64: VNCR TLB invalidation fixes Marc Zyngier
2026-08-06  9:10 ` [PATCH v2 1/8] KVM: arm64: Remove VM-wide VNCR mapping counter Marc Zyngier
2026-08-06  9:35   ` sashiko-bot
2026-08-06 11:53     ` Marc Zyngier
2026-08-07 16:45   ` Lorenzo Stoakes (ARM)
2026-08-06  9:10 ` [PATCH v2 2/8] KVM: arm64: Handle negative S1 walk levels in VNCR TLB size evaluation Marc Zyngier
2026-08-07 17:12   ` Lorenzo Stoakes (ARM)
2026-08-06  9:10 ` [PATCH v2 3/8] KVM: arm64: Consider SCTLR_EL2.M when mapping the L1 VNCR page Marc Zyngier
2026-08-06  9:27   ` sashiko-bot
2026-08-06  9:10 ` [PATCH v2 4/8] KVM: arm64: Correctly handle end of VA space TLBI invalidation Marc Zyngier
2026-08-06  9:30   ` sashiko-bot
2026-08-06 11:51     ` Marc Zyngier [this message]
2026-08-06  9:10 ` [PATCH v2 5/8] KVM: arm64: Handle VNCR TLB invalidation race with vcpu_put() VNCR unmapping Marc Zyngier
2026-08-06  9:25   ` sashiko-bot
2026-08-06  9:52     ` Marc Zyngier
2026-08-07  6:03   ` Yao Yuan
2026-08-06  9:10 ` [PATCH v2 6/8] KVM: arm64: Sign-extend VA for range-based TLBI invalidation Marc Zyngier
2026-08-06  9:10 ` [PATCH v2 7/8] KVM: arm64: Make VNCR invalidation participate in MMU invalidation retry Marc Zyngier
2026-08-06  9:10 ` [PATCH v2 8/8] KVM: arm64: Add VNCR TLB tracking again Marc Zyngier
2026-08-06  9:35   ` sashiko-bot
2026-08-06 11:54     ` Marc Zyngier

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=868q6jbh5u.wl-maz@kernel.org \
    --to=maz@kernel.org \
    --cc=kvm@vger.kernel.org \
    --cc=kvmarm@lists.linux.dev \
    --cc=oupton@kernel.org \
    --cc=sashiko-reviews@lists.linux.dev \
    /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