From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f74.google.com (mail-wr1-f74.google.com [209.85.221.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 9B34A3D8133 for ; Mon, 8 Jun 2026 16:56:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780937764; cv=none; b=sFkeGEb00IM2rY4U830pFBzpgB+Nu0qbbTtfAiIXmQjIk5tl9IWziS4/UsZs9+PdPx8gNXxghJ5mb/PprSVQS1aBMRG8jEOsoCyztW/5tqnaAcs8i0/ce5GK/ggok8Tn17hVgbiCTF98ObV593OxTrFoooEV/rJ3Q329pl/qft8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780937764; c=relaxed/simple; bh=yyMo/IUPF6pLA2eoZ9AGkDfP9o0FQsa5VxDHxpU7Xgw=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=ASCqTEdiVyKCATI+cJe6U7qZ62FqXMDWyQUhgFUanJBvhW6jBbaUFr4IIyewl9xYgL9c61MDEx7flc5UVqOeWGstiKPx9rFb6cRtU1nEk+U9qmzB2LM+wEw8N3mnJlvB66LvxFRCq35hjmejjywm+HAAnMqLpxgkOGGjQCjWt0Q= 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=jSTEwo6b; arc=none smtp.client-ip=209.85.221.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="jSTEwo6b" Received: by mail-wr1-f74.google.com with SMTP id ffacd0b85a97d-45ef63d1214so2970720f8f.3 for ; Mon, 08 Jun 2026 09:56:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780937760; x=1781542560; 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=2857N0FYewLMeBt8Nj5klxJIE+MPtxOFSZN9bVePZ7w=; b=jSTEwo6b9niEkwDOyg62Bsy5Vteby4VPNfUTMH6FPhPmkgL5QH4h4jka3pgSCuibhj e9CxSxJPJz9yk0IuXdMO1Z7jfsa06qixHGDehQFvaPox/eCOfD+tCv101YqD3IvtWzvC Gy57RkIYz4+cjKRFH0Hq3LoVDG437yJYFPN8eh72tKOqr1nQgaWvaTA7UwY+dorVCveJ sT9q+nQFdTXQKm7wzcfDjGepaXCLFt4OcYTKBeHceXyYVd4i75dbKNDMeM+i8TPz6tg5 eMOyVDQ6P0jUKRiOJZYC5FUzJ6lAPpWno9uk+wYEEhl9/Aheau1xfmqJFcouTfyhPD+m PZ5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780937760; x=1781542560; 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=2857N0FYewLMeBt8Nj5klxJIE+MPtxOFSZN9bVePZ7w=; b=EcqFhHdDfsgMx7xJETdBwsEB8S25Xf2dTnPMiEwIxdAcdBndZjxtL3RXWVXXnLRXjb rS1nw1vsZQVHu4AVjaWX4rd78+KoXXs5T+ptjy2mJlU4qIucZjRK6SiFcz75yjMHiWci BHzIynxBUNX230yaxfv9rogao/Ku0WyO/BLKUg31JM0G95gNn8xJhSQ5kK1Zp0hvKNpT 3FiW28UFHi5Mi6/wic3n06d4U+qtEOcve59KjjsdixjdCmkgEd0tprHtXR4eQdpRbSBs RSU1Sn36Hp8n/o2qClrnsm1eWld1eaQcjGKmRiA65FkeKZFgQf5SSyEt2dg5q6PDfCXD RZEw== X-Forwarded-Encrypted: i=1; AFNElJ8eZg6BWv/YsSlICoCL64dg1i8qYQ2S2wsLaadNfxBrGdvCbqzZLPsV5aqRvvY2bRFi1rs46uOObt111v0=@vger.kernel.org X-Gm-Message-State: AOJu0YyeLEWm9MEVV5K90iZHmCTDpujdUjQ2AA+KxaxvUIGjYIS8mYY9 2TVPov5pjUsYk3Wwrqmquw8HczTJ0tRz6qehQCcvycBTXqe74SXFxe/3d8B2MK9HkW998adk4Ad N4C94BhXbSFdkDVaApp2y9MKSRjtvmg== X-Received: from wmqi7.prod.google.com ([2002:a05:600c:3547:b0:490:5e18:ff1c]) (user=sebastianene job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:34d2:b0:490:bbc4:76a6 with SMTP id 5b1f17b1804b1-490c25eea30mr291402965e9.21.1780937759935; Mon, 08 Jun 2026 09:55:59 -0700 (PDT) Date: Mon, 8 Jun 2026 16:55:46 +0000 In-Reply-To: <20260608165549.1479409-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: <20260608165549.1479409-1-sebastianene@google.com> X-Mailer: git-send-email 2.54.0.1064.gd145956f57-goog Message-ID: <20260608165549.1479409-5-sebastianene@google.com> Subject: [PATCH v2 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 eedb01955a45..ca285e89516e 100644 --- a/arch/arm64/kvm/hyp/nvhe/ffa.c +++ b/arch/arm64/kvm/hyp/nvhe/ffa.c @@ -690,7 +690,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: @@ -939,6 +938,27 @@ static void do_ffa_notif_bind(struct arm_smccc_1_2_regs *res, arm_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; @@ -1006,6 +1026,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.1064.gd145956f57-goog