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 3D3DD436379 for ; Tue, 16 Jun 2026 10:54:32 +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=1781607275; cv=none; b=k9aqDd02Y+cmrf8pmODkI4JHyuHvOO51FunjLUQtLbKKKD4D+32nZ5iq8hf/oNporBGSUK4Y5ZeVeOu2RfAwiQ4Y93wSjFpp62W6SEZoqBwT78Ut7y/cIFrH3hh4oZHSumxQ6AmmRjsHcxk08D0MIf9v6/9Z2bWnD6Y84ZF76V0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781607275; c=relaxed/simple; bh=soqXRg7Xq6tEXhPI7rau7QKV1ExiKRib212yAMeripw=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=okXU23JS7d71cigZweUcR2sH3JxjFHU/75s/DUMuyURhnQ247VPP7HQsm6AoVEVLFIhtJwyWd1bvF22oU88qfUhWMWWxVLOuRfibrXML1uO9SvcXWDrdgpQoWcvpF0hpkbpUGqzt8TGtpqG5zoaXyH8AdDlTn4SY3H85JchKDhk= 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=RcU/XeYH; 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="RcU/XeYH" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-490aadb1386so27023105e9.0 for ; Tue, 16 Jun 2026 03:54:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1781607271; x=1782212071; 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=YDR37+e/e3c1wPMzPsYmqv2c5CPvU7koE8nHI68hmNM=; b=RcU/XeYHVuCKCT+dTGvXNq3/TXYjNghldJGJoQKeIN0UMN4QHTLk4QnhlBOgesHg2y 5f3OJ57DJt1w1TUCVYH2UTWDaHD8OBDJ1h2TOK/iniIo/jM7hTcl1uHSzTKIlEg2gtwc 4YUP8dCJcPH4ALd0dNWMWE7JfnjeFaI7f2jNj6qrlRum8+Tg/iXx5MGopTTSrc4Vpv6p D/S8D/erxOOHkXnJeN9PXNJtZdyj5fIhl50uAV68GStZz24e0NKrGgOJQ6sb8N2+LWWE +9IlozActgWoJAqoFZzhmAqAQEI/vC0+w/3qSsASfA9MW7cGnTeL35v76zP/Vzcg7R6i ZP+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781607271; x=1782212071; 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=YDR37+e/e3c1wPMzPsYmqv2c5CPvU7koE8nHI68hmNM=; b=kYKbSvXAIkfRRgfy99uSgBXe1r5EubE+J1dozFC0uPDfe6xZfBlnfBqOtPfIdbVgYt b/vl+BloBArCpgW1d8ptePQSm0jx5Sd+g8qNZIa/sur9W9y0UEuZkiIu3HJaBC6TTJKE RM/RSI7bgo3C9mpijz8GeBJosjutY1qLvF4JCIZgJtzb1esOKNhrHDIMfkc59vf+iMWW IPtkCERTrR4LdoNJaW3d/CIKH25ijDUqjp3spOGwpwOJkrcB3BM3N3ycfTbKtSHfb0Wo DZgGYAgA7MBTvSX+1nNau0MOk8/peT8udWz0WVq0HWBBVp9xXBTPd7jDerx5s0/RfR6f kZFw== X-Forwarded-Encrypted: i=1; AFNElJ+fTpepF8YODJbv58IEJvaq/69sMXsT+KDOrsakQvtUH80yvW70jRXZGpNQES84jEwvZtQBVGq7LrCKHbE=@vger.kernel.org X-Gm-Message-State: AOJu0YwDNhQnPrfTS2xJtm/mcoOZ3m9/PPy3VI5iPnFfnN4T7iGE/oXi 7mz4c/eeuS4ehWyBC7EXE8WUVrzoRqBFkJyPeTN/W3PrlSDRzjsLFgPisij54yFHfyqFNvP+sMS v00xpHToHRcLagKmgfNc+cTh4igNz7g== X-Received: from wmkg1.prod.google.com ([2002:a7b:c4c1:0:b0:490:d981:b3df]) (user=sebastianene job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:821a:b0:490:3cf0:8d81 with SMTP id 5b1f17b1804b1-4922faf12edmr43932515e9.13.1781607270458; Tue, 16 Jun 2026 03:54:30 -0700 (PDT) Date: Tue, 16 Jun 2026 10:54:13 +0000 In-Reply-To: <20260616105417.2578670-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: <20260616105417.2578670-1-sebastianene@google.com> X-Mailer: git-send-email 2.54.0.1136.gdb2ca164c4-goog Message-ID: <20260616105417.2578670-7-sebastianene@google.com> Subject: [PATCH v3 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 --- 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 3d8ed829f558..9ec9bc9a8622 100644 --- a/arch/arm64/kvm/hyp/nvhe/ffa.c +++ b/arch/arm64/kvm/hyp/nvhe/ffa.c @@ -715,7 +715,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: @@ -956,6 +955,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_SENDER_ENDP_MASK, endp_id) != HOST_FFA_ID) { + ffa_to_smccc_res(res, FFA_RET_INVALID_PARAMETERS); + return; + } + + args = (void *)&ctxt->regs.regs[0]; + arm_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; @@ -1021,6 +1041,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.54.0.1136.gdb2ca164c4-goog