| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <5e6c2c1a-dc08-4ab6-8521-4f84b3c4c7c6@gmx.net>
Date: Fri, 23 Aug 2024 23:36:14 +0200
From: Stefan Wahren <wahrenst@....net>
To: Umang Jain <umang.jain@...asonboard.com>,
Florian Fainelli <florian.fainelli@...adcom.com>,
Broadcom internal kernel review list
<bcm-kernel-feedback-list@...adcom.com>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>
Cc: linux-rpi-kernel@...ts.infradead.org,
linux-arm-kernel@...ts.infradead.org, linux-staging@...ts.linux.dev,
linux-kernel@...r.kernel.org, Dan Carpenter <dan.carpenter@...aro.org>,
Laurent Pinchart <laurent.pinchart@...asonboard.com>,
Kieran Bingham <kieran.bingham@...asonboard.com>,
Arnd Bergmann <arnd@...db.de>,
Dave Stevenson <dave.stevenson@...pberrypi.com>,
Phil Elwell <phil@...pberrypi.com>
Subject: Re: [PATCH 3/7] staging: vchiq_core: Factor out bulk transfer for
blocking mode
Hi Umang,
Am 23.08.24 um 17:14 schrieb Umang Jain:
> 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 <umang.jain@...asonboard.com>
> ---
> .../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 *instance, unsigned int handl
> return -ENOMEM;
> }
>
> - ret = vchiq_bulk_transfer(instance, handle, data, NULL, size,
> - &waiter->bulk_waiter,
> - VCHIQ_BULK_MODE_BLOCKING, dir);
> + ret = bulk_xfer_blocking_interruptible(instance, handle, data, NULL, size,
> + &waiter->bulk_waiter, dir);
> if ((ret != -EAGAIN) || fatal_signal_pending(current) || !waiter->bulk_waiter.bulk) {
> struct vchiq_bulk *bulk = waiter->bulk_waiter.bulk;
>
> 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;
> }
>
> +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 = find_service_by_handle(instance, handle);
> + struct bulk_waiter *bulk_waiter = NULL;
No need to init bulk_waiter here
> + enum vchiq_bulk_mode mode = VCHIQ_BULK_MODE_BLOCKING;
> + int status = -EINVAL;
> +
> + if (!service)
> + goto error_exit;
Please return the error directly
> +
> + if (service->srvstate != VCHIQ_SRVSTATE_OPEN)
> + goto error_exit;
> +
> + if (!offset && !uoffset)
> + goto error_exit;
> +
> + if (vchiq_check_service(service))
> + goto error_exit;
> +
> + bulk_waiter = userdata;
> + init_completion(&bulk_waiter->event);
> + bulk_waiter->actual = 0;
> + bulk_waiter->bulk = NULL;
> +
> + status = vchiq_bulk_xfer_queue_msg_interruptible(service, offset, uoffset, size,
> + userdata, mode, dir);
> + if (status)
> + goto error_exit;
> +
> + vchiq_service_put(service);
> +
> + return 0;
> +
> +error_exit:
> + if (service)
> + vchiq_service_put(service);
Since we return directly if service == NULL, we can drop the if statement
> + 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 *instance, unsigned int handle,
> case VCHIQ_BULK_MODE_NOCALLBACK:
> case VCHIQ_BULK_MODE_CALLBACK:
> break;
> - case VCHIQ_BULK_MODE_BLOCKING:
> - bulk_waiter = userdata;
> - init_completion(&bulk_waiter->event);
> - bulk_waiter->actual = 0;
> - bulk_waiter->bulk = 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);
>
> +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_instance *instance,
> }
>
> userdata = &waiter->bulk_waiter;
> +
> + status = bulk_xfer_blocking_interruptible(instance, args->handle,
> + NULL, args->data, args->size,
> + userdata, dir);
> +
> + goto bulk_transfer_handled;
> } else if (args->mode == VCHIQ_BULK_MODE_WAITING) {
> mutex_lock(&instance->bulk_waiter_list_mutex);
> list_for_each_entry(iter, &instance->bulk_waiter_list,
>
Powered by blists - more mailing lists