From nobody Tue Sep 29 13:19:52 2026 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) (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 7E79837F329 for ; Fri, 7 Aug 2026 19:59:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786132792; cv=none; b=Z34rDrWcoF9Q0bFyonOxUiVDfNmYR829cRDvrHkcbOPaaX8ffvI916b+bV4LtTLn2pS0XIG7/PUlsPXvvaHEOe9dmD0qOOoi5V3W59qjs+9hW4ldxNx/Lw2KMQY/H+q5BFFN7LpZuuMeMRJ1Ap6yomkBz23qRL7k3jmMnebHqLA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786132792; c=relaxed/simple; bh=KXRQy6gSEZ6GQq4HdTNEfu9RSYAnHSf/meHGvhmTIM4=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=mbYnGY7j6KGaZ44uVMP3tUlrkGrQEzuB1125YBLvXVwQWnhtC+fYug+X9zjPo/Py3J/jsMQIzAZhmzcOyAFSMVeBb0WsdK8SXh3gdp41Vp7YN8V07y2SX4s2TXB3w495ug7WL/5zHvQexFoo2v0gm0BW/v3hkEPTnDzMKM6esfE= 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=qBs+GTf+; arc=none smtp.client-ip=209.85.128.46 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="qBs+GTf+" Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-4954aff6088so37789105e9.3 for ; Fri, 07 Aug 2026 12:59:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786132789; x=1786737589; 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=l/5omoLS+PKUOF94MoCp80ZUGNWAbWM4K9Y7Slp0kYM=; b=qBs+GTf+bn6ugL4ODiJbm3+sF93QnXHBUTiT4mcALkZE6Ey+gdXk4nAsaw7nN2PRGr /ntrlDRkBM1hndjvTxrAG/5Ectwp264IiGggpD2uIH5Dn2ftvQO+fYLuUo2bU1fw/n6m AepGqxycmMxC78LYVeU9ciHZ+Tap8+zK9nAAAigPm/xw92ToTohjpmSzFKJ+ZUbyfgly MKBRs8UuG9eONJS/v4OvdXSfxTi8U8GTLsPCiua1LVl5phORqXh5m1bric8mRQxQD2HT qQc3LEPW26bYBY+NmTvJOkxF7s1vgiMqplUdl4rchrwsbElgUOjftH1EIFCkFLXqDTii Cq4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786132789; x=1786737589; 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=l/5omoLS+PKUOF94MoCp80ZUGNWAbWM4K9Y7Slp0kYM=; b=AxElGFoYr6ZLls2FVlSMJA9uPXf34ay/DEI9zM5SO8eVJpaABodMB8xVatfAlFe9FU 6xiUXZVAiMVDK5ZdUMHkZl7TNUdwgRaezFRHMhRkOmi1s77ePKSXq8+bSZrs9Ef/+BB2 g7ZZYlcSyp5+t9cE9U5kmLZ2Ciqn2LSzjHCVR0+t19KzMB5Oy45clarnMvDn3a9bJHUq ka381+mmd4XDZlRqKFLI9s7LcKQD5caOGvmQzs6b2EWqHVvVOVOVg8qQlRCb7YscNQMc QDK4grSGmyUgTptbJCrS5urp2zgzON5XR/8NHjls2PgHDvHBnir+niq/njGGlEFPFrBY erIA== X-Forwarded-Encrypted: i=1; AHgh+RocG2mpMCGDc2F9FjuLRT3R2XRvKqQ4ELepELCrVAoZ4otC4mztcULtVZ8s6OJqCknVPqgrq1XRbYQH6nw=@vger.kernel.org X-Gm-Message-State: AOJu0Yz7t4xFvfypJleNkXuQVA240LnJarJgnYzsVZlE52Ghb9lBokZX cFRhWtvW4gd1bfIMPvZ+D3xXiS5MyKnCSDZQJ1zpK7H8VKehL2naFW8K X-Gm-Gg: AR+sD13rrh8+1/zLKxtuR7+jGkZA72vo+7jh9s0mm1QzY19hbW5T1N9MMjidZ82PyG2 wjgMCVZ9ybYZ6Cke1ue61uRHyLYPdjR1Vcf3X/r/gwNJv7wsrCfm7ySiAOhvxovASJ/SiOnIfWK kcsxW9jfsqWyf0ycCRuhSpTzYo0LJrSnouJXu7LL4tP9KbaxZ6bp3n2XuW3XvFflKlu90q/k52V SjjNVzfF6j4UwF7Tzxjd6zgeoZTjMGpqPy5hgOY6Ce6zNrZWudQO5cL1n/KOq7KacAec6N5OjTv DHYycZKRfTSUnDZR26wXGj8rln1P1aw8FS5Rm+4POGeLnLufLbDoHBZMODCide5EZD8i6mS55vP QJ7spmx4NDIHfbrPSvmNExl2QaUKdxrVeqqWFfII7IlyEdNkpaWGEnzJEnzXPMt/j4D1SzBX5M1 B4VgGZUpi0cDWIyON1KPWErfQXRjiJP7AxurQ2SSsO6YyFKIumqvdgxv3zqUtPXOl90scwcwIaZ XvTyJZfVlcXcy5pX9rH0vPERHbnVntPYceVof/3ni8AKAzAIJ0iFgL8HwyItwODnd3cfye9siUy l6LIp9eUJr+z/gk4jUOy3p6h0AQFGhv9Jd4UhUBw7FCCFWhYyeVEcxdwovfznUlDvB1w X-Received: by 2002:a05:600c:190a:b0:495:6a50:3fb8 with SMTP id 5b1f17b1804b1-4994e743275mr311553925e9.1.1786132788419; Fri, 07 Aug 2026 12:59:48 -0700 (PDT) Received: from localhost.localdomain (dynamic-2a02-3100-b105-e101-a437-493a-4de9-ee3e.310.pool.telefonica.de. [2a02:3100:b105:e101:a437:493a:4de9:ee3e]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4995d85b96csm31426435e9.2.2026.08.07.12.59.46 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 07 Aug 2026 12:59:47 -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 v4] KVM: arm64: nv: Keep the shadow S2 MMUs at fixed addresses Date: Fri, 7 Aug 2026 21:59:40 +0200 Message-Id: <20260807195940.12642-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 --- Changes in v4: - The code diff changes only arch/arm64/kvm/nested.c compared to v3: - Restore v2's centralized error paths (Wei-Lin Chang). - Restore explicit write_lock()/write_unlock() to avoid mixing goto-based error handling with cleanup guards. - Drop the allocation-failure comment (Marc Zyngier). v3: https://lore.kernel.org/r/20260806192451.10169-1-kmehltretter@gmail.com/ 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/ 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 | 95 ++++++++++++++++------------- 4 files changed, 60 insertions(+), 50 deletions(-) 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..8376adbb8736 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, i; =20 if (test_bit(KVM_ARM_VCPU_HAS_EL2_E2H0, kvm->arch.vcpu_features) && !cpus_have_final_cap(ARM64_HAS_HCR_NV1)) @@ -83,52 +96,46 @@ int kvm_vcpu_init_nested(struct kvm_vcpu *vcpu) if (!vcpu->arch.ctxt.vncr_array) return -ENOMEM; =20 - /* - * Let's treat memory allocation failures as benign: If we fail to - * allocate anything, return an error and keep the allocated array - * alive. Userspace may try to recover by initializing the vcpu - * again, and there is no reason to affect the whole VM for this. - */ 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; + goto err_free_mmus; } =20 - swap(kvm->arch.nested_mmus, tmp); - - write_unlock(&kvm->mmu_lock); + ret =3D init_nested_s2_mmu(kvm, mmu); + if (ret) { + kfree(mmu); + goto err_free_vncr; + } =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]); + write_lock(&kvm->mmu_lock); + + kvm->arch.nested_mmus_size +=3D S2_MMU_PER_VCPU; =20 - if (ret) { - for (int i =3D kvm->arch.nested_mmus_size; i < num_mmus; i++) - kvm_free_stage2_pgd(&kvm->arch.nested_mmus[i]); + write_unlock(&kvm->mmu_lock); =20 - free_page((unsigned long)vcpu->arch.ctxt.vncr_array); - vcpu->arch.ctxt.vncr_array =3D NULL; + return 0; =20 - return ret; - } +err_free_vncr: + free_page((unsigned long)vcpu->arch.ctxt.vncr_array); + vcpu->arch.ctxt.vncr_array =3D NULL; =20 - kvm->arch.nested_mmus_size =3D num_mmus; +err_free_mmus: + while (i--) + free_nested_s2_mmu(kvm->arch.nested_mmus[kvm->arch.nested_mmus_size + i]= ); =20 - return 0; + return ret; } =20 struct s2_walk_info { @@ -725,7 +732,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 +774,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 +813,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 +1230,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 +1249,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 +1268,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 +1280,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)