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 A62A0C3ABC9 for ; Fri, 16 May 2025 13:12:27 +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=9BbKECuQIgvXK9vjo86BI4yH6OnxwsJ7kCXqk8ODroQ=; b=zcPtF9Pkv5EjZuwYlqGSCqE9UN rAJSNXcCuUcsRTzHZS73spNa2Dd57lT1TU2KRjtiuf+J+VVleoV20C0uh9NXtFV2l7bIOnc0EiEC7 88hcswPpRfzls+JXYE3Iq+1X+CpAMXHrcP/bQJwZ0PQuLxVm8KU5NKCVXKW1/psQxXn3i9RLcNikT hsr8seVYmdHHN1GqGp0qZDL4Hos0IIq5PVvhU18NO2y9IhK7zwrRnvU/9gfQjf0af2GpX0ikCFgcU MYEpVD3OEyAVCZ503fTYCWD4g/8Tf6Zw1vZB/7Ms8f9W0k49v7BzDmCsFhW85NgXcRGdmVLnUF1Z4 p/tzH2tA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1uFurJ-00000003Tjv-3qiL; Fri, 16 May 2025 13:12:17 +0000 Received: from nyc.source.kernel.org ([147.75.193.91]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1uFupH-00000003TQ7-2BEp for linux-arm-kernel@lists.infradead.org; Fri, 16 May 2025 13:10:12 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id B8E31A4E7C7; Fri, 16 May 2025 13:10:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5CF00C4CEE4; Fri, 16 May 2025 13:10:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1747401010; bh=f3bSpBjDNhpmuG7CwGPUxc40Ow4uGBBx47VJXM4QwWE=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=BvOyR4z9k89vA4LEiLj1r7wo8xfwWz8ngi5XkjnLeTrmDfXKR5LfcHzLx+ICH83tb fn766OyuVwFC8G7gkvwlOfmWd+rzsMZQQ+c2vyiehlT22B/8VDWocVfqBUvNfrV1oE IrsAn41sy+W5GsanX+V1llzb4GNl8InClIxuVjtTjIzWGWp1DVPZScn9csjaqpSOV0 pg8TEEW0JLoPrdTPtsZbpO64B/OjtJOnfCoOxutffY9lGhtt/rjmrR7mb7bEY4KvxD KfxVHthYyX+R0MGIFwFhKd0bc+kBkEiBxeL+nuadmHZ9kiOQoMA0XYw4URmB6d6DE5 iUxQjayLGu+hg== Received: from sofa.misterjones.org ([185.219.108.64] helo=goblin-girl.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 1uFupD-00FYsP-P5; Fri, 16 May 2025 14:10:08 +0100 Date: Fri, 16 May 2025 14:10:06 +0100 Message-ID: <868qmwg0r5.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 v4 03/10] KVM: arm64: Add a range to __pkvm_host_share_guest() In-Reply-To: <20250509131706.2336138-4-vdonnefort@google.com> References: <20250509131706.2336138-1-vdonnefort@google.com> <20250509131706.2336138-4-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/30.1 (aarch64-unknown-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: 185.219.108.64 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-20250516_061011_697700_06ACADE7 X-CRM114-Status: GOOD ( 22.98 ) 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, 09 May 2025 14:16:59 +0100, Vincent Donnefort wrote: > > In preparation for supporting stage-2 huge mappings for np-guest. Add a > nr_pages argument to the __pkvm_host_share_guest hypercall. This range > supports only two values: 1 or PMD_SIZE / PAGE_SIZE (that is 512 on a > 4K-pages system). > > Signed-off-by: Vincent Donnefort > > diff --git a/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h b/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h > index 26016eb9323f..47aa7b01114f 100644 > --- a/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h > +++ b/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h > @@ -39,7 +39,7 @@ int __pkvm_host_donate_hyp(u64 pfn, u64 nr_pages); > int __pkvm_hyp_donate_host(u64 pfn, u64 nr_pages); > int __pkvm_host_share_ffa(u64 pfn, u64 nr_pages); > int __pkvm_host_unshare_ffa(u64 pfn, u64 nr_pages); > -int __pkvm_host_share_guest(u64 pfn, u64 gfn, struct pkvm_hyp_vcpu *vcpu, > +int __pkvm_host_share_guest(u64 pfn, u64 gfn, u64 nr_pages, struct pkvm_hyp_vcpu *vcpu, > enum kvm_pgtable_prot prot); > int __pkvm_host_unshare_guest(u64 gfn, struct pkvm_hyp_vm *hyp_vm); > int __pkvm_host_relax_perms_guest(u64 gfn, struct pkvm_hyp_vcpu *vcpu, enum kvm_pgtable_prot prot); > diff --git a/arch/arm64/kvm/hyp/nvhe/hyp-main.c b/arch/arm64/kvm/hyp/nvhe/hyp-main.c > index 59db9606e6e1..4d3d215955c3 100644 > --- a/arch/arm64/kvm/hyp/nvhe/hyp-main.c > +++ b/arch/arm64/kvm/hyp/nvhe/hyp-main.c > @@ -245,7 +245,8 @@ static void handle___pkvm_host_share_guest(struct kvm_cpu_context *host_ctxt) > { > DECLARE_REG(u64, pfn, host_ctxt, 1); > DECLARE_REG(u64, gfn, host_ctxt, 2); > - DECLARE_REG(enum kvm_pgtable_prot, prot, host_ctxt, 3); > + DECLARE_REG(u64, nr_pages, host_ctxt, 3); > + DECLARE_REG(enum kvm_pgtable_prot, prot, host_ctxt, 4); > struct pkvm_hyp_vcpu *hyp_vcpu; > int ret = -EINVAL; > > @@ -260,7 +261,7 @@ static void handle___pkvm_host_share_guest(struct kvm_cpu_context *host_ctxt) > if (ret) > goto out; > > - ret = __pkvm_host_share_guest(pfn, gfn, hyp_vcpu, prot); > + ret = __pkvm_host_share_guest(pfn, gfn, nr_pages, hyp_vcpu, prot); > out: > cpu_reg(host_ctxt, 1) = ret; > } > diff --git a/arch/arm64/kvm/hyp/nvhe/mem_protect.c b/arch/arm64/kvm/hyp/nvhe/mem_protect.c > index 4d269210dae0..f0f7c6f83e57 100644 > --- a/arch/arm64/kvm/hyp/nvhe/mem_protect.c > +++ b/arch/arm64/kvm/hyp/nvhe/mem_protect.c > @@ -696,10 +696,9 @@ static enum pkvm_page_state guest_get_page_state(kvm_pte_t pte, u64 addr) > return pkvm_getstate(kvm_pgtable_stage2_pte_prot(pte)); > } > > -static int __guest_check_page_state_range(struct pkvm_hyp_vcpu *vcpu, u64 addr, > +static int __guest_check_page_state_range(struct pkvm_hyp_vm *vm, u64 addr, > u64 size, enum pkvm_page_state state) > { > - struct pkvm_hyp_vm *vm = pkvm_hyp_vcpu_to_hyp_vm(vcpu); > struct check_walk_data d = { > .desired = state, > .get_page_state = guest_get_page_state, > @@ -908,48 +907,81 @@ int __pkvm_host_unshare_ffa(u64 pfn, u64 nr_pages) > return ret; > } > > -int __pkvm_host_share_guest(u64 pfn, u64 gfn, struct pkvm_hyp_vcpu *vcpu, > +static int __guest_check_transition_size(u64 phys, u64 ipa, u64 nr_pages, u64 *size) > +{ > + if (nr_pages == 1) { > + *size = PAGE_SIZE; > + return 0; > + } > + > + /* We solely support PMD_SIZE huge-pages */ > + if (nr_pages != (1 << (PMD_SHIFT - PAGE_SHIFT))) > + return -EINVAL; I'm not really keen on the whole PxD nomenclature. What we really care about is a mapping level (level 2 in this instance). Can we instead use kvm_granule_size()? Something like: if ((nr_page * PAGE_SIZE) != kvm_granule_size(2)) return -EINVAL; > + > + if (!IS_ALIGNED(phys | ipa, PMD_SIZE)) > + return -EINVAL; > + > + *size = PMD_SIZE; Similar things here. But also, should this level-2 block checking be moved to the patch that actually allows block mapping? Thanks, M. -- Without deviation from the norm, progress is not possible.