From nobody Sun Feb 8 09:23:08 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 D959E204683 for ; Tue, 4 Mar 2025 13:43:54 +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=1741095836; cv=none; b=b13l0hYBrxyGyRKcEla9HdSsFmBqbHWIoVebhvog8RX0/zpupmp+TO05+Om2ikGNvmHg4DBR/PEU68yP63dVcZcXakQ3+ART1J+QbNYwyMnR3QMjPQmUWco3YbKPS/weD9W1rqdnf7S0G3DgRdZDF9M2jOpw+SzqWEevkj9PD3M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741095836; c=relaxed/simple; bh=Mgo4/DO8OD8GZn9j7UQxKW6LhjTLRQV1hFx41dH7LJM=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=QhIePQcUBESbwuNk2/eZeoPSVQn58cj/bywLKX9TDeFDHnzkKt5jAmF6EdJqpjp2sQDwoN8kWz3Eh4VWDtnQfP4B7aqufJ73MDXASJygNftIgePp0mk5rN3xz00A5NRPY0XfDAAD+JaEMHJ5CO3PhMUBj/M4ZlXiYtzmZnf+DdU= 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=Duyf9Jjl; 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="Duyf9Jjl" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-4394c489babso31128155e9.1 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=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=3ciUEmziHwKoR8EZ15kFmNQQUeftjWJUBtJzEaxlx9Y=; b=Duyf9JjlKJw/WWzJi2WWl6RSdb/1NAsNAdl6MREX8WKXJj3Ua2RXh9tAsEA8N+sVKN oS3GfK7c/0AJTjvjOHmr3BT2DwvJ74h2Nwd6L0yavjGcgHNOdSrkFS1mSHlQ2BUcrp1I NgchD6AICpaILqNE3HrnrPVUPs8qg9y9K7kIZlcl9E+GyXg/dIdsUZzPlKVbeKF3t2lT jEREjIg8H01PSJ8mRPs0kaYvK9kRxas3IkDxE2+s8RlMeuytNTVf/+YaKU/7X47AUkyN S5BUPhKoZdOAt01NuxrWanyaPOKZbN24cl72I5TYC6ex9WRWRqF3hltIM76l1IeN58ID mFwg== 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=d8eXE4Hpf/r6Blj7ylE9LbeUcKrzE/EHG5K9VSprtzNuvJVPhyJLZ57kaJwVSkbXiJ 6qrh7HjbKVu2p1o1JEhqPOy9VtWotjYmcIsjxefrrWEztDrR5ZDmV/Ts21JfyMVZEVUk P/NPdMsLpcPgZoDAcejygr6sxBUze6AtRwpm1VnYuaCDMt/CQfTfxpmV5HGGsTMlHeP5 K3EqwL/KywIM4l+uojAB8CmLvl3ORLoaS6jxpX4hN11fLI8+frlyEt2/KOtbpkTsbEPK gweOa/SyMZJqVxU+Bv4UT960SXkA5j66m2k5cUuXTNTWDWxGaLroPe3njWCJJAr22W8l bQkg== X-Forwarded-Encrypted: i=1; AJvYcCXSMSIzVAncWaE82f9vu2F9PWIPIRPn0bBX7AaU9lgOujXHLyhkxzkZAFnpMWWo7588HnoNynkaJ8EEtT8=@vger.kernel.org X-Gm-Message-State: AOJu0Yy1NCCUs4zh/vbSNczaQdLm6LaF4lKVePvEe/muqhqjMZHMlnHb UPVTUrkBmw5NH4RTfJXFIXoxkFy1XbdsJrP7AwJvQDltaABjgM07xPYkAdKoYAd3ST1UgxkyO10 SUuaXVptOqR4q16lhRQ== 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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: 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 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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; }; =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..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) } } =20 -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); } =20 -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; =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->flags); } =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->flags); } =20 /** --=20 2.48.1.711.g2feabab25a-goog From nobody Sun Feb 8 09:23:08 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 091E72046B3 for ; Tue, 4 Mar 2025 13:43:56 +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=1741095839; cv=none; b=r27HNTqDWuE7cbWn8OMfnW2oJQNfXMNQxOxy5gVNCVIjo+mMIwgVEWGDu+cQdvXMj2xXXunmYUzaF4ibdc0h7+b004DjXPVLJ719iMh6kOdKqySYvWNmLA1ueRPV1z/epm8RyFyIXbYbdFIlNYOc0/coA7mypeA8s/6k4vqT03g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741095839; c=relaxed/simple; bh=9Cw1IH7xoxtLsb0KLmFRhEqUvO2U41ms9Pgb7VR+2vE=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=ND82FhTL0N+Tz50d7lNilzss1ZfxZacH9LdIsDD3zn6g4oQiheRdR5MgYhQt1xwE18mTQgIagfnWKNCaC0tOgP281mSnOklwM47D4BcaPznWmzt9Edmfopqi0xJq6nPao/QZ9z3HRRXasq9imJ7due/xC3dntijRJqIlAFvwsQ8= 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=zjVYZagB; 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="zjVYZagB" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-43947a0919aso51041545e9.0 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=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=aJwR7NM7qgJyDoaMyIjmipwZ0p8zhJtFWoNDi35Q6UY=; b=zjVYZagBqoUyP09Puk6an0p1Wx5ihFm3XIOsUfkFvXwLQ5jUghfadIClLYZBC0CSo5 87LkyO5J8Jg1pd/ZUaUycQi9uwLrxCD4CG5sw24BX6Mluqc6l0A0B3flkI4QBF/aeDuQ Ruj+p7UsO4kkxXcd5CRNDKgfrpVOI/Zxv72w+LbnTGMPJSWACn25BZtLZD8J5YOS/cYW bA21e3Qjmq3RwSD4O/HJa7LFtDBd3XVlXkTxQThXP9bBg2KslBFOS7UfIwjSOpmH6lJW 8FqePKWXlRUCyaPLkD9IWdzLcXq0xg0Lwa5KwcOfyUUq9IqVg++6aCpL7PNi6OkGkKPL 2QYQ== 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=uxLaGyI76egPfmG5IXWpfq1h2S8TMZJydksThHCGZ78wwMSft9HwN7T8QpMNpDUwnm TpdNJZUEjPos9M+QsAorHS9kFmZE3iVAv4bKmpP0ApIrg5BlDtbKiuRjyOp9CLPjf6MI kSECXo8xkyAFwZdJ/keKOKZTuxF3e633Of0Njm4+f0H9lhgsI5hgm+leNei7nLbrbb75 8mmciqFcDHBAS9UdhmqKqZd5stQ2g78Gaxwb/DwseenXZAces9+aFT0OEy98MIzH5llV xJ04LeebLihWDYF5u2Vz3zSE/3JT9NyNb5zr9N/eoAzUXZsPbhIMrL56l6l8mbmj74ym V15g== X-Forwarded-Encrypted: i=1; AJvYcCWwHw8Khi6szFCuypXGn4ujZJGeXRjT5NzXbNSVOhsUfje88YBM4RboEH9IIwEIEdHx5O8O5vuUEfJ0v2M=@vger.kernel.org X-Gm-Message-State: AOJu0YwHKrmr1FGnHU1Lg62KhRUVxybqeF98JWeNbHs6zQosQvq7Xzi9 qac8/T+dfLrD2nd1NAYOPcnPQ5nujHpuPziNiOY0cf9uNFROOqb23SUcu8RsnLhw/cvvAkXKem8 AHEWi+bl2CeRJtN0vUA== 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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: 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 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.48.1.711.g2feabab25a-goog From nobody Sun Feb 8 09:23:08 2026 Received: from mail-wr1-f74.google.com (mail-wr1-f74.google.com [209.85.221.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 1E7AE204866 for ; Tue, 4 Mar 2025 13:43:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741095840; cv=none; b=LWx/0us6I8KT8Lgz/zG0hTjTDkjG6vVzOUvCXWZNWSYrei9HeiD35Vx+E2nlBYMvmZGf5dWepNctblo8Sz9jmgnRJ0HAuJE1KfHtcIHyj4TFZ2Z3VQ0AvGDakd1w5JWLsSe1mMtlISXoACvTXgjSqeRgDVPkkKaWtW4Kvw40+Qw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741095840; c=relaxed/simple; bh=TtDaAc80G3uF6Qy8Dx8fbtAtbyeSJL7qw00QyGEAccU=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=oSXI38eHSGfWESf56nUHhsb0ZAYsSpS6uMiu1T1oUGAYv1phmnGeKrZ/6B0Xs+H5v0lGOqP1y96Y7saBe2OAesbzhmW9nJeg5gxMEF8NY0/A0lErSuxVLQMWk0czCec/19Nz5WT7Js7KZDPlcLmQqQMpKdm+qQ37RuoFDCAjNwo= 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=uBeo9gXm; arc=none smtp.client-ip=209.85.221.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="uBeo9gXm" Received: by mail-wr1-f74.google.com with SMTP id ffacd0b85a97d-390ddebcbd1so3409139f8f.2 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=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=nOQyJ57ni6L+J8E7B8owB1YjEi2kSEAuov44m6pse38=; b=uBeo9gXmgzU4K79DBIrKf9tTqj+f2DjSVmq9rzbYcbiyQaQaTsqN83RJUum0gJ8dop U/h20IH/HRzy6UCAFWjbUGnKFLfwMYdi+FspZtewp00jHY20Y4himyQS2U4Tl4HKxStn enYB3JZ43ZWGRkhHB9ML5gguG3C6cuotA2nX0MLnWfUwi3M+HSUGJg7QLiO9Lw8ElwCb aZ+juENJyRYy26a6WBnmqF5pNJ05Ci2FOzoUi6Rvet8E9qh4ooHMbHF4VX0Z9c15LQZ5 7SzvrxzXt3BbKOtW8fETUV3dMtM3PS2Rd6KSdZI5YyQxavcAV+GAbMDmNc8QV3GyDX4m VW9w== 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=VlqIz25HrjENlaLSByBYvF6MMU24a5Rr9Gaawva1OlgNgmsBSbAqEI5xNuMOIGjsLv VNF6mCCnE9gZbMyzVnkoKOpNjK0o9AvhIe4/0Hu7iyTU89TYqn8Twc7EVkt7AzCqKdIo Oww16GvjgAgen8hUC7/569DOqAkIKtVJHR1J0moAaimm90CoPeCDKcDZ+fZekeRJXk4h pDIqep/Czi8FvOgI5rUiUNGTDJRf5e7zLBC2tdlybGZ0e7wqLQfoWS/o9BGHTsKlOX2Q tQqhPfpXq8P4IMG/WtmSwlXmby2/qrQYo2beqLQBwmVc/RbupfRL5NxgGWyGtse/oB00 8YJQ== X-Forwarded-Encrypted: i=1; AJvYcCVBT0F+gLolRgi+IEsaVeRkjDeSpAu87Y+Me8uXSAZDkTxMRfg6Sc1koK/kSb73z64ez8wQJuBbNhrhvQ0=@vger.kernel.org X-Gm-Message-State: AOJu0YwiHTBs7ykNoaDu9peXO3Pz50dHJjITt1K7CC/uFOk2I4bnrb+Y XO7A+AYeiHg2rBgOeXRSSZ3/t48GnHPdcZb8/143YECxYFFV2gldoYn83Kap5/nF9l/aLsxyhV2 d3nzlqQB0sPcdfzYvcQ== 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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: 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 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 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; }; =20 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) =20 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); } =20 static void *hyp_mc_alloc_fn(void *flags) { - return (void *)__get_free_page(GFP_KERNEL_ACCOUNT); + void *addr =3D (void *)__get_free_page(GFP_KERNEL_ACCOUNT); + + if (addr && (unsigned long)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.48.1.711.g2feabab25a-goog