From patchwork Thu Apr 18 16:30:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Ene X-Patchwork-Id: 13635102 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 AA488C4345F for ; Thu, 18 Apr 2024 16:32:07 +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: References:Mime-Version:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=GOSzDeSf+qDy0uFE4NnTHV/Au6PTtTkr+BU8txxgmvY=; b=MOowMxXQlZEehrJ1VWLlObeFNW Lr72p1tOYYF0SOcXtbLjcn471pZHD33EqtnVltpo1W4iIo1tp3/4jF2K2WPh1Zg8t1Ulyi7AVnFHE SeL1CNym34v0mqU3/fPmZGkrjPUSn2jkRdJzWkK+BaJEr+XvasZbDopU+SDK6VeeFR/rMglQC2URF 8s0jwQ7QddKbAcv1tC89ydD6KfhTkkWFfWeANXIzf315HNU9Y5rYZw8tt6lRXrC2lcTlxI9WF91ir NdmGmOzov0N5nvJGslG47KJZmCHOmR/hcH9QnhAmL4ut+DV3XL0c1gleTd9zEdxJetvuYN7+TYhru E+SmfW2A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rxUg1-0000000315g-3aD3; Thu, 18 Apr 2024 16:31:57 +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 1rxUfs-0000000310I-03sd for linux-arm-kernel@lists.infradead.org; Thu, 18 Apr 2024 16:31:49 +0000 Received: by mail-wm1-x34a.google.com with SMTP id 5b1f17b1804b1-418f18458a0so3132695e9.0 for ; Thu, 18 Apr 2024 09:31:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1713457904; x=1714062704; darn=lists.infradead.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=d3k3yKff6xJXH10XLK8AgdBXbkXj7KdOIqksXGEh2rs=; b=J20JTWvq4vXJYCMcNVhYn5Tz6R86WUTeiAZsEFHUDJZexnjqvJHLkWZuqso6lukSEy jX97epUVOOHf+tN4qWTNwwx8VVT/A+N/EzK/vadWyRJ6esLXC6W4cIJuKlOK1eW4E92K xll5o7kmAgGghHxkYaSUw2bgXukygpm6BciJaPtvcdJh6cmNPnxzkaB8Ug5awvaU0MUI eGlL/9m47f2qWtK2lNqXR6S8pXcAuGoI/QKRr3G/pwnakZiUSh0HCpS97KlgrstJe1BK NQPOV3j/+ApjHMH3CHTWmmxOwIwcxfJ3CKdzmzSM4wpHegpCSnKogaRv/XuMB5joQ6Nk fWSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713457904; x=1714062704; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=d3k3yKff6xJXH10XLK8AgdBXbkXj7KdOIqksXGEh2rs=; b=CPq9HkJ8N2cH8RWeiDm0twtn+oYiuDYXo1+QQlwIaqq8zDfeY33HxFh4A93hxEk/Pa RGoBZErMJjbHS4e/66RnfG0cyN4+8yYI6oagwJrd40e86fz+t4uQZmMyDUUmQ5uXvl1C ZaJlB1MfkNHdfl93YSJMe6zpcAQNfl7CWxuoIkidv0K1FPVB3JGBhidRisk6PvQR7lJY YnnlG6VaQyjD6jRqq+zEB85G4zD9u1AvHgI9T+ZUC7gtB+t6wKnCsuMJeHcGXgSO3Zlh lqH/IgnH2KWgbYuKZwEcfpaG7qzwX//rBZz/iLb7D+4FRZgHajDkzSLdJ6nwR1kFayv4 RKIA== X-Forwarded-Encrypted: i=1; AJvYcCUoGwPi7N6m7qnamS/7cZMXE3bxVPh01OiMWDQQY59pYTR39KTv7r7TNaNqk+ruFJ5cfYi6Qt66rBqc7oy2xlgpN+UBmoQzLGjVSOXrrNbVChrTdSg= X-Gm-Message-State: AOJu0YwrS/N25u1q6r11jez1tnGlDHcukCrBHMHbRS7mkpaeM5vFSi/Q sJ8EgTCNYRIyVbh+FayH5V7HdTg6W/cyKc6yx4/OJcqWwxb8dxRKyk6ZPck009cFP5m4+F0sC2L k/QH24UVGca90F8Zu4KGERiNDXw== X-Google-Smtp-Source: AGHT+IGjXKYnowAl0A+gDIzd42aCq8JkZ+PEnaC8UoitJzLnXigFkbCRr4zVMgwW9T/SvrE5pwKJk83JUYctRFJ8200= X-Received: from sebkvm.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:cd5]) (user=sebastianene job=sendgmr) by 2002:a05:600c:1d1b:b0:418:d6ae:a3fc with SMTP id l27-20020a05600c1d1b00b00418d6aea3fcmr17191wms.2.1713457904328; Thu, 18 Apr 2024 09:31:44 -0700 (PDT) Date: Thu, 18 Apr 2024 16:30:23 +0000 In-Reply-To: <20240418163025.1193763-2-sebastianene@google.com> Mime-Version: 1.0 References: <20240418163025.1193763-2-sebastianene@google.com> X-Mailer: git-send-email 2.44.0.769.g3c40516874-goog Message-ID: <20240418163025.1193763-3-sebastianene@google.com> Subject: [PATCH 1/4] KVM: arm64: Trap FFA_VERSION host call in pKVM From: Sebastian Ene To: 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, 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-20240418_093148_099516_91920BD0 X-CRM114-Status: GOOD ( 16.43 ) 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 The pKVM hypervisor initializes with FF-A version 1.0. Keep the supported version inside the host structure and prevent the host drivers from overwriting the FF-A version with an increased version. Without trapping the call, the host drivers can negotiate a higher version number with TEE which can result in a different memory layout described during the memory sharing calls. Signed-off-by: Sebastian Ene --- arch/arm64/kvm/hyp/nvhe/ffa.c | 43 ++++++++++++++++++++++++++++++++--- 1 file changed, 40 insertions(+), 3 deletions(-) diff --git a/arch/arm64/kvm/hyp/nvhe/ffa.c b/arch/arm64/kvm/hyp/nvhe/ffa.c index 320f2eaa14a9..023712e8beeb 100644 --- a/arch/arm64/kvm/hyp/nvhe/ffa.c +++ b/arch/arm64/kvm/hyp/nvhe/ffa.c @@ -58,6 +58,7 @@ struct kvm_ffa_buffers { hyp_spinlock_t lock; void *tx; void *rx; + u32 ffa_version; }; /* @@ -640,6 +641,39 @@ static bool do_ffa_features(struct arm_smccc_res *res, return true; } +static void do_ffa_version(struct arm_smccc_res *res, + struct kvm_cpu_context *ctxt) +{ + DECLARE_REG(u32, ffa_req_version, ctxt, 1); + u32 current_version; + + hyp_spin_lock(&host_buffers.lock); + current_version = host_buffers.ffa_version; + if (FFA_MAJOR_VERSION(ffa_req_version) != FFA_MAJOR_VERSION(current_version)) { + res->a0 = FFA_RET_NOT_SUPPORTED; + goto unlock; + } + + /* + * If the client driver tries to downgrade the version, we need to ask + * first if TEE supports it. + */ + if (FFA_MINOR_VERSION(ffa_req_version) < FFA_MINOR_VERSION(current_version)) { + arm_smccc_1_1_smc(FFA_VERSION, ffa_req_version, 0, + 0, 0, 0, 0, 0, + res); + if (res->a0 == FFA_RET_NOT_SUPPORTED) + goto unlock; + + host_buffers.ffa_version = ffa_req_version; + goto unlock; + } + + res->a0 = current_version; +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 +720,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_VERSION: + do_ffa_version(&res, host_ctxt); + goto out_handled; } if (ffa_call_supported(func_id)) @@ -726,6 +763,8 @@ int hyp_ffa_init(void *pages) if (FFA_MAJOR_VERSION(res.a0) != 1) return -EOPNOTSUPP; + host_buffers.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; @@ -772,9 +811,7 @@ int hyp_ffa_init(void *pages) .rx = rx, }; - host_buffers = (struct kvm_ffa_buffers) { - .lock = __HYP_SPIN_LOCK_UNLOCKED, - }; + host_buffers.lock = __HYP_SPIN_LOCK_UNLOCKED; return 0; } From patchwork Thu Apr 18 16:30:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Ene X-Patchwork-Id: 13635104 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 46B77C04FF8 for ; Thu, 18 Apr 2024 16:32:10 +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: References:Mime-Version:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=wYHEiBdVHmiS7sokrn6tDyAdy8CqMtz/EOT94sxJKNI=; b=g+aAAuQjcAb5WaiReSkTgc1MbG 9LYjYbObGg/yPYd+G9T5Oq+wTB2eYS6cfv7YZkMW3fcBIB+wuD78glbTlR1AHr5cJYjiVA9xs6xYS XN+Kq/ThrVVM27YFFjjUISmKhhotGsT1nWITsT/m9l/SZgo0C0HUgSiIpyXwEyLp7wNgvZElQm3+k yKxyi0AnDhr73BU6GFndLpylj+LukZj9tq71aGnStp5otgUd2Jhshwof70Ksb59D8N3Kdne1NEvhm ylF8fg1LMT89Av/dHQ6olKIcmZ1/PSkNoJ5hNvSPh0OmFT1BEX/1tH84jmAzLwWweZcmtAYOQ6S+l ySIzI6og==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rxUg2-0000000316C-30g8; Thu, 18 Apr 2024 16:31:58 +0000 Received: from mail-yb1-xb4a.google.com ([2607:f8b0:4864:20::b4a]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rxUfs-0000000310b-09zK for linux-arm-kernel@lists.infradead.org; Thu, 18 Apr 2024 16:31:49 +0000 Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-dc743cc50a6so1588604276.2 for ; Thu, 18 Apr 2024 09:31:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1713457907; x=1714062707; darn=lists.infradead.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=8p9c64neWTEzUroG7YZesoYglVijCCcHGMdjez+sjDY=; b=Wk5WrQxJDfxXooEaxnSs4oJzhgoxCW9DWRZN9/14VxlzcykQM3FZ0wHA+lVSbHkbIx YFR0f55gQycxvg0puSHSLJlIpxKVLcShNGX5I6P+qiGG2O1nqaHh9QN9zYjKU4hGnmmz ey6Q0xHn87VfAJ43a+5vV5QSu/FsAbhU/9cponOTgCurV7DQzC/bX3h7srENwv2ypo6g oE2Rm8AObBPVfbAfkDyW1R70dRCeeOLKjWuxvMDEoOsfTOw2X5Zfr0E5YEtzcLYlFn2n 6F1omllSb2TJi86K/DVzrSJ+R+UfyQGzXkxbHZpaz4+DOxS7Ff+23j0EB1GAF41KnvTm fwpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713457907; x=1714062707; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=8p9c64neWTEzUroG7YZesoYglVijCCcHGMdjez+sjDY=; b=Qr7ZZaT0zAUYn2iI2RfNwW5hZECmRjSqUuE5uIEWG3pG0e52AZd7xzbkf44B3SrRRu oXdzWsJYG+gi8MFWbL1os9YsaDLiv4qHTgxRlExAZ66QNT8prbt+1uUyFdLZT4EQkAV0 rZf1WREIE0E3E9zyh4BRTvAbhjp4PlhN1waiJQ8ZOkL8YOrkMgqN2aqyMkLyPKSZsaEV XatjmR+D5Ac2qcfQ7blqeFtTwQhp+uApisXBK80E7sVsLWsesjj5aAwgaq3KzLa+Frqw kVBpWBvokvwtQR1WhLVFLt87w0hxX6cIoQWl1JhcMRSTDtQJdqKumUs3SWZN15YPkIme kTrA== X-Forwarded-Encrypted: i=1; AJvYcCXeQTVH7o8G20R7BMNgOvoW2ztQH2mTiUDRM1L2xroL41qMQsGyLEeDH7OznXY5eP63isci7x6cpG4OiJd6I+e5qEgphSIC20MXOQ2gevyk0Awhwi8= X-Gm-Message-State: AOJu0YzjRsP3ebCgntwfEihje5w44t7ZXeqtEMMqo4xvscaxV+GIPgWX uvoDnHubSpaTMS5TM29JV8eAHUOUPTGhoYsLZc9tfmHrzwRfWfbYNoEGqILjPB03G6Tk2fp1+PT E2qob3v6mFmcvhB9y0oHwKLaiSQ== X-Google-Smtp-Source: AGHT+IHpX3+77ZV25mCqXIANfzu2cm+jHFm8blOeRGiipeMLfzcogzWLO4ECeP8t8lYr9QlOgIVIHYowhRuQKDsITVs= X-Received: from sebkvm.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:cd5]) (user=sebastianene job=sendgmr) by 2002:a05:6902:2b8e:b0:dd9:1b94:edb5 with SMTP id fj14-20020a0569022b8e00b00dd91b94edb5mr293032ybb.10.1713457906943; Thu, 18 Apr 2024 09:31:46 -0700 (PDT) Date: Thu, 18 Apr 2024 16:30:24 +0000 In-Reply-To: <20240418163025.1193763-2-sebastianene@google.com> Mime-Version: 1.0 References: <20240418163025.1193763-2-sebastianene@google.com> X-Mailer: git-send-email 2.44.0.769.g3c40516874-goog Message-ID: <20240418163025.1193763-4-sebastianene@google.com> Subject: [PATCH 2/4] KVM: arm64: Add support for FFA_PARTITION_INFO_GET From: Sebastian Ene To: 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, 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-20240418_093148_123816_8F114D98 X-CRM114-Status: GOOD ( 14.39 ) 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 | 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); + 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) { + buf_sz = sz = res->a3; + if (sz > sizeof(struct ffa_partition_info)) + buf_sz = sizeof(struct ffa_partition_info); + } 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; @@ -723,6 +766,9 @@ bool kvm_host_ffa_handler(struct kvm_cpu_context *host_ctxt, u32 func_id) case FFA_VERSION: do_ffa_version(&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)) From patchwork Thu Apr 18 16:30:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Ene X-Patchwork-Id: 13635103 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 5C3C1C04FFE for ; Thu, 18 Apr 2024 16:32:09 +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: References:Mime-Version:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=Nl7+ym1HBwu0tzGpgzIsfQypIvKyXDdXght7F1mB6JQ=; b=Y/v+5JMQEYyhJxi8KcibxLtHCz sf195W4ss8hwM7HmYnZ3sgcuOsFLV5XKZylo9AbUIlgmOdqFo+5ekaHE/HqbeZxsBbbglurOngdxY uqnL49NQucvP+jnaIjCmO/NvkaYf41cwEyEDSDnKTnf3RkZHuBJPbnzXQL0Q3iC5P5BQ7DswgbsJs Cyv3mxAXgbTXSvSmGNQwaVi009fxCpNHToYyvQRQIbNeb4lryhrjoGvzHJ0u322jhN65YmcbGR2D+ vnEBDKGlliZV5kV0uDE0g2W6dIOevodvdp8pVHhJ3ERXrryV4IAvTp22x6V8wcxFFTsmmY/SPfVNm FgljLWsw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rxUg3-0000000316d-2AfT; Thu, 18 Apr 2024 16:31:59 +0000 Received: from mail-yb1-xb49.google.com ([2607:f8b0:4864:20::b49]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rxUfw-0000000311r-0Rnj for linux-arm-kernel@lists.infradead.org; Thu, 18 Apr 2024 16:31:53 +0000 Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-de462f1cf3dso2135803276.3 for ; Thu, 18 Apr 2024 09:31:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1713457909; x=1714062709; darn=lists.infradead.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=JYz/Mm7XL97gcC37XQSh6FT+KtzHg82q93nX3l947mY=; b=bpR5tddInGRYHMIaQSZc7ECw7h0b0To4gmVQMfG778l7eD+BIyDzaYlhNVZwI6uD4X DThUf9m16uwvHc8h+LNL6GJnC10TU8+Bpvw99/xvkDlWW9ArS3Z8ZDJOlyWrgKabOAnv 757qtCC5vp0QKeoSNvf9ZB/jXZsWlFEirjI5xeLqFC23ioFz5gk1SsFzGI7kJ+0D52At F4o8Hw+kbp1slYEYMbbz3d4Ni7LCesgc7bxDyD7xLmPZNnSUOa/9zEsxP7Q0toUa48CG gzqXhxr9lqeK7WsVlNLCTffLRxOW7sDFjqEBrbZgU25jC39oP0ok5duI1Ns2X78sUqW1 xQlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713457909; x=1714062709; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=JYz/Mm7XL97gcC37XQSh6FT+KtzHg82q93nX3l947mY=; b=N47XHH8Q47LtSgZxDrJde1so93+iYhyXhj9yem94rGoi9u5j0MPDQLY025pvxLkNOf AGcQXql1G90o0FoDLzidG0zU6zl5QxWvKuqfpdmcuZoOj2A+QhmLu4Vud0nryKjUoFeq mXVK+JDgNky+psSEklWfzA5TWwM9Tyd0+GfcFSJJaJhQXlQRrbVmFI9i7HD7bYHvGKFx JDS/Tsb0xTlujfQrnBMaOi4sizsAgt3OYnAxtPANwZYBV9l5Ns1A+Tw7EYPEd73rfgmC QH/L3coq0pkQePAs5mjdRb0T/TylXSKsnClAqvEWYQuRaVIINLrgbtvybKONZnUjKkgT Pz5A== X-Forwarded-Encrypted: i=1; AJvYcCV2CRXdhTifcRWQtvmLHNfpfM/307xF7DfpocKFXBo9j71sfDzdTq9hXSdXT1xVIhYVktsslxcQH1fzUNvMuq3hz8cn8D9OPpF1sVUXT0Wo4iYSlfE= X-Gm-Message-State: AOJu0Yy7sMqIdLsVI5Mgy3KFbvaaflE6CZs6sO/aV0wHN/eAROvZUlAI BZsv/l57t2nioUKnPU1Gb9rzn01NKEZvqhs+0whMXkVJU/Nyy5J3Pm1dV2KXBWD3cjQEt8+ZOvg Ox9QPFWyrdU40WzccdvG7ieiI1w== X-Google-Smtp-Source: AGHT+IGRr7uB8dyL1qZY2tNdLCo6bCgG9f2Ylok0Sq5MdDUUM2WXBpExMqrkM6rHCoVTKgjGEzcyP05psJEyfeFP8OM= X-Received: from sebkvm.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:cd5]) (user=sebastianene job=sendgmr) by 2002:a05:6902:2b08:b0:dda:c59c:3953 with SMTP id fi8-20020a0569022b0800b00ddac59c3953mr882660ybb.0.1713457909290; Thu, 18 Apr 2024 09:31:49 -0700 (PDT) Date: Thu, 18 Apr 2024 16:30:25 +0000 In-Reply-To: <20240418163025.1193763-2-sebastianene@google.com> Mime-Version: 1.0 References: <20240418163025.1193763-2-sebastianene@google.com> X-Mailer: git-send-email 2.44.0.769.g3c40516874-goog Message-ID: <20240418163025.1193763-5-sebastianene@google.com> Subject: [PATCH 3/4] KVM: arm64: Fix the identification range for the FF-A smcs From: Sebastian Ene To: 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, 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-20240418_093152_171484_43931AC9 X-CRM114-Status: GOOD ( 11.71 ) 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 The FF-A spec 1.2 reserves the following ranges for identifying FF-A calls: 0x84000060-0x840000FF: FF-A 32-bit calls 0xC4000060-0xC40000FF: FF-A 64-bit calls. Use the range identification according to the spec and allow calls that are currently out of the range(eg. FFA_MSG_SEND_DIRECT_REQ2) to be identified correctly. Signed-off-by: Sebastian Ene Acked-by: Will Deacon --- arch/arm64/kvm/hyp/include/nvhe/ffa.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/kvm/hyp/include/nvhe/ffa.h b/arch/arm64/kvm/hyp/include/nvhe/ffa.h index d9fd5e6c7d3c..146e0aebfa1c 100644 --- a/arch/arm64/kvm/hyp/include/nvhe/ffa.h +++ b/arch/arm64/kvm/hyp/include/nvhe/ffa.h @@ -9,7 +9,7 @@ #include #define FFA_MIN_FUNC_NUM 0x60 -#define FFA_MAX_FUNC_NUM 0x7F +#define FFA_MAX_FUNC_NUM 0xFF int hyp_ffa_init(void *pages); bool kvm_host_ffa_handler(struct kvm_cpu_context *host_ctxt, u32 func_id); From patchwork Thu Apr 18 16:30:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Ene X-Patchwork-Id: 13635105 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 B4338C4345F for ; Thu, 18 Apr 2024 16:32:12 +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: References:Mime-Version:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=GCKoqhSVCtwxU8nmzjl4yohU+uvdE1I0H7fgDzQo4R4=; b=1Cv+pZaZt1r0h4GQhwN2JG4hOY vgT0UAbJhid5udd3DNBKhxmWzIBpHFeCKmwE8Av0xZYiWCE99/1s0tUnG9+JMa90ADPp30IoxveJc HAfDJfpq7OvWYIRYeiNrp3ize5iolPG2LKrWYSOqIW02R5TYSn8YMo0Z3TIHYRafkWqvuoGKiy9a1 FqsaajI0HuxoPDd5PaaQl4/avAkPyOMMdTh4ieNC1POf/osNJpb4wPGkrFEo4dyGjpRIr3oBAo5oK uzpro5jV24Y2lNIvKeLE1V7XGG4NICa4I/fDlogMtI+3fw5O8pUFrWNnfyrPSxiy5uBbBZSKZw5u2 f1jM8KLg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rxUg4-0000000317c-2bUM; Thu, 18 Apr 2024 16:32:00 +0000 Received: from mail-yb1-xb4a.google.com ([2607:f8b0:4864:20::b4a]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rxUfx-0000000312U-0V64 for linux-arm-kernel@lists.infradead.org; Thu, 18 Apr 2024 16:31:55 +0000 Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-de45d8ec875so2148744276.3 for ; Thu, 18 Apr 2024 09:31:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1713457912; x=1714062712; darn=lists.infradead.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=o/WdHir/Mi2mSDEW62XszsH6Iho8VZ+3enjU3uPIcDs=; b=0QOOrZ2rUyHZH7P8uvXEKQzQq9rvps1J+l38rltE0lVmi7oTFUeHgDrczac+T9E2hD vq6qaUmXZ6sNqcdOTYxr+IKkJHOuBBjr0rsDfuAgO9f5cZgXReGtNQeNT6qwxNtSckMg NXWGQ07CYJEf5aWcNrnZxX/D6gdgN8jyK4RnxCnbzvOeaNPYZXRas36jv6GFQ2iDjh2a 5MlqSxdNK4ne3AKTDtwvw0scn9UHFpBEANKmeCZQu3sWn81FJOyFh9DAH0H+kYA06gld b2mGyVuGeVxZlt4JWl6QrJ3YN3xQ63XKPV04PKALueBB/az11dfQ4ANbnmWTsDWqKWP7 rjTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713457912; x=1714062712; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=o/WdHir/Mi2mSDEW62XszsH6Iho8VZ+3enjU3uPIcDs=; b=I4rreK7tlJIUYnAERPQdowdV841t7WJD7/rMFSIvoDtdwWT6Cpq08e62cT6ALkKfTJ BsXFzTyqd0FnybIxxfRUmxfqQ33VPEfNoReqv6CmLEOUB7kmBQPwdYS0c4qpJEKJHtEO yHDNlSKTvgW9bCQCD13qifaXlk4XT12eXculQ+tiKv29lzql6CVdOI40S0dwtI8yJaPC 5SCzVGiUzYb8oXxfdMyf4OvxYLlHU9FWqg4vwP/LRRJ/wPSdcr7k8ZT1RspS3wx2r+3k xe7MKj0HTsH2XbLZj06KHSzrOZdTwPoCk+zK9GxQAD+1omcqGM2co22jHQWRHoJ9jWdU i9QQ== X-Forwarded-Encrypted: i=1; AJvYcCXQF+ui+Van1PrPiw2t15PgRd8HYbOeFWFgpTQL9ECVk3foIIsxZcLUL3kUSvOrC0jNh7PPX04WQERgNnVcwLX08wxKouIM4K0Ol7/dfPvx7OXzyOk= X-Gm-Message-State: AOJu0Yys/QxX8DCRduAEk8WEmKiW4EvZeukSQd7sdhbKQhBYLMs7OPPp DaD8lQKmi5kKQ1JlMZ5+HL3duHtaMzyZjMShBkYvzNlkQHeK3MNRUpo8w65B5mXV2pJIIifq6Hl y/2epWI+QrGlLpcI9ABsQh6k3KA== X-Google-Smtp-Source: AGHT+IFU3gG7mhRXP799oGDxBlPxLgFLfF8KRo1VK5xtAu+Ns8G5jem0y2bESQeN8vefdLLSBSCfbA/Pv4M4UuLpEoo= X-Received: from sebkvm.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:cd5]) (user=sebastianene job=sendgmr) by 2002:a05:6902:2b8e:b0:dc6:cd85:bcd7 with SMTP id fj14-20020a0569022b8e00b00dc6cd85bcd7mr831056ybb.3.1713457911701; Thu, 18 Apr 2024 09:31:51 -0700 (PDT) Date: Thu, 18 Apr 2024 16:30:26 +0000 In-Reply-To: <20240418163025.1193763-2-sebastianene@google.com> Mime-Version: 1.0 References: <20240418163025.1193763-2-sebastianene@google.com> X-Mailer: git-send-email 2.44.0.769.g3c40516874-goog Message-ID: <20240418163025.1193763-6-sebastianene@google.com> Subject: [PATCH 4/4] KVM: arm64: Use FF-A 1.1 with pKVM From: Sebastian Ene To: 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, 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-20240418_093153_403914_10B1D366 X-CRM114-Status: GOOD ( 14.65 ) 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 Now that the layout of the structures is compatible with 1.1 it is time to probe the 1.1 version of the FF-A protocol inside the hypervisor. If the TEE doesn't support it, it should return the minimum supported version. Signed-off-by: Sebastian Ene --- arch/arm64/kvm/hyp/nvhe/ffa.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm64/kvm/hyp/nvhe/ffa.c b/arch/arm64/kvm/hyp/nvhe/ffa.c index d53f50c73acb..8633c8e0b09b 100644 --- a/arch/arm64/kvm/hyp/nvhe/ffa.c +++ b/arch/arm64/kvm/hyp/nvhe/ffa.c @@ -455,7 +455,7 @@ static __always_inline void do_ffa_mem_xfer(const u64 func_id, memcpy(buf, host_buffers.tx, fraglen); ep_mem_access = (void *)buf + - ffa_mem_desc_offset(buf, 0, FFA_VERSION_1_0); + ffa_mem_desc_offset(buf, 0, host_buffers.ffa_version); offset = ep_mem_access->composite_off; if (!offset || buf->ep_count != 1 || buf->sender_id != HOST_FFA_ID) { ret = FFA_RET_INVALID_PARAMETERS; @@ -534,7 +534,7 @@ static void do_ffa_mem_reclaim(struct arm_smccc_res *res, fraglen = res->a2; ep_mem_access = (void *)buf + - ffa_mem_desc_offset(buf, 0, FFA_VERSION_1_0); + ffa_mem_desc_offset(buf, 0, host_buffers.ffa_version); offset = ep_mem_access->composite_off; /* * We can trust the SPMD to get this right, but let's at least @@ -789,7 +789,7 @@ int hyp_ffa_init(void *pages) if (kvm_host_psci_config.smccc_version < ARM_SMCCC_VERSION_1_2) return 0; - arm_smccc_1_1_smc(FFA_VERSION, FFA_VERSION_1_0, 0, 0, 0, 0, 0, 0, &res); + arm_smccc_1_1_smc(FFA_VERSION, FFA_VERSION_1_1, 0, 0, 0, 0, 0, 0, &res); if (res.a0 == FFA_RET_NOT_SUPPORTED) return 0;