From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) (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 E1D1147D94F for ; Wed, 29 Jul 2026 12:13:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.71 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785327223; cv=none; b=AzE+p7EShCcUPs8yapOPVGVRy3fX9Ypd8MTyQ2dQ96I6qCVrO/1JCha0NjKKTt0S9xIAd8baqV7XuxswIwhGjEWNf2imCQhYUAhGgmQYRJMdi5R69AMOSGImoPtnmGzHvDY98IVqQNKyNHTotf1vU+CHI4r2HnLjqIhZgPHzkAM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785327223; c=relaxed/simple; bh=be7b4ayvc+IDNiL8+f5NlNB1D6htnnrFNYow4uOvTs4=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=LoS3vBuh+7PnvR5l7EMbltSFvLcSu5cJsOusAgy9sDbW29Y65GG73HI2/qPdQ4NY4wpEb+Y8RV67ug3hI7vr2icX862BttJ+AIEw/fwWG17WOQcVxFGP7WmgGHoYX3Y0MJsSnGW80eC9FqAu+dpJM7nKVw1B37D7TAyIsLY5k+8= 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=AZC2SRFw; arc=none smtp.client-ip=209.85.218.71 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="AZC2SRFw" Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-c1f74261f67so119578966b.2 for ; Wed, 29 Jul 2026 05:13:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1785327220; x=1785932020; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=bVYKMhOgYVvCC+zk5/t2FdOwyXguvLtb1E7ngjK3egQ=; b=AZC2SRFwpNmlud7c8FnN6xVPHfas2YAie6ZRx93ELI5xaxKaxok6oYEQYsfxvmBmaL H+ozbLSQeTxGCmvQpm6ARjFTA1XAy71hVhtoTgYuhrjAJyDMT2fpAr8gRuIyCN95fh7q 1Cra+x5CHB2DttcIF9GN36nQ/wUSy0zWxGNaRCEAaD2OgcQOAtYIT9tUWUAtfmYvdMbl sYpYmYbZ9xKFPEn8oaYAhD/0uDcxIwsIHr/HkJA1LBKe8G9tyLGa174m1o9fuHOk3AIS aMSx/e28+q7lL0kObRdAYjV+IkkhnebDl2Q6ajqaCLSeWQoukuHj2TF8mfcCPakA/vPd Ueyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785327220; x=1785932020; h=content-type: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:content-type; bh=bVYKMhOgYVvCC+zk5/t2FdOwyXguvLtb1E7ngjK3egQ=; b=oVEqCunrUe1Asce/9gogL7Pyane3o/r33IsTg5F6WMwmrAKuGaFUVaFNRwyJ7JsVIX BHCfgfvU12o0zno+jYu/JERlD9rdBXmyTxDJZoWBLD+u56v2lF+/MuIBrtG+3Q9m0O8r XV+YJCdbwV/50cnE1etPsiYsOmVKLimNYE99OOk0KYHxwgCBBg9O2IQp8h0BDNXTU6vs S9BC0NPkI2LRO6A4Vxr8CM8p1UFvvQWb44f0GJex/A3JSio65dzhIn3AZVFckA3KAARP +roKHuZlUKaqMXlXQcy7gCPdRhdhclfRlSMHRF3x3kvFFvSUxovuTPAcC8yyHfuKbe8U Mulg== X-Forwarded-Encrypted: i=1; AHgh+Rq0pWUukGselQWjL44v6cB3lUZ/pgtOKzijyRniPdhXTFthvMGdA4rzXObPQNj7t8CqBaKFdXMryNo5ykM=@vger.kernel.org X-Gm-Message-State: AOJu0YycIVM231hjYnQTG/bGIzOhHjvVus02rg4W0kRt96RTedl/Rszm 5sqFbHYcQ0abymCbkQLC858zLPpL9oYOd2pNtICeD1Mq7IyHdMiRigeNuG2YoWhn5bWjzkn1WzO NHCQP3qCpWjh4bunKWsaLn02o/giwvA== X-Received: from ejckk19.prod.google.com ([2002:a17:907:7673:b0:c12:533f:6b88]) (user=sebastianene job=prod-delivery.src-stubby-dispatcher) by 2002:a17:907:c80e:b0:c12:34ed:da14 with SMTP id a640c23a62f3a-c1f72504745mr341409866b.64.1785327220002; Wed, 29 Jul 2026 05:13:40 -0700 (PDT) Date: Wed, 29 Jul 2026 12:13:04 +0000 In-Reply-To: <20260729121306.1519473-2-sebastianene@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260729121306.1519473-2-sebastianene@google.com> X-Mailer: git-send-email 2.55.0.487.gaf234c4eb3-goog Message-ID: <20260729121306.1519473-6-sebastianene@google.com> Subject: [PATCH v8 4/7] KVM: arm64: Support FFA_NOTIFICATION_SET in host handler From: Sebastian Ene To: catalin.marinas@arm.com, maz@kernel.org, oupton@kernel.org, fuad.tabba@linux.dev, 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" Allow FF-A notification SET messages to be proxied from the pKVM hypervisor to Trustzone and verify the arguments. Reviewed-by: Vincent Donnefort Signed-off-by: Sebastian Ene --- arch/arm64/kvm/hyp/nvhe/ffa.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kvm/hyp/nvhe/ffa.c b/arch/arm64/kvm/hyp/nvhe/ffa.c index d52d7c4d5e7f..2bb16aa414f9 100644 --- a/arch/arm64/kvm/hyp/nvhe/ffa.c +++ b/arch/arm64/kvm/hyp/nvhe/ffa.c @@ -43,6 +43,7 @@ #define HOST_FFA_ID 0 #define FFA_NOTIF_RECEIVER_ENDP_MASK GENMASK(15, 0) +#define FFA_NOTIF_SENDER_ENDP_MASK GENMASK(31, 16) /* * A buffer to hold the maximum descriptor size we can see from the host, @@ -678,7 +679,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_SET: case FFA_NOTIFICATION_GET: case FFA_NOTIFICATION_INFO_GET: /* Optional interfaces added in FF-A 1.2 */ @@ -917,6 +917,27 @@ static void do_ffa_notif_unbind(struct arm_smccc_1_2_regs *res, hyp_smccc_1_2_smc(args, res); } +static void do_ffa_notif_set(struct arm_smccc_1_2_regs *res, + struct kvm_cpu_context *ctxt) +{ + DECLARE_REG(u32, endp_id, ctxt, 1); + DECLARE_REG(u32, flags, ctxt, 2); + struct arm_smccc_1_2_regs *args; + + if (FIELD_GET(FFA_NOTIF_SENDER_ENDP_MASK, endp_id) != HOST_FFA_ID) { + ffa_to_smccc_res(res, FFA_RET_INVALID_PARAMETERS); + return; + } + + if (flags & GENMASK(15, 2)) { + 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; @@ -985,6 +1006,9 @@ bool kvm_host_ffa_handler(struct kvm_cpu_context *host_ctxt, u32 func_id) case FFA_NOTIFICATION_UNBIND: do_ffa_notif_unbind(&res, host_ctxt); goto out_handled; + case FFA_NOTIFICATION_SET: + do_ffa_notif_set(&res, host_ctxt); + goto out_handled; } if (ffa_call_supported(func_id)) -- 2.55.0.487.gaf234c4eb3-goog