Skip to content
This repository was archived by the owner on Sep 30, 2022. It is now read-only.

btl/openib: remove OFED version runtime check when XRC is used #503

Merged
merged 1 commit into from
Aug 17, 2015
Merged

btl/openib: remove OFED version runtime check when XRC is used #503

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
4 changes: 0 additions & 4 deletions opal/mca/btl/openib/btl_openib_component.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1011,10 +1011,6 @@ static void device_destruct(mca_btl_openib_device_t *device)

#if HAVE_XRC

if (!mca_btl_openib_xrc_check_api()) {
return;
}

if (MCA_BTL_XRC_ENABLED) {
if (OPAL_SUCCESS != mca_btl_openib_close_xrc_domain(device)) {
BTL_VERBOSE(("XRC Internal error. Failed to close xrc domain"));
Expand Down
23 changes: 0 additions & 23 deletions opal/mca/btl/openib/btl_openib_xrc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,29 +39,6 @@ OBJ_CLASS_INSTANCE(ib_address_t,
ib_address_constructor,
ib_address_destructor);

/* run-time check for which libibverbs XRC API we really have underneath */
bool mca_btl_openib_xrc_check_api()
{
void *lib = dlopen(NULL, RTLD_NOW); /* current program */
if (!lib) {
BTL_ERROR(("XRC error: could not find XRC API version"));
return false;
}

#if OPAL_HAVE_CONNECTX_XRC_DOMAINS
if (NULL != dlsym(lib, "ibv_open_xrcd")) {
BTL_ERROR(("XRC error: bad XRC API (require XRC from OFED 3.12+)"));
return false;
}
#else
if (NULL != dlsym(lib, "ibv_create_xrc_rcv_qp")) {
BTL_ERROR(("XRC error: bad XRC API (require XRC from OFED pre 3.12)."));
return false;
}
#endif
return true;
}

/* This func. opens XRC domain */
int mca_btl_openib_open_xrc_domain(struct mca_btl_openib_device_t *device)
{
Expand Down
2 changes: 0 additions & 2 deletions opal/mca/btl/openib/btl_openib_xrc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,4 @@ int mca_btl_openib_close_xrc_domain(struct mca_btl_openib_device_t *device);
int mca_btl_openib_ib_address_add_new (uint16_t lid, uint64_t s_id,
opal_jobid_t ep_jobid, mca_btl_openib_endpoint_t *ep);

bool mca_btl_openib_xrc_check_api(void);

#endif