From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 49132375AAD for ; Tue, 23 Jun 2026 11:54:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782215657; cv=none; b=PpzprcF+yEXasEZCg4g/nwGe7zomvSa+NTT55zKLEfNRnPj3Kzbub0rtJ7I/nPFuRl3Z1MT5U24B3ICW3o+GN/wIAsMxJKch5/TNQU/WNgcaY32NoAHjM2e+PxfjXgYZ+IHQj7Ve2yg0grCY6StNz39BX6gVu+jAUsc6F/+1LSo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782215657; c=relaxed/simple; bh=gBUuV2mlGdMKuSeayu20eiObPVeJvZ100LSrcjuMx1Q=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=odmLJJZxO5W6peKAT9F6lmTO1G6WfpU+GGQ3mWHf7UGHUHfgRZA+juahvK75ZBnetNISnSHkngG4rYY36iXgzy4w4mi5fHH1+EDB75FZC3XyAQZr7iCVrkpRq1OxLtBeBBE+Kw6AdwFKFYgTsoKadIUk+u9ityo5hIwlPIuHJjI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--sebastianene.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=jrO8FOhz; arc=none smtp.client-ip=209.85.128.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--sebastianene.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="jrO8FOhz" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-492488f8583so31357765e9.2 for ; Tue, 23 Jun 2026 04:54:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1782215655; x=1782820455; darn=vger.kernel.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=8rDVjRX05LswWm3CoIhO4tKCfKLIFEXEGSybtuh+IOM=; b=jrO8FOhzoGC6ZLqMufcFwilI+92JGbYmKV1HjviwUTTG6q5LwCebqnyWbwlrhLssHs zG9eRwbqoButkLmHk+UefBShgdCRpaHBFP9ALwDMuof86w3Gn7908g0XH4wubJy065Yu iqDdtg8ZlurQUuekqH8vNdqY/xxG2W9xVd4iCj51Z4nABXd3cpq+/M34REhg/IfvAaT7 8jBW/xAqDS0XZp71WfNq15MXS6003n+z6Nugauyko06PN1xX1G49yApY6jZhqsAI0WkA 3kEuqOhi4f6kQzfNOqesfY9XGTysRHn4DEZGh3KTmc7ZUR8PxtwSQKyHaOOPK3GuNB8A vrmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782215655; x=1782820455; 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=8rDVjRX05LswWm3CoIhO4tKCfKLIFEXEGSybtuh+IOM=; b=V8bnTPo1Sb/Abc51jyEF3PqRdDCniHlCTKAuTiRKwe2/qHf+k45lbh/E4JeGNxXh5/ Q09pwjGb2k73RSD3n6EyOOB/9hXhY7FNd+9i696InU5C9MKVW8zktGc9oFuvaQ9WkDxx uGEA1gr9xsAZFRP8V7mgvDSMoOWbJrBOzIxqB//C417PHgO1NUZwS3w7j53gAjVnq/M0 SkM1QxWl3xSuBDmx6h4LpmAqKFvtqIbLri+F1yecmPFxRP3xmDoRxyf8x/z0dL4l9itz 5rRyN8uqZtKvj/ElmmMNHg/xtQKQ2t2cek6NSmsHlOPiWQxEgw/vPPJlcjCEDkDd7oUU OAzw== X-Forwarded-Encrypted: i=1; AFNElJ/ehK5s5YbCz1sMqbqAroqj/uPZVFEPjymxR74VAaw+dCagI4Q1LrQBx7qCiU/UkkCgDHwpRzMrhI8dc+o=@vger.kernel.org X-Gm-Message-State: AOJu0YyN8BdeDBQoHIus1xcJ0kNVnWlh2is+gPs8mA3+hWWLV4jRqg4A WGuBaX/gbYJJ5VXWGqTRU4jw3dVS9F73ngjBGS7t/ryFKPPQ4rr8roiHkwU/sJ34JU08QBucEUY IMS4ZZASDkN/kHRPXyfssxf5Sozia0w== X-Received: from wrus3.prod.google.com ([2002:a5d:6a83:0:b0:462:fc9c:4a7a]) (user=sebastianene job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:3acb:b0:490:44eb:c1dd with SMTP id 5b1f17b1804b1-4925b38682emr29908865e9.29.1782215654493; Tue, 23 Jun 2026 04:54:14 -0700 (PDT) Date: Tue, 23 Jun 2026 11:53:51 +0000 In-Reply-To: <20260623115354.632361-1-sebastianene@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260623115354.632361-1-sebastianene@google.com> X-Mailer: git-send-email 2.55.0.rc0.786.g65d90a0328-goog Message-ID: <20260623115354.632361-5-sebastianene@google.com> Subject: [PATCH v5 4/7] KVM: arm64: Support FFA_NOTIFICATION_UNBIND in host handler From: Sebastian Ene To: catalin.marinas@arm.com, maz@kernel.org, oupton@kernel.org, will@kernel.org Cc: joey.gouly@arm.com, korneld@google.com, kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, android-kvm@google.com, mrigendra.chaubey@gmail.com, perlarsen@google.com, sebastianene@google.com, suzuki.poulose@arm.com, vdonnefort@google.com, yuzenghui@huawei.com Content-Type: text/plain; charset="UTF-8" Verify the arguments of the FF-A notification unbind call and forward the message to Trustzone. Signed-off-by: Sebastian Ene Reviewed-by: Vincent Donnefort --- arch/arm64/kvm/hyp/nvhe/ffa.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kvm/hyp/nvhe/ffa.c b/arch/arm64/kvm/hyp/nvhe/ffa.c index c7910ee4000d..4b9e2b6b7143 100644 --- a/arch/arm64/kvm/hyp/nvhe/ffa.c +++ b/arch/arm64/kvm/hyp/nvhe/ffa.c @@ -717,7 +717,6 @@ static bool ffa_call_supported(u64 func_id) case FFA_MEM_DONATE: case FFA_MEM_RETRIEVE_REQ: /* Optional notification interfaces added in FF-A 1.1 */ - case FFA_NOTIFICATION_UNBIND: case FFA_NOTIFICATION_SET: case FFA_NOTIFICATION_GET: case FFA_NOTIFICATION_INFO_GET: @@ -957,6 +956,27 @@ static void do_ffa_notif_bind(struct arm_smccc_1_2_regs *res, hyp_smccc_1_2_smc(args, res); } +static void do_ffa_notif_unbind(struct arm_smccc_1_2_regs *res, + struct kvm_cpu_context *ctxt) +{ + DECLARE_REG(u32, endp_id, ctxt, 1); + DECLARE_REG(u32, reserved, ctxt, 2); + struct arm_smccc_1_2_regs *args; + + if (ffa_check_unused_args_sbz(ctxt, 5) || reserved) { + ffa_to_smccc_res(res, FFA_RET_INVALID_PARAMETERS); + return; + } + + if (FIELD_GET(FFA_NOTIF_RECEIVER_ENDP_MASK, endp_id) != HOST_FFA_ID) { + ffa_to_smccc_res(res, FFA_RET_INVALID_PARAMETERS); + return; + } + + args = (void *)&ctxt->regs.regs[0]; + hyp_smccc_1_2_smc(args, res); +} + bool kvm_host_ffa_handler(struct kvm_cpu_context *host_ctxt, u32 func_id) { struct arm_smccc_1_2_regs res; @@ -1027,6 +1047,9 @@ bool kvm_host_ffa_handler(struct kvm_cpu_context *host_ctxt, u32 func_id) case FFA_NOTIFICATION_BIND: do_ffa_notif_bind(&res, host_ctxt); goto out_handled; + case FFA_NOTIFICATION_UNBIND: + do_ffa_notif_unbind(&res, host_ctxt); + goto out_handled; } if (ffa_call_supported(func_id)) -- 2.55.0.rc0.786.g65d90a0328-goog