gpudev: fix deadlocks when registering callback
Checks
Commit Message
gpu_callback_lock was not released in some branches of the register
helper.
While at it, set rte_errno in one branch.
Fixes: 18cb07563165 ("gpudev: add event notification")
Cc: stable@dpdk.org
Signed-off-by: David Marchand <david.marchand@redhat.com>
---
lib/gpudev/gpudev.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
Comments
Agree with the patch.
Thanks!
On Tue, Jan 3, 2023 at 11:49 AM David Marchand
<david.marchand@redhat.com> wrote:
>
> gpu_callback_lock was not released in some branches of the register
> helper.
> While at it, set rte_errno in one branch.
>
> Fixes: 18cb07563165 ("gpudev: add event notification")
> Cc: stable@dpdk.org
>
> Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Elena Agostini <eagostini@nvidia.com>
Applied, thanks.
@@ -408,6 +408,7 @@ rte_gpu_callback_register(int16_t dev_id, enum rte_gpu_event event,
callback->function == function &&
callback->user_data == user_data) {
GPU_LOG(INFO, "callback already registered");
+ rte_rwlock_write_unlock(&gpu_callback_lock);
return 0;
}
}
@@ -415,7 +416,9 @@ rte_gpu_callback_register(int16_t dev_id, enum rte_gpu_event event,
callback = malloc(sizeof(*callback));
if (callback == NULL) {
GPU_LOG(ERR, "cannot allocate callback");
- return -ENOMEM;
+ rte_rwlock_write_unlock(&gpu_callback_lock);
+ rte_errno = ENOMEM;
+ return -rte_errno;
}
callback->function = function;
callback->user_data = user_data;