From nobody Sun Feb 8 17:13:57 2026 Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) (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 F248A21767C for ; Fri, 7 Mar 2025 11:34:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741347262; cv=none; b=hFGNnpIwouQHV2XRFwD+HiFnfwodcAfua0IT46XBdk3HYHWJv+K6ebvz/P/OVLReJ3SC655yFeG5v9b8qcVIFcr7QNnQeWx4KcF6xtfIPEL3H3FfMzBGELaw4v+IePv2XalJw9aJMLwww0fIq6M0MoAIq6DeT0lB3LS9WwWZd3w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741347262; c=relaxed/simple; bh=dAOYkLLFHOymrTr6TpeE0Wl2p2/V2JWcE5kJsjBx6rg=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=FFM+r7nxGVHilb2sEFbI8QPpWZAGp3Jsh7aQ/GtBwRNdzJ7ilKkssutQDuS2Z+pAd+Z3dG0u//bXIhj2PSCJcBRlImYd3FRWOk3O6WjNBnAOO/nEx0kyrlF6/xhZdeduDd8k5foMS6hXDC5Ice1LqWSx13/mUq7o8leJjFCIv2A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--vdonnefort.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=qJzYXCbB; arc=none smtp.client-ip=209.85.128.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--vdonnefort.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="qJzYXCbB" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-43bce8882d4so8015625e9.0 for ; Fri, 07 Mar 2025 03:34:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1741347259; x=1741952059; darn=vger.kernel.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=pOQy/PNkKkoEowxNbThyv2leDUZfqMcfcwikaBspss8=; b=qJzYXCbBwBBtdsbaQ2GGOnPrHM7oF7l16skuzIaCxPqPShfN0MOjZ1n9toZOzGrH+p DmyoyleRQyjVLkxFmNTuMNVpOGDjApGBraMj4iR4qw3jWofPMry/45UmfMlr7e6ypZMv UgYFHKkuyLocfcPdgw/LwkhoLmWwdu2VACanI1+04G6+TVCDpZkK9MEqt44XzKV5WoKE kY6QDWeP6wr+ogwqYwZxv8t4J5REoJr3hR20WbqF6I/8j4Ekli5cPTT0HKVNYhmZYTq7 SEki+TdzmQsNewlcKKlNUFkbeunnnoFcm99zdgmOnnAGAx9ji5aNFw8dnFpuH+dvOJVf v5XQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741347259; x=1741952059; 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=pOQy/PNkKkoEowxNbThyv2leDUZfqMcfcwikaBspss8=; b=UXr2Mm50x9ngy04xU39F3juoI5d5UzwbqB2WBJ5kNKCoc5h+ZLNTUPYFxLWh3EX4YJ EypK/gu5/mUOz2p0vsLY+WDWVMvVbC1h64zW60ESyLXp8Jo1rwvKTuBib3Ym9PO7T0ez ljOBAjdN8HOnLNnB+aYnqbeYG3E9ApDx+i5D854DuTH+GEkoF4bGphkDq4Y3EbKCOHv2 yUN3F1kUzxPdxOT9JLDCtjP+/7kCLGJLPnMJdHnBT7lqCSUJWn521CblLZEhKKqSrUs7 +JonGRcOAa+c8mZ6TpnNyja5q4A/OuDx8NX14UimhzuwKtfALNAn124Z1x1h85RdCkRD pBhQ== X-Forwarded-Encrypted: i=1; AJvYcCWHS0+u4RL0JuI4/DfD8dcYqk+gG5GZjqL2fXZyeCuvV9VcYwtFvpEZwMEfsXCiITToDnfR5Cxp5CaekVU=@vger.kernel.org X-Gm-Message-State: AOJu0Yz0fTp8fNvd858VO1GN69RFOrqtVz5EGZ9Mj2cBi/RqKjtbyu2w LIK+S5qJMbQGeH4cxmVdg/Xr0jjtnByWGPm0H0vCHeXn5tTUqjANLK17famcffWXfAcR7flKzxe 6zbsPnZKqpigHHnFNTw== X-Google-Smtp-Source: AGHT+IEufDVmieTtOmTjD0ozshwtJsjGuKwUjK5sVkafXGyepALDAzCQ7cNYVDR3nM3liRfh3n/pBfr+E6zRFIsK X-Received: from wmgg5.prod.google.com ([2002:a05:600d:5:b0:43b:bd03:5d2]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:3b1a:b0:43b:cc87:374a with SMTP id 5b1f17b1804b1-43c601e1294mr21499365e9.18.1741347259383; Fri, 07 Mar 2025 03:34:19 -0800 (PST) Date: Fri, 7 Mar 2025 11:34:09 +0000 In-Reply-To: <20250307113411.469018-1-vdonnefort@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250307113411.469018-1-vdonnefort@google.com> X-Mailer: git-send-email 2.49.0.rc0.332.g42c0ae87b1-goog Message-ID: <20250307113411.469018-2-vdonnefort@google.com> Subject: [PATCH v3 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 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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; }; =20 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..c01ad4430729 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) } } =20 -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); } =20 -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; =20 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); } =20 int topup_hyp_memcache(struct kvm_hyp_memcache *mc, unsigned long min_page= s) @@ -1117,7 +1117,7 @@ int topup_hyp_memcache(struct kvm_hyp_memcache *mc, u= nsigned long min_pages) } =20 return __topup_hyp_memcache(mc, min_pages, hyp_mc_alloc_fn, - kvm_host_pa, NULL); + kvm_host_pa, (void *)mc); } =20 /** --=20 2.49.0.rc0.332.g42c0ae87b1-goog From nobody Sun Feb 8 17:13:57 2026 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) (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 D54BA217F40 for ; Fri, 7 Mar 2025 11:34:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741347264; cv=none; b=jw973GOJHen+zFoD43e72IlrQ4hMDF1X9hz5s+mFr0l8nnJ1TgcpikB7/ONII2yNPNnBwyWBdKuNJibV67Bxd5Rak3DcD4OzTwTAkkjRqGa4HNEEeaPQBhjeEwTnINmGwne2S5H63gp6S55w/CvrEva5cmCIfeEth2iBlCan7jw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741347264; c=relaxed/simple; bh=Ypd4dYU1ILWbsSeqw6wcgbXkF8nETMXbg0ZC/3Szgp4=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=tO7c8xtTge9fThnNz0sEY7/5erqpSa4PgaZ16s/JzY6jyUmLrJg15i3zNwmksJgN+NRtuyBXLtkmFWfUv9GMQmGJioAUkOTzC9+Ew1HXSe4lzqhsfrHPlsZZmrjQfrlrBNAxEHdhZs9tRiEg/QUy7GAz4upiEN6/X5lHpKOE8VY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--vdonnefort.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=vR7CMM0O; arc=none smtp.client-ip=209.85.128.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--vdonnefort.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="vR7CMM0O" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-43bcd9a46feso7676155e9.2 for ; Fri, 07 Mar 2025 03:34:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1741347261; x=1741952061; darn=vger.kernel.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=QuT8+oUGsBynEgnzcW+tCpFVQN9FB8Rfc7b2wdhbmiU=; b=vR7CMM0OPGbs4u8BhSlS2mYRcVh3LFq0qARDCNaHwh/JcH6voEFzjXKwmIjXlq3vAz 8C4dCy/vTqXWB9nlK+eG39syJ6pwf4RCXZAt+mpRoTIhztP7mmQAsKv48gJzTZ1xmPds RlYa6bN+nQzF572CCKkcBozQUmLnhk5GzGVCcjlQxQnnQd2rXtcPy9wWGRFDFebIOJaH EzGFf3Wuc+M8BXrGQOVKQ1veU+G5NGbEgVsVlDLpscjG0Ur32jbPyu4V+s7j3gJRZ9AA fnvuGILzs/K9SEF1CRwuC8xuIK8eukuBYbPyTlWzEyna/5O2jCXlIjr9p13exrFVQ8nf TANw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741347261; x=1741952061; 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=QuT8+oUGsBynEgnzcW+tCpFVQN9FB8Rfc7b2wdhbmiU=; b=uxLePE7fdMbE5e9KibsDA3aEbKAEPsYypU2D7kSpwg1nD1TwerhKB9Ir9gpdq4E3QE 0TUs03R/FoljW/vV91Q3+ryWJGqrLT1tLPc2leasE78ViWB89SNM+jc4R4enMAv8GsZA XZkMHPNXrJjFNOJpwoEK6mI+9csKSNHiPeLAQIuVt3P5dEjvpepq/sfXKMmXDuQ/rbOi fr38HUXWhUp3fpe2KXkaLerFXdOnPiRVWgycStbXCl6tnfAYFzZ1gtK1qVZKElHzDC2U x/pZb1i5XFjcauEE5xMJoUiXNrydk2q3RLINWJiARJthE8+avmmWkRNl+YT6q9g/9tNY OTng== X-Forwarded-Encrypted: i=1; AJvYcCXvZUQjnUMtktVuDxcxWmAeIlAfg3PW6maF6V7NxG1x/PblV2UpW0r0WC/uesTp6LhkIhAsQ9PTlypJ4AE=@vger.kernel.org X-Gm-Message-State: AOJu0YwCCaEE/4YREWWpJUds8V22lsV62H8eeJpiaf1LX1Qr0NASbeEn +MZO2AeWji7KUOAAYGSqhRJiCL67Yox0YSYXs4PS5BuZllZCNDUpzx5czUhZgj9uF/o1c0vLX1I To058l8zKvi6TI23d0Q== X-Google-Smtp-Source: AGHT+IE5ohZTOn+0c6BjasjJlIh0P0Oc4mdAIR1nvzh8MTc0ThPVpUeGzQhz5Qwx85rHnQz0WNel/HDvkjZrlgFj X-Received: from wmbhc5.prod.google.com ([2002:a05:600c:8705:b0:439:64f9:d801]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:1d01:b0:439:84d3:f7ee with SMTP id 5b1f17b1804b1-43c64db0d9cmr17578165e9.24.1741347261332; Fri, 07 Mar 2025 03:34:21 -0800 (PST) Date: Fri, 7 Mar 2025 11:34:10 +0000 In-Reply-To: <20250307113411.469018-1-vdonnefort@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250307113411.469018-1-vdonnefort@google.com> X-Mailer: git-send-email 2.49.0.rc0.332.g42c0ae87b1-goog Message-ID: <20250307113411.469018-3-vdonnefort@google.com> Subject: [PATCH v3 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 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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; }; =20 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, vo= id *addr, size_t size) =20 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) =20 /* Reclaim guest pages (including page-table pages) */ mc =3D &host_kvm->arch.pkvm.teardown_mc; - reclaim_guest_pages(hyp_vm, mc); + stage2_mc =3D &host_kvm->arch.pkvm.stage2_teardown_mc; + reclaim_guest_pages(hyp_vm, stage2_mc); unpin_host_vcpus(hyp_vm->vcpus, hyp_vm->nr_vcpus); =20 /* 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 =3D pop_hyp_memcache(vcpu_mc, hyp_phys_to_virt); =20 - 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); } =20 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) =20 host_kvm->arch.pkvm.handle =3D 0; free_hyp_memcache(&host_kvm->arch.pkvm.teardown_mc); + free_hyp_memcache(&host_kvm->arch.pkvm.stage2_teardown_mc); } =20 /* --=20 2.49.0.rc0.332.g42c0ae87b1-goog From nobody Sun Feb 8 17:13:57 2026 Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) (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 4897021885C for ; Fri, 7 Mar 2025 11:34:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741347267; cv=none; b=TCrREMH/tJlSKSpksmuktb6y+0WYTPtHhZfdl3WdXB9gRMStYOcR6dvMvHpLUcgicaAwg9vQsPyfFDbgTQKoEj/9XDASd0j4xrN0ty+DTRkteme6VA6SMqkuThsflSEBBig8e/jJymMhqU3m+6tYCHS60i7p002aNtjwGybHfR4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741347267; c=relaxed/simple; bh=HH6yLXJUvxDiJ1cSfj8yphZfz5sICSe4TnVL3hkc6bA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Enz3ErPKC+CHEN13zE4SZfBNGhGArp0d8buUuVoTwQL+NtKiV5FiOGMRgrheIZaRmYQefPemoQaDcB5T8ZA8VRbnfx+nSJcimXZSLO3VOTBK+u4x5NkOviFixv1aBew+hf+hFCSIioPNRCk6jnmkFx1PURFLpDlcqT5CKkd1yOI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--vdonnefort.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=j62tgaCi; arc=none smtp.client-ip=209.85.128.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--vdonnefort.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="j62tgaCi" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-43bcddbe609so15618135e9.3 for ; Fri, 07 Mar 2025 03:34:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1741347263; x=1741952063; darn=vger.kernel.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=7ntuubx8ETsO6TTIOT42EyExqJBNP9f2/d8qVb4BOX4=; b=j62tgaCiKIGUGSyCK7zCoE7dQhixMORaRzrL5ocEkgb5vpCx6Q0yuZ6WA5XgNrsEzn whYHBylT1JVpy/ofNnHGLEaZhzxu4J4w59qpXmYIYtnvILNWOv5Au2YzAt1//ypJqCeK avdkdxqTPSl6ZV1Llx56aSIja6ku9rBy47KdxlbRvZg/lq4pLXWCzl8M1ymXN1bj3rJM gEE0yqhzVZfwBsShJ67T59e1Im/pF6nudUI6qqclJ2CoDFnWewkFSL0RslK8b06skqDy cF8DKq/5Q5paGFu3jsygJSLTY86Wfj+rsT5+ugX+vW5Wg4NsMowPgw/jR6UgBZXuO7l7 MnpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741347263; x=1741952063; 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=7ntuubx8ETsO6TTIOT42EyExqJBNP9f2/d8qVb4BOX4=; b=lFzI9fmj3LQR3Mmh0h9vHIYFrOI6c9uPBVjFl0GQT1EV7UwyjdyXOswzk/EE+bVkzK 92ul/eJGnUzJ4lh7akkXHiU84FPcwE298A4SH1YMzxHjUcfLGj8AQ7EcRpzLL8JGZYse ogZy1Sq8MExnz2OUlS7rUWrqjiNIby0NGoWmixDQ9uGTN92RA+rozPOWoS3dX2xE/nOZ rsw5D4DjCeOqWxlms9/EHxyb6Dn7v6lL17nigQXgpB3lSGFyWdByM0nG3t8Kj2GfNL4O wc9N3ljnoUE6lr+Ihbv/OyuCjSwqKon0wJB/PZ7bXE4faQemhLJFGi8MgoEnh1slkLhs gBdw== X-Forwarded-Encrypted: i=1; AJvYcCV6d3iXYGm8alFNo8hTXSht8G54+DUD+Y+X+V8PyZaW4XZTWqgytucK4xxi9hNvV9u+itRrpLlYeY+QsWU=@vger.kernel.org X-Gm-Message-State: AOJu0YyTfH7H3Z6F24GO1SdZAYJ6uqt4Cyg9rc2feFMe6TRD5XkILbVH +EE0lwMs1hEbAi28TMo8nvlKHZdmMxxsev5FNBO87PFb9fCJshddUxPQuv3wXUGCgV3wxAFo5Pk glTvjz4GVMjtKBqSHQg== X-Google-Smtp-Source: AGHT+IHklc9pmH21U3YbDQ5Gwc1RGIuSlYKt8XLy0tqeyn/MaP9krs7wUaI3Q0qrAvYZEPn9BnOr0sZM8eUcQbxr X-Received: from wmbja12.prod.google.com ([2002:a05:600c:556c:b0:43b:d8f9:568a]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:310c:b0:43b:d72d:368 with SMTP id 5b1f17b1804b1-43c5a630260mr27416035e9.2.1741347263644; Fri, 07 Mar 2025 03:34:23 -0800 (PST) Date: Fri, 7 Mar 2025 11:34:11 +0000 In-Reply-To: <20250307113411.469018-1-vdonnefort@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250307113411.469018-1-vdonnefort@google.com> X-Mailer: git-send-email 2.49.0.rc0.332.g42c0ae87b1-goog Message-ID: <20250307113411.469018-4-vdonnefort@google.com> Subject: [PATCH v3 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 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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; }; =20 diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c index c01ad4430729..73b44f1200c7 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) =20 static void hyp_mc_free_fn(void *addr, void *mc) { + struct kvm_hyp_memcache *memcache =3D mc; + + if (memcache->flags & HYP_MEMCACHE_ACCOUNT_STAGE2) + kvm_account_pgtable_pages(addr, -1); + free_page((unsigned long)addr); } =20 static void *hyp_mc_alloc_fn(void *mc) { - return (void *)__get_free_page(GFP_KERNEL_ACCOUNT); + struct kvm_hyp_memcache *memcache =3D mc; + void *addr; + + addr =3D (void *)__get_free_page(GFP_KERNEL_ACCOUNT); + if (addr && memcache->flags & HYP_MEMCACHE_ACCOUNT_STAGE2) + kvm_account_pgtable_pages(addr, 1); + + return addr; } =20 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 =3D ret; =20 host_kvm->arch.pkvm.handle =3D handle; + host_kvm->arch.pkvm.stage2_teardown_mc.flags |=3D HYP_MEMCACHE_ACCOUNT_ST= AGE2; + kvm_account_pgtable_pages(pgd, PAGE_ALIGN(pgd_sz) >> PAGE_SHIFT); =20 /* Donate memory for the vcpus at hyp and initialize it. */ hyp_vcpu_sz =3D PAGE_ALIGN(PKVM_HYP_VCPU_SIZE); kvm_for_each_vcpu(idx, host_vcpu, host_kvm) { void *hyp_vcpu; =20 + host_vcpu->arch.pkvm_memcache.flags |=3D HYP_MEMCACHE_ACCOUNT_STAGE2; + /* Indexing of the vcpus to be sequential starting at 0. */ if (WARN_ON(host_vcpu->vcpu_idx !=3D idx)) { ret =3D -EINVAL; --=20 2.49.0.rc0.332.g42c0ae87b1-goog