5e13e1ab7d
The max inline send size on a queue pair is not available until after the endpoint is connected. Before this commit the send flags (including the inline flag) were set before this value was initialized. This commit moves setting the send_flags down to mca_btl_openib_put_internal which is only called after the endpoint is connected. This fixes a bug when using osc/rdma. Signed-off-by: Nathan Hjelm <hjelmn@lanl.gov>
176 строки
6.4 KiB
C
176 строки
6.4 KiB
C
/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
|
|
/*
|
|
* Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
|
|
* University Research and Technology
|
|
* Corporation. All rights reserved.
|
|
* Copyright (c) 2004-2013 The University of Tennessee and The University
|
|
* of Tennessee Research Foundation. All rights
|
|
* reserved.
|
|
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
|
* University of Stuttgart. All rights reserved.
|
|
* Copyright (c) 2004-2005 The Regents of the University of California.
|
|
* All rights reserved.
|
|
* Copyright (c) 2007-2013 Cisco Systems, Inc. All rights reserved.
|
|
* Copyright (c) 2006-2009 Mellanox Technologies. All rights reserved.
|
|
* Copyright (c) 2006-2016 Los Alamos National Security, LLC. All rights
|
|
* reserved.
|
|
* Copyright (c) 2006-2007 Voltaire All rights reserved.
|
|
* Copyright (c) 2008-2012 Oracle and/or its affiliates. All rights reserved.
|
|
* Copyright (c) 2009 IBM Corporation. All rights reserved.
|
|
* Copyright (c) 2013-2014 Intel, Inc. All rights reserved
|
|
* Copyright (c) 2013 NVIDIA Corporation. All rights reserved.
|
|
* Copyright (c) 2014-2015 Research Organization for Information Science
|
|
* and Technology (RIST). All rights reserved.
|
|
* $COPYRIGHT$
|
|
*
|
|
* Additional copyrights may follow
|
|
*
|
|
* $HEADER$
|
|
*/
|
|
|
|
#include "btl_openib.h"
|
|
#include "btl_openib_frag.h"
|
|
#include "btl_openib_endpoint.h"
|
|
#include "btl_openib_proc.h"
|
|
#include "btl_openib_xrc.h"
|
|
/*
|
|
* RDMA WRITE local buffer to remote buffer address.
|
|
*/
|
|
|
|
int mca_btl_openib_put (mca_btl_base_module_t *btl, struct mca_btl_base_endpoint_t *ep, void *local_address,
|
|
uint64_t remote_address, mca_btl_base_registration_handle_t *local_handle,
|
|
mca_btl_base_registration_handle_t *remote_handle, size_t size, int flags,
|
|
int order, mca_btl_base_rdma_completion_fn_t cbfunc, void *cbcontext, void *cbdata)
|
|
{
|
|
mca_btl_openib_put_frag_t *frag = NULL;
|
|
int rc, qp = order;
|
|
|
|
if (MCA_BTL_NO_ORDER == qp) {
|
|
qp = mca_btl_openib_component.rdma_qp;
|
|
}
|
|
|
|
if (OPAL_UNLIKELY((btl->btl_put_local_registration_threshold < size && !local_handle) || !remote_handle ||
|
|
size > btl->btl_put_limit)) {
|
|
return OPAL_ERR_BAD_PARAM;
|
|
}
|
|
|
|
frag = to_put_frag(alloc_send_user_frag ());
|
|
if (OPAL_UNLIKELY(NULL == frag)) {
|
|
return OPAL_ERR_OUT_OF_RESOURCE;
|
|
}
|
|
|
|
/* set base descriptor flags */
|
|
to_base_frag(frag)->base.order = qp;
|
|
/* free this descriptor when the operation is complete */
|
|
to_base_frag(frag)->base.des_flags = MCA_BTL_DES_FLAGS_BTL_OWNERSHIP;
|
|
|
|
/* set up scatter-gather entry */
|
|
to_com_frag(frag)->sg_entry.length = size;
|
|
|
|
if (local_handle) {
|
|
to_com_frag(frag)->sg_entry.lkey = local_handle->lkey;
|
|
} else {
|
|
/* lkey is not required for inline RDMA write */
|
|
to_com_frag(frag)->sg_entry.lkey = 0;
|
|
}
|
|
|
|
to_com_frag(frag)->sg_entry.addr = (uint64_t)(intptr_t) local_address;
|
|
to_com_frag(frag)->endpoint = ep;
|
|
|
|
/* set up rdma callback */
|
|
frag->cb.func = cbfunc;
|
|
frag->cb.context = cbcontext;
|
|
frag->cb.data = cbdata;
|
|
frag->cb.local_handle = local_handle;
|
|
|
|
/* post descriptor */
|
|
to_out_frag(frag)->sr_desc.opcode = IBV_WR_RDMA_WRITE;
|
|
to_out_frag(frag)->sr_desc.wr.rdma.remote_addr = remote_address;
|
|
|
|
qp_inflight_wqe_to_frag(ep, qp, to_com_frag(frag));
|
|
qp_reset_signal_count(ep, qp);
|
|
|
|
#if OPAL_ENABLE_HETEROGENEOUS_SUPPORT
|
|
if ((ep->endpoint_proc->proc_opal->proc_arch & OPAL_ARCH_ISBIGENDIAN)
|
|
!= (opal_proc_local_get()->proc_arch & OPAL_ARCH_ISBIGENDIAN)) {
|
|
to_out_frag(frag)->sr_desc.wr.rdma.rkey = opal_swap_bytes4(remote_handle->rkey);
|
|
} else
|
|
#endif
|
|
{
|
|
to_out_frag(frag)->sr_desc.wr.rdma.rkey = remote_handle->rkey;
|
|
}
|
|
|
|
if (ep->endpoint_state != MCA_BTL_IB_CONNECTED) {
|
|
OPAL_THREAD_LOCK(&ep->endpoint_lock);
|
|
rc = check_endpoint_state(ep, &to_base_frag(frag)->base, &ep->pending_put_frags);
|
|
OPAL_THREAD_UNLOCK(&ep->endpoint_lock);
|
|
if (OPAL_ERR_RESOURCE_BUSY == rc) {
|
|
/* descriptor was queued pending connection */
|
|
return OPAL_SUCCESS;
|
|
}
|
|
|
|
if (OPAL_UNLIKELY(OPAL_SUCCESS != rc)) {
|
|
MCA_BTL_IB_FRAG_RETURN (frag);
|
|
return rc;
|
|
}
|
|
}
|
|
|
|
rc = mca_btl_openib_put_internal (btl, ep, frag);
|
|
if (OPAL_UNLIKELY(OPAL_SUCCESS != rc)) {
|
|
if (OPAL_LIKELY(OPAL_ERR_OUT_OF_RESOURCE == rc)) {
|
|
rc = OPAL_SUCCESS;
|
|
|
|
/* queue the fragment for when resources are available */
|
|
OPAL_THREAD_LOCK(&ep->endpoint_lock);
|
|
opal_list_append(&ep->pending_put_frags, (opal_list_item_t*)frag);
|
|
OPAL_THREAD_UNLOCK(&ep->endpoint_lock);
|
|
} else {
|
|
MCA_BTL_IB_FRAG_RETURN (frag);
|
|
}
|
|
}
|
|
|
|
return rc;
|
|
}
|
|
|
|
int mca_btl_openib_put_internal (mca_btl_base_module_t *btl, struct mca_btl_base_endpoint_t *ep,
|
|
mca_btl_openib_put_frag_t *frag)
|
|
{
|
|
int qp = to_base_frag(frag)->base.order;
|
|
struct ibv_send_wr *bad_wr;
|
|
int rc;
|
|
|
|
/* NTH: the inline send size and remote SRQ number are only available once the endpoint is
|
|
* connected. By setting these values here instead of mca_btl_openib_put we guarantee
|
|
* both fields are initialized */
|
|
to_out_frag(frag)->sr_desc.send_flags = ib_send_flags (to_com_frag(frag)->sg_entry.length,
|
|
&(ep->qps[qp]), 1);
|
|
|
|
#if HAVE_XRC
|
|
if (MCA_BTL_XRC_ENABLED && BTL_OPENIB_QP_TYPE_XRC(qp)) {
|
|
#if OPAL_HAVE_CONNECTX_XRC
|
|
to_out_frag(frag)->sr_desc.xrc_remote_srq_num = ep->rem_info.rem_srqs[qp].rem_srq_num;
|
|
#elif OPAL_HAVE_CONNECTX_XRC_DOMAINS
|
|
to_out_frag(frag)->sr_desc.qp_type.xrc.remote_srqn = ep->rem_info.rem_srqs[qp].rem_srq_num;
|
|
#else
|
|
#error "that should never happen"
|
|
#endif
|
|
}
|
|
#endif
|
|
|
|
/* check for a send wqe */
|
|
if (qp_get_wqe(ep, qp) < 0) {
|
|
qp_put_wqe(ep, qp);
|
|
return OPAL_ERR_OUT_OF_RESOURCE;
|
|
}
|
|
|
|
qp_inflight_wqe_to_frag(ep, qp, to_com_frag(frag));
|
|
qp_reset_signal_count(ep, qp);
|
|
|
|
if (0 != (rc = ibv_post_send(ep->qps[qp].qp->lcl_qp, &to_out_frag(frag)->sr_desc, &bad_wr))) {
|
|
qp_put_wqe(ep, qp);
|
|
return OPAL_ERROR;
|
|
}
|
|
|
|
return OPAL_SUCCESS;
|
|
}
|