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 E6CD1C4345F for ; Fri, 3 May 2024 15:01:47 +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=cASpaW66YVhW8fxhjz4shjwKjvE4S2oPUN7A59XvBxg=; b=fWglGy2TVa+R5n lnWd2WYGSV2W0CTgjT3zeNT11Yygd6q0dXMoXt7JqgzumUpGheIIigH4pFkJb7+1HilyZ8bmU2BCe BCZqFQDdG0ieqNSM9or5KYe+w9B7AFQ8UrYSXbs6lWhsz9R1HbsC1Alb5vfjJs+R7qEMYHjVXcDDI rarx8GQ6brZPVB1gcA2/agGBzrdO4qPLAjs6X2hd3YOB6fIGEF9QoMJ35RiVJcdeXWGEHYLAXQKwV 1MraByNtm+KOszUv6kQFrz6iU+d3N9P20nq74uXvt3HVzPfVgzxk6LDskPt3wTnKZ5ZVwOO8OAAN5 0lxDYHGoLjPFE6sd5zDA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1s2uPf-0000000Gx5l-3VAt; Fri, 03 May 2024 15:01:27 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1s2uPc-0000000Gx5E-2CwH for linux-arm-kernel@lists.infradead.org; Fri, 03 May 2024 15:01:25 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 5012C61D0A; Fri, 3 May 2024 15:01:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D4F87C116B1; Fri, 3 May 2024 15:01:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1714748483; bh=UXXUMTs3xuoh35OPltFV2PaGUabtM91G4z1H+6ANXqc=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=RHgsbqhfhhnWXt7vZEq/n3A1dRZyUltjDpSXa3bsBvFJodtas18PnkKRMEsFBCt5M pQgCTY7uYcfQ0Yzi5RaIbOTGiOL0p9EQu/8n0JySlanhTSbU13ozsG17wfSfhbpcPl 8dNTB/hv2LdNudWXK5sC8C5iBEFR60B9Bs0+NwUwCucjz+ivfvAanNUvQ6L2+kjiM2 6IpS/xhzto24IeMVWxXP08xWIB7x14R5hUM1aKVnIh1+YDsV5yqgN8mlP4/HbtV2Vc Bubs2zNjvEG6jcfYFCDUoLrKboifhW8QU45Pi0ER5IFrgGEFhbcN/LeJHNZUsXoR6t 7xOmbYjkcCz6Q== Date: Fri, 3 May 2024 16:01:16 +0100 From: Will Deacon To: Sebastian Ene Cc: catalin.marinas@arm.com, james.morse@arm.com, jean-philippe@linaro.org, maz@kernel.org, oliver.upton@linux.dev, qperret@google.com, qwandor@google.com, sudeep.holla@arm.com, suzuki.poulose@arm.com, tabba@google.com, yuzenghui@huawei.com, lpieralisi@kernel.org, kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel-team@android.com Subject: Re: [PATCH 2/4] KVM: arm64: Add support for FFA_PARTITION_INFO_GET Message-ID: <20240503150114.GB18656@willie-the-truck> References: <20240418163025.1193763-2-sebastianene@google.com> <20240418163025.1193763-4-sebastianene@google.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20240418163025.1193763-4-sebastianene@google.com> User-Agent: Mutt/1.10.1 (2018-07-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240503_080124_697409_A7E35288 X-CRM114-Status: GOOD ( 27.03 ) 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, Apr 18, 2024 at 04:30:24PM +0000, Sebastian Ene wrote: > Handle the FFA_PARTITION_INFO_GET host call inside the pKVM hypervisor > and copy the response message back to the host buffers. Save the > returned FF-A version as we will need it later to interpret the response > from the TEE. > > Signed-off-by: Sebastian Ene > --- > arch/arm64/kvm/hyp/nvhe/ffa.c | 46 +++++++++++++++++++++++++++++++++++ > 1 file changed, 46 insertions(+) > > diff --git a/arch/arm64/kvm/hyp/nvhe/ffa.c b/arch/arm64/kvm/hyp/nvhe/ffa.c > index 023712e8beeb..d53f50c73acb 100644 > --- a/arch/arm64/kvm/hyp/nvhe/ffa.c > +++ b/arch/arm64/kvm/hyp/nvhe/ffa.c > @@ -674,6 +674,49 @@ static void do_ffa_version(struct arm_smccc_res *res, > hyp_spin_unlock(&host_buffers.lock); > } > > +static void do_ffa_part_get(struct arm_smccc_res *res, > + struct kvm_cpu_context *ctxt) > +{ > + DECLARE_REG(u32, uuid0, ctxt, 1); > + DECLARE_REG(u32, uuid1, ctxt, 2); > + DECLARE_REG(u32, uuid2, ctxt, 3); > + DECLARE_REG(u32, uuid3, ctxt, 4); > + DECLARE_REG(u32, flags, ctxt, 5); > + u32 off, count, sz, buf_sz; > + > + hyp_spin_lock(&host_buffers.lock); > + if (!host_buffers.rx) { > + ffa_to_smccc_res(res, FFA_RET_INVALID_PARAMETERS); This should be FFA_RET_BUSY per the spec. > + goto out_unlock; > + } > + > + arm_smccc_1_1_smc(FFA_PARTITION_INFO_GET, uuid0, uuid1, > + uuid2, uuid3, flags, 0, 0, > + res); > + > + if (res->a0 != FFA_SUCCESS) > + goto out_unlock; > + > + count = res->a2; > + if (!count) > + goto out_unlock; > + > + if (host_buffers.ffa_version > FFA_VERSION_1_0) { The spec says that the size field is populated based on the flags parameter. Why aren't you checking that instead of the version number? > + buf_sz = sz = res->a3; > + if (sz > sizeof(struct ffa_partition_info)) > + buf_sz = sizeof(struct ffa_partition_info); I don't think this is right, as if the payload really is bigger than 'struct ffa_partition_info' we'll truncate the data (and you don't adjust res->a3 afaict). Can't we just copy the whole thing back to the host? We're not interpreting the thing, so we can just treat it like a stream of bytes. > + } else { > + /* FFA_VERSION_1_0 lacks the size in the response */ > + buf_sz = sz = 8; Can you define that as a constant in arm_ffa.h, please? It's the size of a 1.0 partition info structure. > + } > + > + WARN_ON((count - 1) * sz + buf_sz > PAGE_SIZE); We should bounds-check against 'KVM_FFA_MBOX_NR_PAGES * PAGE_SIZE' and return an error (FFA_RET_ABORTED) if the size is over that. > + for (off = 0; off < count * sz; off += sz) > + > + memcpy(host_buffers.rx + off, hyp_buffers.rx + off, buf_sz); I think this is wrong if bit 0 of 'flags' is set to 1. In that case, I think you just get back the number of partitions and that's it, so we shouldn't be going near the mailboxes. Will _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel