From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f73.google.com (mail-wr1-f73.google.com [209.85.221.73]) (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 5167D3D5259 for ; Tue, 23 Jun 2026 11:54:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.73 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782215662; cv=none; b=WqHY4MSJ1AQOkr48UP4TNO6sMa+Yo+5V46O2eYNLH32qF1sVZyGozp55Bu3g+r44O9yCFZ9fxvAjBbtr9qbox1wvQTBQh6L3avGM4GLAeShQxIz/8O2OmFWV8Fs7U1/hmiVMiaYYqCzP/iLxoxnsHyy6be8Lg3XU4LIhnSfrETA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782215662; c=relaxed/simple; bh=d84murYs4PPbnQ3O8oPYOzZyYgNqic239iULT8jIX4g=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Ax7tB3UEdwWWBcqBzbR8KERzgya+7BrdBaUopxbDoq960wzoTFzKS88m1VFbwlRjqOHWHsQtCyX4AuIvSE6cExc/cU5T2ig20m0FFfU2pXtnBmBXi769Ixg5T5GNEM9IvC+5C/pKP7dZv8+8KemN/XmeZHX+p52IxS0dahD8GxQ= 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=RfKBMJxk; arc=none smtp.client-ip=209.85.221.73 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="RfKBMJxk" Received: by mail-wr1-f73.google.com with SMTP id ffacd0b85a97d-461a5d02540so3829533f8f.3 for ; Tue, 23 Jun 2026 04:54:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1782215657; x=1782820457; 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=SGR+TN4xuVGCrc6fFlK/aC8+eZFM94myNXts5JflryA=; b=RfKBMJxkYBDuPa0IGKO1uEvxs6YAFVYGPGOsCbphQjFJNcCkL9cyExEl+obHjyJ9EG 0qCjjxhfKGSvCPDjLhM9C19aBPWME/4JAwWsNR6fI7xqUXQmpk+AEtDSGvyxy4dfpv8n tWo9JmDduzuLTOhjy0vkkjHyPO2YyCQqkIlyYB0n9mOwxOrYyEOzJnRrlCQXWgnpZvEx g94MUX8dr7y80mZfKM+mTUIzI1TPEy0wYDd6T4w40I0WMByjYtDYlwfG/DjvbYGfjr9n 5TuTuXYFMpAl9uWdMIgGgMA5oyDFxr/vjHKhNyOABi/UFUKiv9Xeje/qqZIQV0aFDNzg X0Tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782215657; x=1782820457; 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=SGR+TN4xuVGCrc6fFlK/aC8+eZFM94myNXts5JflryA=; b=tW2vQ2FeLS5NOepDos8QE6jWzUmB79E+KSKjvaEyUicb5j/qxxwlSUhidg+QNayQno Fp0LHygXgd5rjPaTWcW81cBaUDcWUdTDdx/zydNY+okqpIfkTO85oOYn4KX3RjD41UQj Tb4ywNBbyYc4IOb4QyjSJ8CsqBVwSpQ3EzSvUx0v6dnQRx8DjGLRmvDrmaijwvX9UHX1 Si5Yh26iz0EmQkAr3utnqSiJHLeKeE4BOrWFcryvg3ShFTFW4rxUuRugLeKtCFdeal5P huHdKaqn40ej17OlAK3NOiVe4APlB1cloV7vHy81Ln/8UeWYok+JaQkZHBjc96eSkJfB u7WQ== X-Forwarded-Encrypted: i=1; AHgh+RrYEeaA2mkDLKu+Ww7eAmQBxK8jXcC3xBIO5i/sBEkaQKdbDq4zPLYByqkR5T5VqCFg5EXdPcOQtwPEr3U=@vger.kernel.org X-Gm-Message-State: AOJu0YziIeLhEjcEhkr9AIq33STfDcuOGc1P1riQ54u+karyLyobhORH MnqY2DQRjHNat500KdpnAylAK5ghNCRTAQCp2YtKOg18PBRqftTwpeBPdKve7suN52ifGPgaBqA +ZRXthIO2eV7FX7XkD1EMvFbdYu3LJw== X-Received: from wrsx9.prod.google.com ([2002:adf:ffc9:0:b0:449:2f8e:2b32]) (user=sebastianene job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6000:1448:b0:45e:ea65:d329 with SMTP id ffacd0b85a97d-46506385549mr31804863f8f.7.1782215656453; Tue, 23 Jun 2026 04:54:16 -0700 (PDT) Date: Tue, 23 Jun 2026 11:53:52 +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-6-sebastianene@google.com> Subject: [PATCH v5 5/7] KVM: arm64: Support FFA_NOTIFICATION_SET 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" Allow FF-A notification SET messages to be proxied from the pKVM hypervisor to Trustzone and enforce MBZ/SBZ fields. Signed-off-by: Sebastian Ene Reviewed-by: Vincent Donnefort --- arch/arm64/kvm/hyp/nvhe/ffa.c | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kvm/hyp/nvhe/ffa.c b/arch/arm64/kvm/hyp/nvhe/ffa.c index 4b9e2b6b7143..b30dfc192d09 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, @@ -717,7 +718,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 */ @@ -977,6 +977,32 @@ 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 (ffa_check_unused_args_sbz(ctxt, 5)) { + 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; @@ -1050,6 +1076,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.rc0.786.g65d90a0328-goog