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 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: , 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 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; } -- 2.44.0.769.g3c40516874-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel