Skip to content

prov/efa: Move domain check inside the fabric lock #11463

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

Merged
merged 1 commit into from
Oct 6, 2025
Merged

prov/efa: Move domain check inside the fabric lock #11463

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
24 changes: 13 additions & 11 deletions prov/efa/src/efa_user_info.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,22 +607,24 @@ int efa_get_user_info(uint32_t version, const char *node,
util_lookup_existing_fabric_domain(&efa_util_prov, hints, &dupinfo);

if (hints && hints->domain_attr && hints->domain_attr->name &&
dupinfo->fabric_attr->fabric && !dupinfo->domain_attr->domain) {
dupinfo->fabric_attr->fabric) {
fabric = container_of(dupinfo->fabric_attr->fabric, struct util_fabric, fabric_fid);
EFA_INFO(FI_LOG_CORE, "Reusing open fabric %s\n", fabric->name);

/* Use efa specific efa_find_domain instead of util_find_domain */
ofi_mutex_lock(&fabric->lock);
item = dlist_find_first_match(&fabric->domain_list, efa_find_domain, prov_info);
if (item) {
domain = container_of(item, struct util_domain, list_entry);
ofi_genlock_lock(&domain->lock);
dupinfo->domain_attr->domain = &domain->domain_fid;
EFA_INFO(FI_LOG_CORE, "Reusing open domain %s\n", domain->name);
domain->info_domain_caps |= dupinfo->caps | dupinfo->domain_attr->caps;
domain->info_domain_mode |= dupinfo->mode | dupinfo->domain_attr->mode;
domain->mr_mode |= dupinfo->domain_attr->mr_mode;
ofi_genlock_unlock(&domain->lock);
if (!dupinfo->domain_attr->domain) {
item = dlist_find_first_match(&fabric->domain_list, efa_find_domain, prov_info);
if (item) {
domain = container_of(item, struct util_domain, list_entry);
ofi_genlock_lock(&domain->lock);
dupinfo->domain_attr->domain = &domain->domain_fid;
EFA_INFO(FI_LOG_CORE, "Reusing open domain %s\n", domain->name);
domain->info_domain_caps |= dupinfo->caps | dupinfo->domain_attr->caps;
domain->info_domain_mode |= dupinfo->mode | dupinfo->domain_attr->mode;
domain->mr_mode |= dupinfo->domain_attr->mr_mode;
ofi_genlock_unlock(&domain->lock);
}
}
ofi_mutex_unlock(&fabric->lock);
}
Expand Down