Skip to content

Commit

Permalink
prov/opx: Resolve coverity scan defects uncovered after upstream
Browse files Browse the repository at this point in the history 
Signed-off-by: Elias Kozah <[email protected]>
  • Loading branch information
@j-xiong
Elias Kozah authored and j-xiong committed Sep 12, 2024
1 parent 16e34ee commit e9bc616
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 21 deletions.
7 changes: 6 additions & 1 deletion prov/opx/src/fi_opx_domain.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ int fi_opx_domain(struct fid_fabric *fabric,
strncpy(opx_domain->unique_job_key_str, env_var_uuid, OPX_JOB_KEY_STR_SIZE-1);
opx_domain->unique_job_key_str[OPX_JOB_KEY_STR_SIZE-1] = '\0';

sscanf(opx_domain->unique_job_key_str, "%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx-%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx",
int elements_read = sscanf(opx_domain->unique_job_key_str, "%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx",
&opx_domain->unique_job_key[0],
&opx_domain->unique_job_key[1],
&opx_domain->unique_job_key[2],
Expand All @@ -509,6 +509,11 @@ int fi_opx_domain(struct fid_fabric *fabric,
&opx_domain->unique_job_key[13],
&opx_domain->unique_job_key[14],
&opx_domain->unique_job_key[15]);
if (elements_read == EOF) {
FI_WARN(fi_opx_global.prov, FI_LOG_DOMAIN, "Error: sscanf encountered an input failure (EOF), unable to parse the unique job key string.\n");
errno = FI_EINVAL;
goto err;
}

FI_INFO(fi_opx_global.prov, FI_LOG_DOMAIN, "Domain unique job key set to %s\n", opx_domain->unique_job_key_str);
//TODO: Print out a summary of all domain settings wtih FI_INFO
Expand Down
55 changes: 36 additions & 19 deletions prov/opx/src/fi_opx_rma.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -469,9 +469,14 @@ ssize_t fi_opx_writev_internal(struct fid_ep *ep, const struct iovec *iov, void
cc->hit_zero = fi_opx_hit_zero;

struct fi_opx_mr **mr_ptr_array = (struct fi_opx_mr **)desc;
const uint64_t mr_ptr_present = (mr_ptr_array != NULL);
struct fi_opx_mr *mr_ptr = mr_ptr_present ? *mr_ptr_array : NULL;
for (index = 0; index < count; ++index) {
struct fi_opx_mr *mr_ptr;
if (mr_ptr_array != NULL) {
mr_ptr = *mr_ptr_array;
++mr_ptr_array;
} else {
mr_ptr = NULL;
}
struct fi_opx_hmem_iov hmem_iov;
const uint64_t is_hmem = fi_opx_hmem_iov_init(iov[index].iov_base,
iov[index].iov_len,
Expand All @@ -484,8 +489,6 @@ ssize_t fi_opx_writev_internal(struct fid_ep *ep, const struct iovec *iov, void
lock_required, caps, reliability, hfi1_type);

addr_offset += iov[index].iov_len;
++mr_ptr_array;
mr_ptr = mr_ptr_present ? *mr_ptr_array : NULL;
}

return 0;
Expand Down Expand Up @@ -603,12 +606,17 @@ ssize_t fi_opx_writemsg_internal(struct fid_ep *ep, const struct fi_msg_rma *msg
uintptr_t msg_iov_vaddr = (uintptr_t)msg->msg_iov[msg_iov_index].iov_base;

struct fi_opx_mr **mr_ptr_array = (struct fi_opx_mr **)msg->desc;
const uint64_t mr_ptr_present = (mr_ptr_array != NULL);
struct fi_opx_mr *mr_ptr = mr_ptr_present ? *mr_ptr_array : NULL;
struct fi_opx_hmem_iov iov;
uint64_t is_hmem = fi_opx_hmem_iov_init((void *)msg_iov_vaddr, msg_iov_bytes, mr_ptr, &iov);

while (msg_iov_bytes != 0 && rma_iov_bytes != 0) {
struct fi_opx_mr *mr_ptr;
if (mr_ptr_array != NULL) {
mr_ptr = *mr_ptr_array;
++mr_ptr_array;
} else {
mr_ptr = NULL;
}
uint64_t is_hmem = fi_opx_hmem_iov_init((void *)msg_iov_vaddr, msg_iov_bytes, mr_ptr, &iov);
size_t len = (msg_iov_bytes <= rma_iov_bytes) ? msg_iov_bytes : rma_iov_bytes;
iov.buf = msg_iov_vaddr;
iov.len = len;
Expand All @@ -624,8 +632,6 @@ ssize_t fi_opx_writemsg_internal(struct fid_ep *ep, const struct fi_msg_rma *msg
++msg_iov_index;
msg_iov_bytes = msg->msg_iov[msg_iov_index].iov_len;
msg_iov_vaddr = (uintptr_t)msg->msg_iov[msg_iov_index].iov_base;
++mr_ptr_array;
mr_ptr = mr_ptr_present ? *mr_ptr_array : NULL;
is_hmem = fi_opx_hmem_iov_init((void *)msg_iov_vaddr, msg_iov_bytes, mr_ptr, &iov);
}

Expand Down Expand Up @@ -789,18 +795,21 @@ ssize_t fi_opx_readv(struct fid_ep *ep, const struct iovec *iov, void **desc,

/* max 8 descriptors (iovecs) per readv_internal */
struct fi_opx_mr **mr_ptr_array = (struct fi_opx_mr **)desc;
const uint64_t mr_ptr_present = (mr_ptr_array != NULL);
struct fi_opx_mr *mr_ptr = mr_ptr_present ? *mr_ptr_array : NULL;
const size_t full_count = count >> 3;
for (index = 0; index < full_count; index += 8) {
for (int i = 0; i < 8; ++i) {
struct fi_opx_mr *mr_ptr;
if (mr_ptr_array != NULL) {
mr_ptr = *mr_ptr_array;
++mr_ptr_array;
} else {
mr_ptr = NULL;
}
hmem_iface = fi_opx_hmem_get_iface(iov[index + i].iov_base, mr_ptr, &hmem_device);
hmem_iovs[i].buf = (uintptr_t) iov[index + i].iov_base;
hmem_iovs[i].len = iov[index + i].iov_len;
hmem_iovs[i].iface = hmem_iface;
hmem_iovs[i].device = hmem_device;
++mr_ptr_array;
mr_ptr = mr_ptr_present ? *mr_ptr_array : NULL;
}
fi_opx_readv_internal(opx_ep, hmem_iovs, 8, opx_addr, addr_v, key_v,
NULL, 0, NULL, NULL, cc, FI_VOID, FI_NOOP,
Expand All @@ -811,13 +820,18 @@ ssize_t fi_opx_readv(struct fid_ep *ep, const struct iovec *iov, void **desc,
/* if 'partial_ndesc' is zero, the fi_opx_readv_internal() will fence */
const size_t partial_ndesc = count & 0x07ull;
for (int i = 0; i < partial_ndesc; ++i) {
struct fi_opx_mr *mr_ptr;
if (mr_ptr_array != NULL) {
mr_ptr = *mr_ptr_array;
++mr_ptr_array;
} else {
mr_ptr = NULL;
}
hmem_iface = fi_opx_hmem_get_iface(iov[index + i].iov_base, mr_ptr, &hmem_device);
hmem_iovs[i].buf = (uintptr_t) iov[index + i].iov_base;
hmem_iovs[i].len = iov[index + i].iov_len;
hmem_iovs[i].iface = hmem_iface;
hmem_iovs[i].device = hmem_device;
++mr_ptr_array;
mr_ptr = mr_ptr_present ? *mr_ptr_array : NULL;
}
fi_opx_readv_internal(opx_ep, hmem_iovs, partial_ndesc, opx_addr, addr_v, key_v,
opx_context, tx_op_flags, opx_ep->rx->cq, opx_ep->read_cntr, cc,
Expand Down Expand Up @@ -920,10 +934,15 @@ ssize_t fi_opx_readmsg_internal(struct fid_ep *ep, const struct fi_msg_rma *msg,
cc->hit_zero = fi_opx_hit_zero;

struct fi_opx_mr **mr_ptr_array = (struct fi_opx_mr **)msg->desc;
const uint64_t mr_ptr_present = (mr_ptr_array != NULL);
struct fi_opx_mr *mr_ptr = mr_ptr_present ? *mr_ptr_array : NULL;
while (src_iov_index < src_iov_count) {
for (niov = 0; niov < 8; ++niov) {
struct fi_opx_mr *mr_ptr;
if (mr_ptr_array != NULL) {
mr_ptr = *mr_ptr_array;
++mr_ptr_array;
} else {
mr_ptr = NULL;
}
const size_t len =
(dst_iov_bytes <= src_iov_bytes) ? dst_iov_bytes : src_iov_bytes;
fi_opx_hmem_iov_init(dst_iov_vaddr, len, mr_ptr, &iov[niov]);
Expand Down Expand Up @@ -987,8 +1006,6 @@ ssize_t fi_opx_readmsg_internal(struct fid_ep *ep, const struct fi_msg_rma *msg,
++dst_iov_index;
dst_iov_bytes = msg->msg_iov[dst_iov_index].iov_len;
dst_iov_vaddr = msg->msg_iov[dst_iov_index].iov_base;
++mr_ptr_array;
mr_ptr = (mr_ptr_present) ? *mr_ptr_array : NULL;
}
} else {
dst_iov_vaddr = (void *)((uintptr_t)dst_iov_vaddr + len);
Expand Down
6 changes: 5 additions & 1 deletion prov/opx/src/fi_opx_tid_domain.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,11 @@ int opx_close_tid_domain(struct opx_tid_domain *tid_domain, int locked)
}

dlist_remove(&tid_domain->list_entry);
ofi_domain_close(&tid_domain->util_domain);
int ret = ofi_domain_close(&tid_domain->util_domain);
if (ret != 0) {
FI_WARN(fi_opx_global.prov, FI_LOG_DOMAIN, "Error closing domain: %d\n", ret);
}

free(tid_domain);

return 0;
Expand Down

0 comments on commit e9bc616

Please sign in to comment.