Skip to content

Commit 92a251c

Browse files
JackMorgenjgunthorpe
authored andcommitted
RDMA/cma: Fix hang when cma_netevent_callback fails to queue_work
The cited commit fixed a crash when cma_netevent_callback was called for a cma_id while work on that id from a previous call had not yet started. The work item was re-initialized in the second call, which corrupted the work item currently in the work queue. However, it left a problem when queue_work fails (because the item is still pending in the work queue from a previous call). In this case, cma_id_put (which is called in the work handler) is therefore not called. This results in a userspace process hang (zombie process). Fix this by calling cma_id_put() if queue_work fails. Fixes: 45f5dcd ("RDMA/cma: Fix workqueue crash in cma_netevent_work_handler") Link: https://patch.msgid.link/r/4f3640b501e48d0166f312a64fdadf72b059bd04.1747827103.git.leon@kernel.org Signed-off-by: Jack Morgenstein <jackm@nvidia.com> Signed-off-by: Feng Liu <feliu@nvidia.com> Reviewed-by: Vlad Dumitrescu <vdumitrescu@nvidia.com> Signed-off-by: Leon Romanovsky <leonro@nvidia.com> Reviewed-by: Sharath Srinivasan <sharath.srinivasan@oracle.com> Reviewed-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com> Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
1 parent ef22338 commit 92a251c

File tree

1 file changed

+2
-1
lines changed
  • drivers/infiniband/core

1 file changed

+2
-1
lines changed

drivers/infiniband/core/cma.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5231,7 +5231,8 @@ static int cma_netevent_callback(struct notifier_block *self,
52315231
neigh->ha, ETH_ALEN))
52325232
continue;
52335233
cma_id_get(current_id);
5234-
queue_work(cma_wq, &current_id->id.net_work);
5234+
if (!queue_work(cma_wq, &current_id->id.net_work))
5235+
cma_id_put(current_id);
52355236
}
52365237
out:
52375238
spin_unlock_irqrestore(&id_table_lock, flags);

0 commit comments

Comments
 (0)