Skip to content
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.

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

prov/verbs: Always return vrb_prov in VERBS_INI #10795

Merged
merged 1 commit into from
Feb 19, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions prov/verbs/src/verbs_info.c
Original file line number Diff line number Diff line change
Expand Up @@ -1366,6 +1366,13 @@ static int vrb_init_info(const struct fi_info **all_infos)
initialized = true;
*all_infos = NULL;

if (vrb_os_ini()) {
FI_WARN(&vrb_prov, FI_LOG_FABRIC,
"failed in OS specific device initialization\n");
ret = -FI_ENODATA;
goto done;
}

vrb_prof_func_start("vrb_os_mem_support");
vrb_os_mem_support(&vrb_gl_data.peer_mem_support,
&vrb_gl_data.dmabuf_support);
Expand Down
3 changes: 0 additions & 3 deletions prov/verbs/src/verbs_init.c
Original file line number Diff line number Diff line change
Expand Up @@ -807,9 +807,6 @@ VERBS_INI
#endif
ofi_mutex_init(&vrb_init_mutex);

if (vrb_os_ini())
return NULL;

vrb_prof_init();

return &vrb_prov;
Expand Down