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 4EC6B3FC5D1 for ; Mon, 29 Jun 2026 09:36:15 +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=1782725778; cv=none; b=e3i3Nwm/GCChiOhZTDt29kXyQJ90PEhaoQBMr7eGrQb/wAjgOK+ihRD2FpeYkxL4/xg+iUNht63x3R4ZasKobxLT4JLp1WqkrBIJ8XtjwJg/J3lGPHrtAutbToOj4NWgrmz1FQU5Df1rANZiSRNa8fy8xq69imJ7y/lf/AtUoiY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782725778; c=relaxed/simple; bh=tKYP+GZEflyKSlmPC4K0hHDZmwBpOjHjHt0haihLqJ0=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=I80rsy8CGsYV++1qwJA7Wnax/RhM/rtL6vO0W4vM/NvDXWbt7ZxCX7u6njgClzrwxpTzIq9UZKJcYrx7duDM5zD9sZF33C/3NuorrYwaQXxmQnytk1Bl1CxNK7sB4LYk1C3gEVh7ntKy8B9I9wXAjfi5kB/ZylRampJubtbR8u4= 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=l4058Hzw; 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="l4058Hzw" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-493b0fe95b6so4292915e9.1 for ; Mon, 29 Jun 2026 02:36:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1782725773; x=1783330573; 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=+Nwcle4m1xhjtWQ5cG6kqMRZxeBIvD7DoAMnMMXwmNs=; b=l4058HzwcoUl9luZdeqRv4aa2zsKKIFUalPwx++EO/H9e49+cNdUAt3AJpfy+vZUmk CyiCOX7GcFN36VBLKvDRfZGVfwhIMe+0q1UE0ZRw6cpaAxWZK4OabwoV3VRTwvh4gwkl rDIPA5op0i8g8Sj2yEAxvyDed9HifvGgmCT9CISz4N3RFAXkg3kP064c6r3Spje6ozPr d5FkoRdwbP+DE42G6hkCH1d5vdLPhj1py77vhPe2n4Ao66oWqG5RS9yeU6ywCqp0rGtk juk4Yrj0rhqfJx2goAzHTxNyadelBcpYUxf4I6gCwpOIPk8wqMq4B6AkPnLcymj6B3Pv kPRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782725773; x=1783330573; 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=+Nwcle4m1xhjtWQ5cG6kqMRZxeBIvD7DoAMnMMXwmNs=; b=Y9Og1vs+g4+mtQol6fKt3QF8ku7DTa81n5VRbiuBfitd+RdDFypk4E/EnQfWfySZLY U4id+g/q2XkzMbM5FRPtEQVsvWsWUV8BdnqISC1FRC/f2XfJpISe4wRVy6v0p1YntFgR nAUsqe+keiMkqrZJPBFY0uBXkTGaiqekR3o3KXcPNpEj+jTY4vxHGryEYlEV4lLYIB4r zOqcAuNM7Kan1aDSs2hmVMgQdK7x//puIHnq75iZ6HWeLZSKd5QDPfwNP9eIdh4guHre pzbkFlsbomcvbfEWL8aSKeifzZ36xTwYRK1344kE3q4wC8owhpVgaM5GKDkw+FEtu/JX 8+Vg== X-Forwarded-Encrypted: i=1; AFNElJ/8cbpZqggHBlxXD1jPELLQN1RnkU1BWEG4guyJYFfsll5iUEtXsQobnNZxhY8v0br2dOdPyAtIJ4kkgEM=@vger.kernel.org X-Gm-Message-State: AOJu0YxPfYIxB8Lz7Lv236lOwVabHw6i2y1ADb+D4zJtoo82Llv+zgY2 g0eM5vNkZX4e5iFcBjcrol39oUQRGTWubf9WPw9IlXmk18QwxJp7a4c2fYHQiqjbyD797AR4aRe +XndLCBBjbHnTX7OtkNQroT385zsiDQ== X-Received: from wmnk7.prod.google.com ([2002:a05:600c:1687:b0:493:b0fe:519e]) (user=sebastianene job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:1554:b0:493:b307:6777 with SMTP id 5b1f17b1804b1-493b307689dmr19016065e9.22.1782725773023; Mon, 29 Jun 2026 02:36:13 -0700 (PDT) Date: Mon, 29 Jun 2026 09:35:54 +0000 In-Reply-To: <20260629093558.2425257-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: <20260629093558.2425257-1-sebastianene@google.com> X-Mailer: git-send-email 2.55.0.rc0.799.gd6f94ed593-goog Message-ID: <20260629093558.2425257-4-sebastianene@google.com> Subject: [PATCH v7 3/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 331d9d0d8287..d52d7c4d5e7f 100644 --- a/arch/arm64/kvm/hyp/nvhe/ffa.c +++ b/arch/arm64/kvm/hyp/nvhe/ffa.c @@ -678,7 +678,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: @@ -897,6 +896,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 (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; @@ -962,6 +982,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.799.gd6f94ed593-goog