From nobody Tue Sep 29 14:55:06 2026 Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 962594D2EF2 for ; Thu, 6 Aug 2026 19:25:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786044309; cv=none; b=i1mRY/9OPh5PoB7e9mydHJOIGK0jzl6rIgnr6yHy0mjOTxplj4RVUYtkEa6pmia+PPv7M3oVzEq5gBLgfB6TfgCGmEv9W6QYQgUIBjPg+Sx3uthibYnDZitaGlU3JFOtHwsjID239PYgvZwvAyIgBfUkn314dE7PXLguHoIFujg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786044309; c=relaxed/simple; bh=eOpTOOtsSiH93bf4Pk+e4HZeJ9yZohnQhzBcJPSS5Y0=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=dk7728uGzrf743DkVWGgpRO+rrLRIe9erprmOQai2+A6vYm3l2QwbkQ0/V6HXIpxNM3yi/bSOdVEmsX/yzv/7M7KCBct01zblcwTeGNStXFd8vbEPrTNKB02KiwsspX8RleAJ27Ib3/fr1PuaMxGlrHUSVJErgzZLGQcXtRATTY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=sszNEkcf; arc=none smtp.client-ip=209.85.221.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="sszNEkcf" Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-47fecbb7000so1343459f8f.2 for ; Thu, 06 Aug 2026 12:25:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786044299; x=1786649099; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=VJntHgxC09/3/XGghh26P3Kedsxi46TFVYMjNf12sL4=; b=sszNEkcf0hodniT1/LUAjrhzvn2lbAEk+9kRg6vP+tOf6LykAd0NCxtUOyfWt5gkaR FrOGsw3aO0XrV3EHY5l9yWO7FDhI42wqQ/pM4oO4Yzq03UilVhOagkL7imOHdgEB3JsQ UpGrQx2uzD0dwDCmgHGBat4aLA2PCDFlsnULKNFGtFGzQk4TitTYedQfcyGyj5RfTLQK GF+UQdrVp7/sgf9PIrxYDwGXFX5NN+8z+e5mOU9nSm7ZqfqoYLFQGXWf5WOHXT7U3kYA W4OMLRFik9KX51AnTWsKOdhGxgn+idAHd9ZDG9pNFsXteWd3nkXVg27aAaIsxGzlF29b zykQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786044299; x=1786649099; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=VJntHgxC09/3/XGghh26P3Kedsxi46TFVYMjNf12sL4=; b=oV8UbdsCplqzcPF07FHFUdsuY7EhChpRUkup06jZ2ywtDeE2QEKaCkPYt1TsBxo+DS qGKNhFJpy/c7VT6sdI7KaYO/YygaAJb83N93HM22XyVSfZpoYySoG0/NDBW+h7AE9Xat I+GfVmpulY7LJJyNd+Fe0hVbWyX/MqdnYMCYC8cwOboSIC+LDsNRvFrPJNn3aRyJjE+U PE/yJqapNXs/lt4TIlhfrUJJjDJwHKtjfwU1R394irU2ZHCJ5jSlgO+E2MIsoDOLurq+ qMrA1ixdsLn9r2Qt24e053uWw6TKMbqtJ2WxP26UNNn2QuOrs3lUuxl+o9SXqYRExeCP SArw== X-Forwarded-Encrypted: i=1; AHgh+RpVFi+Aqu+R5qx6pgLAcSqfQ5NQUWlHJPcjV1WD0QGaQ/iaFo4YXOMlfJVGaGqjGE1fhH+1Arwv8WxoZrE=@vger.kernel.org X-Gm-Message-State: AOJu0YzMZxacdvUt39c3FQm/eGJVd6DgaZnGIzEVigdTEUZNODy0z0aB CJBX9KMibBgtp2nyELuxi3kv+CX0SbnbCAtjchekrJeza0MQblj+ic4x X-Gm-Gg: AR+sD12zKD/93AhJfw4X9NyC0SzZRIkkuUUEA97rs99nfbv/tepNZZNactXKX/howdw HshlaGd0kGjkA8yHwzRgnkeTv9BtsbG/FV+JY2JyDI8SgoLvvDOqw7jnxAsd+3LdyApV+qkTh2g 16G33vqoswQkQNy5Pj++/ZAskmkvZLfcmy7jMt0mZ13vq/vPvLREACwhAScjJUYv0Z3jKWPDj35 XVX46GF944jIcjJTQJN1mS8aK0Z4SVUkPAoYMpQ2HvUzRYQTN7HEqRFqbnusUnc5mzX+l/EBRxu BVOJAcks35XAXPUpFByDWDWU26tqEeimRWAtoSvtFj8qyrERZ+rSwa4XsIaGw5iaK8BLkQcfS0k H6UHEuTRt9U5HICu/6mOkRKiGiqjOqUqVuLH6AtV3xI00ldGOTC3nyOt6CUTvo7MjGSlFeRtvUX sYI3WeWN87ZFHYjQvf3KH0GFNAkbTVDY7/ammE5OVO9A4Z3XXw6Gl+kPJar/2zKLgpUdC4IzCVP 6Af936dMRJnveI4++n2w8ihks7WrBjDMY+DjKCPFZHhTTXwBnQLlHmAblQBd/Sv5Ddn9FhfrVdf 92N1CRu7NT+WKz0o26Wyf+Wo//L6jP6DY/L4n/sREA5eOcTom1ShH5H1UGUh6fNwlHJ7tyKp6A= = X-Received: by 2002:adf:f4cf:0:b0:47f:776f:3838 with SMTP id ffacd0b85a97d-47fec5030e5mr23574023f8f.6.1786044298253; Thu, 06 Aug 2026 12:24:58 -0700 (PDT) Received: from localhost.localdomain (dynamic-2a02-3100-adf9-2301-8c14-6be6-a9e6-a2d4.310.pool.telefonica.de. [2a02:3100:adf9:2301:8c14:6be6:a9e6:a2d4]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-47ff79a718bsm9164173f8f.5.2026.08.06.12.24.57 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 06 Aug 2026 12:24:57 -0700 (PDT) From: Karl Mehltretter To: Marc Zyngier , Oliver Upton Cc: Karl Mehltretter , Fuad Tabba , Joey Gouly , Steffen Eiden , Suzuki K Poulose , Zenghui Yu , Catalin Marinas , Will Deacon , linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org, stable@vger.kernel.org, grayhat@foxmail.com Subject: [PATCH v3] KVM: arm64: nv: Keep the shadow S2 MMUs at fixed addresses Date: Thu, 6 Aug 2026 21:24:51 +0200 Message-Id: <20260806192451.10169-1-kmehltretter@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" kvm_vcpu_init_nested() can grow kvm->arch.nested_mmus while initialising another vCPU: it copies the MMUs, publishes the new allocation, and frees the old one. It updates pgt->mmu back-pointers, but not hw_mmu, leaving already-running vCPUs with pointers to freed memory. hw_mmu cannot be fixed up the same way: a running vCPU reads it without holding mmu_lock. The nested S2 ptdump file's debugfs private data is also affected, as it points into the freed array. KASAN reports an access through the stale hw_mmu pointer as a slab-use-after-free in kvm_handle_guest_abort(). Turn nested_mmus into a pointer table allocated once for the maximum number of vCPUs during VM creation. Allocate the MMUs separately as vCPUs are initialised and append their pointers to that table. The MMU objects never move, so cached hw_mmu pointers, pgt->mmu back-pointers, and ptdump private data remain valid. Two issues in the old implementation are also fixed: - The old failure path passed uninitialised MMUs to kvm_free_stage2_pgd(), which derives kvm from mmu->arch and can therefore dereference an invalid pointer. Only call kvm_free_stage2_pgd() for initialised MMUs. - Previously, initialisation of the new MMUs was not ordered before publication of nested_mmus_size. Fix this by taking mmu_lock when increasing nested_mmus_size. Fixes: 4f128f8e1aaa ("KVM: arm64: nv: Support multiple nested Stage-2 mmu s= tructures") Cc: stable@vger.kernel.org Suggested-by: Marc Zyngier Assisted-by: Claude:claude-fable-5 Signed-off-by: Karl Mehltretter --- arch/arm64/include/asm/kvm_host.h | 6 +-- arch/arm64/include/asm/kvm_nested.h | 2 +- arch/arm64/kvm/arm.c | 7 ++- arch/arm64/kvm/nested.c | 81 ++++++++++++++++------------- 4 files changed, 54 insertions(+), 42 deletions(-) Changes in v3: - Tighten the commit message (Wei-Lin Chang). - The code diff changes only arch/arm64/kvm/nested.c compared to v2: - Drop the redundant pointer-table allocation comment and use guard(write_lock) when publishing nested_mmus_size (Wei-Lin Chang). - Rewrite the error handling without gotos. v2: https://lore.kernel.org/r/20260806062352.93489-1-kmehltretter@gmail.com/ Changes in v2: - Allocate the fixed pointer table during VM creation, as suggested by Marc. - Allocate the MMUs individually and simplify the error and teardown paths. - Drop the selftest patch that triggered KASAN. It is not a good fit for the existing suite. v1: https://lore.kernel.org/r/20260803224405.41468-1-kmehltretter@gmail.com/ diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm= _host.h index bae2c4f92ef5..59d1d77ee116 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -319,10 +319,10 @@ struct kvm_arch { u64 fgu[__NR_FGT_GROUP_IDS__]; =20 /* - * Stage 2 paging state for VMs with nested S2 using a virtual - * VMID. + * Stage 2 paging state for VMs with nested S2 using a virtual VMID. + * MMUs are allocated separately to keep their addresses stable. */ - struct kvm_s2_mmu *nested_mmus; + struct kvm_s2_mmu **nested_mmus; size_t nested_mmus_size; int nested_mmus_next; =20 diff --git a/arch/arm64/include/asm/kvm_nested.h b/arch/arm64/include/asm/k= vm_nested.h index 012d711034d1..d21be647ac57 100644 --- a/arch/arm64/include/asm/kvm_nested.h +++ b/arch/arm64/include/asm/kvm_nested.h @@ -66,7 +66,7 @@ static inline u64 translate_ttbr0_el2_to_ttbr0_el1(u64 tt= br0) =20 extern bool forward_smc_trap(struct kvm_vcpu *vcpu); extern bool forward_debug_exception(struct kvm_vcpu *vcpu); -extern void kvm_init_nested(struct kvm *kvm); +extern int kvm_init_nested(struct kvm *kvm); extern int kvm_vcpu_init_nested(struct kvm_vcpu *vcpu); extern void kvm_init_nested_s2_mmu(struct kvm_s2_mmu *mmu); extern struct kvm_s2_mmu *lookup_s2_mmu(struct kvm_vcpu *vcpu); diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index 50adfff75be8..e883e45382fb 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -223,8 +223,6 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long typ= e) mutex_unlock(&kvm->lock); #endif =20 - kvm_init_nested(kvm); - ret =3D kvm_share_hyp(kvm, kvm + 1); if (ret) return ret; @@ -239,6 +237,10 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long ty= pe) if (ret) goto err_free_cpumask; =20 + ret =3D kvm_init_nested(kvm); + if (ret) + goto err_uninit_mmu; + if (is_protected_kvm_enabled()) { /* * If any failures occur after this is successful, make sure to @@ -267,6 +269,7 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long typ= e) =20 err_uninit_mmu: kvm_uninit_stage2_mmu(kvm); + kvfree(kvm->arch.nested_mmus); err_free_cpumask: free_cpumask_var(kvm->arch.supported_cpus); err_unshare_kvm: diff --git a/arch/arm64/kvm/nested.c b/arch/arm64/kvm/nested.c index dfb96edbdc43..7dedb9f8ee86 100644 --- a/arch/arm64/kvm/nested.c +++ b/arch/arm64/kvm/nested.c @@ -44,11 +44,18 @@ struct vncr_tlb { */ #define S2_MMU_PER_VCPU 2 =20 -void kvm_init_nested(struct kvm *kvm) +int kvm_init_nested(struct kvm *kvm) { - kvm->arch.nested_mmus =3D NULL; + kvm->arch.nested_mmus =3D kvcalloc(KVM_MAX_VCPUS * S2_MMU_PER_VCPU, + sizeof(*kvm->arch.nested_mmus), + GFP_KERNEL_ACCOUNT); + if (!kvm->arch.nested_mmus) + return -ENOMEM; + kvm->arch.nested_mmus_size =3D 0; atomic_set(&kvm->arch.vncr_map_count, 0); + + return 0; } =20 static int init_nested_s2_mmu(struct kvm *kvm, struct kvm_s2_mmu *mmu) @@ -66,11 +73,17 @@ static int init_nested_s2_mmu(struct kvm *kvm, struct k= vm_s2_mmu *mmu) return kvm_init_stage2_mmu(kvm, mmu, kvm_get_pa_bits(kvm)); } =20 +static void free_nested_s2_mmu(struct kvm_s2_mmu *mmu) +{ + kvm_free_stage2_pgd(mmu); + kfree(mmu); +} + int kvm_vcpu_init_nested(struct kvm_vcpu *vcpu) { struct kvm *kvm =3D vcpu->kvm; - struct kvm_s2_mmu *tmp; - int num_mmus, ret =3D 0; + struct kvm_s2_mmu *mmu; + int num_mmus, ret =3D 0, i; =20 if (test_bit(KVM_ARM_VCPU_HAS_EL2_E2H0, kvm->arch.vcpu_features) && !cpus_have_final_cap(ARM64_HAS_HCR_NV1)) @@ -91,42 +104,38 @@ int kvm_vcpu_init_nested(struct kvm_vcpu *vcpu) */ num_mmus =3D atomic_read(&kvm->online_vcpus) * S2_MMU_PER_VCPU; =20 - if (num_mmus > kvm->arch.nested_mmus_size) { - tmp =3D kvcalloc(num_mmus, sizeof(*tmp), GFP_KERNEL_ACCOUNT); - if (!tmp) - return -ENOMEM; - - write_lock(&kvm->mmu_lock); + if (num_mmus <=3D kvm->arch.nested_mmus_size) + return 0; =20 - if (kvm->arch.nested_mmus_size) { - memcpy(tmp, kvm->arch.nested_mmus, - size_mul(sizeof(*tmp), kvm->arch.nested_mmus_size)); + lockdep_assert_held(&kvm->arch.config_lock); =20 - for (int i =3D 0; i < kvm->arch.nested_mmus_size; i++) - tmp[i].pgt->mmu =3D &tmp[i]; + for (i =3D 0; i < S2_MMU_PER_VCPU; i++) { + mmu =3D kzalloc_obj(*mmu, GFP_KERNEL_ACCOUNT); + if (!mmu) { + ret =3D -ENOMEM; + break; } =20 - swap(kvm->arch.nested_mmus, tmp); - - write_unlock(&kvm->mmu_lock); + ret =3D init_nested_s2_mmu(kvm, mmu); + if (ret) { + kfree(mmu); + free_page((unsigned long)vcpu->arch.ctxt.vncr_array); + vcpu->arch.ctxt.vncr_array =3D NULL; + break; + } =20 - kvfree(tmp); + kvm->arch.nested_mmus[kvm->arch.nested_mmus_size + i] =3D mmu; } =20 - for (int i =3D kvm->arch.nested_mmus_size; !ret && i < num_mmus; i++) - ret =3D init_nested_s2_mmu(kvm, &kvm->arch.nested_mmus[i]); - if (ret) { - for (int i =3D kvm->arch.nested_mmus_size; i < num_mmus; i++) - kvm_free_stage2_pgd(&kvm->arch.nested_mmus[i]); - - free_page((unsigned long)vcpu->arch.ctxt.vncr_array); - vcpu->arch.ctxt.vncr_array =3D NULL; + while (i--) + free_nested_s2_mmu(kvm->arch.nested_mmus[kvm->arch.nested_mmus_size + i= ]); =20 return ret; } =20 - kvm->arch.nested_mmus_size =3D num_mmus; + guard(write_lock)(&kvm->mmu_lock); + kvm->arch.nested_mmus_size +=3D S2_MMU_PER_VCPU; =20 return 0; } @@ -725,7 +734,7 @@ void kvm_s2_mmu_iterate_by_vmid(struct kvm *kvm, u16 vm= id, write_lock(&kvm->mmu_lock); =20 for (int i =3D 0; i < kvm->arch.nested_mmus_size; i++) { - struct kvm_s2_mmu *mmu =3D &kvm->arch.nested_mmus[i]; + struct kvm_s2_mmu *mmu =3D kvm->arch.nested_mmus[i]; =20 if (!kvm_s2_mmu_valid(mmu)) continue; @@ -767,7 +776,7 @@ struct kvm_s2_mmu *lookup_s2_mmu(struct kvm_vcpu *vcpu) * if S2 translation is disabled. */ for (int i =3D 0; i < kvm->arch.nested_mmus_size; i++) { - struct kvm_s2_mmu *mmu =3D &kvm->arch.nested_mmus[i]; + struct kvm_s2_mmu *mmu =3D kvm->arch.nested_mmus[i]; =20 if (!kvm_s2_mmu_valid(mmu)) continue; @@ -806,7 +815,7 @@ static struct kvm_s2_mmu *get_s2_mmu_nested(struct kvm_= vcpu *vcpu) for (i =3D kvm->arch.nested_mmus_next; i < (kvm->arch.nested_mmus_size + kvm->arch.nested_mmus_next); i++) { - s2_mmu =3D &kvm->arch.nested_mmus[i % kvm->arch.nested_mmus_size]; + s2_mmu =3D kvm->arch.nested_mmus[i % kvm->arch.nested_mmus_size]; =20 if (atomic_read(&s2_mmu->refcnt) =3D=3D 0) break; @@ -1223,7 +1232,7 @@ void kvm_nested_s2_wp(struct kvm *kvm) return; =20 for (i =3D 0; i < kvm->arch.nested_mmus_size; i++) { - struct kvm_s2_mmu *mmu =3D &kvm->arch.nested_mmus[i]; + struct kvm_s2_mmu *mmu =3D kvm->arch.nested_mmus[i]; =20 if (kvm_s2_mmu_valid(mmu)) kvm_stage2_wp_range(mmu, 0, kvm_phys_size(mmu)); @@ -1242,7 +1251,7 @@ void kvm_nested_s2_unmap(struct kvm *kvm, bool may_bl= ock) return; =20 for (i =3D 0; i < kvm->arch.nested_mmus_size; i++) { - struct kvm_s2_mmu *mmu =3D &kvm->arch.nested_mmus[i]; + struct kvm_s2_mmu *mmu =3D kvm->arch.nested_mmus[i]; =20 if (kvm_s2_mmu_valid(mmu)) kvm_stage2_unmap_range(mmu, 0, kvm_phys_size(mmu), may_block); @@ -1261,7 +1270,7 @@ void kvm_nested_s2_flush(struct kvm *kvm) return; =20 for (i =3D 0; i < kvm->arch.nested_mmus_size; i++) { - struct kvm_s2_mmu *mmu =3D &kvm->arch.nested_mmus[i]; + struct kvm_s2_mmu *mmu =3D kvm->arch.nested_mmus[i]; =20 if (kvm_s2_mmu_valid(mmu)) kvm_stage2_flush_range(mmu, 0, kvm_phys_size(mmu)); @@ -1273,10 +1282,10 @@ void kvm_arch_flush_shadow_all(struct kvm *kvm) int i; =20 for (i =3D 0; i < kvm->arch.nested_mmus_size; i++) { - struct kvm_s2_mmu *mmu =3D &kvm->arch.nested_mmus[i]; + struct kvm_s2_mmu *mmu =3D kvm->arch.nested_mmus[i]; =20 if (!WARN_ON(atomic_read(&mmu->refcnt))) - kvm_free_stage2_pgd(mmu); + free_nested_s2_mmu(mmu); } kvfree(kvm->arch.nested_mmus); kvm->arch.nested_mmus =3D NULL; --=20 2.39.5 (Apple Git-154)