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 75555E81E0B for ; Fri, 6 Oct 2023 15:26:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=vzATcHVqSrKDk8nCImTsIDR8r762bbns2PKbMh9ec+g=; b=lfay1YvE1s3+3A GF+1IuBV6kofxdhkawnDfk6CfiDzscLs+noYbss7SKZbr+lkgWbtJvD2IFn3yB+Wxre+rLJeK8JNl P3P4hO/5QrSdahlBowHeW3DFyvedbu1fK5xA9Ibqs5CRgotvl58v85ne705TZWvorkWW7XgoSMZ7P gDbALMP9SIe7X3aRaJ+9Zhd9ZRkZ/eb9RefTkwKTZMJFfjLfPtKDxgEu+PstIcFEuCt5T4G1i9V4+ oKOLGpNj3CVnMsyV722H9wr8GQ7YlJFgxSQznZ3zPfs2M84prZcVWUMVhA8hTTNEh+247Fnb4rPG8 BtVecuChetsNox+75+TQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qomhv-00655c-0t; Fri, 06 Oct 2023 15:25:39 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qomhs-00654h-1S for linux-arm-kernel@lists.infradead.org; Fri, 06 Oct 2023 15:25:38 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 5A401C15; Fri, 6 Oct 2023 08:26:07 -0700 (PDT) Received: from bogus (e103737-lin.cambridge.arm.com [10.1.197.49]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 9AC943F5A1; Fri, 6 Oct 2023 08:25:26 -0700 (PDT) Date: Fri, 6 Oct 2023 16:25:24 +0100 From: Sudeep Holla To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Marc Zyngier , Will Deacon Cc: Oliver Upton , Marc Bonnici , Sudeep Holla , Jens Wiklander , Coboy Chen , Lorenzo Pieralisi , Olivier Deprez , Quentin Perret Subject: Re: [PATCH v4 14/17] KVM: arm64: FFA: Remove access of endpoint memory access descriptor array Message-ID: <20231006152524.revw6utl5zezffgr@bogus> References: <20231005-ffa_v1-1_notif-v4-0-cddd3237809c@arm.com> <20231005-ffa_v1-1_notif-v4-14-cddd3237809c@arm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20231005-ffa_v1-1_notif-v4-14-cddd3237809c@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231006_082536_586376_2AFF3DB4 X-CRM114-Status: GOOD ( 23.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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Thu, Oct 05, 2023 at 03:45:07PM +0100, Sudeep Holla wrote: > FF-A v1.1 removes the fixed location of endpoint memory access descriptor > array within the memory transaction descriptor structure. In preparation > to remove the ep_mem_access member from the ffa_mem_region structure, > provide the accessor to fetch the offset and use the same in FF-A proxy > implementation. > > The accessor take the FF-A version as the argument from which the memory > access descriptor format can be determined. v1.0 uses the old format while > v1.1 onwards use the new format specified in the v1.1 specification. > > Cc: Marc Zyngier > Cc: Oliver Upton > Cc: Will Deacon > Cc: Quentin Perret > Signed-off-by: Sudeep Holla > --- > arch/arm64/kvm/hyp/nvhe/ffa.c | 10 ++++++++-- > include/linux/arm_ffa.h | 6 ++++++ > 2 files changed, 14 insertions(+), 2 deletions(-) > Hi Marc, Does this look better with respect to FF-A version passed as parameter. Since this case needs both major and minor(to handle difference between v1.0 and v1.1), I am passing the full version(both major and minor) in the compact form. If you happy, please ack. I would like to take it with other FF-A changes. Regards, Sudeep > diff --git a/arch/arm64/kvm/hyp/nvhe/ffa.c b/arch/arm64/kvm/hyp/nvhe/ffa.c > index 6e4dba9eadef..320f2eaa14a9 100644 > --- a/arch/arm64/kvm/hyp/nvhe/ffa.c > +++ b/arch/arm64/kvm/hyp/nvhe/ffa.c > @@ -423,6 +423,7 @@ static __always_inline void do_ffa_mem_xfer(const u64 func_id, > DECLARE_REG(u32, fraglen, ctxt, 2); > DECLARE_REG(u64, addr_mbz, ctxt, 3); > DECLARE_REG(u32, npages_mbz, ctxt, 4); > + struct ffa_mem_region_attributes *ep_mem_access; > struct ffa_composite_mem_region *reg; > struct ffa_mem_region *buf; > u32 offset, nr_ranges; > @@ -452,7 +453,9 @@ static __always_inline void do_ffa_mem_xfer(const u64 func_id, > buf = hyp_buffers.tx; > memcpy(buf, host_buffers.tx, fraglen); > > - offset = buf->ep_mem_access[0].composite_off; > + ep_mem_access = (void *)buf + > + ffa_mem_desc_offset(buf, 0, FFA_VERSION_1_0); > + offset = ep_mem_access->composite_off; > if (!offset || buf->ep_count != 1 || buf->sender_id != HOST_FFA_ID) { > ret = FFA_RET_INVALID_PARAMETERS; > goto out_unlock; > @@ -504,6 +507,7 @@ static void do_ffa_mem_reclaim(struct arm_smccc_res *res, > DECLARE_REG(u32, handle_lo, ctxt, 1); > DECLARE_REG(u32, handle_hi, ctxt, 2); > DECLARE_REG(u32, flags, ctxt, 3); > + struct ffa_mem_region_attributes *ep_mem_access; > struct ffa_composite_mem_region *reg; > u32 offset, len, fraglen, fragoff; > struct ffa_mem_region *buf; > @@ -528,7 +532,9 @@ static void do_ffa_mem_reclaim(struct arm_smccc_res *res, > len = res->a1; > fraglen = res->a2; > > - offset = buf->ep_mem_access[0].composite_off; > + ep_mem_access = (void *)buf + > + ffa_mem_desc_offset(buf, 0, FFA_VERSION_1_0); > + offset = ep_mem_access->composite_off; > /* > * We can trust the SPMD to get this right, but let's at least > * check that we end up with something that doesn't look _completely_ > diff --git a/include/linux/arm_ffa.h b/include/linux/arm_ffa.h > index 748d0a83a4bc..2444d596b703 100644 > --- a/include/linux/arm_ffa.h > +++ b/include/linux/arm_ffa.h > @@ -357,6 +357,12 @@ struct ffa_mem_region { > #define CONSTITUENTS_OFFSET(x) \ > (offsetof(struct ffa_composite_mem_region, constituents[x])) > > +static inline u32 > +ffa_mem_desc_offset(struct ffa_mem_region *buf, int count, u32 ffa_version) > +{ > + return COMPOSITE_OFFSET(0); > +} > + > struct ffa_mem_ops_args { > bool use_txbuf; > u32 nattrs; > > -- > 2.42.0 > -- Regards, Sudeep _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel