Commit 98837c6c authored by Jason Gunthorpe's avatar Jason Gunthorpe

RDMA/ucma: Fix locking for ctx->events_reported

This value is locked under the file->mut, ensure it is held whenever
touching it.

The case in ucma_migrate_id() is a race, while in ucma_free_uctx() it is
already not possible for the write side to run, the movement is just for
clarity.

Fixes: 88314e4d ("RDMA/cma: add support for rdma_migrate_id()")
Link: https://lore.kernel.org/r/20200818120526.702120-10-leon@kernel.orgSigned-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 09e328e4
...@@ -587,6 +587,7 @@ static int ucma_free_ctx(struct ucma_context *ctx) ...@@ -587,6 +587,7 @@ static int ucma_free_ctx(struct ucma_context *ctx)
list_move_tail(&uevent->list, &list); list_move_tail(&uevent->list, &list);
} }
list_del(&ctx->list); list_del(&ctx->list);
events_reported = ctx->events_reported;
mutex_unlock(&ctx->file->mut); mutex_unlock(&ctx->file->mut);
list_for_each_entry_safe(uevent, tmp, &list, list) { list_for_each_entry_safe(uevent, tmp, &list, list) {
...@@ -596,7 +597,6 @@ static int ucma_free_ctx(struct ucma_context *ctx) ...@@ -596,7 +597,6 @@ static int ucma_free_ctx(struct ucma_context *ctx)
kfree(uevent); kfree(uevent);
} }
events_reported = ctx->events_reported;
mutex_destroy(&ctx->mutex); mutex_destroy(&ctx->mutex);
kfree(ctx); kfree(ctx);
return events_reported; return events_reported;
...@@ -1697,7 +1697,9 @@ static ssize_t ucma_migrate_id(struct ucma_file *new_file, ...@@ -1697,7 +1697,9 @@ static ssize_t ucma_migrate_id(struct ucma_file *new_file,
rdma_lock_handler(ctx->cm_id); rdma_lock_handler(ctx->cm_id);
cur_file = ctx->file; cur_file = ctx->file;
if (cur_file == new_file) { if (cur_file == new_file) {
mutex_lock(&cur_file->mut);
resp.events_reported = ctx->events_reported; resp.events_reported = ctx->events_reported;
mutex_unlock(&cur_file->mut);
goto response; goto response;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment