mirror of https://gitee.com/openkylin/linux.git
IB/ucm: Fix deadlock in cleanup
ib_ucm_cleanup_events() holds file_mutex while calling ib_destroy_cm_id(). This can deadlock since ib_destroy_cm_id() flushes event handlers, and ib_ucm_event_handler() needs file_mutex, too. Therefore, drop the file_mutex during the call to ib_destroy_cm_id(). Signed-off-by: Michael S. Tsirkin <mst@mellanox.co.il> Signed-off-by: Roland Dreier <rolandd@cisco.com>
This commit is contained in:
parent
e1444b5a16
commit
f469b2626f
|
@ -161,12 +161,14 @@ static void ib_ucm_cleanup_events(struct ib_ucm_context *ctx)
|
|||
struct ib_ucm_event, ctx_list);
|
||||
list_del(&uevent->file_list);
|
||||
list_del(&uevent->ctx_list);
|
||||
mutex_unlock(&ctx->file->file_mutex);
|
||||
|
||||
/* clear incoming connections. */
|
||||
if (ib_ucm_new_cm_id(uevent->resp.event))
|
||||
ib_destroy_cm_id(uevent->cm_id);
|
||||
|
||||
kfree(uevent);
|
||||
mutex_lock(&ctx->file->file_mutex);
|
||||
}
|
||||
mutex_unlock(&ctx->file->file_mutex);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue