prov/efa: allocate pke_vec, recv_wr_vec, sge_vec from heap

Signed-off-by: Shi Jin <sjina@amazon.com>
shijin-aws · Oct 23, 2023 · 5b2327c · 5b2327c
1 parent 56b2286
commit 5b2327c
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 8 deletions.
diff --git a/prov/efa/src/efa_base_ep.c b/prov/efa/src/efa_base_ep.c
@@ -100,6 +100,12 @@ int efa_base_ep_destruct(struct efa_base_ep *base_ep)
 		base_ep->util_ep_initialized = false;
 	}
 
+	if (base_ep->recv_wr_vec)
+		free(base_ep->recv_wr_vec);
+
+	if (base_ep->sge_vec)
+		free(base_ep->sge_vec);
+
 	return err;
 }
 
@@ -299,6 +305,16 @@ int efa_base_ep_construct(struct efa_base_ep *base_ep,
 
 	base_ep->xmit_more_wr_tail = &base_ep->xmit_more_wr_head;
 	base_ep->recv_more_wr_tail = &base_ep->recv_more_wr_head;
+	base_ep->recv_wr_vec = calloc(sizeof(struct ibv_recv_wr), EFA_RDM_EP_MAX_WR_PER_IBV_POST_RECV);
+	if (!base_ep->recv_wr_vec) {
+		EFA_WARN(FI_LOG_EP_CTRL, "cannot alloc memory for base_ep->recv_wr_vec!\n");
+		return -FI_ENOMEM;
+	}
+	base_ep->sge_vec = calloc(sizeof(struct ibv_sge), EFA_RDM_EP_MAX_WR_PER_IBV_POST_RECV);
+	if (!base_ep->sge_vec) {
+		EFA_WARN(FI_LOG_EP_CTRL, "cannot alloc memory for base_ep->sge_vec!\n");
+		return -FI_ENOMEM;
+	}
 	base_ep->efa_qp_enabled = false;
 	return 0;
 }

diff --git a/prov/efa/src/efa_base_ep.h b/prov/efa/src/efa_base_ep.h
@@ -68,6 +68,8 @@ struct efa_base_ep {
 	struct ibv_send_wr *xmit_more_wr_tail;
 	struct ibv_recv_wr recv_more_wr_head;
 	struct ibv_recv_wr *recv_more_wr_tail;
+	struct ibv_recv_wr *recv_wr_vec;
+	struct ibv_sge *sge_vec;
 };
 
 int efa_base_ep_bind_av(struct efa_base_ep *base_ep, struct efa_av *av);

diff --git a/prov/efa/src/rdm/efa_rdm_ep.h b/prov/efa/src/rdm/efa_rdm_ep.h
@@ -233,6 +233,7 @@ struct efa_rdm_ep {
 	bool sendrecv_in_order_aligned_128_bytes; /**< whether to support in order send/recv of each aligned 128 bytes memory region */
 	bool write_in_order_aligned_128_bytes; /**< whether to support in order write of each aligned 128 bytes memory region */
 	char err_msg[EFA_RDM_ERROR_MSG_BUFFER_LENGTH]; /* A large enough buffer to store CQ/EQ error data used by e.g. fi_cq_readerr */
+	struct efa_rdm_pke **pke_vec;
 };
 
 int efa_rdm_ep_flush_queued_blocking_copy_to_hmem(struct efa_rdm_ep *ep);

diff --git a/prov/efa/src/rdm/efa_rdm_ep_fiops.c b/prov/efa/src/rdm/efa_rdm_ep_fiops.c
@@ -543,6 +543,13 @@ int efa_rdm_ep_open(struct fid_domain *domain, struct fi_info *info,
 	if (ret)
 		goto err_close_core_cq;
 
+	efa_rdm_ep->pke_vec = calloc(sizeof(struct efa_rdm_pke *), EFA_RDM_EP_MAX_WR_PER_IBV_POST_RECV);
+	if (!efa_rdm_ep->pke_vec) {
+		EFA_WARN(FI_LOG_EP_CTRL, "cannot alloc memory for efa_rdm_ep->pke_vec!\n");
+		ret = -FI_ENOMEM;
+		goto err_close_core_cq;
+	}
+
 	*ep = &efa_rdm_ep->base_ep.util_ep.ep_fid;
 	(*ep)->msg = &efa_rdm_msg_ops;
 	(*ep)->rma = &efa_rdm_rma_ops;
@@ -845,6 +852,9 @@ static int efa_rdm_ep_close(struct fid *fid)
 		efa_rdm_ep->peer_srx_ep = NULL;
 	}
 	efa_rdm_ep_destroy_buffer_pools(efa_rdm_ep);
