core: Move FI_PRIORITY to internal flag

Flag is only used between rxm and verbs. Signed-off-by: Sean Hefty <[email protected]>
ofiwg · Mar 7, 2024 · 31fc403 · 31fc403
1 parent c0c835b
commit 31fc403
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/include/ofi_util.h b/include/ofi_util.h
@@ -1248,6 +1248,7 @@ void *ofi_ns_resolve_name(struct util_ns *ns, const char *server,
  *     the core by calling add_credits.
  */
 #define OFI_OPS_FLOW_CTRL "ofix_flow_ctrl_v1"
+#define OFI_PRIORITY (1ULL << 62)
 
 struct ofi_ops_flow_ctrl {
 	size_t	size;

diff --git a/include/rdma/fabric.h b/include/rdma/fabric.h
@@ -148,7 +148,7 @@ typedef struct fid *fid_t;
 #define FI_PEEK			(1ULL << 19)
 #define FI_TRIGGER		(1ULL << 20)
 #define FI_FENCE		(1ULL << 21)
-#define FI_PRIORITY		(1ULL << 22)
+/* #define FI_PRIORITY		(1ULL << 22) */
 
 #define FI_COMPLETION		(1ULL << 24)
 #define FI_EVENT		FI_COMPLETION

diff --git a/prov/rxm/src/rxm_domain.c b/prov/rxm/src/rxm_domain.c
@@ -771,7 +771,7 @@ static ssize_t rxm_send_credits(struct fid_ep *ep, uint64_t credits)
 	msg.context = tx_buf;
 	msg.desc = &tx_buf->hdr.desc;
 
-	ret = fi_sendmsg(ep, &msg, FI_PRIORITY);
+	ret = fi_sendmsg(ep, &msg, OFI_PRIORITY);
 	if (!ret)
 		return FI_SUCCESS;
 

diff --git a/prov/rxm/src/rxm_ep.c b/prov/rxm/src/rxm_ep.c
@@ -960,7 +960,7 @@ void rxm_ep_progress_deferred_queue(struct rxm_ep *rxm_ep,
 			msg.msg_iov = &iov;
 
 			ret = fi_sendmsg(def_tx_entry->rxm_conn->msg_ep, &msg,
-					 FI_PRIORITY);
+					 OFI_PRIORITY);
 			if (ret) {
 				if (ret != -FI_EAGAIN) {
 					rxm_cq_write_error(

diff --git a/prov/verbs/src/verbs_ep.c b/prov/verbs/src/verbs_ep.c
@@ -155,7 +155,7 @@ ssize_t vrb_post_send(struct vrb_ep *ep, struct ibv_send_wr *wr, uint64_t flags)
 	}
 
 	if (vrb_wr_consumes_recv(wr) && !--ep->peer_rq_credits &&
-	    !(flags & FI_PRIORITY)) {
+	    !(flags & OFI_PRIORITY)) {
 		/* Last credit is reserved for credit update */
 		ep->peer_rq_credits++;
 		goto freectx;