9613b3176c
After much work by Jeff and myself, and quite a lot of discussion, it has become clear that we simply cannot resolve the infinite loops caused by RML-involved subsystems calling orte_output. The original rationale for the change to orte_output has also been reduced by shifting the output of XML-formatted vs human readable messages to an alternative approach. I have globally replaced the orte_output/ORTE_OUTPUT calls in the code base, as well as the corresponding .h file name. I have test compiled and run this on the various environments within my reach, so hopefully this will prove minimally disruptive. This commit was SVN r18619.
178 строки
5.6 KiB
C
178 строки
5.6 KiB
C
/*
|
|
* Copyright (c) 2007-2008 Mellanox Technologies. All rights reserved.
|
|
* $COPYRIGHT$
|
|
*
|
|
* Additional copyrights may follow
|
|
*
|
|
* $HEADER$
|
|
*/
|
|
|
|
#include "ompi_config.h"
|
|
|
|
#include <infiniband/verbs.h>
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
#include <fcntl.h>
|
|
#include <errno.h>
|
|
#include <unistd.h>
|
|
|
|
#include "orte/util/show_help.h"
|
|
#include "ompi/mca/btl/btl.h"
|
|
#include "ompi/mca/btl/base/base.h"
|
|
#include "btl_openib_xrc.h"
|
|
#include "btl_openib.h"
|
|
|
|
#if HAVE_XRC
|
|
#define SIZE_OF3(A, B, C) (sizeof(A) + sizeof(B) + sizeof(C))
|
|
|
|
static void ib_address_constructor(ib_address_t *ib_addr);
|
|
static void ib_address_destructor(ib_address_t *ib_addr);
|
|
|
|
OBJ_CLASS_INSTANCE(ib_address_t,
|
|
opal_list_item_t,
|
|
ib_address_constructor,
|
|
ib_address_destructor);
|
|
|
|
/* This func. opens XRC domain */
|
|
int mca_btl_openib_open_xrc_domain(struct mca_btl_openib_hca_t *hca)
|
|
{
|
|
int len;
|
|
char *xrc_file_name;
|
|
const char *dev_name;
|
|
|
|
dev_name = ibv_get_device_name(hca->ib_dev);
|
|
len = asprintf(&xrc_file_name,
|
|
"%s"OPAL_PATH_SEP"openib_xrc_domain_%s",
|
|
orte_process_info.job_session_dir, dev_name);
|
|
if (0 > len) {
|
|
BTL_ERROR(("Failed to allocate memomry for XRC file name\n",
|
|
strerror(errno)));
|
|
return OMPI_ERROR;
|
|
}
|
|
|
|
hca->xrc_fd = open(xrc_file_name, O_CREAT, S_IWUSR|S_IRUSR);
|
|
if (0 > hca->xrc_fd) {
|
|
BTL_ERROR(("Failed to open XRC domain file %s, errno says %s\n",
|
|
xrc_file_name,strerror(errno)));
|
|
free(xrc_file_name);
|
|
return OMPI_ERROR;
|
|
}
|
|
|
|
hca->xrc_domain = ibv_open_xrc_domain(hca->ib_dev_context, hca->xrc_fd, O_CREAT);
|
|
if (NULL == hca->xrc_domain) {
|
|
BTL_ERROR(("Failed to open XRC domain\n"));
|
|
close(hca->xrc_fd);
|
|
free(xrc_file_name);
|
|
return OMPI_ERROR;
|
|
}
|
|
|
|
return OMPI_SUCCESS;
|
|
}
|
|
|
|
/* This func. closes XRC domain */
|
|
int mca_btl_openib_close_xrc_domain(struct mca_btl_openib_hca_t *hca)
|
|
{
|
|
if (NULL == hca->xrc_domain) {
|
|
/* No XRC domain, just exit */
|
|
return OMPI_SUCCESS;
|
|
}
|
|
if (ibv_close_xrc_domain(hca->xrc_domain)) {
|
|
BTL_ERROR(("Failed to close XRC domain, errno says %s\n",
|
|
hca->xrc_fd, strerror(errno)));
|
|
return OMPI_ERROR;
|
|
}
|
|
/* do we need to check exit status */
|
|
if (close(hca->xrc_fd)) {
|
|
BTL_ERROR(("Failed to close XRC file descriptor %s, errno says %s\n",
|
|
hca->xrc_fd, strerror(errno)));
|
|
return OMPI_ERROR;
|
|
}
|
|
return OMPI_SUCCESS;
|
|
}
|
|
|
|
static void ib_address_constructor(ib_address_t *ib_addr)
|
|
{
|
|
ib_addr->key = NULL;
|
|
ib_addr->subnet_id = 0;
|
|
ib_addr->lid = 0;
|
|
ib_addr->status = MCA_BTL_IB_ADDR_CLOSED;
|
|
ib_addr->qp = NULL;
|
|
OBJ_CONSTRUCT(&ib_addr->addr_lock, opal_mutex_t);
|
|
OBJ_CONSTRUCT(&ib_addr->pending_ep, opal_list_t);
|
|
}
|
|
|
|
static void ib_address_destructor(ib_address_t *ib_addr)
|
|
{
|
|
if (NULL != ib_addr->key) {
|
|
free(ib_addr->key);
|
|
}
|
|
OBJ_DESTRUCT(&ib_addr->addr_lock);
|
|
OBJ_DESTRUCT(&ib_addr->pending_ep);
|
|
}
|
|
|
|
static int ib_address_init(ib_address_t *ib_addr, uint16_t lid, uint64_t s_id, orte_jobid_t ep_jobid)
|
|
{
|
|
ib_addr->key = malloc(SIZE_OF3(s_id, lid, ep_jobid));
|
|
if (NULL == ib_addr->key) {
|
|
BTL_ERROR(("Failed to allocate memory for key\n"));
|
|
return OMPI_ERROR;
|
|
}
|
|
memset(ib_addr->key, 0, SIZE_OF3(s_id, lid, ep_jobid));
|
|
/* creating the key = lid + s_id + ep_jobid */
|
|
memcpy(ib_addr->key, &lid, sizeof(lid));
|
|
memcpy((void*)((char*)ib_addr->key + sizeof(lid)), &s_id, sizeof(s_id));
|
|
memcpy((void*)((char*)ib_addr->key + sizeof(lid) + sizeof(s_id)),
|
|
&ep_jobid, sizeof(ep_jobid));
|
|
/* caching lid and subnet id */
|
|
ib_addr->subnet_id = s_id;
|
|
ib_addr->lid = lid;
|
|
|
|
return OMPI_SUCCESS;
|
|
}
|
|
|
|
/* Create new entry in hash table for subnet_id and lid,
|
|
* update the endpoint pointer.
|
|
* Before call to this function you need to protect with
|
|
*/
|
|
int mca_btl_openib_ib_address_add_new (uint16_t lid, uint64_t s_id,
|
|
orte_jobid_t ep_jobid, mca_btl_openib_endpoint_t *ep)
|
|
{
|
|
void *tmp;
|
|
int ret = OMPI_SUCCESS;
|
|
struct ib_address_t *ib_addr = OBJ_NEW(ib_address_t);
|
|
|
|
ret = ib_address_init(ib_addr, lid, s_id, ep_jobid);
|
|
if (OMPI_SUCCESS != ret ) {
|
|
BTL_ERROR(("XRC Internal error. Failed to init ib_addr\n"));
|
|
OBJ_DESTRUCT(ib_addr);
|
|
return ret;
|
|
}
|
|
/* is it already in the table ?*/
|
|
OPAL_THREAD_LOCK(&mca_btl_openib_component.ib_lock);
|
|
if (OPAL_SUCCESS != opal_hash_table_get_value_ptr(&mca_btl_openib_component.ib_addr_table,
|
|
ib_addr->key,
|
|
SIZE_OF3(s_id, lid, ep_jobid), &tmp)) {
|
|
/* It is new one, lets put it on the table */
|
|
ret = opal_hash_table_set_value_ptr(&mca_btl_openib_component.ib_addr_table,
|
|
ib_addr->key, SIZE_OF3(s_id, lid, ep_jobid), (void*)ib_addr);
|
|
if (OPAL_SUCCESS != ret) {
|
|
BTL_ERROR(("XRC Internal error."
|
|
" Failed to add element to mca_btl_openib_component.ib_addr_table\n"));
|
|
OPAL_THREAD_UNLOCK(&mca_btl_openib_component.ib_lock);
|
|
OBJ_DESTRUCT(ib_addr);
|
|
return ret;
|
|
}
|
|
/* update the endpoint with pointer to ib address */
|
|
ep->ib_addr = ib_addr;
|
|
} else {
|
|
/* so we have this one in the table, just add the pointer to the endpoint */
|
|
ep->ib_addr = (ib_address_t *)tmp;
|
|
assert(lid == ep->ib_addr->lid && s_id == ep->ib_addr->subnet_id);
|
|
OBJ_DESTRUCT(ib_addr);
|
|
}
|
|
OPAL_THREAD_UNLOCK(&mca_btl_openib_component.ib_lock);
|
|
|
|
return ret;
|
|
}
|
|
#endif
|