From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 712B322A7E9; Wed, 12 Mar 2025 08:59:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741769960; cv=none; b=OPZG0Fy1l0/j0KfF+YtVPMfvNnrfzhGNB3q0tyAZcJaHhpox/ibZHhkezKEED1/hZ94Movtv3McnB4FpyZyWQkqt+y/Ne6MawwJhfhSiOf7IjzbnmIPSsva1yzwysob/xTCySpHjQgSt/c9EGzp/C/LKI4dqTQnJcRGW6rBxnaI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741769960; c=relaxed/simple; bh=IKNcjZBYeAxkRhWSJBPJs/lzHdI4VhmT0PC6QU1clQM=; h=Date:Message-ID:From:To:Cc:Subject:In-Reply-To:References: MIME-Version:Content-Type; b=CKV38BImq43gF5R6NVgxOCrfcbTElU9SlLj8cgMLINvmvVnJ5Kzcd9OSxo4zvus89HmT5zMCCQWy7nLEGMKUUagzuOUTKemMp56oSMF+4ZJamJVy/fWQOAmlRusJGUYdMcme7Foi7YmF+iacx/ZKmLAQpACY1im4+1Jp23hthKQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=IrW9BSEU; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="IrW9BSEU" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 469C2C4CEE3; Wed, 12 Mar 2025 08:59:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741769960; bh=IKNcjZBYeAxkRhWSJBPJs/lzHdI4VhmT0PC6QU1clQM=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=IrW9BSEUC0TxrcsoX4eyTdLHK7QIQR26/ltW1TImz/p7JSKfD9wrAPp95B/ITF7RP dZf7pwGzPpVgwaRI4Dri5tnP5UfzKDp7iNGKxYqUOVoRhD4MrrLTtXx+H9benf8tbb Yn8bMyXrhNpd1VBs4M/l0N6Dn/WEeOUzto2ssBPWL4+jIt/ag1Mm+yAQl1qTWtFBD8 +iDwpuooGCpAD/nnc8Vv8xfFVofjoCSLmpAOX70sUni9EZQuwhGUOpPIGZhXrXkn3G saQAvwbbiMd2NbHSqmslOugPhGMu9wGXoDo8G72vjW25LXDE7xKNk8VpBkNewEBd0Q KbMbDow1lxS2Q== Received: from 82-132-232-216.dab.02.net ([82.132.232.216] helo=wait-a-minute.misterjones.org) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1tsHvp-00Cnoj-Sg; Wed, 12 Mar 2025 08:59:18 +0000 Date: Wed, 12 Mar 2025 08:59:15 +0000 Message-ID: <87plim7hgc.wl-maz@kernel.org> From: Marc Zyngier To: Vincent Donnefort Cc: oliver.upton@linux.dev, joey.gouly@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com, catalin.marinas@arm.com, will@kernel.org, qperret@google.com, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org, kernel-team@android.com Subject: Re: [PATCH v3 2/3] KVM: arm64: Distinct pKVM teardown memcache for stage-2 In-Reply-To: <20250307113411.469018-3-vdonnefort@google.com> References: <20250307113411.469018-1-vdonnefort@google.com> <20250307113411.469018-3-vdonnefort@google.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/29.4 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII X-SA-Exim-Connect-IP: 82.132.232.216 X-SA-Exim-Rcpt-To: vdonnefort@google.com, oliver.upton@linux.dev, joey.gouly@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com, catalin.marinas@arm.com, will@kernel.org, qperret@google.com, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org, kernel-team@android.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false On Fri, 07 Mar 2025 11:34:10 +0000, Vincent Donnefort wrote: > > 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; > }; > > 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, 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,7 +706,8 @@ 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_guest_pages(hyp_vm, stage2_mc); This looks odd. What counts as stage-2 pages here? Or is it that reclaim_guest_pages() is very badly named? Thanks, M. -- Without deviation from the norm, progress is not possible.