From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6ECA4C5AD05 for ; Sat, 8 Aug 2026 00:40:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=MSMRR2LWS0eYsjyx6GvhLb6OzJlZLcL9WlAoG1vJi74=; b=A9mWVMv4OA/5h/feiFZr11/jGI kRuOoSUDV8QaJQvtHMP2f6alEZSBd/+AZpErEuXO0ESo7pQm+VEYGo6Pv5SZDbG1e/kD4wwdxQgHY RVMb4k2alfaXpwf9O8KiUvyNPoiriQuHF4yhGcwLz2rIHypmmPnrH4+MCMtkya/eFbf0wwSuQI2cN xpth2D9Y7l2uUW+lbucBnHdDo07dQViNnrGy2VyxeCbU9ZAJoJvwRJ2LYypM4N4pl2FFES9k133Gt pZ7MTJ9R6ehA+ZpjnWhtsTkpANSowA+k4caPqVmOIpkWTuazp5B3SLkRfg63PHXqRvOjmi2Dxplux O0q2iIHQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wsV6R-00000008vIz-2NYB; Sat, 08 Aug 2026 00:39:55 +0000 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wsV6P-00000008vId-0ZwX for linux-arm-kernel@lists.infradead.org; Sat, 08 Aug 2026 00:39:54 +0000 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-47f703a9d05so35908f8f.0 for ; Fri, 07 Aug 2026 17:39:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786149591; x=1786754391; darn=lists.infradead.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=MSMRR2LWS0eYsjyx6GvhLb6OzJlZLcL9WlAoG1vJi74=; b=mEqNEZgNF4RXxbzGrcte1WlFAyxeDCN9NRngw3i3hGxw0RG2PdkOtkbH1j9jzT6SGk DehDvJfNTour3Pqt4cdNA2r5rX9ihgBrQe3vZ68KCwH5P/Y5CuaLXVTOGjOXEKMbMbSd 80N2pPYYjWiLNUeaL4fOtp5VTGBGZovyCM8CJooKwX/okATFBaW8P20AZ4aBPqm36bZc TqpLT8loWX1ze1Q5pr5UKN3UtCCKHsIuA+hqB2yHVT75B7VHf2UXW+GMGAxVQFibYB7C /SiKUHBhG3mqak5/h2WVtBF3T5C5sQhmoVRQqGdqC+6MssdGaXX/6IUV4JMXw9vzTcid 1U4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786149591; x=1786754391; 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=MSMRR2LWS0eYsjyx6GvhLb6OzJlZLcL9WlAoG1vJi74=; b=tQOv0aKkkXErtXLzzjG1phuyNRdV0luK8nxBAjtboUKpSHdt3Bb65fjMSz5MvxtwdU FcgP0dyClPqcPQM2Hn3Zf1ldaNfcWKehrZRNus/uJa3JxpGSzqjh1CA02y9k3nNPftNA RRQOcRGX8x1abjwCszNT1vggeDJyJ7NrQqa1G4Qr+8Xy+7mdOzjpIGWL/ZDAY9HCtedd 7NUZbf0DGFh7id1WMHQ3Ky1mNOXyvcEn65gALav1lW5KjmPyYVQkH9K+tCy+M+/Nx59/ vifFkuFLf29EF1AWGC1EvVLs5Db9XgTdrioEXXOENex/Y0lnt/+ceZlDlBMhXDLDVYTd yr7w== X-Forwarded-Encrypted: i=1; AHgh+RpFSd3gP5x/hjNVqL9ZufEyV3lRAipR1sGp50yxIkDu/hIb7lwYxvJl6IwEJEKltHv89JPE46vfw+MhiJkD3+OV@lists.infradead.org X-Gm-Message-State: AOJu0YzncZuRyA2c52Ji7iKVv8msaOuY5AO6sCfDM404RfXz29i6Ms/J CjRi6ZoeV9a+ERUB4WtoYFEEyJoZn2LnlKOWIXqqjM2qbspG7rF3AUEh X-Gm-Gg: AR+sD12RefajkOy6vd35fqHi0P7t7Xc5H/1gjtOVvh9/iAm1SsegfuLRKbPBJ1mAmTc TL2Zfms57bUGg6MvlrRx0Ss6otubbJ17GcTe7cBGYk0a9xuxIqEUNkFxzu3GX4aeLxfstpAKajK G3wWPnisxeN20uo2o234NIb2aqIN31Ci3VxGNpqOTEsN1QKEXBWiUcL0XB6OjieLZZczCiDTz3j xS5p/1q0NBLyx+ct2ggwbzfl7Xo5/0ftuX7SXEqVLKPRAuLJf1KNqA08VP6aaeQYPgLfbgtcVPr ujhcHmt8YAzdmc800mm9/a1eKJqTn74i0iNKWv9GvPRYtoZJNMIXIZXRPbSpGiDnbLjVYgWo5Y2 2kJDVsTBCT0gBhaUUeeSdifo+l6CNWYCTn0CJ4SlJwkDSYnGh28S811D6plHBYUpK9iLLRHBK4B kumnvBiOy+Th8ireKdJts7s0/UlX45noTW/Z0FnlMGxpuAMK/U2YwpKWlkmSIFfWQWKgpLLxepn 7kFBbdSbwMYbyt4+Sg7db2s+xlHcX1oq+bMgXrbmmjyQvFU2O2VKBRj/13ePNS88RGp/cBee4Sh gFl1eep9lGLHAhEtr+k1hFW5Nhw1zXHbY8DbRIgJoDyjXcapdnJ5ub2Ib77iDy5bSO9r X-Received: by 2002:a5d:64ce:0:b0:47f:93e4:5389 with SMTP id ffacd0b85a97d-480026d5f84mr10771351f8f.20.1786149590548; Fri, 07 Aug 2026 17:39:50 -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 ffacd0b85a97d-480021f9182sm10345921f8f.28.2026.08.07.17.39.47 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 07 Aug 2026 17:39:49 -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 v5] KVM: arm64: nv: Keep the shadow S2 MMUs at fixed addresses Date: Sat, 8 Aug 2026 02:39:43 +0200 Message-Id: <20260808003943.60963-1-kmehltretter@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260807_173953_428645_D1902D32 X-CRM114-Status: GOOD ( 26.87 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 structures") Cc: stable@vger.kernel.org Suggested-by: Marc Zyngier Assisted-by: Claude:claude-fable-5 Signed-off-by: Karl Mehltretter --- Changes in v5: - Free the fixed nested_mmus pointer table from kvm_arch_destroy_vm() when generic VM creation fails after kvm_arch_init_vm() succeeds (reported by Sashiko AI). 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 | 8 ++- arch/arm64/kvm/nested.c | 95 ++++++++++++++++------------- 4 files changed, 61 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__]; /* - * 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; diff --git a/arch/arm64/include/asm/kvm_nested.h b/arch/arm64/include/asm/kvm_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 ttbr0) 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..12bb94a95b36 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 type) mutex_unlock(&kvm->lock); #endif - kvm_init_nested(kvm); - ret = kvm_share_hyp(kvm, kvm + 1); if (ret) return ret; @@ -239,6 +237,10 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) if (ret) goto err_free_cpumask; + ret = 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 type) 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: @@ -317,6 +320,7 @@ void kvm_arch_destroy_vm(struct kvm *kvm) pkvm_destroy_hyp_vm(kvm); kvm_uninit_stage2_mmu(kvm); + kvfree(kvm->arch.nested_mmus); kvm_destroy_mpidr_data(kvm); kfree(kvm->arch.sysreg_masks); 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 -void kvm_init_nested(struct kvm *kvm) +int kvm_init_nested(struct kvm *kvm) { - kvm->arch.nested_mmus = NULL; + kvm->arch.nested_mmus = 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 = 0; atomic_set(&kvm->arch.vncr_map_count, 0); + + return 0; } 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 kvm_s2_mmu *mmu) return kvm_init_stage2_mmu(kvm, mmu, kvm_get_pa_bits(kvm)); } +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 = vcpu->kvm; - struct kvm_s2_mmu *tmp; - int num_mmus, ret = 0; + struct kvm_s2_mmu *mmu; + int num_mmus, ret, i; 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; - /* - * 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 = atomic_read(&kvm->online_vcpus) * S2_MMU_PER_VCPU; - if (num_mmus > kvm->arch.nested_mmus_size) { - tmp = kvcalloc(num_mmus, sizeof(*tmp), GFP_KERNEL_ACCOUNT); - if (!tmp) - return -ENOMEM; - - write_lock(&kvm->mmu_lock); + if (num_mmus <= kvm->arch.nested_mmus_size) + return 0; - 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); - for (int i = 0; i < kvm->arch.nested_mmus_size; i++) - tmp[i].pgt->mmu = &tmp[i]; + for (i = 0; i < S2_MMU_PER_VCPU; i++) { + mmu = kzalloc_obj(*mmu, GFP_KERNEL_ACCOUNT); + if (!mmu) { + ret = -ENOMEM; + goto err_free_mmus; } - swap(kvm->arch.nested_mmus, tmp); - - write_unlock(&kvm->mmu_lock); + ret = init_nested_s2_mmu(kvm, mmu); + if (ret) { + kfree(mmu); + goto err_free_vncr; + } - kvfree(tmp); + kvm->arch.nested_mmus[kvm->arch.nested_mmus_size + i] = mmu; } - for (int i = kvm->arch.nested_mmus_size; !ret && i < num_mmus; i++) - ret = init_nested_s2_mmu(kvm, &kvm->arch.nested_mmus[i]); + write_lock(&kvm->mmu_lock); + + kvm->arch.nested_mmus_size += S2_MMU_PER_VCPU; - if (ret) { - for (int i = kvm->arch.nested_mmus_size; i < num_mmus; i++) - kvm_free_stage2_pgd(&kvm->arch.nested_mmus[i]); + write_unlock(&kvm->mmu_lock); - free_page((unsigned long)vcpu->arch.ctxt.vncr_array); - vcpu->arch.ctxt.vncr_array = NULL; + return 0; - return ret; - } +err_free_vncr: + free_page((unsigned long)vcpu->arch.ctxt.vncr_array); + vcpu->arch.ctxt.vncr_array = NULL; - kvm->arch.nested_mmus_size = num_mmus; +err_free_mmus: + while (i--) + free_nested_s2_mmu(kvm->arch.nested_mmus[kvm->arch.nested_mmus_size + i]); - return 0; + return ret; } struct s2_walk_info { @@ -725,7 +732,7 @@ void kvm_s2_mmu_iterate_by_vmid(struct kvm *kvm, u16 vmid, write_lock(&kvm->mmu_lock); for (int i = 0; i < kvm->arch.nested_mmus_size; i++) { - struct kvm_s2_mmu *mmu = &kvm->arch.nested_mmus[i]; + struct kvm_s2_mmu *mmu = kvm->arch.nested_mmus[i]; 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 = 0; i < kvm->arch.nested_mmus_size; i++) { - struct kvm_s2_mmu *mmu = &kvm->arch.nested_mmus[i]; + struct kvm_s2_mmu *mmu = kvm->arch.nested_mmus[i]; 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 = kvm->arch.nested_mmus_next; i < (kvm->arch.nested_mmus_size + kvm->arch.nested_mmus_next); i++) { - s2_mmu = &kvm->arch.nested_mmus[i % kvm->arch.nested_mmus_size]; + s2_mmu = kvm->arch.nested_mmus[i % kvm->arch.nested_mmus_size]; if (atomic_read(&s2_mmu->refcnt) == 0) break; @@ -1223,7 +1230,7 @@ void kvm_nested_s2_wp(struct kvm *kvm) return; for (i = 0; i < kvm->arch.nested_mmus_size; i++) { - struct kvm_s2_mmu *mmu = &kvm->arch.nested_mmus[i]; + struct kvm_s2_mmu *mmu = kvm->arch.nested_mmus[i]; 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_block) return; for (i = 0; i < kvm->arch.nested_mmus_size; i++) { - struct kvm_s2_mmu *mmu = &kvm->arch.nested_mmus[i]; + struct kvm_s2_mmu *mmu = kvm->arch.nested_mmus[i]; 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; for (i = 0; i < kvm->arch.nested_mmus_size; i++) { - struct kvm_s2_mmu *mmu = &kvm->arch.nested_mmus[i]; + struct kvm_s2_mmu *mmu = kvm->arch.nested_mmus[i]; 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; for (i = 0; i < kvm->arch.nested_mmus_size; i++) { - struct kvm_s2_mmu *mmu = &kvm->arch.nested_mmus[i]; + struct kvm_s2_mmu *mmu = kvm->arch.nested_mmus[i]; 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 = NULL; -- 2.39.5 (Apple Git-154)