From patchwork Thu Apr 11 13:32:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Ene X-Patchwork-Id: 13626054 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 9832EC4345F for ; Thu, 11 Apr 2024 14:09:42 +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:Cc:To:From:Subject:Message-ID: Mime-Version:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=iW7DMvx01CjrB3IshNk14v2OGtPLg1AT35Ud0sl5170=; b=qRK AiLs9rCzzJc1OCQjMI9s4hBB/DOwrVfifQY1wFPz67tXxzMq9kwE+W2zi3plH4e9xAto4Ie6P3Qwq DOj/xOwNqG8b+XHgNfw9ptVYvNhcwXRkCUJ7diB3Yd3//4RP0Htyfzdh/yIrqmD59OQDw2zj4FhWU 0CE6eOmc4Rt4qjDMpJ2eUzcFxDxif/igc8JUbKan1Kivd+9hbpMiyLp5AMEmBbqfDnDcyq2tsQGJB qfnMZgrUEZjSIDlFNF3rM95QZHLIJEHENVUQIn15kcF9y5DDRGJz2OCwIFc3FqBcLqiViJYooiGMO Cxunekm3i+7FglOqJNfSo7xlPqHc9Gw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1ruuY7-0000000CA32-0wbb; Thu, 11 Apr 2024 13:33:07 +0000 Received: from mail-wm1-x34a.google.com ([2a00:1450:4864:20::34a]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1ruuY4-0000000CA2L-1udz for linux-arm-kernel@lists.infradead.org; Thu, 11 Apr 2024 13:33:05 +0000 Received: by mail-wm1-x34a.google.com with SMTP id 5b1f17b1804b1-416ac21981dso5076735e9.1 for ; Thu, 11 Apr 2024 06:33:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1712842381; x=1713447181; darn=lists.infradead.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=jLbdCZtEB493P/s/ORJxcOLOX4Rib20uKwmrnMJ0nuE=; b=3G+oAenAOXDiz6ALbaUqFBbEYZFHJQu31PlG/M8lBtLCTebE0Qh72QJ1ObCQ00JKrk OoaLa1w54z4TDix/V7Tnn09tUJ97aIU55CzjxxIYAdP1/0JCL84R2UY2bynH+7L+z+2y 0IRChBZe6Pbs25SZNEuUjjecNSIUVNrM3tnbmevf1LBbujmz6hUc17aOQ6ZH12Z4Qg19 QbjB6nELLaDQ11rgFTaZ0jxxTMBhBscp/lDaOGziXvLP6/0xGeIGrtu7AuRM6RdhwTL4 DAyXqMp8Yg8ftVjnMyrmZ8kORowHXGHD8Y2Ui55y8GAlslQTQli+/DzHjBlrzv9nH4rj SqTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712842381; x=1713447181; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=jLbdCZtEB493P/s/ORJxcOLOX4Rib20uKwmrnMJ0nuE=; b=USF1K6ZVF2b5B/Q99niw+J0PMUmBwwhQU+ROMA79oDCPo+o8k5bj3T/9jEeIZLujR4 jFoQSzXah0DTP4iLW9z19djSPDlXTmA5C5AUW3tRoEQI9cc3tjpUS7VP+/ol4py6G149 CYpy4wV/C7WxqBsfKmkcfN/inyoF92LXKXjWDzgT6oZLLB3fCUtgn6gQrfH0xGoEZ1MU wb2MGG+kP6np3/kVxwHJl/aFLUnMtJpzYfSlTGpKKKAXRc3dRjNtoBIrb8LlbB5T6NXo YKJ12+3dTbl/OrotDKJ6+0bpB0RXfM70N3LSNqxZLeITLaJ5JSy1uugWZHOivr79JQHQ zU/A== X-Forwarded-Encrypted: i=1; AJvYcCXyhcfAC3Guzni2uQcvAXMBS5GRxT7nVCbTh73tnL3Om8UWlfuh1fT+g14E4rG7tTZPt621smdrOD0kBQTYgAe11HKBOX1It3ZLkZIzUix2zSL7GAM= X-Gm-Message-State: AOJu0Ywii1x+MpThS1RQYICLzsytX4fQgoZfVrKYqiNSEpVulshdreaL 7c4Mv5DoxZGlzSJFVohhistxkMMWF/uEw84aLF/liAb16i+IpKFZ1wNtU8Ro7gDAtqGB1azitxo XlvOkYMsQXylBQdyH4poqZn6N5w== X-Google-Smtp-Source: AGHT+IEBtyO1OCnSzcg3FPObYJAZ6zsaFmfxsv4pfdATs2M1m7kwFkbGnhcitqth2TnArhHYAdgWS+f4LvVTF396FzQ= X-Received: from sebkvm.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:cd5]) (user=sebastianene job=sendgmr) by 2002:a05:600c:511d:b0:416:98c7:9b96 with SMTP id o29-20020a05600c511d00b0041698c79b96mr42890wms.2.1712842380871; Thu, 11 Apr 2024 06:33:00 -0700 (PDT) Date: Thu, 11 Apr 2024 13:32:49 +0000 Mime-Version: 1.0 X-Mailer: git-send-email 2.44.0.478.gd926399ef9-goog Message-ID: <20240411133249.2134696-1-sebastianene@google.com> Subject: [PATCH v2] KVM: arm64: Add support for FFA_PARTITION_INFO_GET From: Sebastian Ene To: catalin.marinas@arm.com, james.morse@arm.com, maz@kernel.org, oliver.upton@linux.dev, qperret@google.com, qwandor@google.com, suzuki.poulose@arm.com, tabba@google.com, will@kernel.org, yuzenghui@huawei.com, vdonnefort@google.com, lpieralisi@kernel.org Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel-team@android.com, Sebastian Ene X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240411_063304_536207_A0CABEDE X-CRM114-Status: GOOD ( 14.74 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 | 45 +++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/arch/arm64/kvm/hyp/nvhe/ffa.c b/arch/arm64/kvm/hyp/nvhe/ffa.c index 320f2eaa14a9..31ad740137fd 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,45 @@ 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 count, 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; + + /* FFA_VERSION_1_0 lacks the size in the response */ + if (ffa_version > FFA_VERSION_1_0) + sz = res->a3; + else + sz = 8; + + WARN_ON(count * sz > PAGE_SIZE); + memcpy(host_buffers.rx, hyp_buffers.rx, count * 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 +726,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); + goto out_handled; } if (ffa_call_supported(func_id)) @@ -726,6 +769,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;