From patchwork Tue Mar 4 13:43:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Donnefort X-Patchwork-Id: 14000760 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 44F90C021B8 for ; Tue, 4 Mar 2025 13:47:15 +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-Type:Cc:To:From: Subject:Message-ID:References:Mime-Version:In-Reply-To:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=3ciUEmziHwKoR8EZ15kFmNQQUeftjWJUBtJzEaxlx9Y=; b=1Dfr1u62GI5mb33VUa84gOaKVm 9xp4pEg+QTj8kdL0U8oVZsKgxOCL5wBE4smbs3OmrRRcK9ax6L5wo34afPyP4pq3oHsI6oixjsJ9u F+9Si1q4/AYEezY6ZAYEIJuCfVq9OaCQ2QiE8LSYvse7vOhFhhXfGT+ukIDp/EquKI4tVxzGLz2/h nlOk8w9W6eeQiKznwUDW/VSr/mJ7kaG+HNGB3E1YtFgyTOsHSX7C4m17wEo2mivBFNmbYc+Y31Xmq BEAMMdj+eb6o6mK1LVexGtvOmYugyzZivQ38gtI3hPN2RY6sGNYeB9ujumOiKgdmKbjDuj2pRlNbD r//mV3JA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tpSbz-00000004ppE-1LT2; Tue, 04 Mar 2025 13:47:07 +0000 Received: from mail-wm1-x349.google.com ([2a00:1450:4864:20::349]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tpSYs-00000004p37-3oC1 for linux-arm-kernel@lists.infradead.org; Tue, 04 Mar 2025 13:43:55 +0000 Received: by mail-wm1-x349.google.com with SMTP id 5b1f17b1804b1-43bc97e6360so7287475e9.3 for ; Tue, 04 Mar 2025 05:43:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1741095833; x=1741700633; darn=lists.infradead.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=3ciUEmziHwKoR8EZ15kFmNQQUeftjWJUBtJzEaxlx9Y=; b=4rRvhrrdPPXeC0oggHtXFCpXVV1cBGxUcvVculpw0iNfVQRVirhO9D5ItLZw7dyukl 2+Mp9oDOf/G/K5R25IIRnDjlxjOvCVjlbHigExbYzT8oYaUyWREWIOMselciQxiLOcTN R3D6GhPfnuQCEmFTVS/oTSsN4H7aSuwT5ET10MI7QMPoKytJ1MkWR3ZBQdIu+VXbnlyD Ph3cs1IkTpxE9BLuOOQ1y6jp9qgG9zf0H+xpDJPua7KQzzpUxacbpyiCw31uwFjEme01 kwEbzBtqHFS3K2Z58PO4NuRrYtF2wsIkvb62VnWPMim8WSkCDdkS8pkBkAkpPuSrr++c JUSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741095833; x=1741700633; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=3ciUEmziHwKoR8EZ15kFmNQQUeftjWJUBtJzEaxlx9Y=; b=hUljtvC0HsqlDrsq4rnwES7DDQjrRqgO+/RZFnVcGoA/H9IvJAxfQVo4EFN8wybOOV e5NZ5MT2Wa41a1w/94Xdd/gYgzIpdIcmlRpbl6/Ejquh67L3DF+EcbgKGwlzGUymraZi uZphyjI8DKDyKUCo728tU4i4i0Lg/I43A0qT84pJCN1XUJPzoEBK7wF8FwqBmYHv+c9T oktFgbopN8yyO2zDOLiRvkbIKD+7OI/l8C0N3axQzVyFFcrU/JzDpYKJ3maeau573jwy btjxCOgrTei5c1pqmihf/YOJJ7DrmVgf3GqZhPARbVavt6IKiorSu5f/9DKOXB7wmw2h lzxg== X-Forwarded-Encrypted: i=1; AJvYcCWgnwW5TfjL3xsnlFcb+WMDcDsmrC9yioDFVbQyuYBDJtTvKSz0qNpQy35jfCtC+3CwYwQ+otKdt1vob0UTJzyC@lists.infradead.org X-Gm-Message-State: AOJu0YzDsDRoVXpYJpGkjvNcZ0A+FnCuamV1KLHJNc9RKKLpsY27pE6l aqw1pVoR6C11zQOJo1kAba+SkULGBJ1U6gjY8tNOofVMjTbCu2JzZMwSUjqCIYZSnqEjTP3fetq G91OGfDFqB4P/ozEIAg== X-Google-Smtp-Source: AGHT+IFHZt3BnQxTnjrinSVy1JtKhEMHkRg+LEokGOtmOBZxYSPyEETqTBFJckhElghvkIX1hmSvWSCVF9ljT4k9 X-Received: from wmsp7.prod.google.com ([2002:a05:600c:1d87:b0:439:88bc:d27d]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:4f86:b0:43b:ca39:6c7d with SMTP id 5b1f17b1804b1-43bca3972efmr32164545e9.3.1741095833346; Tue, 04 Mar 2025 05:43:53 -0800 (PST) Date: Tue, 4 Mar 2025 13:43:44 +0000 In-Reply-To: <20250304134347.369854-1-vdonnefort@google.com> Mime-Version: 1.0 References: <20250304134347.369854-1-vdonnefort@google.com> X-Mailer: git-send-email 2.48.1.711.g2feabab25a-goog Message-ID: <20250304134347.369854-2-vdonnefort@google.com> Subject: [PATCH v2 1/3] KVM: arm64: Add flags to kvm_hyp_memcache From: Vincent Donnefort To: maz@kernel.org, oliver.upton@linux.dev, joey.gouly@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com, catalin.marinas@arm.com, will@kernel.org Cc: qperret@google.com, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org, kernel-team@android.com, Vincent Donnefort X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250304_054354_945308_745A9805 X-CRM114-Status: UNSURE ( 9.64 ) X-CRM114-Notice: Please train this message. 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 Add flags to kvm_hyp_memcache and propagate them up to the allocation and free callbacks. This will later allow to account for memory, based on the memcache configuration. Signed-off-by: Vincent Donnefort diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h index 3a7ec98ef123..12691ae23d4c 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -86,6 +86,7 @@ struct kvm_hyp_memcache { phys_addr_t head; unsigned long nr_pages; struct pkvm_mapping *mapping; /* only used from EL1 */ + unsigned long flags; }; static inline void push_hyp_memcache(struct kvm_hyp_memcache *mc, diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c index 1f55b0c7b11d..68d99baa76c2 100644 --- a/arch/arm64/kvm/mmu.c +++ b/arch/arm64/kvm/mmu.c @@ -1086,12 +1086,12 @@ void kvm_free_stage2_pgd(struct kvm_s2_mmu *mmu) } } -static void hyp_mc_free_fn(void *addr, void *unused) +static void hyp_mc_free_fn(void *addr, void *flags) { free_page((unsigned long)addr); } -static void *hyp_mc_alloc_fn(void *unused) +static void *hyp_mc_alloc_fn(void *flags) { return (void *)__get_free_page(GFP_KERNEL_ACCOUNT); } @@ -1102,7 +1102,7 @@ void free_hyp_memcache(struct kvm_hyp_memcache *mc) return; kfree(mc->mapping); - __free_hyp_memcache(mc, hyp_mc_free_fn, kvm_host_va, NULL); + __free_hyp_memcache(mc, hyp_mc_free_fn, kvm_host_va, (void *)mc->flags); } int topup_hyp_memcache(struct kvm_hyp_memcache *mc, unsigned long min_pages) @@ -1117,7 +1117,7 @@ int topup_hyp_memcache(struct kvm_hyp_memcache *mc, unsigned long min_pages) } return __topup_hyp_memcache(mc, min_pages, hyp_mc_alloc_fn, - kvm_host_pa, NULL); + kvm_host_pa, (void *)mc->flags); } /** From patchwork Tue Mar 4 13:43:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Donnefort X-Patchwork-Id: 14000761 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 50CDFC021B8 for ; Tue, 4 Mar 2025 13:48:53 +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-Type:Cc:To:From: Subject:Message-ID:References:Mime-Version:In-Reply-To:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=aJwR7NM7qgJyDoaMyIjmipwZ0p8zhJtFWoNDi35Q6UY=; b=C6EJ3lS716eifYWu/LpmzyP9pa TiPWYE4RKLC2Zaio5KI++w+CUsOsF4gLgPBdSR0xT2Ttc0GIMN8pc/k+OnhNQ1K80iO+I3ggDwV7I /cPULfExG6hQxakGBPykn3fBmJsWnNW0x3qZfBkVXfSQW9FJ+YcaiRpG564mJNBnC7wmMB62CZZ8R hsjY83sIZB7j8KpccN/tlm5j9XnWmpA2WtxveeQA6SrRSoTPh7gu33+Z84d08S7Y0U/y+6BGRwC3n Fg9onWDWy2eC5+/4OjzGPWyZZ56hgXgXx8WbBedZw8LvIz7jJUr6ED95pXge2FQriUbw9PhbXVfL5 E1n5URQA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tpSdX-00000004q0v-1C0n; Tue, 04 Mar 2025 13:48:43 +0000 Received: from mail-wm1-x34a.google.com ([2a00:1450:4864:20::34a]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tpSYv-00000004p3R-1Imp for linux-arm-kernel@lists.infradead.org; Tue, 04 Mar 2025 13:43:58 +0000 Received: by mail-wm1-x34a.google.com with SMTP id 5b1f17b1804b1-43bcddbe609so5578575e9.3 for ; Tue, 04 Mar 2025 05:43:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1741095835; x=1741700635; darn=lists.infradead.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=aJwR7NM7qgJyDoaMyIjmipwZ0p8zhJtFWoNDi35Q6UY=; b=PkQRy1vQUqygP0c7qDDxBKJeBCq8JltPyyyGBroJDp1tZuilQWd9AviseGmrqIK9OH lqDu6BFZmjG4DSRPfjSTS1v0o4/4Y5HB8i9tP8GIDwDNJh+SlqhjGpzGR5ZKL77m+l3x NBnaAQEKVCnk2atS5HpiF/00I0AOQtuTOfnXaLNzZWhSGOEmrUvA3w48mFDsQLyVdv3F WxrSxCuXyF7h+kRYE7QR/Ny0qlrRPxsn/dYN29NXamR67BYGvqiaC8Cqq3AHC+usYr9L Kw82jUBOmyMGxrzq4vM3lE3FPBSSLoP7avBsffQ601UGdj5fy4Wh9GNWiXkp2n9jj1Ke aasg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741095835; x=1741700635; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=aJwR7NM7qgJyDoaMyIjmipwZ0p8zhJtFWoNDi35Q6UY=; b=tkVopfGd8PBcB9ACcDzV4pZUSqkCcb+fLnTRGVEOv3ofXXnzijB+avBVyT4po3XlHj jHlpWndm/JZTKnqnQfd1RkozoTH4W3tZ6YW163KXifwD1uINoRe05Wl6rhgYdJ2KA49w oLH2ze2uwtLCOmGyeRBSSOwUSqN8GaLNkMiwwPaJvYx3nUuBHYwgg3NIeLmFOv+obEeD fITYyn/5UoFA+1xERimJC7WaeW7Bfh6Vrep1Ol2lqDSAgx+j7AGKIHhZ6VqNSI6FkRKH bTF/+6CedGZowl35ubOTVWo3dO75HEblZmI2nbS9OhnSqaZwOMasVOj3CZg/41ZWACWB 1iUw== X-Forwarded-Encrypted: i=1; AJvYcCX5Odm3q9NPTi+kibmurN6EyE9zzU14JGFN0nX2BHHEZzqVzp8E5eFQawrdwwbOmrcxavxxKUCWaxRSfhN1ILUK@lists.infradead.org X-Gm-Message-State: AOJu0YyA42fPUj6+gc/0xkwVecyQi6c62h2IX4nr3PkmJuZbi6y17ye4 GQxo8XpsIQgbx1lKZXl0TdTR6sPRI5/46K89o9Sksqik1PWY63CK06s327iQX3e/znIG9M0yrtS OC6U/ANOg6VcemhkTnw== X-Google-Smtp-Source: AGHT+IHuciObnyTqS58fROBaIT+QoD8DEu2FY6Ra9IE8fIz0oz/Si6xHw1earUtEBbeoC9ZyaeZgeRKxDyWAOb/F X-Received: from wmbay1.prod.google.com ([2002:a05:600c:1e01:b0:43b:c9a4:5137]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:3ba0:b0:43b:cbe2:ebeb with SMTP id 5b1f17b1804b1-43bcbe2ef02mr21962745e9.24.1741095835455; Tue, 04 Mar 2025 05:43:55 -0800 (PST) Date: Tue, 4 Mar 2025 13:43:45 +0000 In-Reply-To: <20250304134347.369854-1-vdonnefort@google.com> Mime-Version: 1.0 References: <20250304134347.369854-1-vdonnefort@google.com> X-Mailer: git-send-email 2.48.1.711.g2feabab25a-goog Message-ID: <20250304134347.369854-3-vdonnefort@google.com> Subject: [PATCH v2 2/3] KVM: arm64: Distinct pKVM teardown memcache for stage-2 From: Vincent Donnefort To: maz@kernel.org, oliver.upton@linux.dev, joey.gouly@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com, catalin.marinas@arm.com, will@kernel.org Cc: qperret@google.com, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org, kernel-team@android.com, Vincent Donnefort X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250304_054357_347148_00484F27 X-CRM114-Status: UNSURE ( 9.81 ) X-CRM114-Notice: Please train this message. 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 In order to account for memory dedicated to the stage-2 page-tables, use a separated memcache when tearing down the VM. Signed-off-by: Vincent Donnefort diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h index 12691ae23d4c..ace3969e8106 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -246,6 +246,7 @@ typedef unsigned int pkvm_handle_t; struct kvm_protected_vm { pkvm_handle_t handle; struct kvm_hyp_memcache teardown_mc; + struct kvm_hyp_memcache stage2_teardown_mc; bool enabled; }; diff --git a/arch/arm64/kvm/hyp/nvhe/pkvm.c b/arch/arm64/kvm/hyp/nvhe/pkvm.c index 3927fe52a3dd..15f8d5315959 100644 --- a/arch/arm64/kvm/hyp/nvhe/pkvm.c +++ b/arch/arm64/kvm/hyp/nvhe/pkvm.c @@ -678,7 +678,7 @@ teardown_donated_memory(struct kvm_hyp_memcache *mc, void *addr, size_t size) int __pkvm_teardown_vm(pkvm_handle_t handle) { - struct kvm_hyp_memcache *mc; + struct kvm_hyp_memcache *mc, *stage2_mc; struct pkvm_hyp_vm *hyp_vm; struct kvm *host_kvm; unsigned int idx; @@ -706,7 +706,8 @@ int __pkvm_teardown_vm(pkvm_handle_t handle) /* Reclaim guest pages (including page-table pages) */ mc = &host_kvm->arch.pkvm.teardown_mc; - reclaim_guest_pages(hyp_vm, mc); + stage2_mc = &host_kvm->arch.pkvm.stage2_teardown_mc; + reclaim_guest_pages(hyp_vm, stage2_mc); unpin_host_vcpus(hyp_vm->vcpus, hyp_vm->nr_vcpus); /* Push the metadata pages to the teardown memcache */ @@ -717,7 +718,7 @@ int __pkvm_teardown_vm(pkvm_handle_t handle) while (vcpu_mc->nr_pages) { void *addr = pop_hyp_memcache(vcpu_mc, hyp_phys_to_virt); - push_hyp_memcache(mc, addr, hyp_virt_to_phys); + push_hyp_memcache(stage2_mc, addr, hyp_virt_to_phys); unmap_donated_memory_noclear(addr, PAGE_SIZE); } diff --git a/arch/arm64/kvm/pkvm.c b/arch/arm64/kvm/pkvm.c index 930b677eb9b0..19921ca407c6 100644 --- a/arch/arm64/kvm/pkvm.c +++ b/arch/arm64/kvm/pkvm.c @@ -111,6 +111,7 @@ static void __pkvm_destroy_hyp_vm(struct kvm *host_kvm) host_kvm->arch.pkvm.handle = 0; free_hyp_memcache(&host_kvm->arch.pkvm.teardown_mc); + free_hyp_memcache(&host_kvm->arch.pkvm.stage2_teardown_mc); } /* From patchwork Tue Mar 4 13:43:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Donnefort X-Patchwork-Id: 14000762 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 15E41C021B8 for ; Tue, 4 Mar 2025 13:50:28 +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-Type:Cc:To:From: Subject:Message-ID:References:Mime-Version:In-Reply-To:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=nOQyJ57ni6L+J8E7B8owB1YjEi2kSEAuov44m6pse38=; b=mfvA66ur0r+65kyfVV0LUf4c0O vCKErHLyiTFu9kDrSRCDrV3D0menVW2poUVZXTrKht2FMIpdXkm/JOSe/Qq587SzF7H6AZmK6d8k+ X7+M4hLfskSIRdIKWvUwVaJEYqPTNpBa8kN4FMi089LoxbWGY0qn2jr6GPbjXCBM3PjqBOOhGFODY wU8Zhci6ZltLWx+HQot7T9c/zRnVUc/0WwepXKKNXCGwEKE/Uhj8Wqm4dBD8cV3pgKf6YjGg3oz07 VUcdDDreXrUpQ3Fkq4o117NfwJ3NTSuEP4rlT/iVRoyiJrU2dRH39PmqeMWl3dsb+bUo/z7iMZqsn 8t2DAk5Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tpSf5-00000004qN8-0nQg; Tue, 04 Mar 2025 13:50:19 +0000 Received: from mail-wr1-x44a.google.com ([2a00:1450:4864:20::44a]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tpSYx-00000004p3t-3yuP for linux-arm-kernel@lists.infradead.org; Tue, 04 Mar 2025 13:44:01 +0000 Received: by mail-wr1-x44a.google.com with SMTP id ffacd0b85a97d-390e8df7ab6so2056821f8f.3 for ; Tue, 04 Mar 2025 05:43:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1741095837; x=1741700637; darn=lists.infradead.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=nOQyJ57ni6L+J8E7B8owB1YjEi2kSEAuov44m6pse38=; b=iFw6qx7fgts2RVKOE+2LtOddteL2hdkuTUyloy9sryBcpcnpgBlDXT21mq4r1Z+CIK WDF3DaKKbcWomUQ/WOD1NwWIzAJULAlojcfSfH7uhLvl4UlTjruffnLwCEZ0ONWzvsf9 OVDLndce0DClNrbnJ4azB6dxiSUgu5XrXOjLPKStdGZW1eZBfxV0E5moamE5n9pzLzLd aLtAgHEIjD/ZQlTVphCbd/bN7SAm0jLoErXNA4D4dtN3RY7H+FUzm4VhDNw93dxbHgUy urWXhizuohJb5qdy09ElMheVaLusqbLgseRQoQ7AsllD6dwUbibZvfS2IdwALMwkEHuU Onsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741095837; x=1741700637; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=nOQyJ57ni6L+J8E7B8owB1YjEi2kSEAuov44m6pse38=; b=jPtbPrGJNaQ+rwPX8cWpJxRdOY5fEt9pRzQyM8R7wuhbZ/siWL0G4yddQNRpRohIhb KeE4V//cl1LhbPjlEZams2gSiuSh6khWn9GMsL04ls9F6mTsGIFbICNizU1GB/4ahLqe 34PkPBQgNAgVONgHj8yl/C3oiuMEizJdLnoXp4obkV451k1aw8Q0cwDn64ylEUvXFuUe XRbX4RjzjFR6s+Q4DqWSPtuySrDyaMpAYjmPukBUk/0LuD477URu4rkgRak4osOTNl4S llmprFMZ03c5WobcPssUouz1nIgnkXW4T3j56tIuBuuT2M5eJGnGAf3TiTTSSyBYbSpH Rmjw== X-Forwarded-Encrypted: i=1; AJvYcCUyC7hISLJrzXxzYC/JJOCdT3Y7j5Q2acgMckr04JCwFvKrI4d0L0KrRihqxV4LCJSIaBqeTW2cKCJ6eGNffVXi@lists.infradead.org X-Gm-Message-State: AOJu0YwcWaJFvRg6kmNfmeCOUvXmINwuVWdEkRCSbqnkz38MiLS6HTdm 1PtDuxSVnF4VIBFn2IqD6MOsIECSdDpsuuVtX2x/dHoAX88XeNqm9xAMac91gFGnLgLoC/O1sQ/ J7ELNebNqXU5MbfILuQ== X-Google-Smtp-Source: AGHT+IEFMhEaRI/rg8Se9LHpsnXPQyKb7X7zdX+0i//MGRw5LE5hwf7vaICZu9T6cB0TCPM/wkm9G80CRMo3IsJ2 X-Received: from wmbbe7.prod.google.com ([2002:a05:600c:1e87:b0:43b:c6a4:89a0]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6000:418a:b0:38f:32a7:b6f3 with SMTP id ffacd0b85a97d-390eca41867mr10968930f8f.40.1741095837446; Tue, 04 Mar 2025 05:43:57 -0800 (PST) Date: Tue, 4 Mar 2025 13:43:46 +0000 In-Reply-To: <20250304134347.369854-1-vdonnefort@google.com> Mime-Version: 1.0 References: <20250304134347.369854-1-vdonnefort@google.com> X-Mailer: git-send-email 2.48.1.711.g2feabab25a-goog Message-ID: <20250304134347.369854-4-vdonnefort@google.com> Subject: [PATCH v2 3/3] KVM: arm64: Count pKVM stage-2 usage in secondary pagetable stats From: Vincent Donnefort To: maz@kernel.org, oliver.upton@linux.dev, joey.gouly@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com, catalin.marinas@arm.com, will@kernel.org Cc: qperret@google.com, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org, kernel-team@android.com, Vincent Donnefort X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250304_054359_985706_F1CFC2BD X-CRM114-Status: GOOD ( 13.00 ) 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 Count the pages used by pKVM for the guest stage-2 in memory stats under secondary pagetable stats, similarly to what the VHE mode does. Signed-off-by: Vincent Donnefort diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h index ace3969e8106..51754a354b7a 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -86,6 +86,8 @@ struct kvm_hyp_memcache { phys_addr_t head; unsigned long nr_pages; struct pkvm_mapping *mapping; /* only used from EL1 */ + +#define HYP_MEMCACHE_ACCOUNT_STAGE2 BIT(1) unsigned long flags; }; diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c index 68d99baa76c2..85d739fbddb8 100644 --- a/arch/arm64/kvm/mmu.c +++ b/arch/arm64/kvm/mmu.c @@ -1088,12 +1088,20 @@ void kvm_free_stage2_pgd(struct kvm_s2_mmu *mmu) static void hyp_mc_free_fn(void *addr, void *flags) { + if ((unsigned long)flags & HYP_MEMCACHE_ACCOUNT_STAGE2) + kvm_account_pgtable_pages(addr, -1); + free_page((unsigned long)addr); } static void *hyp_mc_alloc_fn(void *flags) { - return (void *)__get_free_page(GFP_KERNEL_ACCOUNT); + void *addr = (void *)__get_free_page(GFP_KERNEL_ACCOUNT); + + if (addr && (unsigned long)flags & HYP_MEMCACHE_ACCOUNT_STAGE2) + kvm_account_pgtable_pages(addr, 1); + + return addr; } void free_hyp_memcache(struct kvm_hyp_memcache *mc) diff --git a/arch/arm64/kvm/pkvm.c b/arch/arm64/kvm/pkvm.c index 19921ca407c6..7e6e3b0518f8 100644 --- a/arch/arm64/kvm/pkvm.c +++ b/arch/arm64/kvm/pkvm.c @@ -165,12 +165,16 @@ static int __pkvm_create_hyp_vm(struct kvm *host_kvm) handle = ret; host_kvm->arch.pkvm.handle = handle; + host_kvm->arch.pkvm.stage2_teardown_mc.flags |= HYP_MEMCACHE_ACCOUNT_STAGE2; + kvm_account_pgtable_pages(pgd, PAGE_ALIGN(pgd_sz) >> PAGE_SHIFT); /* Donate memory for the vcpus at hyp and initialize it. */ hyp_vcpu_sz = PAGE_ALIGN(PKVM_HYP_VCPU_SIZE); kvm_for_each_vcpu(idx, host_vcpu, host_kvm) { void *hyp_vcpu; + host_vcpu->arch.pkvm_memcache.flags |= HYP_MEMCACHE_ACCOUNT_STAGE2; + /* Indexing of the vcpus to be sequential starting at 0. */ if (WARN_ON(host_vcpu->vcpu_idx != idx)) { ret = -EINVAL;