From nobody Wed Feb 11 01:26:03 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