Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

prov/efa: Add missing locks in efa_msg and efa_rma #10669

Merged
merged 1 commit into from
Jan 6, 2025
Merged

prov/efa: Add missing locks in efa_msg and efa_rma #10669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions prov/efa/src/efa_msg.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,12 @@ static inline ssize_t efa_post_recv(struct efa_base_ep *base_ep, const struct fi
struct ibv_recv_wr *wr;
uintptr_t addr;
ssize_t err, post_recv_err;
size_t i, wr_index = base_ep->recv_wr_index;
size_t i, wr_index;

efa_tracepoint(recv_begin_msg_context, (size_t) msg->context, (size_t) msg->addr);

ofi_genlock_lock(&base_ep->util_ep.lock);
wr_index = base_ep->recv_wr_index;
if (wr_index >= base_ep->info->rx_attr->size) {
EFA_INFO(FI_LOG_EP_DATA,
"recv_wr_index exceeds the rx limit, "
Expand Down Expand Up @@ -118,8 +120,10 @@ static inline ssize_t efa_post_recv(struct efa_base_ep *base_ep, const struct fi

base_ep->recv_wr_index++;

if (flags & FI_MORE)
return 0;
if (flags & FI_MORE) {
err = 0;
goto out;
}

efa_tracepoint(post_recv, wr->wr_id, (uintptr_t)msg->context);

Expand All @@ -134,6 +138,9 @@ static inline ssize_t efa_post_recv(struct efa_base_ep *base_ep, const struct fi

base_ep->recv_wr_index = 0;

out:
ofi_genlock_unlock(&base_ep->util_ep.lock);

return err;

out_err:
Expand All @@ -148,6 +155,8 @@ static inline ssize_t efa_post_recv(struct efa_base_ep *base_ep, const struct fi

base_ep->recv_wr_index = 0;

ofi_genlock_unlock(&base_ep->util_ep.lock);

return err;
}

Expand Down Expand Up @@ -209,6 +218,7 @@ static inline ssize_t efa_post_send(struct efa_base_ep *base_ep, const struct fi

assert(len <= base_ep->info->ep_attr->max_msg_size);

ofi_genlock_lock(&base_ep->util_ep.lock);
if (!base_ep->is_wr_started) {
ibv_wr_start(qp->ibv_qp_ex);
base_ep->is_wr_started = true;
Expand Down Expand Up @@ -260,10 +270,9 @@ static inline ssize_t efa_post_send(struct efa_base_ep *base_ep, const struct fi
ret = ibv_wr_complete(qp->ibv_qp_ex);
base_ep->is_wr_started = false;
}
if (OFI_UNLIKELY(ret))
return ret;

return 0;
ofi_genlock_unlock(&base_ep->util_ep.lock);
return ret;
}

static ssize_t efa_ep_sendmsg(struct fid_ep *ep_fid, const struct fi_msg *msg, uint64_t flags)
Expand Down
17 changes: 10 additions & 7 deletions prov/efa/src/efa_rma.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,9 @@ static inline ssize_t efa_rma_post_read(struct efa_base_ep *base_ep,
base_ep->domain->device->max_rdma_size);

qp = base_ep->qp;

ofi_genlock_lock(&base_ep->util_ep.lock);

if (!base_ep->is_wr_started) {
ibv_wr_start(qp->ibv_qp_ex);
base_ep->is_wr_started = true;
Expand Down Expand Up @@ -113,10 +116,9 @@ static inline ssize_t efa_rma_post_read(struct efa_base_ep *base_ep,
err = ibv_wr_complete(qp->ibv_qp_ex);
base_ep->is_wr_started = false;
}
if (OFI_UNLIKELY(err))
return err;

return 0;
ofi_genlock_unlock(&base_ep->util_ep.lock);
return err;
}

static
Expand Down Expand Up @@ -212,6 +214,9 @@ static inline ssize_t efa_rma_post_write(struct efa_base_ep *base_ep,
efa_tracepoint(write_begin_msg_context, (size_t) msg->context, (size_t) msg->addr);

qp = base_ep->qp;

ofi_genlock_lock(&base_ep->util_ep.lock);

if (!base_ep->is_wr_started) {
ibv_wr_start(qp->ibv_qp_ex);
base_ep->is_wr_started = true;
Expand Down Expand Up @@ -256,10 +261,8 @@ static inline ssize_t efa_rma_post_write(struct efa_base_ep *base_ep,
base_ep->is_wr_started = false;
}

if (OFI_UNLIKELY(err))
return err;

return 0;
ofi_genlock_unlock(&base_ep->util_ep.lock);
return err;
}

ssize_t efa_rma_writemsg(struct fid_ep *ep_fid, const struct fi_msg_rma *msg,
Expand Down
Loading