From nobody Mon Feb 9 23:57:59 2026 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A8A9C18B466 for ; Fri, 23 Aug 2024 15:14:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=213.167.242.64 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724426080; cv=none; b=l4WezSgLI/qKvgI0eXRt6UhPSd1BMnPck2hJipPh9qvZMK7U5WWPasLmt3taw+mCrma3ih5KrX9vMoEeB56WXzJQNLpxwcMdBN1eiXee3vDTgG+3DBfESyHq5wHiCKferYgAjwSi/H23NL8pkcKPYcgT+86SLJVJXlhe43/XDM8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724426080; c=relaxed/simple; bh=LoPuo+reaO+XM9ZvWtpE+KdjZN48B6ryoWNNMPGVE2w=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=dRgldLNa1TPDPS3C40+s5dWNiJH39cIPUmOM7z/nXOHPOVUtsXGjpjQlp2SGCMhbHOSKUNSL45nckN/aKyWnTKmYIe5xWNrKl8LludAdwprFw+OgrXDzg0NSBpXa7IQsbYtn+QZsV95UgW7zZkKtbcv7Url2ndeutcpWJsD0EeM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ideasonboard.com; spf=pass smtp.mailfrom=ideasonboard.com; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b=ooZbMPgB; arc=none smtp.client-ip=213.167.242.64 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="ooZbMPgB" Received: from [192.168.29.25] (unknown [IPv6:2405:201:2015:f873:55f8:639e:8e9f:12ec]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 674182D5; Fri, 23 Aug 2024 17:13:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1724426013; bh=LoPuo+reaO+XM9ZvWtpE+KdjZN48B6ryoWNNMPGVE2w=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=ooZbMPgBBi6loLBV6mgo8ClDAAJtMMIeNeFSwh3w67Cwd6myHMLD5FCkO18KGHicM sGXU7OUK4do4LEoA2m4VVNgH/Hh5UTJuvv6Sy1ANwUqx+YtbSffdxebTwUXr9j4NDP FtE7CCYFwW6uRYbzSRRShu5mZQhwYnPniN5lBwXs= From: Umang Jain Date: Fri, 23 Aug 2024 20:44:24 +0530 Subject: [PATCH 4/7] staging: vchiq_core: Factor out bulk transfer for (no/)callback mode Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240823-to_sent2-v1-4-8bc182a0adaf@ideasonboard.com> References: <20240823-to_sent2-v1-0-8bc182a0adaf@ideasonboard.com> In-Reply-To: <20240823-to_sent2-v1-0-8bc182a0adaf@ideasonboard.com> To: Florian Fainelli , Broadcom internal kernel review list , Greg Kroah-Hartman Cc: linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Dan Carpenter , Laurent Pinchart , Kieran Bingham , Arnd Bergmann , Stefan Wahren , Dave Stevenson , Phil Elwell , Umang Jain X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1724426064; l=5975; i=umang.jain@ideasonboard.com; s=20240731; h=from:subject:message-id; bh=LoPuo+reaO+XM9ZvWtpE+KdjZN48B6ryoWNNMPGVE2w=; b=fzN8eQP5N69C8NWCb+6iYuOnvJ2fotCeYzNJkr4Jw7hzBJtWspPeS/A9tF+BYt8B98QZhSM6m dFIRS6wz1TCAEQ1SwQeV0yNjvpS80oLj1NewWpjHTyyRIfkIxeePpwN X-Developer-Key: i=umang.jain@ideasonboard.com; a=ed25519; pk=7pvnIBNsDpFUMiph0Vlhrr01+rAn5fSIn/QtDeLeXL0= Factor out bulk transfer for VCHIQ_BULK_MODE_NOCALLBACK and VCHIQ_BULK_MODE_CALLBACK mode into a separate dedicated function bulk_xfer_callback_interruptible(). It is suffixed by "_interruptible" to denote that it can be interrupted and -EAGAIN can be returned. It would be up to the users of the function to retry the call in those cases. bulk_xfer_callback_interruptible() also takes in 'mode' parameter to differentiate between VCHIQ_BULK_MODE_NOCALLBACK and VCHIQ_BULK_MODE_CALLBACK, which then is directly passed to vchiq_bulk_xfer_queue_msg_interruptible() inside the function. Adjust the calls to vchiq-dev.c ioctl interface and vchiq_arm.c for the respective bulk transfers. Signed-off-by: Umang Jain --- .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 15 ++++---- .../vc04_services/interface/vchiq_arm/vchiq_core.c | 40 ++++++++++++++++++= ++++ .../vc04_services/interface/vchiq_arm/vchiq_core.h | 6 ++++ .../vc04_services/interface/vchiq_arm/vchiq_dev.c | 6 ++++ 4 files changed, 60 insertions(+), 7 deletions(-) diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c = b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c index e9b9c76381dc..5210ce8d269e 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c @@ -857,10 +857,10 @@ vchiq_bulk_transmit(struct vchiq_instance *instance, = unsigned int handle, const switch (mode) { case VCHIQ_BULK_MODE_NOCALLBACK: case VCHIQ_BULK_MODE_CALLBACK: - ret =3D vchiq_bulk_transfer(instance, handle, - (void *)data, NULL, - size, userdata, mode, - VCHIQ_BULK_TRANSMIT); + ret =3D bulk_xfer_callback_interruptible(instance, handle, + (void *)data, NULL, + size, mode, userdata, + VCHIQ_BULK_TRANSMIT); break; case VCHIQ_BULK_MODE_BLOCKING: ret =3D vchiq_blocking_bulk_transfer(instance, handle, (void *)data, si= ze, @@ -895,9 +895,10 @@ int vchiq_bulk_receive(struct vchiq_instance *instance= , unsigned int handle, switch (mode) { case VCHIQ_BULK_MODE_NOCALLBACK: case VCHIQ_BULK_MODE_CALLBACK: - ret =3D vchiq_bulk_transfer(instance, handle, data, NULL, - size, userdata, - mode, VCHIQ_BULK_RECEIVE); + ret =3D bulk_xfer_callback_interruptible(instance, handle, + (void *)data, NULL, + size, mode, userdata, + VCHIQ_BULK_RECEIVE); break; case VCHIQ_BULK_MODE_BLOCKING: ret =3D vchiq_blocking_bulk_transfer(instance, handle, (void *)data, si= ze, diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c= b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c index 341a06997848..0606561fd3d0 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c @@ -3027,6 +3027,46 @@ bulk_xfer_blocking_interruptible(struct vchiq_instan= ce *instance, unsigned int h return status; } =20 +int +bulk_xfer_callback_interruptible(struct vchiq_instance *instance, unsigned= int handle, + void *offset, void __user *uoffset, int size, + enum vchiq_bulk_mode mode, void *userdata, + enum vchiq_bulk_dir dir) +{ + struct vchiq_service *service =3D find_service_by_handle(instance, handle= ); + int status =3D -EINVAL; + + if (!service) + goto error_exit; + + if (mode !=3D VCHIQ_BULK_MODE_CALLBACK && + mode !=3D VCHIQ_BULK_MODE_NOCALLBACK) + goto error_exit; + + if (service->srvstate !=3D VCHIQ_SRVSTATE_OPEN) + goto error_exit; + + if (!offset && !uoffset) + goto error_exit; + + if (vchiq_check_service(service)) + goto error_exit; + + status =3D vchiq_bulk_xfer_queue_msg_interruptible(service, offset, uoffs= et, + size, userdata, mode, dir); + if (status) + goto error_exit; + + vchiq_service_put(service); + + return 0; + +error_exit: + if (service) + vchiq_service_put(service); + return status; +} + /* * This function may be called by kernel threads or user threads. * User threads may receive -EAGAIN to indicate that a signal has been diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h= b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h index ff3559c3d1ba..8aaf3c9d3dbe 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h @@ -479,6 +479,12 @@ bulk_xfer_blocking_interruptible(struct vchiq_instance= *instance, unsigned int h void *offset, void __user *uoffset, int size, void __user *userdata, enum vchiq_bulk_dir dir); =20 +extern int +bulk_xfer_callback_interruptible(struct vchiq_instance *instance, unsigned= int handle, + void *offset, void __user *uoffset, int size, + enum vchiq_bulk_mode mode, void *userdata, + enum vchiq_bulk_dir dir); + extern int vchiq_bulk_transfer(struct vchiq_instance *instance, unsigned int handle, = void *offset, void __user *uoffset, int size, void *userdata, enum vchiq_bulk_mode= mode, diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_dev.c = b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_dev.c index 1bff97ad28fa..7ecfcaa85569 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_dev.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_dev.c @@ -336,6 +336,12 @@ static int vchiq_irq_queue_bulk_tx_rx(struct vchiq_ins= tance *instance, goto bulk_transfer_handled; } else { userdata =3D args->userdata; + + status =3D bulk_xfer_callback_interruptible(instance, args->handle, + NULL, args->data, args->size, + args->mode, userdata, dir); + + goto bulk_transfer_handled; } =20 status =3D vchiq_bulk_transfer(instance, args->handle, NULL, args->data, = args->size, --=20 2.45.0