+
+	if (efa_rdm_ep->pke_vec)
+		free(efa_rdm_ep->pke_vec);
 	free(efa_rdm_ep);
 	return retv;
 }

diff --git a/prov/efa/src/rdm/efa_rdm_ep_progress.c b/prov/efa/src/rdm/efa_rdm_ep_progress.c
@@ -54,23 +54,22 @@
  */
 int efa_rdm_ep_bulk_post_internal_rx_pkts(struct efa_rdm_ep *ep)
 {
-	struct efa_rdm_pke *pke_vec[EFA_RDM_EP_MAX_WR_PER_IBV_POST_RECV];
 	int i, err;
 
 	if (ep->efa_rx_pkts_to_post == 0)
 		return 0;
 
 	assert(ep->efa_rx_pkts_to_post + ep->efa_rx_pkts_posted <= ep->efa_max_outstanding_rx_ops);
 	for (i = 0; i < ep->efa_rx_pkts_to_post; ++i) {
-		pke_vec[i] = efa_rdm_pke_alloc(ep, ep->efa_rx_pkt_pool,
+		ep->pke_vec[i] = efa_rdm_pke_alloc(ep, ep->efa_rx_pkt_pool,
 					       EFA_RDM_PKE_FROM_EFA_RX_POOL);
-		assert(pke_vec[i]);
+		assert(ep->pke_vec[i]);
 	}
 
-	err = efa_rdm_pke_recvv(pke_vec, ep->efa_rx_pkts_to_post);
+	err = efa_rdm_pke_recvv(ep->pke_vec, ep->efa_rx_pkts_to_post);
 	if (OFI_UNLIKELY(err)) {
 		for (i = 0; i < ep->efa_rx_pkts_to_post; ++i)
-			efa_rdm_pke_release_rx(pke_vec[i]);
+			efa_rdm_pke_release_rx(ep->pke_vec[i]);
 
 		EFA_WARN(FI_LOG_EP_CTRL,
 			"failed to post buf %d (%s)\n", -err,
@@ -80,7 +79,7 @@ int efa_rdm_ep_bulk_post_internal_rx_pkts(struct efa_rdm_ep *ep)
 
 #if ENABLE_DEBUG
 	for (i = 0; i < ep->efa_rx_pkts_to_post; ++i) {
-		dlist_insert_tail(&pke_vec[i]->dbg_entry,
+		dlist_insert_tail(&ep->pke_vec[i]->dbg_entry,
 				  &ep->rx_posted_buf_list);
 	}
 #endif

diff --git a/prov/efa/src/rdm/efa_rdm_pke.c b/prov/efa/src/rdm/efa_rdm_pke.c
@@ -633,13 +633,15 @@ ssize_t efa_rdm_pke_recvv(struct efa_rdm_pke **pke_vec,
 			  int pke_cnt)
 {
 	struct efa_rdm_ep *ep;
-	struct ibv_recv_wr recv_wr_vec[EFA_RDM_EP_MAX_WR_PER_IBV_POST_RECV], *bad_wr;
-	struct ibv_sge sge_vec[EFA_RDM_EP_MAX_WR_PER_IBV_POST_RECV];
+	struct ibv_recv_wr *recv_wr_vec, *bad_wr;
+	struct ibv_sge *sge_vec;
 	int i, err;
 
 	assert(pke_cnt);
 
 	ep = pke_vec[0]->ep;
+	recv_wr_vec = ep->base_ep.recv_wr_vec;
+	sge_vec = ep->base_ep.sge_vec;
 	assert(ep);
 
 	for (i = 0; i < pke_cnt; ++i) {