From nobody Mon Feb 9 17:37:12 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 6C468189BA9 for ; Fri, 23 Aug 2024 15:14:36 +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=1724426078; cv=none; b=C0RCTpsB1BbUrRIDF/lLOjaFrnYRYVplWIawV3eIH8FV92oORJZGuN/cFpT44s05R1GoUQ5TJvJ4OEwxpsiqZoIT7MiJgVQgi/38NqL0na1zZZmsci1nPyZ1RlcznxpfW2AKrCcAyO1BF8eSa1FTrVvB8ajCeRh4352mZrWvUr4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724426078; c=relaxed/simple; bh=uczQTHc/hJKZFwcpphfWQ48EAdA8J/cRvXojkpCAitw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=M4R9rMrM2hF5k6F+Un4NGNzK+TwbG1vtrLxjrweY/1rZCvfH5Rz6xRRcLumndI4OSBlwRv4S0x9nNEmRY09g5p8X/g+OcGQkUmLGRNckCvIgyuyJYEW0R7Q5kKUMzLqkvBM48EyVQxxhDEqNCpfss/UMIRYRptWBNPuOcrWnSzQ= 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=BKP4s+yN; 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="BKP4s+yN" Received: from [192.168.29.25] (unknown [IPv6:2405:201:2015:f873:55f8:639e:8e9f:12ec]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id CF063E7C; Fri, 23 Aug 2024 17:13:28 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1724426011; bh=uczQTHc/hJKZFwcpphfWQ48EAdA8J/cRvXojkpCAitw=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=BKP4s+yNmARUq6QppbA6TIMDB57XvoieF0d54rOKuENxAGUf5dwE6hFgCzoIGFaTZ B89ucq8WrQGQsVROqvzWVz9MriG7TlZn90yIuK0ar7y14Oq8+PJVzAAECAlotMu6A/ Ii2v/M9C2MEvtUiOApnkpdu4gyYAzLyAoanbTpxc= From: Umang Jain Date: Fri, 23 Aug 2024 20:44:23 +0530 Subject: [PATCH 3/7] staging: vchiq_core: Factor out bulk transfer for blocking 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-3-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=5364; i=umang.jain@ideasonboard.com; s=20240731; h=from:subject:message-id; bh=uczQTHc/hJKZFwcpphfWQ48EAdA8J/cRvXojkpCAitw=; b=HkrgIOoi3sFW3j4ZN1ZTzjTeRdIGA81r75Fl+wbVWWhuah28u+fwXQo0CWYNa4oQt91a0Qaqa D1tSByuXtfRBAvYqohx80Lm62D3VJoGEKoc0gNphMKqBbT9TsZ1YS2b X-Developer-Key: i=umang.jain@ideasonboard.com; a=ed25519; pk=7pvnIBNsDpFUMiph0Vlhrr01+rAn5fSIn/QtDeLeXL0= Factor out bulk transfer for blocking mode into a separate dedicated function bulk_xfer_blocking_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. Adjust the calls to vchiq-dev.c ioctl interface and vchiq_arm.c for blocking bulk transfers. Signed-off-by: Umang Jain --- .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 5 +-- .../vc04_services/interface/vchiq_arm/vchiq_core.c | 48 ++++++++++++++++++= +--- .../vc04_services/interface/vchiq_arm/vchiq_core.h | 5 +++ .../vc04_services/interface/vchiq_arm/vchiq_dev.c | 6 +++ 4 files changed, 55 insertions(+), 9 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 c4d97dbf6ba8..e9b9c76381dc 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c @@ -968,9 +968,8 @@ vchiq_blocking_bulk_transfer(struct vchiq_instance *ins= tance, unsigned int handl return -ENOMEM; } =20 - ret =3D vchiq_bulk_transfer(instance, handle, data, NULL, size, - &waiter->bulk_waiter, - VCHIQ_BULK_MODE_BLOCKING, dir); + ret =3D bulk_xfer_blocking_interruptible(instance, handle, data, NULL, si= ze, + &waiter->bulk_waiter, dir); if ((ret !=3D -EAGAIN) || fatal_signal_pending(current) || !waiter->bulk_= waiter.bulk) { struct vchiq_bulk *bulk =3D waiter->bulk_waiter.bulk; =20 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 c31f5d773fa5..341a06997848 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c @@ -2985,6 +2985,48 @@ vchiq_remove_service(struct vchiq_instance *instance= , unsigned int handle) return status; } =20 +int +bulk_xfer_blocking_interruptible(struct vchiq_instance *instance, unsigned= int handle, + void *offset, void __user *uoffset, int size, + void __user *userdata, enum vchiq_bulk_dir dir) +{ + struct vchiq_service *service =3D find_service_by_handle(instance, handle= ); + struct bulk_waiter *bulk_waiter =3D NULL; + enum vchiq_bulk_mode mode =3D VCHIQ_BULK_MODE_BLOCKING; + int status =3D -EINVAL; + + if (!service) + 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; + + bulk_waiter =3D userdata; + init_completion(&bulk_waiter->event); + bulk_waiter->actual =3D 0; + bulk_waiter->bulk =3D NULL; + + 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 @@ -3018,12 +3060,6 @@ int vchiq_bulk_transfer(struct vchiq_instance *insta= nce, unsigned int handle, case VCHIQ_BULK_MODE_NOCALLBACK: case VCHIQ_BULK_MODE_CALLBACK: break; - case VCHIQ_BULK_MODE_BLOCKING: - bulk_waiter =3D userdata; - init_completion(&bulk_waiter->event); - bulk_waiter->actual =3D 0; - bulk_waiter->bulk =3D NULL; - break; default: goto error_exit; } 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 1fda8631d1b6..ff3559c3d1ba 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h @@ -474,6 +474,11 @@ extern int bulk_xfer_waiting_interruptible(struct vchiq_instance *instance, unsigned = int handle, void *userdata); =20 +extern int +bulk_xfer_blocking_interruptible(struct vchiq_instance *instance, unsigned= int handle, + void *offset, void __user *uoffset, int size, + void __user *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 445b7938eea3..1bff97ad28fa 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_dev.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_dev.c @@ -304,6 +304,12 @@ static int vchiq_irq_queue_bulk_tx_rx(struct vchiq_ins= tance *instance, } =20 userdata =3D &waiter->bulk_waiter; + + status =3D bulk_xfer_blocking_interruptible(instance, args->handle, + NULL, args->data, args->size, + userdata, dir); + + goto bulk_transfer_handled; } else if (args->mode =3D=3D VCHIQ_BULK_MODE_WAITING) { mutex_lock(&instance->bulk_waiter_list_mutex); list_for_each_entry(iter, &instance->bulk_waiter_list, --=20 2.45.0