From 8b95051ff64fbc14fc6349e92427dc23f95c41ca Mon Sep 17 00:00:00 2001 From: Sergey Oblomov Date: Thu, 18 Oct 2018 10:24:10 +0300 Subject: [PATCH] UCT/MD: fixed incorrect md index usage - there were few places where incorrect md index used to process IOV (cherry picked from commit 5bd06df9b9eee9c0d85cb4174ff4ffea669e5d46) --- src/ucp/proto/proto_am.inl | 2 +- src/ucp/tag/offload.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/ucp/proto/proto_am.inl b/src/ucp/proto/proto_am.inl index 712bbfb63e2..5ac4ced59da 100644 --- a/src/ucp/proto/proto_am.inl +++ b/src/ucp/proto/proto_am.inl @@ -188,7 +188,7 @@ ucs_status_t ucp_do_am_zcopy_single(uct_pending_req_t *self, uint8_t am_id, ucp_dt_iov_copy_uct(ep->worker->context,iov, &iovcnt, max_iov, &state, req->send.buffer, req->send.datatype, - req->send.length, 0, NULL); + req->send.length, ucp_ep_md_index(ep, req->send.lane), NULL); status = uct_ep_am_zcopy(ep->uct_eps[req->send.lane], am_id, (void*)hdr, hdr_size, iov, iovcnt, 0, diff --git a/src/ucp/tag/offload.c b/src/ucp/tag/offload.c index bc323c628ed..7a220cefcf6 100644 --- a/src/ucp/tag/offload.c +++ b/src/ucp/tag/offload.c @@ -471,7 +471,8 @@ ucp_do_tag_offload_zcopy(uct_pending_req_t *self, uint64_t imm_data, req->send.lane = ucp_ep_get_tag_lane(ep); ucp_dt_iov_copy_uct(ep->worker->context, iov, &iovcnt, max_iov, &dt_state, - req->send.buffer, req->send.datatype, req->send.length, 0, NULL); + req->send.buffer, req->send.datatype, req->send.length, + ucp_ep_md_index(ep, req->send.lane), NULL); status = uct_ep_tag_eager_zcopy(ep->uct_eps[req->send.lane], req->send.tag.tag, imm_data, iov, iovcnt, 0, @@ -559,7 +560,8 @@ ucs_status_t ucp_tag_offload_rndv_zcopy(uct_pending_req_t *self) ucs_assert_always(UCP_DT_IS_CONTIG(req->send.datatype)); ucp_dt_iov_copy_uct(ep->worker->context, iov, &iovcnt, max_iov, &dt_state, - req->send.buffer, req->send.datatype, req->send.length, 0, NULL); + req->send.buffer, req->send.datatype, req->send.length, + ucp_ep_md_index(ep, req->send.lane), NULL); rndv_op = uct_ep_tag_rndv_zcopy(ep->uct_eps[req->send.lane], req->send.tag.tag, &rndv_hdr, sizeof(rndv_hdr), iov, iovcnt, 0,