Skip to content

Commit 5616e12

Browse files
committed
Merge pull request open-mpi#767 from alex-mikheev/topic/ikrit_err_fix_fix-v2.x
SPML/IKRIT: opal_progress and ud_only fixes
2 parents 17714ad + b623293 commit 5616e12

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

oshmem/mca/spml/ikrit/spml_ikrit.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,13 @@ static inline mxm_mem_key_t *to_mxm_mkey(sshmem_mkey_t *mkey) {
105105

106106
static inline void mca_spml_irkit_req_wait(mxm_req_base_t *req)
107107
{
108-
while (!mxm_req_test(req))
108+
do {
109+
/* do at least one progress since
110+
* with some TLs (self, shm) request
111+
* can be completed immediately
112+
*/
109113
opal_progress();
114+
} while (!mxm_req_test(req));
110115
}
111116

112117
static int mca_spml_ikrit_put_request_free(struct oshmem_request_t** request)

oshmem/mca/spml/ikrit/spml_ikrit_component.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@ static inline int check_mxm_hw_tls(char *v, char *tls)
126126
if (strstr(tls, "ud") &&
127127
(NULL == strstr(tls, "rc") && NULL == strstr(tls, "dc") &&
128128
NULL == strstr(tls, "shm"))) {
129-
mca_spml_ikrit.ud_only = 1;
130129
return OSHMEM_SUCCESS;
131130
}
132131
}

0 commit comments

Comments
 (0)