From nobody Fri Dec 19 08:09:33 2025 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 AA7A4E71D47 for ; Fri, 29 Sep 2023 15:04:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233594AbjI2PEI (ORCPT ); Fri, 29 Sep 2023 11:04:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55552 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233507AbjI2PDg (ORCPT ); Fri, 29 Sep 2023 11:03:36 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 184C1CD4 for ; Fri, 29 Sep 2023 08:03:31 -0700 (PDT) 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 24D60106F; Fri, 29 Sep 2023 08:04:10 -0700 (PDT) Received: from e103737-lin.cambridge.arm.com (e103737-lin.cambridge.arm.com [10.1.197.49]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 5953C3F5A1; Fri, 29 Sep 2023 08:03:30 -0700 (PDT) From: Sudeep Holla Date: Fri, 29 Sep 2023 16:03:03 +0100 Subject: [PATCH v3 14/17] KVM: arm64: FFA: Remove access of endpoint memory access descriptor array MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230929-ffa_v1-1_notif-v3-14-c8e4f15190c8@arm.com> References: <20230929-ffa_v1-1_notif-v3-0-c8e4f15190c8@arm.com> In-Reply-To: <20230929-ffa_v1-1_notif-v3-0-c8e4f15190c8@arm.com> To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Sudeep Holla , Marc Bonnici , Jens Wiklander , Coboy Chen , Lorenzo Pieralisi , Olivier Deprez Cc: Marc Zyngier , Oliver Upton , Will Deacon , Quentin Perret X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=3159; i=sudeep.holla@arm.com; h=from:subject:message-id; bh=64pcj+hQs1mQBRXTHk+OD4ILrYtlsf+Zd4SaIeIRqXs=; b=owEBbQKS/ZANAwAIAQBBurwxfuKYAcsmYgBlFucwKh/Fe3GJay3phEMH0ENESU2rWfHbdYJMI ySGRC8yREeJAjMEAAEIAB0WIQS6ceUSBvMeskPdk+EAQbq8MX7imAUCZRbnMAAKCRAAQbq8MX7i mJJyD/9Q2noyk3D968ikUkQGfX8OZNm4vkic6pbl9zlMTAVy6rlNgkCcBRp20EGRHv7e8QJqHI7 mQCnJ/Jmj4EKCWzzKsb00YYxkLuPnJh6LlfuAdOpli7YBaL6yaUWT4hVXK+dbJsBzFvFu0mCPl4 pLT6oSO+0DRQbA28btZF7bH8xaUCajsqQ2wr3tiK4yQyY5kDxIWGVqDoN52w+nvki+F4JLLgR4w KA0d8ojDpffbyZD5eES1TxyLuBZL8H7GijFgco+G5C2URDJ5BRS9LtI/8tfEz6LF3TZ34hN1D0z UwzbVp+ZH3EUF/4cpcf2dniVBq2p1mdQPYmV8X18K8GCNNIFd3W2aIMNsOXAGChWnMbl6X2UTKr vCFnvY1Y3wlc3x2+c/SjEUvQqXwWBT+pVJv47/6pwg4DFSyMQ4ZOWqM+6pohVKsSxGJdJD2zVPG fs1eNYIqENGi4hLyYuZ8hzEJbetFPVrr4La9LaRtjQgGJKMDAqgYTMpob95l7sX1yTeXiwNZyV6 ihXZDcLQo3nZ5OAP22EuM5ljfJGwIDkEGvHGBtt5VMZwQpMLfD0pLJeOV7jhpUKgyCqltf6wuLV zP+TB4ndSP/J7MyWfvnp1232pQRvR9pQiDts8CnilJtB3luJrNxf800Jq6gMESJYGCgrnYqNewD GK1rKGoRX/DWBhg== X-Developer-Key: i=sudeep.holla@arm.com; a=openpgp; fpr=7360A21742ADF5A11767C1C139CFD4755FE2D5B4 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 boolean argument that indicates if the memory access descriptor versions is v1(old format) or not. Currently it is set true as FF-A proxy supports only v1.0 Cc: Marc Zyngier Cc: Oliver Upton Cc: Will Deacon Cc: Quentin Perret Signed-off-by: Sudeep Holla --- arch/arm64/kvm/hyp/nvhe/ffa.c | 8 ++++++-- include/linux/arm_ffa.h | 6 ++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kvm/hyp/nvhe/ffa.c b/arch/arm64/kvm/hyp/nvhe/ffa.c index 6e4dba9eadef..5f956f53e6bf 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 f= unc_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,8 @@ static __always_inline void do_ffa_mem_xfer(const u64 f= unc_id, buf =3D hyp_buffers.tx; memcpy(buf, host_buffers.tx, fraglen); =20 - offset =3D buf->ep_mem_access[0].composite_off; + ep_mem_access =3D (void *)buf + ffa_mem_desc_offset(buf, 0, true); + offset =3D ep_mem_access->composite_off; if (!offset || buf->ep_count !=3D 1 || buf->sender_id !=3D HOST_FFA_ID) { ret =3D FFA_RET_INVALID_PARAMETERS; goto out_unlock; @@ -504,6 +506,7 @@ static void do_ffa_mem_reclaim(struct arm_smccc_res *re= s, 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 +531,8 @@ static void do_ffa_mem_reclaim(struct arm_smccc_res *re= s, len =3D res->a1; fraglen =3D res->a2; =20 - offset =3D buf->ep_mem_access[0].composite_off; + ep_mem_access =3D (void *)buf + ffa_mem_desc_offset(buf, 0, true); + offset =3D 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..7be240e37f36 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])) =20 +static inline u32 +ffa_mem_desc_offset(struct ffa_mem_region *buf, int count, bool mem_desc_v= 1) +{ + return COMPOSITE_OFFSET(0); +} + struct ffa_mem_ops_args { bool use_txbuf; u32 nattrs; --=20 2.42.0