| Message ID | 20240823-to_sent2-v1-1-8bc182a0adaf@ideasonboard.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | staging: vchiq_core: Refactor vchiq_bulk_transfer() logic | expand |
On Fri, Aug 23, 2024, at 15:14, Umang Jain wrote: > The bulk transfer is VCHIQ_BULK_MODE_WAITING is used by VCHIQ ioctl > interface. It is factored out to a separate function from > vchiq_bulk_transfer() to bulk_xfer_waiting_interruptible(). > > This is a part of vchiq_bulk_transfer refactoring. Each bulk mode > will have their dedicated functions to execute bulk transfers. > Each mode will be handled separately in subsequent patches. > > bulk_xfer_waiting_interruptible() is suffixed with "_interruptible" > to denote that it can be interrupted when a signal is received. > -EAGAIN maybe returned in those cases, similar to what > vchiq_bulk_transfer() does. > > Adjust the vchiq_irq_queue_bulk_tx_rx() in the vchiq-dev.c to call > bulk_xfer_waiting_interruptible() for waiting mode. A temporary > goto label has been introduced to jump the call execution over > vchiq_bulk_transfer() for waiting mode only. When all dedicated bulk > transfer calls are introduced, this label shall be dropped. > > No function changes intended in this patch. > > Signed-off-by: Umang Jain <umang.jain@ideasonboard.com> This looks reasonable, just one think I would change: > +int > +bulk_xfer_waiting_interruptible(struct vchiq_instance *instance, > unsigned int handle, > + void *userdata) > +{ > + struct vchiq_service *service = find_service_by_handle(instance, > handle); > + struct bulk_waiter *bulk_waiter = NULL; > + > + bulk_waiter = userdata; Since you always pass a 'struct bulk_waiter' here, please replace the 'void *userdata' with the typed argument directly. Arnd
Hi Umang, Am 23.08.24 um 17:14 schrieb Umang Jain: > The bulk transfer is VCHIQ_BULK_MODE_WAITING is used by VCHIQ ioctl > interface. It is factored out to a separate function from > vchiq_bulk_transfer() to bulk_xfer_waiting_interruptible(). > > This is a part of vchiq_bulk_transfer refactoring. Each bulk mode > will have their dedicated functions to execute bulk transfers. > Each mode will be handled separately in subsequent patches. > > bulk_xfer_waiting_interruptible() is suffixed with "_interruptible" > to denote that it can be interrupted when a signal is received. > -EAGAIN maybe returned in those cases, similar to what > vchiq_bulk_transfer() does. > > Adjust the vchiq_irq_queue_bulk_tx_rx() in the vchiq-dev.c to call > bulk_xfer_waiting_interruptible() for waiting mode. A temporary > goto label has been introduced to jump the call execution over > vchiq_bulk_transfer() for waiting mode only. When all dedicated bulk > transfer calls are introduced, this label shall be dropped. > > No function changes intended in this patch. > > Signed-off-by: Umang Jain <umang.jain@ideasonboard.com> > --- > .../vc04_services/interface/vchiq_arm/vchiq_core.c | 52 +++++++++++++++++++--- > .../vc04_services/interface/vchiq_arm/vchiq_core.h | 4 ++ > .../vc04_services/interface/vchiq_arm/vchiq_dev.c | 5 +++ > 3 files changed, 56 insertions(+), 5 deletions(-) > > 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 50af04b217f4..228a41ecf90c 100644 > --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c > +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c > @@ -3023,10 +3023,6 @@ int vchiq_bulk_transfer(struct vchiq_instance *instance, unsigned int handle, > bulk_waiter->actual = 0; > bulk_waiter->bulk = NULL; > break; > - case VCHIQ_BULK_MODE_WAITING: > - bulk_waiter = userdata; > - bulk = bulk_waiter->bulk; > - goto waiting; > default: > goto error_exit; > } > @@ -3115,7 +3111,6 @@ int vchiq_bulk_transfer(struct vchiq_instance *instance, unsigned int handle, > state->id, service->localport, dir_char, queue->local_insert, > queue->remote_insert, queue->process); > > -waiting: > vchiq_service_put(service); > > status = 0; > @@ -3143,6 +3138,53 @@ int vchiq_bulk_transfer(struct vchiq_instance *instance, unsigned int handle, > return status; > } > > +/* > + * This function is called by VCHIQ ioctl interface and is interruptible. > + * It may receive -EAGAIN to indicate that a signal has been received > + * and the call should be retried after being returned to user context. > + */ > +int > +bulk_xfer_waiting_interruptible(struct vchiq_instance *instance, unsigned int handle, > + void *userdata) > +{ > + struct vchiq_service *service = find_service_by_handle(instance, handle); > + struct bulk_waiter *bulk_waiter = NULL; I think there is no need to init bulk_waiter with NULL > + struct vchiq_bulk *bulk; > + int status = -EINVAL; > + > + if (!service) > + goto error_exit; > + > + if (!userdata) > + goto error_exit; > + > + if (service->srvstate != VCHIQ_SRVSTATE_OPEN) > + goto error_exit; > + > + if (vchiq_check_service(service)) > + goto error_exit; > + > + bulk_waiter = userdata; > + bulk = bulk_waiter->bulk; > + > + vchiq_service_put(service); > + > + status = 0; > + > + bulk_waiter->bulk = bulk; Maybe i missed something, but before vchiq_service_put() we already assigned the other way around. > + if (wait_for_completion_interruptible(&bulk_waiter->event)) > + status = -EAGAIN; > + else if (bulk_waiter->actual == VCHIQ_BULK_ACTUAL_ABORTED) > + status = -EINVAL; > + > + return status; How about return the return code directly at these 3 places? This would improve readability. Best regards > + > +error_exit: > + if (service) > + vchiq_service_put(service); > + return status; > +} > + > int > vchiq_queue_message(struct vchiq_instance *instance, unsigned int handle, > ssize_t (*copy_callback)(void *context, void *dest, > 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 77cc4d7ac077..1fda8631d1b6 100644 > --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h > +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h > @@ -470,6 +470,10 @@ vchiq_shutdown_internal(struct vchiq_state *state, struct vchiq_instance *instan > extern void > remote_event_pollall(struct vchiq_state *state); > > +extern int > +bulk_xfer_waiting_interruptible(struct vchiq_instance *instance, unsigned int handle, > + void *userdata); > + > 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 9cd2a64dce5e..445b7938eea3 100644 > --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_dev.c > +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_dev.c > @@ -324,6 +324,10 @@ static int vchiq_irq_queue_bulk_tx_rx(struct vchiq_instance *instance, > dev_dbg(service->state->dev, "arm: found bulk_waiter %pK for pid %d\n", > waiter, current->pid); > userdata = &waiter->bulk_waiter; > + > + status = bulk_xfer_waiting_interruptible(instance, args->handle, userdata); > + > + goto bulk_transfer_handled; > } else { > userdata = args->userdata; > } > @@ -331,6 +335,7 @@ static int vchiq_irq_queue_bulk_tx_rx(struct vchiq_instance *instance, > status = vchiq_bulk_transfer(instance, args->handle, NULL, args->data, args->size, > userdata, args->mode, dir); > > +bulk_transfer_handled: > if (!waiter) { > ret = 0; > goto out; >
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 50af04b217f4..228a41ecf90c 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c @@ -3023,10 +3023,6 @@ int vchiq_bulk_transfer(struct vchiq_instance *instance, unsigned int handle, bulk_waiter->actual = 0; bulk_waiter->bulk = NULL; break; - case VCHIQ_BULK_MODE_WAITING: - bulk_waiter = userdata; - bulk = bulk_waiter->bulk; - goto waiting; default: goto error_exit; } @@ -3115,7 +3111,6 @@ int vchiq_bulk_transfer(struct vchiq_instance *instance, unsigned int handle, state->id, service->localport, dir_char, queue->local_insert, queue->remote_insert, queue->process); -waiting: vchiq_service_put(service); status = 0; @@ -3143,6 +3138,53 @@ int vchiq_bulk_transfer(struct vchiq_instance *instance, unsigned int handle, return status; } +/* + * This function is called by VCHIQ ioctl interface and is interruptible. + * It may receive -EAGAIN to indicate that a signal has been received + * and the call should be retried after being returned to user context. + */ +int +bulk_xfer_waiting_interruptible(struct vchiq_instance *instance, unsigned int handle, + void *userdata) +{ + struct vchiq_service *service = find_service_by_handle(instance, handle); + struct bulk_waiter *bulk_waiter = NULL; + struct vchiq_bulk *bulk; + int status = -EINVAL; + + if (!service) + goto error_exit; + + if (!userdata) + goto error_exit; + + if (service->srvstate != VCHIQ_SRVSTATE_OPEN) + goto error_exit; + + if (vchiq_check_service(service)) + goto error_exit; + + bulk_waiter = userdata; + bulk = bulk_waiter->bulk; + + vchiq_service_put(service); + + status = 0; + + bulk_waiter->bulk = bulk; + if (wait_for_completion_interruptible(&bulk_waiter->event)) + status = -EAGAIN; + else if (bulk_waiter->actual == VCHIQ_BULK_ACTUAL_ABORTED) + status = -EINVAL; + + return status; + +error_exit: + if (service) + vchiq_service_put(service); + return status; +} + int vchiq_queue_message(struct vchiq_instance *instance, unsigned int handle, ssize_t (*copy_callback)(void *context, void *dest, 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 77cc4d7ac077..1fda8631d1b6 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h @@ -470,6 +470,10 @@ vchiq_shutdown_internal(struct vchiq_state *state, struct vchiq_instance *instan extern void remote_event_pollall(struct vchiq_state *state); +extern int +bulk_xfer_waiting_interruptible(struct vchiq_instance *instance, unsigned int handle, + void *userdata); + 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 9cd2a64dce5e..445b7938eea3 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_dev.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_dev.c @@ -324,6 +324,10 @@ static int vchiq_irq_queue_bulk_tx_rx(struct vchiq_instance *instance, dev_dbg(service->state->dev, "arm: found bulk_waiter %pK for pid %d\n", waiter, current->pid); userdata = &waiter->bulk_waiter; + + status = bulk_xfer_waiting_interruptible(instance, args->handle, userdata); + + goto bulk_transfer_handled; } else { userdata = args->userdata; } @@ -331,6 +335,7 @@ static int vchiq_irq_queue_bulk_tx_rx(struct vchiq_instance *instance, status = vchiq_bulk_transfer(instance, args->handle, NULL, args->data, args->size, userdata, args->mode, dir); +bulk_transfer_handled: if (!waiter) { ret = 0; goto out;
The bulk transfer is VCHIQ_BULK_MODE_WAITING is used by VCHIQ ioctl interface. It is factored out to a separate function from vchiq_bulk_transfer() to bulk_xfer_waiting_interruptible(). This is a part of vchiq_bulk_transfer refactoring. Each bulk mode will have their dedicated functions to execute bulk transfers. Each mode will be handled separately in subsequent patches. bulk_xfer_waiting_interruptible() is suffixed with "_interruptible" to denote that it can be interrupted when a signal is received. -EAGAIN maybe returned in those cases, similar to what vchiq_bulk_transfer() does. Adjust the vchiq_irq_queue_bulk_tx_rx() in the vchiq-dev.c to call bulk_xfer_waiting_interruptible() for waiting mode. A temporary goto label has been introduced to jump the call execution over vchiq_bulk_transfer() for waiting mode only. When all dedicated bulk transfer calls are introduced, this label shall be dropped. No function changes intended in this patch. Signed-off-by: Umang Jain <umang.jain@ideasonboard.com> --- .../vc04_services/interface/vchiq_arm/vchiq_core.c | 52 +++++++++++++++++++--- .../vc04_services/interface/vchiq_arm/vchiq_core.h | 4 ++ .../vc04_services/interface/vchiq_arm/vchiq_dev.c | 5 +++ 3 files changed, 56 insertions(+), 5 deletions(-)