From 3299864c1af78a6b433f5c8aff3f12c62da94a5d Mon Sep 17 00:00:00 2001 From: Shi Jin Date: Thu, 28 Mar 2024 21:47:25 +0000 Subject: [PATCH 1/2] prov/efa: remove unused cq_attr Signed-off-by: Shi Jin --- prov/efa/src/rdm/efa_rdm_ep_fiops.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/prov/efa/src/rdm/efa_rdm_ep_fiops.c b/prov/efa/src/rdm/efa_rdm_ep_fiops.c index 23a37e498c7..9ac3628c920 100644 --- a/prov/efa/src/rdm/efa_rdm_ep_fiops.c +++ b/prov/efa/src/rdm/efa_rdm_ep_fiops.c @@ -427,7 +427,6 @@ int efa_rdm_ep_open(struct fid_domain *domain, struct fi_info *info, { struct efa_domain *efa_domain = NULL; struct efa_rdm_ep *efa_rdm_ep = NULL; - struct fi_cq_attr cq_attr; int ret, retv, i; efa_rdm_ep = calloc(1, sizeof(*efa_rdm_ep)); @@ -436,9 +435,6 @@ int efa_rdm_ep_open(struct fid_domain *domain, struct fi_info *info, efa_domain = container_of(domain, struct efa_domain, util_domain.domain_fid); - memset(&cq_attr, 0, sizeof(cq_attr)); - cq_attr.format = FI_CQ_FORMAT_DATA; - cq_attr.wait_obj = FI_WAIT_NONE; ret = efa_base_ep_construct(&efa_rdm_ep->base_ep, domain, info, efa_rdm_ep_progress, context); @@ -476,9 +472,6 @@ int efa_rdm_ep_open(struct fid_domain *domain, struct fi_info *info, efa_rdm_ep->use_device_rdma = efa_rdm_get_use_device_rdma(info->fabric_attr->api_version); efa_rdm_ep->shm_permitted = true; - cq_attr.size = MAX(efa_rdm_ep->rx_size + efa_rdm_ep->tx_size, - efa_env.cq_size); - assert(info->tx_attr->msg_order == info->rx_attr->msg_order); efa_rdm_ep->msg_order = info->rx_attr->msg_order; efa_rdm_ep->max_msg_size = info->ep_attr->max_msg_size; From 1403c516a3a2d167f4996560b925f3686c7427b7 Mon Sep 17 00:00:00 2001 From: Shi Jin Date: Thu, 28 Mar 2024 21:48:48 +0000 Subject: [PATCH 2/2] prov/efa: Move efa_rdm_cq_poll_ibv_cq to efa_rdm_cq.h This function is specific for RDM endpoint. Signed-off-by: Shi Jin --- prov/efa/src/efa_cq.h | 2 -- prov/efa/src/rdm/efa_rdm_cq.h | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/prov/efa/src/efa_cq.h b/prov/efa/src/efa_cq.h index c913b6f8172..e616741d454 100644 --- a/prov/efa/src/efa_cq.h +++ b/prov/efa/src/efa_cq.h @@ -18,8 +18,6 @@ struct efa_ibv_cq_poll_list_entry { struct efa_ibv_cq *cq; }; -void efa_rdm_cq_poll_ibv_cq(ssize_t cqe_to_process, struct efa_ibv_cq *ibv_cq); - static inline int efa_ibv_cq_poll_list_match(struct dlist_entry *entry, const void *cq) { diff --git a/prov/efa/src/rdm/efa_rdm_cq.h b/prov/efa/src/rdm/efa_rdm_cq.h index c7fe15d9166..23848b6cc1d 100644 --- a/prov/efa/src/rdm/efa_rdm_cq.h +++ b/prov/efa/src/rdm/efa_rdm_cq.h @@ -22,4 +22,5 @@ struct efa_rdm_cq { int efa_rdm_cq_open(struct fid_domain *domain, struct fi_cq_attr *attr, struct fid_cq **cq_fid, void *context); +void efa_rdm_cq_poll_ibv_cq(ssize_t cqe_to_process, struct efa_ibv_cq *ibv_cq); #endif