From patchwork Thu Mar 13 11:40:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Donnefort X-Patchwork-Id: 14014862 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 F2D29C282DE for ; Thu, 13 Mar 2025 11:44:25 +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=dVJVlv+KRiLMqpaJQOXgQktnx0DyjzlKOnB26dCdeT4=; b=0YbCokw1LvRStzs3TvITJ24Pme 60kMdfHhKrYxqj6fcEsIbD5NK43iFoVqui6IKQbJ+Am7lNxLu3ocEpXaxrzxWuH/1c3bI1g1P5aA8 U0Yzhpr77vr9IfwJiicV8WsP8Rlwy2PNckYyGStz5r8bIBiSu1Herv6Y5V0E309xdbCoCh3Upwyci fYZqCg77Rg5q6DNyY6MOOXSzw6qkhJuI1L+8teL/2jwKzM/rkIQOuXM32hziXTiPo0LA67dE+PwD3 jLbo3h059vGGlXQdKkNvb5p3m5KeQlj/6J9RQHIhz6wfXj9C9T5Zh1/ksJ6EtBiM+2nrS+fB/zLJx ZKiZnAxA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tsgz2-0000000B5AI-2zuO; Thu, 13 Mar 2025 11:44:16 +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 1tsgvj-0000000B4Oy-3koh for linux-arm-kernel@lists.infradead.org; Thu, 13 Mar 2025 11:40:52 +0000 Received: by mail-wm1-x34a.google.com with SMTP id 5b1f17b1804b1-43d0830c3f7so6413425e9.2 for ; Thu, 13 Mar 2025 04:40:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1741866049; x=1742470849; 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=dVJVlv+KRiLMqpaJQOXgQktnx0DyjzlKOnB26dCdeT4=; b=KL8y90qdtBuLHqjOWP5nLNeqamWVR0M4Wc6bs9C+dmpjrq4SVWCHRy0jSQ6HAzxzdb 0NmWmS30MgZgfT/PKFk69CIEY/YjPCoSqKRvspGdVvKN0gd1nXx8KSFfAzFxI2e6FiJ1 FYgU0nKObYVSUY8g+dGj2wkQDhb61E0rqiO30+xTeYZFWqfS+VkPdJyf6QttYlzltSVi OsYZ+qyGA8USNOJO3FD+ps71FLbXZ6BsSyMooWkQoxPanAb8yFc3cPuYDkhSRR+4hJ/3 jQKwKaQw/hjkZ1cQvEr1XjsW4YBA5soBMHHFLZq+murMIeUtpnDF6e93uB1Kcmw/zUu2 VYrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741866049; x=1742470849; 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=dVJVlv+KRiLMqpaJQOXgQktnx0DyjzlKOnB26dCdeT4=; b=g1Z4ELyIh6ErCkXRaqQCFpc2SQiKp43mvzDQK+PseGTw3jqO5tFCtXwf1sBMFtTf5l gYYKxiBIpLJ08EywvknoNz+xwR/3t9X5l6HMNopBZFfx1JqLquk7zMw7LvCjI9QN0bHn NoQAu/U7hFylLP/7m4y7O4TyKfLG0clBJELpJliOqIDZlhQkwIPFcKV8O8obT7DQJz43 TWPMO1DlnxHT8BInWV3PbI46Hjtc+2e548PrH35Z0z+D5R4cyNJlUA1R2LwFVofKr2oo /VHlq81GJ9vfdguajFMvFIbJg4gdP4mC3Ml7fiTIbLZqMPsJ6tMMYB0T+3e4UH77xdwg gi6g== X-Forwarded-Encrypted: i=1; AJvYcCVpcBEZuM3rmxilRlNab/MSMud5NDuJccr7VtC8rMhjzy5qFdryeWCT2bv5u0MokTvqnc163AmESNachZXQSkMy@lists.infradead.org X-Gm-Message-State: AOJu0YzFa2kGGom+H1xBHfPrQVLi7wxHQXAYtdtB0FBNBkdPNRFuFz7S qY8ypYtUGL6txK/fYNPYh/iNURUOkugugpjhqgi8CPT0EiDiDKmjlVk2J7oOoKS943hxv/jHRPA 5ZX4Ua/irDaRSK2Sz8g== X-Google-Smtp-Source: AGHT+IEzRRTpq9BGThjAtTMnpcfpVggLzq2Mj7jsx/mhuvVJKFcSB7Gz6JGQE1qtaMHhWCec0Q9TXeSZjyRruCGb X-Received: from wmqb15.prod.google.com ([2002:a05:600c:4e0f:b0:43c:faa1:bb58]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:524c:b0:43d:b32:40aa with SMTP id 5b1f17b1804b1-43d0b32419amr49874555e9.3.1741866049761; Thu, 13 Mar 2025 04:40:49 -0700 (PDT) Date: Thu, 13 Mar 2025 11:40:36 +0000 In-Reply-To: <20250313114038.1502357-1-vdonnefort@google.com> Mime-Version: 1.0 References: <20250313114038.1502357-1-vdonnefort@google.com> X-Mailer: git-send-email 2.49.0.rc0.332.g42c0ae87b1-goog Message-ID: <20250313114038.1502357-2-vdonnefort@google.com> Subject: [PATCH v4 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-20250313_044051_930331_29A5465D X-CRM114-Status: UNSURE ( 8.77 ) 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 the latter 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..6107a3c8ccf6 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 *mc) { free_page((unsigned long)addr); } -static void *hyp_mc_alloc_fn(void *unused) +static void *hyp_mc_alloc_fn(void *mc) { 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, mc); } 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, mc); } /** From patchwork Thu Mar 13 11:40:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Donnefort X-Patchwork-Id: 14014863 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 67D6EC282DE for ; Thu, 13 Mar 2025 11:46: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-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=NDWqfNf0Ci0kqTl0GDSnxlhwnncAHfDpHJ3DMUVydnk=; b=mrsoe/tf9v0nzAsLe3r1DuaNsd IKH4XrWbicC991pgKgTJYv9MFhetxNjkfawh67yNibDvYz0FLgMHWTj0DlN5ElReJs6Iqn044xRI1 zkxl+ItwyeG4Qfnp+2z4/thBDI0se7UaPN4LVzkoy2AdyauKGaxMUx0xCQkqsTo0iW9mdBGrnTOXG 8O2LGjV9IxhlF0x6o+tZy09+zCQrRzGoQiNuQfFT2QefJGkyXeMC3r6wGlmr1npoAldgwrodm5kqb aoNY8OmikCk1c5tKmb8EhsvWnDUvWv9k775WW1Ck9J8OTuRmfVB94eIdrVDQivtcFFQpERM3HSiSb H1imbuFg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tsh0h-0000000B5mr-0DaE; Thu, 13 Mar 2025 11:45:59 +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 1tsgvm-0000000B4Pu-0LJM for linux-arm-kernel@lists.infradead.org; Thu, 13 Mar 2025 11:40:55 +0000 Received: by mail-wm1-x349.google.com with SMTP id 5b1f17b1804b1-4394c489babso4385485e9.1 for ; Thu, 13 Mar 2025 04:40:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1741866052; x=1742470852; 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=NDWqfNf0Ci0kqTl0GDSnxlhwnncAHfDpHJ3DMUVydnk=; b=CNNx4Vki+6t7l302hcvlYcHSgztMXWNa1i1NqCMRLClPO0viUCfBvZlsoL/8iPz8Ah LQBAkKpszsz1AgPGqYIDPSQm6ZIduHzTNCm+PPrCbddEhveeni3fXBqb26VvSnQ+rHwE Chzcr6zosVhj8/GTQPwvIwwu5gBwbnjMZPjJRRnz2lO1GVYioWs3IbSA7mlAROisU+U8 EQBMWOCK7d1WwoBF8013VbaXIPgP8rEEY8Y1xpn6rS5rwMylvff0lcpTHRbrVhoqcATo QZlUeBnTeiLdYvbIMoq95XFbcu0qh33SEEFJQTBKGokec27MM5zuJbyIRzgdkmU+zTkY bGKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741866052; x=1742470852; 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=NDWqfNf0Ci0kqTl0GDSnxlhwnncAHfDpHJ3DMUVydnk=; b=XQseWfssNYt5aOumHhPwb/aIUCKY1x7JjcAAxlfp7ek7zQNwoZCJGzm2lYlBz+e+lj TwkBe2XzDmh7vmj2wqR+sJqVXYuEiZUo4ZmiAOSeM0boxErmpDIAIpYRRWrQoUNENFmE kSpbXJaXUxNrQjmp5VjE5eKSo6tQ/N6+5U7UhrQFCEC410YXR4JQOW6gE05V4zu++QT4 +eR8RFI8lbublWb2vUMl152Hsump+5OQtXHnLt7/eU2Npi0vTtoQH5fdKWgUWn/LkYEx BM5qhZ3yExcFq7PdAZGDGF4Z6vxDkPxwx7qQ56wDSQyr5a3rAIkoN0KdA1EYVZASjQye zH5Q== X-Forwarded-Encrypted: i=1; AJvYcCVjWcgm+qHQHA6M9FeHFTvt8/VZEPA+DdvTwc1byOlQtbGIK6e3mI2lzjakz2TyC5y8vXTb2lMSwjVACpcdTnRa@lists.infradead.org X-Gm-Message-State: AOJu0Yw9kcYuXkxGzu0TVQ4NRO0ne24G3zrVx+lc8CXGjknvTLiTC1G1 rQFR/09B08yArO8DV2MxilhpQGI46BFfKfho6JBOZ3rDPopPG4fEknOtlw/+1m6FpiXjgVzVGFH RuGmD2qWz/f1XD4Ckiw== X-Google-Smtp-Source: AGHT+IFKKo1u7bMMw5ZxGIjRt9SaBMTtCTn1z/fHmkTMPIsujAZAFsyBOCACwf96nv+XqVJo4hWsVe0aFo0TzDK4 X-Received: from wmbgz9-n2.prod.google.com ([2002:a05:600c:8889:20b0:43c:fcbd:f2eb]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:4f4f:b0:43d:d06:3798 with SMTP id 5b1f17b1804b1-43d0d063a25mr31305935e9.20.1741866052022; Thu, 13 Mar 2025 04:40:52 -0700 (PDT) Date: Thu, 13 Mar 2025 11:40:37 +0000 In-Reply-To: <20250313114038.1502357-1-vdonnefort@google.com> Mime-Version: 1.0 References: <20250313114038.1502357-1-vdonnefort@google.com> X-Mailer: git-send-email 2.49.0.rc0.332.g42c0ae87b1-goog Message-ID: <20250313114038.1502357-3-vdonnefort@google.com> Subject: [PATCH v4 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-20250313_044054_131437_72598E32 X-CRM114-Status: UNSURE ( 9.93 ) 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. Meanwhile rename reclaim_guest_pages to reflect the fact it only reclaim page-table pages. 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/include/nvhe/mem_protect.h b/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h index 978f38c386ee..ea0a704da9b8 100644 --- a/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h +++ b/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h @@ -56,7 +56,7 @@ void handle_host_mem_abort(struct kvm_cpu_context *host_ctxt); int hyp_pin_shared_mem(void *from, void *to); void hyp_unpin_shared_mem(void *from, void *to); -void reclaim_guest_pages(struct pkvm_hyp_vm *vm, struct kvm_hyp_memcache *mc); +void reclaim_pgtable_pages(struct pkvm_hyp_vm *vm, struct kvm_hyp_memcache *mc); int refill_memcache(struct kvm_hyp_memcache *mc, unsigned long min_pages, struct kvm_hyp_memcache *host_mc); diff --git a/arch/arm64/kvm/hyp/nvhe/mem_protect.c b/arch/arm64/kvm/hyp/nvhe/mem_protect.c index 19c3c631708c..f34f11c720d7 100644 --- a/arch/arm64/kvm/hyp/nvhe/mem_protect.c +++ b/arch/arm64/kvm/hyp/nvhe/mem_protect.c @@ -266,7 +266,7 @@ int kvm_guest_prepare_stage2(struct pkvm_hyp_vm *vm, void *pgd) return 0; } -void reclaim_guest_pages(struct pkvm_hyp_vm *vm, struct kvm_hyp_memcache *mc) +void reclaim_pgtable_pages(struct pkvm_hyp_vm *vm, struct kvm_hyp_memcache *mc) { struct hyp_page *page; void *addr; diff --git a/arch/arm64/kvm/hyp/nvhe/pkvm.c b/arch/arm64/kvm/hyp/nvhe/pkvm.c index 3927fe52a3dd..ac85bc51b8d3 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,10 +706,10 @@ 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_pgtable_pages(hyp_vm, stage2_mc); unpin_host_vcpus(hyp_vm->vcpus, hyp_vm->nr_vcpus); - /* Push the metadata pages to the teardown memcache */ for (idx = 0; idx < hyp_vm->nr_vcpus; ++idx) { struct pkvm_hyp_vcpu *hyp_vcpu = hyp_vm->vcpus[idx]; struct kvm_hyp_memcache *vcpu_mc = &hyp_vcpu->vcpu.arch.pkvm_memcache; @@ -717,7 +717,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 Thu Mar 13 11:40:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Donnefort X-Patchwork-Id: 14014864 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 EF5B8C282DE for ; Thu, 13 Mar 2025 11:47:52 +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=Fp6lx89NDYaCWj8yztXIUiroS+BazPKE4hbafizh3a4=; b=H6tQWBN+16uZXLFmfx/hcwfy2o WMKenl2uKKgydKsj8KqBj52v6ntCs9hiif3k6s6VPJ3B6iOBWkYPGVxMDmaCjXpbI2Y+JryQLIn3p Qq1FMvxX6OrMwqISOLrDje8UuwWRC489l8kcSEiFRvy2nf6vRs+PFiXLP9wCk6UgJHxyieuBDGtJx djMMOfoU8iFQudOxfXN57F1u8WcVsuzVi6lIfPn7Dfm1kY2wF4EyiRWh2b1t4qeFu49Kz/QdkLODR NuvF9Npxoi5F2EfyQy767hR5JfvMiIZpvbcIHwab0jCZBN+YUA4u+mtTwmwQCDz7WpbcUWiXcMkQ0 V92Rxifw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tsh2K-0000000B6IX-3KxR; Thu, 13 Mar 2025 11:47:40 +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 1tsgvo-0000000B4R9-2hEF for linux-arm-kernel@lists.infradead.org; Thu, 13 Mar 2025 11:40:57 +0000 Received: by mail-wr1-x44a.google.com with SMTP id ffacd0b85a97d-3913aaf1e32so556187f8f.0 for ; Thu, 13 Mar 2025 04:40:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1741866054; x=1742470854; 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=Fp6lx89NDYaCWj8yztXIUiroS+BazPKE4hbafizh3a4=; b=n0IVg+BaU5MG8IpfbwLhXfGfM66OZTHips6B8x9tqAUhEpLOdD4R+08hyFQp2n/Dr4 OGmCiOgTQX9y6COM0sUD5fPrizYcisZsD0BPpY5/jdlkowbGxguGzeue1VJYaabk1MNY nVFAOrOFwbX4xMZs4kbVKWr3E8krhLDEOp9iTk1TUWeV8Zmq84cH3255aagvQ40zwXGH v6lJF7Y9HbfB9dD2IoFsoAFumer4IdXTaOGTzGFtoDf4Ke/og+vKdanE+4S+uPVCFHRK nqus831BjRm8Y9ttpac1+NS83gIEfhVvSlZmYBzEQOY7T80gN/3Cg2fNLU1See2Lj0Fk adkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741866054; x=1742470854; 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=Fp6lx89NDYaCWj8yztXIUiroS+BazPKE4hbafizh3a4=; b=LMyyTTPLm5tVTfH3TbcMkhFYc7awMK8qhGXyk6JhPSAk8hm5fqbqoe1lxvuJuK/f5Q jmCIoatXu+fDmsfVUv1Ca8ShTlQoZ7u5FpOQ0KjkhXHYk199D4lVX9Hxw/jURqjvatK7 QcY5APhXlWxGszEKtQY9saVV8hPXM8jhOcdECfJP5CcWKBbNS+SPco3vy9gPPfG0scay PL5DAYaCungohWVyGFYoEkOCCYO0MOrz0bcCmYSlPK/svQuo6fhYACQHgwLVJKfbK/e1 8fR9kGMLUDn9BOjWV6+jCVlF5Xxav2KFU6Mc03JgspGcpqAp/n7+8VlYpSgIYJbrg5l/ 7YkQ== X-Forwarded-Encrypted: i=1; AJvYcCW3qgQanxL+XtSey/qDKJih87lRJqzDHgfjDfYnejj/glDbbfjSDB7fFSof20J42Q7tGp8MobDrf/M64iL3pbc/@lists.infradead.org X-Gm-Message-State: AOJu0YzpjvAiOu8ckpKeQR/GXAfppiKbcWLB9ssAa6fh/eWrLLYMvrfN x84J9c7EaNWx8P6dXa37TBhIkQas1Hxg6TZeRNsvKkam1jqKz46LX9VZuoiS688gKAKQuOVhogL SEhUqqzVrW9Xd+E2dzQ== X-Google-Smtp-Source: AGHT+IFt9bxBQ+OiJ6M9T42VJJBXQ3dgE7XPDiGETKJiQhO61thf8YCecySsYum/tlZhh/1oFpOYkgivgvMyU5WF X-Received: from wryv4.prod.google.com ([2002:a5d:59c4:0:b0:391:3be0:78cb]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6000:1a87:b0:391:1923:5a91 with SMTP id ffacd0b85a97d-39132dc4395mr17764441f8f.55.1741866054357; Thu, 13 Mar 2025 04:40:54 -0700 (PDT) Date: Thu, 13 Mar 2025 11:40:38 +0000 In-Reply-To: <20250313114038.1502357-1-vdonnefort@google.com> Mime-Version: 1.0 References: <20250313114038.1502357-1-vdonnefort@google.com> X-Mailer: git-send-email 2.49.0.rc0.332.g42c0ae87b1-goog Message-ID: <20250313114038.1502357-4-vdonnefort@google.com> Subject: [PATCH v4 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-20250313_044056_678223_56C51624 X-CRM114-Status: GOOD ( 12.99 ) 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, 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 6107a3c8ccf6..2feb6c6b63af 100644 --- a/arch/arm64/kvm/mmu.c +++ b/arch/arm64/kvm/mmu.c @@ -1088,12 +1088,24 @@ void kvm_free_stage2_pgd(struct kvm_s2_mmu *mmu) static void hyp_mc_free_fn(void *addr, void *mc) { + struct kvm_hyp_memcache *memcache = mc; + + if (memcache->flags & HYP_MEMCACHE_ACCOUNT_STAGE2) + kvm_account_pgtable_pages(addr, -1); + free_page((unsigned long)addr); } static void *hyp_mc_alloc_fn(void *mc) { - return (void *)__get_free_page(GFP_KERNEL_ACCOUNT); + struct kvm_hyp_memcache *memcache = mc; + void *addr; + + addr = (void *)__get_free_page(GFP_KERNEL_ACCOUNT); + if (addr && memcache->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..4409a10d02b6 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, pgd_sz / PAGE_SIZE); /* 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;