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 741B7C67861 for ; Tue, 9 Apr 2024 16:15:48 +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=Sb9BO3oC/U6xzJZMed/qLO4YMMx/LuptGvmmbmbMWLc=; b=gqjEUN/GCS609E iVL14g7KHNajh6gYqqyABRGY826lbXggXr3Aaodmy5O0Bx/2cG4ykB3oB3nDgQaoudnImu946YCuQ zkFwraopAlFnClb12Gy5q22L9j8xMsSQ05vOdRGtLZZ/pooSsn7vTFXCtK28GvgLR3YfoJNoL0pER zBF7ENovOWsC6eO8G68/qOZgOwyhDP6UbdtpowvAKgfqoDuDyJuFinWm6x2qMivLCQcOKRVGnF+yz g3ufkgm8hAtY66zqO3zD87jUH6txQ2OmW/nuWGRjjozi2qPZwVGZd2p1o4kNUuzqreBRubFOucc4X a3GsJggblk+sHXtJZU2w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1ruE8E-00000002tQX-1fHB; Tue, 09 Apr 2024 16:15:34 +0000 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1ruE8B-00000002tNM-0Pg9 for linux-arm-kernel@lists.infradead.org; Tue, 09 Apr 2024 16:15:32 +0000 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-416b606f3e3so3598875e9.1 for ; Tue, 09 Apr 2024 09:15:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1712679324; x=1713284124; darn=lists.infradead.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=NdZtD6irNdlXhmhm1A43aB93TmxueujQEV4FlCrB2O0=; b=EdWwiRpD4/DVV/pzu9fIkIjGGJvej+1PrjC4b3y2MDjZ+wuTHxZdwV2oU/XuuU1eab ix1LsI3C4cM/Owt3wqOLaxt+L4AwS2v8S7Cy80/H/5qSNtf8eNrvuZAf7nX8HdzwI97Q 6EI5ngD4nvdI+hoiArF9hWOYipA1aTENHQEdUPJwY+eE7GI55Xk3Ptp8/8JwwLNBPxAx 15LUdpDQkOo7yslYyk/+ZK7OFUXEYwosmGZeehX32ZddkP38mobnv/+OZQLujBLYyRhz aBQDkgwpATQ8mwKPY5HySDJ/V7qCt5qafKM8/A/WNMeyFw9nTwCUG+qH7x2IKByvHSvB rleg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712679324; x=1713284124; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=NdZtD6irNdlXhmhm1A43aB93TmxueujQEV4FlCrB2O0=; b=cS1/PWfuws1oPW90jtPvGzzG7aB0D7o/borh7KoKrUJDu/SFMhy3JEtZqakXWY2UKW HKJLo+L8xAh+3bB4SHz/BuzTvfjSFYhMITSgzvAFeIY2PSiJvfL+Yg7hif2QgYjnKy+u K7+PYMqLNkmYe9wi9r1NWb9Fc8swRdcPb4WhfX/khoOYc9uSSDCu0ud8IqyXcIwGw2UW P+CRVIRFWJ4qSq1wlIB+cN4W4aoWxPwGijEwRtVBB7DuBIJ6x8a9THKp7RoiwXGXr3Tu wxdDdI8itSqgiHeWgUDCgzD58UoA2ztlUhKJxI/gF6rFjx4tMNHBEJ+b7XWgfPsGDFD7 hgwg== X-Forwarded-Encrypted: i=1; AJvYcCVis3xBvAO6FdNDxdtCyYia/0bj4d8lsfdkZn49qFrHbVrDZIP6OYercJ7YhPe8AjWx/CSmmSX24xltuAE5vLSb0sCb3M+MNC1NCNoL0TaflMktL/0= X-Gm-Message-State: AOJu0YzubJWG5BLDLGJ2A9Nn+rovO4bugqv1y1gFCEZ/c+20qMSbR8kp 7FhkR7RYqSg02IUivjEYU5yakMYZwsDCbbJKRwedbODOUy2qr5aaq0t2qKQ+pg== X-Google-Smtp-Source: AGHT+IGGfIBhxH5DQCjXOXjwLQSpl49ieGPZM+MwVbQZknp7RGIYrhHK/YQcv5YCidu4HTjG9iIDmQ== X-Received: by 2002:a5d:5185:0:b0:33d:b376:8a07 with SMTP id k5-20020a5d5185000000b0033db3768a07mr118036wrv.8.1712679324100; Tue, 09 Apr 2024 09:15:24 -0700 (PDT) Received: from google.com (161.126.77.34.bc.googleusercontent.com. [34.77.126.161]) by smtp.gmail.com with ESMTPSA id z13-20020a056000110d00b0034174875850sm11895914wrw.70.2024.04.09.09.15.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Apr 2024 09:15:23 -0700 (PDT) Date: Tue, 9 Apr 2024 17:15:20 +0100 From: Vincent Donnefort 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, will@kernel.org, yuzenghui@huawei.com, kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel-team@android.com Subject: Re: [PATCH] KVM: arm64: Add support for FFA_PARTITION_INFO_GET Message-ID: References: <20240409151908.541589-1-sebastianene@google.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20240409151908.541589-1-sebastianene@google.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240409_091531_192190_0710EEED X-CRM114-Status: GOOD ( 25.50 ) 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 Hi Seb, On Tue, Apr 09, 2024 at 03:19:08PM +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 | 49 +++++++++++++++++++++++++++++++++++ > 1 file changed, 49 insertions(+) > > diff --git a/arch/arm64/kvm/hyp/nvhe/ffa.c b/arch/arm64/kvm/hyp/nvhe/ffa.c > index 320f2eaa14a9..72fc365bc7a8 100644 > --- a/arch/arm64/kvm/hyp/nvhe/ffa.c > +++ b/arch/arm64/kvm/hyp/nvhe/ffa.c > @@ -67,6 +67,7 @@ struct kvm_ffa_buffers { > */ > static struct kvm_ffa_buffers hyp_buffers; > static struct kvm_ffa_buffers host_buffers; > +static u32 ffa_version; > > static void ffa_to_smccc_error(struct arm_smccc_res *res, u64 ffa_errno) > { > @@ -640,6 +641,49 @@ static bool do_ffa_features(struct arm_smccc_res *res, > return true; > } > > +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); > + 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; Looking at the table 13.34, it seems what's in "count" depends on the flag. Shouldn't we check its value, and only memcpy into the host buffers if the flag is 0? > + > + if (ffa_version > FFA_VERSION_1_0) { > + buf_sz = sz = res->a3; > + if (sz > sizeof(struct ffa_partition_info)) > + buf_sz = sizeof(struct ffa_partition_info); What are you trying to protect against here? We have to trust EL3 anyway, (as other functions do). The WARN() could be kept though to make sure we won't overflow our buffer. But it could be transformed into an error? FFA_RET_ABORTED? > + } else { > + /* FFA_VERSION_1_0 lacks the size in the response */ > + buf_sz = sz = 8; > + } > + > + WARN_ON((count - 1) * sz + buf_sz > PAGE_SIZE); > + for (off = 0; off < count * sz; off += sz) > + memcpy(host_buffers.rx + off, hyp_buffers.rx + off, buf_sz); > +out_unlock: > + hyp_spin_unlock(&host_buffers.lock); > +} > + > bool kvm_host_ffa_handler(struct kvm_cpu_context *host_ctxt, u32 func_id) > { > struct arm_smccc_res res; > @@ -686,6 +730,9 @@ bool kvm_host_ffa_handler(struct kvm_cpu_context *host_ctxt, u32 func_id) > case FFA_MEM_FRAG_TX: > do_ffa_mem_frag_tx(&res, host_ctxt); > goto out_handled; > + case FFA_PARTITION_INFO_GET: > + do_ffa_part_get(&res, host_ctxt); > + break; > } > > if (ffa_call_supported(func_id)) > @@ -726,6 +773,8 @@ int hyp_ffa_init(void *pages) > if (FFA_MAJOR_VERSION(res.a0) != 1) > return -EOPNOTSUPP; > > + ffa_version = res.a0; > + > arm_smccc_1_1_smc(FFA_ID_GET, 0, 0, 0, 0, 0, 0, 0, &res); > if (res.a0 != FFA_SUCCESS) > return -EOPNOTSUPP; > -- > 2.44.0.478.gd926399ef9-goog > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel