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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 34596E81E1F for ; Fri, 6 Oct 2023 18:25:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233252AbjJFSZ4 (ORCPT ); Fri, 6 Oct 2023 14:25:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46120 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233233AbjJFSZx (ORCPT ); Fri, 6 Oct 2023 14:25:53 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 92BD5B6 for ; Fri, 6 Oct 2023 11:25:52 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 33CB7C433C7; Fri, 6 Oct 2023 18:25:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1696616752; bh=0s7XSTa4N92Ujnnwdg/7gTJrzEQ91J9ts2I7XBTXC5Q=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=g/7qd/swmx7g3EM/dwzIeT0CgY/+lDyiBD0eYkjzICAZKi8JosfCBRsa2zssVTZxk 4KwyrFIyzX2IeI7hpU5HQyOECPM1z81rosMefj+qrG/CqQNS+zusSNOYoSMapHVX8i 9fhbQc7YenSPDAKTyIdAPtV+hS9lvKc9BQEW7EP2OIll1TdYHwRG5Y+HSOJusDB9u1 +7Dcz3OIgbEL58jwP6W06ecbxFvZ3AOgP/kLQFFoC0SX356RpUJCtDAeo9gRnKL/CD LeCkqhaOsW5di5TCSffg8hScYfUMkcrtjJgNrf5wTyHTdxXjfvj42+dvFV9fsPs5GK X61xQCKxtJUsw== Received: from sofa.misterjones.org ([185.219.108.64] 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 1qopWH-001nny-VN; Fri, 06 Oct 2023 19:25:50 +0100 Date: Fri, 06 Oct 2023 19:25:49 +0100 Message-ID: <878r8fmwuq.wl-maz@kernel.org> From: Marc Zyngier To: Sudeep Holla Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Marc Bonnici , Jens Wiklander , Coboy Chen , Lorenzo Pieralisi , Olivier Deprez , Oliver Upton , Will Deacon , Quentin Perret Subject: Re: [PATCH v4 14/17] KVM: arm64: FFA: Remove access of endpoint memory access descriptor array In-Reply-To: <20231005-ffa_v1-1_notif-v4-14-cddd3237809c@arm.com> References: <20231005-ffa_v1-1_notif-v4-0-cddd3237809c@arm.com> <20231005-ffa_v1-1_notif-v4-14-cddd3237809c@arm.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/28.2 (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: 185.219.108.64 X-SA-Exim-Rcpt-To: sudeep.holla@arm.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, marc.bonnici@arm.com, jens.wiklander@linaro.org, coboy.chen@mediatek.com, lpieralisi@kernel.org, olivier.deprez@arm.com, oliver.upton@linux.dev, will@kernel.org, qperret@google.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 05 Oct 2023 15:45:07 +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(-) > > 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; > I haven't looked at the rest of the series, but for the purpose of this particular patch, it looks OK to me. Acked-by: Marc Zyngier M. -- Without deviation from the norm, progress is not possible.