From nobody Mon Feb 9 16:17:48 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