From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5CA6CC28B2E for ; Wed, 12 Mar 2025 08:40:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type:MIME-Version: References:In-Reply-To:Subject:Cc:To:From:Message-ID:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=OKU1KDBdBhebOZ32XdEWegCk2jB1kp6oBqcU7yNGPVc=; b=CXa4g3caF7MMxX6f0T37HnXL4L K1LlkFhePXFPXBIClM+VDeB8zAG2I523IRCavMtVfC/W/GxVL7ottDqcKE/7aLtL9B8qn7FDy4L6/ y8E4OUJzVKTbzu4zzFWguAboAfKj1t4HZwXg2FcMetWhUg8aCfHtZAWoQbGmljo2IBzyE97l4Yvd3 7t86FmARvQT8K7TTatY47/Qs4BA5DFpviRWj56jMtD4hDCngH2HiBlMJqPGzIcoEl9QqdIQGT1gPy EkG1zcSJOlqr3mUA+EB+zUpkOjahyWQxv/STrrBqxBzo+Oh1GPzi7e6V/ONaeEQAJ8O03qCHUu6C4 X5UC05gw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tsHdf-00000007qt5-2SXu; Wed, 12 Mar 2025 08:40:31 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tsHc1-00000007qfS-0Ddc for linux-arm-kernel@lists.infradead.org; Wed, 12 Mar 2025 08:38:50 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id A4F1C5C55B2; Wed, 12 Mar 2025 08:36:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 211B7C4CEE3; Wed, 12 Mar 2025 08:38:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741768728; bh=aoRSn+Ge+OFGhJG+BqVTYAMNvaYrTDa2lkYMIa9r1Go=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=nMisL0Alo24OqfZs5DJsP7fMNYMn/y6s+lb+FUpIiJLNx8Y/vM8nboxVqWeM+VMdZ HowqnCvj4GoEdZ82v6YBjeAV43CFNO4ubGTbWp4WoMsLhdyT8pvyYIa5ygUkk5DSCH FXgI+Lqj/338K21275pV3Fnnj6e/uTWuKdBipCB7T7Ri+7IZGQ3mhbjJo+9XDZTwOI Wo6wNinEYQJ2NtLPyZ5zD4ZfTDM//0qfjzmlVheT0vkFjQ37qdovA3qr3xJi7ECE+B o9Khei00taruEW78qBahhRq1jXdcoGS4mHpfeFh8aF1xvS3ME9HlBlcznqvMKBgD8C XV1zRsw/Lhzaw== 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 1tsHbx-00CnRd-QC; Wed, 12 Mar 2025 08:38:46 +0000 Date: Wed, 12 Mar 2025 08:38:43 +0000 Message-ID: <87r0327iek.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 1/3] KVM: arm64: Add flags to kvm_hyp_memcache In-Reply-To: <20250307113411.469018-2-vdonnefort@google.com> References: <20250307113411.469018-1-vdonnefort@google.com> <20250307113411.469018-2-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) 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250312_013849_171717_8F9D634D X-CRM114-Status: GOOD ( 18.92 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, 07 Mar 2025 11:34:09 +0000, Vincent Donnefort wrote: > > 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; > }; > > 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) > } > } > > -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); > } > > -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; > > 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); Why the cast? It looks superfluous to me. > } > > int topup_hyp_memcache(struct kvm_hyp_memcache *mc, unsigned long min_pages) > @@ -1117,7 +1117,7 @@ int topup_hyp_memcache(struct kvm_hyp_memcache *mc, unsigned long min_pages) > } > > return __topup_hyp_memcache(mc, min_pages, hyp_mc_alloc_fn, > - kvm_host_pa, NULL); > + kvm_host_pa, (void *)mc); Same here. Thanks, M. -- Without deviation from the norm, progress is not possible.