Skip to content

Add BTL_OFI_BLACKLIST #6734

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

Closed
wants to merge 2 commits into from
Closed

Add BTL_OFI_BLACKLIST #6734

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
48c228f
Add BTL_OFI_BLACKLIST
guserav Jun 3, 2019
36fa464
Add requested changes of @jsquyres
guserav Jun 4, 2019
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
68 changes: 59 additions & 9 deletions opal/mca/btl/ofi/btl_ofi_component.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,11 @@

#define MCA_BTL_OFI_REQUESTED_MR_MODE (FI_MR_ALLOCATED | FI_MR_PROV_KEY | FI_MR_VIRT_ADDR)

#define MCA_BTL_OFI_PROV_EXCLUDE_DEFAULT \
"shm,sockets,tcp,udp,rstream,psm2"

static char *prov_include;
static char *prov_exclude;
static char *ofi_progress_mode;
static bool disable_sep;
static int mca_btl_ofi_init_device(struct fi_info *info);
Expand Down Expand Up @@ -117,13 +121,22 @@ static int mca_btl_ofi_component_register(void)
"provider_include",
"OFI provider that ofi btl will query for. This parameter only "
"accept ONE provider name. "
"(e.g., \"psm2\"; an empty value means that all providers will "
"(e.g., \"gni\"; an empty value means that all providers will "
"be considered.",
MCA_BASE_VAR_TYPE_STRING, NULL, 0, 0,
OPAL_INFO_LVL_4,
MCA_BASE_VAR_SCOPE_READONLY,
&prov_include);

prov_exclude = MCA_BTL_OFI_PROV_EXCLUDE_DEFAULT;
(void) mca_base_component_var_register(&mca_btl_ofi_component.super.btl_version,
"provider_exclude",
"Comma-delimited list of OFI providers that are not considered for use (default: \"" MCA_BTL_OFI_PROV_EXCLUDE_DEFAULT "\"; empty value means that all providers will be considered). Mutually exclusive with btl_ofi_provider_include.",
MCA_BASE_VAR_TYPE_STRING, NULL, 0, 0,
OPAL_INFO_LVL_4,
MCA_BASE_VAR_SCOPE_READONLY,
&prov_exclude);

mca_btl_ofi_component.num_cqe_read = MCA_BTL_OFI_NUM_CQE_READ;
(void) mca_base_component_var_register(&mca_btl_ofi_component.super.btl_version,
"num_cq_read",
Expand Down Expand Up @@ -213,6 +226,22 @@ void mca_btl_ofi_exit(void)
exit(1);
}

static bool is_in_list(char * const *list, const char *item)
{
int i;

if (!list) {
return false;
}
for (i = 0; list[i]; i++) {
if (!strcmp(list[i], item)) {
return true;
}
}

return false;
}

/*
* OFI component initialization:
* read interface list from kernel and compare against component parameters
Expand Down Expand Up @@ -325,19 +354,40 @@ static mca_btl_base_module_t **mca_btl_ofi_component_init (int *num_btl_modules,
}
BTL_VERBOSE(("ofi btl found %d possible resources.", resource_count));

info = info_list;
char **exclude_list = NULL;
char *prov_name;

while(info) {
if (prov_exclude) {
exclude_list = opal_argv_split(prov_exclude, ',');
}
for (info = info_list; info; info = info->next) {
prov_name = info->fabric_attr->prov_name;
opal_output_verbose(1, opal_btl_base_framework.framework_output,
"%s:%d: btl:ofi: trying \"%s\"\n",
__FILE__, __LINE__, prov_name);
/* prov_include wins; same behavior as mtl_ofi */
if ((exclude_list && is_in_list(exclude_list, prov_name)) &&
!(prov_include && !strcmp(prov_include, prov_name))) {
opal_output_verbose(1, opal_btl_base_framework.framework_output,
"%s:%d: btl:ofi: \"%s\" in exclude list\n",
__FILE__, __LINE__, prov_name);
continue;
}
rc = validate_info(info, required_caps);
if (OPAL_SUCCESS != rc) {
continue;
}
/* Device passed sanity check, let's make a module.
* We only pick the first device we found valid */
rc = mca_btl_ofi_init_device(info);
if (OPAL_SUCCESS == rc) {
/* Device passed sanity check, let's make a module.
* We only pick the first device we found valid */
rc = mca_btl_ofi_init_device(info);
if (OPAL_SUCCESS == rc)
break;
opal_output_verbose(1, opal_btl_base_framework.framework_output,
"%s:%d: btl:ofi: using \"%s\"\n",
__FILE__, __LINE__, prov_name);
break;
}
info = info->next;
}
free(exclude_list);

/* We are done with the returned info. */
fi_freeinfo(info_list);
Expand Down