Re: [PATCH v2 2/8] KVM: arm64: Handle negative S1 walk levels in VNCR TLB size evaluation
flat view
From: "Lorenzo Stoakes (ARM)" <ljs@kernel.org>
Date: 2026-08-07 17:12:37
Also in:
kvm, kvmarm, stable
On Thu, Aug 06, 2026 at 10:10:20AM +0100, Marc Zyngier wrote:
Computing the effects of a TLB invalidation involves looking at the size of the mapping cached by the TLB. For S1 mappings such as VNCR, this is deducted from the combination of the base granule size and the mapping level. However, this implies that the S1 MMU is *on*. When the MMU is off, we indicate this with the level being set to a "creative" value of -127 (S1_MMU_DISABLED).
:)
This ends-up being misinterpreted by pgshift_level_to_ttl() as it doesn't handle negative levels at all (the level is immediately cast to a u8 and only the bottom two bits considered), leading to an invalidation size of 0. Not helpful.
So by two's complement -127 is ~0b01111111 + 1 = 0b10000001 = 129
And:
static u8 pgshift_level_to_ttl(u16 shift, u8 level)
{
u8 ttl;
... shift stuff ...
ttl <<= 2;
ttl |= level & 3;
return tll;
}
So ttl |= 1 because of the mask and in ttl_to_size():
static unsigned int ttl_to_size(u8 ttl)
{
int level = ttl & 3;
int gran = (ttl >> 2) & 3;
unsigned int max_size = 0;
switch (gran) {
case TLBI_TTL_TG_4K:
switch (level) {
...
case 1:
max_size = SZ_1G;
break;
...
case TLBI_TTL_TG_16K:
switch (level) {
...
case 1:
break;
...
case TLBI_TTL_TG_64K:
switch (level) {
...
case 1:
/* No 52bit IPA support */
break;
...
}
return max_size;
}
So actually if granularity is TLBI_TTL_TG_4K this will return SZ_1G and 0 in the
other cases unless I'm getting something wrong here?
This is really more a 'maybe worth mentioning in the commit log to be pedantic'
kind of thing :)
IOW you could luck out before with SZ_1G for TLBI_TTL_TG_4K.
Tidy-up pgshift_level_to_ttl() to handle these negative levels, and ttl_to_size() to always return SZ_1G when no valid TTL is present. This allows the removal of open-coded checks for similar situations.
I guess SZ_1G is a reasonable default here?
Note that the check for a negative value not explicitely checking for
NIT: explicitely -> explicitly
quoted hunk ↗ jump to hunk
S1_MMU_DISABLED is deliberate, so that actual negative levels introduced with LVA2 and D128 can take the same path if we ever support them. Fixes: 7270cc9157f47 ("KVM: arm64: nv: Handle VNCR_EL2 invalidation from MMU notifiers") Reported-by: Hyunwoo Kim <redacted> Link: https://lore.kernel.org/r/ameGoxbn2wzBq2kL@v4bel (local) Signed-off-by: Marc Zyngier <maz@kernel.org> Cc: stable@vger.kernel.org --- arch/arm64/kvm/nested.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-)diff --git a/arch/arm64/kvm/nested.c b/arch/arm64/kvm/nested.c index f3c75954cf36c..035cda256e2a5 100644 --- a/arch/arm64/kvm/nested.c +++ b/arch/arm64/kvm/nested.c@@ -505,7 +505,7 @@ int kvm_walk_nested_s2(struct kvm_vcpu *vcpu, phys_addr_t gipa, return ret; } -static unsigned int ttl_to_size(u8 ttl) +static unsigned int __ttl_to_size(u8 ttl) { int level = ttl & 3; int gran = (ttl >> 2) & 3;@@ -561,10 +561,22 @@ static unsigned int ttl_to_size(u8 ttl) return max_size; } -static u8 pgshift_level_to_ttl(u16 shift, u8 level) +static unsigned int ttl_to_size(u8 ttl) +{ + return __ttl_to_size(ttl) ?: SZ_1G; +}
Might be worth a comment about the default?
quoted hunk ↗ jump to hunk
+ +static u8 pgshift_level_to_ttl(u16 shift, s8 level) { u8 ttl; + /* + * If we don't have a proper level, fallback to the maximum + * size. + */ + if (level < 0) + return 0; + switch(shift) { case 12: ttl = TLBI_TTL_TG_4K;@@ -675,7 +687,11 @@ unsigned long compute_tlb_inval_range(struct kvm_s2_mmu *mmu, u64 val) ttl = get_guest_mapping_ttl(mmu, addr); } - max_size = ttl_to_size(ttl); + /* + * Don't use the default 1GB fallback, as we can adapt to the + * max mapping size we allow at S2. + */
Being a bit pedantic here but I wonder if simply just to say 'Adapt to the max mapping size allowed at S2' as the fallback is inferred?
quoted hunk ↗ jump to hunk
+ max_size = __ttl_to_size(ttl); if (!max_size) { /* Compute the maximum extent of the invalidation */@@ -1124,8 +1140,6 @@ static void compute_s1_tlbi_range(struct kvm_vcpu *vcpu, u32 inst, u64 val, case OP_TLBI_VALE1OSNXS: scope->type = TLBI_VA; scope->size = ttl_to_size(FIELD_GET(TLBI_TTL_MASK, val)); - if (!scope->size) - scope->size = SZ_1G; scope->va = tlbi_va_s1_to_va(val) & ~(scope->size - 1); scope->asid = FIELD_GET(TLBIR_ASID_MASK, val); break;@@ -1152,8 +1166,6 @@ static void compute_s1_tlbi_range(struct kvm_vcpu *vcpu, u32 inst, u64 val, case OP_TLBI_VAALE1OSNXS: scope->type = TLBI_VAA; scope->size = ttl_to_size(FIELD_GET(TLBI_TTL_MASK, val)); - if (!scope->size) - scope->size = SZ_1G;
Nice that you can eliminate this and the one above!
scope->va = tlbi_va_s1_to_va(val) & ~(scope->size - 1); break; case OP_TLBI_RVAE2: -- 2.47.3
-- Cheers, Lorenzo