From nobody Wed Dec 17 10:46:18 2025 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.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 7957C199384 for ; Tue, 18 Mar 2025 16:25:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742315135; cv=none; b=p2606kmSKVzQKpOuZM+a8tRA7g4i32qWZjkZal0gKg4F80lXB02Z/BOCR0zR6Yexnrsa0nhab4WFrdVlI2JRePv2Ons4rE6/8IEf1xGzBoxGcBBPHyvvxREGAtyenqEWz24bysSLTdkjW2NcTuJQvX6tlb/SvCtOCdCptS6Ru/4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742315135; c=relaxed/simple; bh=J1w3wfRE32zhiryslT+guZ7VzCeopgfRWQrYjFcSKwk=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=D+yaPSmYCgH26eApcaBJz8mQSqtg3fFQyk6lokqFK5PH1r1p3cNd39RBXMihFd3ABFY/EtkJi32AzVFUL46Uh8tHawhupj2buAfGRBQqWTyvYORccqseKNXRVJZQup39rRFSE4qxo6Gl4f4tqF2E2Sp413JrRqG2+r61fDdI+Ic= 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=Qs362Fmr; arc=none smtp.client-ip=209.85.128.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="Qs362Fmr" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-43cec217977so24352135e9.0 for ; Tue, 18 Mar 2025 09:25:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1742315132; x=1742919932; 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=82xqydvgKJEdTD6AS9zEoISi5ga6dIOMUMPwBL0TAWM=; b=Qs362Fmrxh3Y6otIfhglQn1VA6JhLyskwpBOrEH9C4LYlKA5FK4o11KdtjY6j8bCld do0Osc1vqHOTRsq4uWYEXxKUOzI5lx+Z/sger6/8ZtAwXEE5UHXEMOQ4VWOdARkL1Bov OYymnNipXNoHysYv/Fafi5yKTCuV0BYjrJlYhC6ZNW5BcaQ0UIJKeS6AbfVuP8+zh09f AQqbBYl0udDKgneeW1Tcp3exGiACNRoSp+3KEyQchn/8pK2oAd6wad9nzNdd4luIDUgb oJLrUdcyqQqJvMYDt95ZaKf61kITUUv/xS33kW7MlAVbpaV8xHa2haO9h6oVngKHbCq7 TeIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742315132; x=1742919932; 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=82xqydvgKJEdTD6AS9zEoISi5ga6dIOMUMPwBL0TAWM=; b=kWGoaj9eiputiO6nXM6dfURkVG0gwa903y8jwRi2YVLeidzNh6+rORMuKkPjnkqKts 7v+uR/7NCawJdS7L4+00z2SCIpiqacuWe53lu6MvDbwMl9OVHxK/gsZsyu9pD7/mLYc0 NDF98MFKW5HCAccK2llZc6fOK1H+5ObQBAWwrqim4qhf9LRmK6k/JHNH44BHnsEF4qQk KmNqB66qxJuslSdY9Ynaxm8FE0krOazBnEXZZcMvg1wNX75RaNlShLQ9qvLOLXMuIBI6 2CEFs4rEZQr/ebvXHgePay6Nf8Moi/CvU1RkecmS5xE93MnP1HGJYfDhmfiUrZAM2gSi PH6w== X-Forwarded-Encrypted: i=1; AJvYcCXtAUlzk9i0bNQ81g4DwputBMhegN4vgr+nb61s76BzXW2+5TFfPuOOF/4vuLD9boYcmRTpRiTNm89vTbk=@vger.kernel.org X-Gm-Message-State: AOJu0YxQpx9Ci6J7zjP9yzm9mKEdJUAUO0jKC0IdWvGh0XW4FxUc6wnI rYrvHQ3zqEYekMf3VJCbLJyMpwkE4Y6kbUQR81Jh3OfYtKpv5HMIT3I5F+iOa2wL0aH/HkziNsT eWh0OJknUoyJYOf23MOGpBpyADA== X-Google-Smtp-Source: AGHT+IFqbXkqs2Mp4b7p4DEZXKXsbkJMcBqeeMGJEs4JUgbYXZRQtxNivjVbKfH+2JB9M7Bhly80ZxRnTmUFvY4cw9c= X-Received: from wmco3.prod.google.com ([2002:a05:600c:a303:b0:43c:eb09:3784]) (user=sebastianene job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:1c02:b0:43c:e7a7:1e76 with SMTP id 5b1f17b1804b1-43d3b951acamr22481225e9.1.1742315131880; Tue, 18 Mar 2025 09:25:31 -0700 (PDT) Date: Tue, 18 Mar 2025 16:25:08 +0000 In-Reply-To: <20250318162510.3280359-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: <20250318162510.3280359-1-sebastianene@google.com> X-Mailer: git-send-email 2.49.0.rc1.451.g8f38331e32-goog Message-ID: <20250318162510.3280359-2-sebastianene@google.com> Subject: [PATCH v3 1/3] KVM: arm64: Use the static initializer for the version lock From: Sebastian Ene To: catalin.marinas@arm.com, joey.gouly@arm.com, maz@kernel.org, oliver.upton@linux.dev, sebastianene@google.com, snehalreddy@google.com, sudeep.holla@arm.com, suzuki.poulose@arm.com, vdonnefort@google.com, will@kernel.org, yuzenghui@huawei.com Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel-team@android.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Replace the definition of the hypervisor version lock with a static initializer. Signed-off-by: Sebastian Ene Acked-by: Will Deacon --- arch/arm64/kvm/hyp/nvhe/ffa.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm64/kvm/hyp/nvhe/ffa.c b/arch/arm64/kvm/hyp/nvhe/ffa.c index e433dfab882a..6df6131f1107 100644 --- a/arch/arm64/kvm/hyp/nvhe/ffa.c +++ b/arch/arm64/kvm/hyp/nvhe/ffa.c @@ -69,7 +69,7 @@ static struct kvm_ffa_buffers hyp_buffers; static struct kvm_ffa_buffers host_buffers; static u32 hyp_ffa_version; static bool has_version_negotiated; -static hyp_spinlock_t version_lock; +static DEFINE_HYP_SPINLOCK(version_lock); =20 static void ffa_to_smccc_error(struct arm_smccc_res *res, u64 ffa_errno) { @@ -911,6 +911,5 @@ int hyp_ffa_init(void *pages) .lock =3D __HYP_SPIN_LOCK_UNLOCKED, }; =20 - version_lock =3D __HYP_SPIN_LOCK_UNLOCKED; return 0; } --=20 2.49.0.rc1.451.g8f38331e32-goog From nobody Wed Dec 17 10:46:18 2025 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 D6C95211464 for ; Tue, 18 Mar 2025 16:25:35 +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=1742315137; cv=none; b=X7DsK+lBqIwFdv4ozzueDwGHNk1xS6O1jHPToL/CKYjy23UNFcb8Juut0+AOxUV8R0FVhqQjsggAoIDheZF2Tme/1ig9UcZP5y/Q3z94GzMc119rWzsynmhFDHqdBpD5n7ocg1Y63fWXyVaY0/+aVp2eq7lIY7mL2SQHnu8a0ro= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742315137; c=relaxed/simple; bh=+cUzHTM1msMshEPjgxhwtRV3Pje5egr7gsw54xqxOyE=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=uuLOlmkcXSxwpuGnU8SpSffLooY3Fa4GG4g53mpa++U0AVAdD055C1PiXupXLIm/KW6LJxWWkXWFapS7QkgdsYMIVjl7X4P9FCb0Filv6QQwLS9Gw7Ybb7Xqv52jN2t37I/+kR8htCaL8KrW84H2iilDCdRkxKwWCQhHRBWW5qs= 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=qVvQF4LA; 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="qVvQF4LA" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-43cf446681cso20307825e9.1 for ; Tue, 18 Mar 2025 09:25:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1742315134; x=1742919934; 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=rDMdEEdy1VVckNvVv+9Uw4kcuPuHKQ0YP6w02i+CGWM=; b=qVvQF4LAetKeMgDvJOfL2m/YTCDjm/w3991u/MLSAo2GmEsy8a8rVTpQnD52fQK367 eGw34IOkyqaeCeNeDigWc6Cdm2vHaiTQa9u5g6kLb1BfkPkP4vuNVsYFsOj+/sKDfvPc Erc8Vl8pcPd/y2lRop3EQpuoKEoJjn0KnxzLr8lt1IhOI4Nh0l4WqhN2+Fek1uIsZzZj jhK7hR90BCt7vbYfYc3CYjTOB0hHt0uN6KOmlDeGDMXQYbEtc2libZ6jM/Xs5/cIwgQv H6Az/AktXvwlHph+DsZdGI91VPm2J22GCIO4+3htZYhDrzJCYc+zGPGBGh+XNKobhJPm rN3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742315134; x=1742919934; 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=rDMdEEdy1VVckNvVv+9Uw4kcuPuHKQ0YP6w02i+CGWM=; b=JQJdyaTVimZYSICjdrSmg3K8bPmLr2utz4Q7EBvb9AtFspWNiJsPvg9wU+mqMSPlm4 bo8gm6ia9iP0CCutc0BE7KmModqNMFNuLsnNLl4aJsB9o1Fel8TeMRfLByK+4Nzzh0rX dAHgzdxdjfQBwgB+1xjfXr3+osNHvLyngHZE1vnakpaUsDm+LmcR01VLmzlObRmJOhjG GmmMU8j5umqoWVYlfVtwPc5LvC9XtKXXRVkfdQ7m0cEgTFLMVc3O1KpFuu28f6bkRbD+ Mg+Ql+hQ5M/PSjnYntp3x09JKJCelWPX366Dky/g3cmaSlJRtoz2ribpi/HVsfFPy+Vu t37w== X-Forwarded-Encrypted: i=1; AJvYcCVaGAHpnbMsemD03a+j9PdTxBFe+ksxANOOwhhXGinRRLq3HsCy5wl3yLy0txvFAmKtVggyFoaQMAC5BXE=@vger.kernel.org X-Gm-Message-State: AOJu0Yzcqf5X/HlPKhK0dRbW1kc+naYLPtdpxqWTxTkYRqfW3o/Dvp8r fvFLLNMGJcUigRAM6CKf/Y7Hvkl4Wm7TQuXG0RpUMNTaXK+bZhVSgT4oSm9XGFkegboJtu4MX3g qrH+ORtVwUwHKnPLGzaLZRSiyZA== X-Google-Smtp-Source: AGHT+IGrqCyZAj3WhiZpuq4EomsTyl0s1Z4lp12t9lZvwltIa9qDp+9pdQe/IpL9JiYdK9qni53p5x/BRGVpG+ks5V4= X-Received: from wmcn5.prod.google.com ([2002:a05:600c:c0c5:b0:43d:1db0:6628]) (user=sebastianene job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:3584:b0:43c:fd72:f028 with SMTP id 5b1f17b1804b1-43d3ba27a69mr28607885e9.29.1742315134353; Tue, 18 Mar 2025 09:25:34 -0700 (PDT) Date: Tue, 18 Mar 2025 16:25:09 +0000 In-Reply-To: <20250318162510.3280359-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: <20250318162510.3280359-1-sebastianene@google.com> X-Mailer: git-send-email 2.49.0.rc1.451.g8f38331e32-goog Message-ID: <20250318162510.3280359-3-sebastianene@google.com> Subject: [PATCH v3 2/3] firmware: arm_ffa: Move the ffa_to_linux definition to the ffa header From: Sebastian Ene To: catalin.marinas@arm.com, joey.gouly@arm.com, maz@kernel.org, oliver.upton@linux.dev, sebastianene@google.com, snehalreddy@google.com, sudeep.holla@arm.com, suzuki.poulose@arm.com, vdonnefort@google.com, will@kernel.org, yuzenghui@huawei.com Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel-team@android.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Keep the ffa_to_linux error map in the header and move it away from the arm ffa driver to make it accessible for other components. Signed-off-by: Sebastian Ene Reviewed-by: Sudeep Holla --- drivers/firmware/arm_ffa/driver.c | 24 ------------------------ include/linux/arm_ffa.h | 24 ++++++++++++++++++++++++ 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/drivers/firmware/arm_ffa/driver.c b/drivers/firmware/arm_ffa/d= river.c index 2c2ec3c35f15..b02b80f3dfe8 100644 --- a/drivers/firmware/arm_ffa/driver.c +++ b/drivers/firmware/arm_ffa/driver.c @@ -61,30 +61,6 @@ =20 static ffa_fn *invoke_ffa_fn; =20 -static const int ffa_linux_errmap[] =3D { - /* better than switch case as long as return value is continuous */ - 0, /* FFA_RET_SUCCESS */ - -EOPNOTSUPP, /* FFA_RET_NOT_SUPPORTED */ - -EINVAL, /* FFA_RET_INVALID_PARAMETERS */ - -ENOMEM, /* FFA_RET_NO_MEMORY */ - -EBUSY, /* FFA_RET_BUSY */ - -EINTR, /* FFA_RET_INTERRUPTED */ - -EACCES, /* FFA_RET_DENIED */ - -EAGAIN, /* FFA_RET_RETRY */ - -ECANCELED, /* FFA_RET_ABORTED */ - -ENODATA, /* FFA_RET_NO_DATA */ - -EAGAIN, /* FFA_RET_NOT_READY */ -}; - -static inline int ffa_to_linux_errno(int errno) -{ - int err_idx =3D -errno; - - if (err_idx >=3D 0 && err_idx < ARRAY_SIZE(ffa_linux_errmap)) - return ffa_linux_errmap[err_idx]; - return -EINVAL; -} - struct ffa_pcpu_irq { struct ffa_drv_info *info; }; diff --git a/include/linux/arm_ffa.h b/include/linux/arm_ffa.h index 74169dd0f659..850577edadbc 100644 --- a/include/linux/arm_ffa.h +++ b/include/linux/arm_ffa.h @@ -475,4 +475,28 @@ struct ffa_ops { const struct ffa_notifier_ops *notifier_ops; }; =20 +static const int ffa_linux_errmap[] =3D { + /* better than switch case as long as return value is continuous */ + 0, /* FFA_RET_SUCCESS */ + -EOPNOTSUPP, /* FFA_RET_NOT_SUPPORTED */ + -EINVAL, /* FFA_RET_INVALID_PARAMETERS */ + -ENOMEM, /* FFA_RET_NO_MEMORY */ + -EBUSY, /* FFA_RET_BUSY */ + -EINTR, /* FFA_RET_INTERRUPTED */ + -EACCES, /* FFA_RET_DENIED */ + -EAGAIN, /* FFA_RET_RETRY */ + -ECANCELED, /* FFA_RET_ABORTED */ + -ENODATA, /* FFA_RET_NO_DATA */ + -EAGAIN, /* FFA_RET_NOT_READY */ +}; + +static inline int ffa_to_linux_errno(int errno) +{ + int err_idx =3D -errno; + + if (err_idx >=3D 0 && err_idx < ARRAY_SIZE(ffa_linux_errmap)) + return ffa_linux_errmap[err_idx]; + return -EINVAL; +} + #endif /* _LINUX_ARM_FFA_H */ --=20 2.49.0.rc1.451.g8f38331e32-goog From nobody Wed Dec 17 10:46:18 2025 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 F06E5211486 for ; Tue, 18 Mar 2025 16:25:37 +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=1742315143; cv=none; b=vCh+NhlAQzmxdgqLSXsUvbM0cX8z1JGJKOa0QZdcecDkO+/VLyKo72fA1cPg6g2MBnj8koYG/oGtH/nhHRoMGHyYcQRDRZ6FavgCK6MJ6NusVJdrhd0yqk1XWjm3ehiPkNchDIYcpfsNlQbp0N2BcmrLbjpXK1mvecUIVq63s0w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742315143; c=relaxed/simple; bh=APr23r7WvaanM9oDUyKut3wB8DoFtC1/LjrigTitMVs=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=baRUiLRGsP2l2j5GIldyIq01ayRhDHsVv2MVni+oDphr4MFsvDNh8QKgIgDPw+oZNT6jd9ce1xBECqwwth4VMcKpWhUFeZpTcftTdtGMxcedkBewj8BXL+HNZm7twHQow6dqq6nzSiS7OGZKSm7W+Ag5+7lLgrSklPZFHXlzTmM= 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=IMEF++xz; 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="IMEF++xz" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-43d0a037f97so23084745e9.2 for ; Tue, 18 Mar 2025 09:25:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1742315136; x=1742919936; 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=zO3ZzM+RurQ0HVvhTyBHJz7UiXcbKFmS1I/Hti/J8oU=; b=IMEF++xznRWBbGnEVR1uyOMRMfyQ7MusizATOpJ8DBaFuhYMbyMVhXrdUsrgyGHusu aYUZ1ZP9B1seHM76AirH4sy1RdAIsHVvX3Hk3C1h2+auz+6iFITJvNRZeyC9uFX5aaZw 09a4FcpGI517XIK3t6Gb+nZCtmWMaiiPfISh5d/DQk7zbK4gH0MDJUkRHVIyp5p29BJ4 AIGSvV4RzZyC2e4t4ubEjSKJ2IxmHbDLHc61Y6i6J7TtDCWyZxlcA1GvG7bz/7+t6jbZ Kr2l/8HGqZNnmaTwNuMxi+a7XeCQUOCZJ64mu9fXZMjAwD0qqUa/qCUUgPf+6oon5hpT R/nQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742315136; x=1742919936; 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=zO3ZzM+RurQ0HVvhTyBHJz7UiXcbKFmS1I/Hti/J8oU=; b=UPKH7cCBeqbmJyy1uqjGM4tYPWEkvaKeESIHJFOT010+ICU7rsocYQrbz98IQ+Fwgc 0bJ8+NG1fd9utywaA6gIgj51ISAnhg6DLV+JCJxJp3hgkWPIS5IwRyYfG3ZFWdK94nzk 3vNacJqX/RXlzkK2OYOuCPH+mISK4FwUtT1wQeAbSeDkKD9XoCLkWLSTL6HczCHUyFKY KSUQFmzy5hjA/zswEl6RsojF6P8/zAZVYjla7ctaIgcIRdmmL7dNOw9xs/H7wvTgRXuG VF6bjgb9isqo0HNZlolmCbxk3vyX73OOq8xiNMNet8S0tPh04mnkVWclx4fngCS9jMKY bdkw== X-Forwarded-Encrypted: i=1; AJvYcCVs/bHhJfRlSNPRnckUcgGL7dzaVV3Pw7jf/+zXSs7luFAxOJU7FgdqiWFphHtqmD6nDxddXQ/tdJD0yKY=@vger.kernel.org X-Gm-Message-State: AOJu0YxF4WnKhcudJBhn4Bcx715G6mq8NSkQmYVvI/Hwh3gTDzd9RnuQ sucmXRBjQyyX09kDr2kLXh8pKqa6DloDkxbW2grrnOR7JFrUum840xs5CRxHASejWFZRvjVgOIv Qs9fPy6tEA80jg5qPjf7zIE1oog== X-Google-Smtp-Source: AGHT+IHi1UgeMel0/A+rXKxvMkXf6AY2s0C2/6FsLbf6+yhSlW/MgJVCp1Jp/o/iLc/G34hYG7cfGijEvYJBHA3IS0U= X-Received: from wmbbd27.prod.google.com ([2002:a05:600c:1f1b:b0:43d:4055:98e3]) (user=sebastianene job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:470e:b0:43b:d0fe:b8ac with SMTP id 5b1f17b1804b1-43d3b9dc569mr30076925e9.30.1742315136406; Tue, 18 Mar 2025 09:25:36 -0700 (PDT) Date: Tue, 18 Mar 2025 16:25:10 +0000 In-Reply-To: <20250318162510.3280359-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: <20250318162510.3280359-1-sebastianene@google.com> X-Mailer: git-send-email 2.49.0.rc1.451.g8f38331e32-goog Message-ID: <20250318162510.3280359-4-sebastianene@google.com> Subject: [PATCH v3 3/3] KVM: arm64: Release the ownership of the hyp rx buffer to Trustzone From: Sebastian Ene To: catalin.marinas@arm.com, joey.gouly@arm.com, maz@kernel.org, oliver.upton@linux.dev, sebastianene@google.com, snehalreddy@google.com, sudeep.holla@arm.com, suzuki.poulose@arm.com, vdonnefort@google.com, will@kernel.org, yuzenghui@huawei.com Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel-team@android.com, Andrei Homescu Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Introduce the release FF-A call to notify Trustzone that the hypervisor has finished copying the data from the buffer shared with Trustzone to the non-secure partition. Reported-by: Andrei Homescu Signed-off-by: Sebastian Ene --- arch/arm64/kvm/hyp/nvhe/ffa.c | 9 ++++++--- include/linux/arm_ffa.h | 3 +++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/arch/arm64/kvm/hyp/nvhe/ffa.c b/arch/arm64/kvm/hyp/nvhe/ffa.c index 6df6131f1107..ac898ea6274a 100644 --- a/arch/arm64/kvm/hyp/nvhe/ffa.c +++ b/arch/arm64/kvm/hyp/nvhe/ffa.c @@ -749,6 +749,7 @@ static void do_ffa_part_get(struct arm_smccc_res *res, DECLARE_REG(u32, uuid3, ctxt, 4); DECLARE_REG(u32, flags, ctxt, 5); u32 count, partition_sz, copy_sz; + struct arm_smccc_res _res; =20 hyp_spin_lock(&host_buffers.lock); if (!host_buffers.rx) { @@ -765,11 +766,11 @@ static void do_ffa_part_get(struct arm_smccc_res *res, =20 count =3D res->a2; if (!count) - goto out_unlock; + goto release_rx; =20 if (hyp_ffa_version > FFA_VERSION_1_0) { /* Get the number of partitions deployed in the system */ - if (flags & 0x1) + if (flags & PARTITION_INFO_GET_RETURN_COUNT_ONLY) goto out_unlock; =20 partition_sz =3D res->a3; @@ -781,10 +782,12 @@ static void do_ffa_part_get(struct arm_smccc_res *res, copy_sz =3D partition_sz * count; if (copy_sz > KVM_FFA_MBOX_NR_PAGES * PAGE_SIZE) { ffa_to_smccc_res(res, FFA_RET_ABORTED); - goto out_unlock; + goto release_rx; } =20 memcpy(host_buffers.rx, hyp_buffers.rx, copy_sz); +release_rx: + ffa_rx_release(&_res); out_unlock: hyp_spin_unlock(&host_buffers.lock); } diff --git a/include/linux/arm_ffa.h b/include/linux/arm_ffa.h index 850577edadbc..32e235a2bedf 100644 --- a/include/linux/arm_ffa.h +++ b/include/linux/arm_ffa.h @@ -223,6 +223,9 @@ extern const struct bus_type ffa_bus_type; /* The FF-A 1.0 partition structure lacks the uuid[4] */ #define FFA_1_0_PARTITON_INFO_SZ (8) =20 +/* Return the count of partitions deployed in the system */ +#define PARTITION_INFO_GET_RETURN_COUNT_ONLY (1) + /* FFA transport related */ struct ffa_partition_info { u16 id; --=20 2.49.0.rc1.451.g8f38331e32-goog