[Pkg-ofed-commits] [libfabric] 19/123: prov/sockets: Changed ep capabilities definition to primary and secondary

Ana Beatriz Guerrero López ana at moszumanska.debian.org
Sat Oct 22 12:28:25 UTC 2016


This is an automated email from the git hooks/post-receive script.

ana pushed a commit to annotated tag v1.1.1
in repository libfabric.

commit e56d9839af236a4d0b27e4c0ca620797a5cb8d27
Author: shantonu <shantonu.hossain at intel.com>
Date:   Thu Aug 27 14:28:11 2015 -0700

    prov/sockets: Changed ep capabilities definition to primary and secondary
    
    Signed-off-by: Shantonu Hossain <shantonu.hossain at intel.com>
---
 prov/sockets/src/sock.h          | 26 +++++++++++++++++---------
 prov/sockets/src/sock_ep.c       |  4 ++--
 prov/sockets/src/sock_ep_dgram.c | 22 +++++++++++-----------
 prov/sockets/src/sock_ep_msg.c   | 22 +++++++++++-----------
 prov/sockets/src/sock_ep_rdm.c   | 24 ++++++++++++------------
 prov/sockets/src/sock_fabric.c   |  6 +++---
 6 files changed, 56 insertions(+), 48 deletions(-)

diff --git a/prov/sockets/src/sock.h b/prov/sockets/src/sock.h
index a1505cb..3c039b8 100644
--- a/prov/sockets/src/sock.h
+++ b/prov/sockets/src/sock.h
@@ -96,20 +96,28 @@
 #define SOCK_EP_MAX_RETRY (5)
 #define SOCK_EP_MAX_CM_DATA_SZ (256)
 
-#define SOCK_EP_RDM_CAP (FI_MSG | FI_RMA | FI_TAGGED | FI_ATOMICS |	\
+#define SOCK_EP_RDM_PRI_CAP (FI_MSG | FI_RMA | FI_TAGGED | FI_ATOMICS |	\
 			 FI_NAMED_RX_CTX | \
-			 FI_DIRECTED_RECV | FI_MULTI_RECV | \
-			 FI_SOURCE | FI_READ | FI_WRITE | FI_RECV | FI_SEND | \
-			 FI_REMOTE_READ | FI_REMOTE_WRITE | \
+			 FI_DIRECTED_RECV | \
+			 FI_READ | FI_WRITE | FI_RECV | FI_SEND | \
+			 FI_REMOTE_READ | FI_REMOTE_WRITE)
+
+#define SOCK_EP_RDM_SEC_CAP (FI_MULTI_RECV | \
+			 FI_SOURCE | \
 			 FI_RMA_EVENT | \
-			 FI_MORE | FI_FENCE | FI_TRIGGER)
+			 FI_FENCE | FI_TRIGGER)
+
+#define SOCK_EP_MSG_PRI_CAP SOCK_EP_RDM_PRI_CAP
 
-#define SOCK_EP_MSG_CAP SOCK_EP_RDM_CAP
+#define SOCK_EP_MSG_SEC_CAP SOCK_EP_RDM_SEC_CAP
 
-#define SOCK_EP_DGRAM_CAP (FI_MSG | FI_TAGGED | \
+#define SOCK_EP_DGRAM_PRI_CAP (FI_MSG | FI_TAGGED | \
 			   FI_NAMED_RX_CTX | FI_DIRECTED_RECV | \
-			   FI_MULTI_RECV | FI_SOURCE | FI_RECV | FI_SEND | \
-			   FI_MORE | FI_FENCE | FI_TRIGGER)
+			   FI_RECV | FI_SEND)
+
+#define SOCK_EP_DGRAM_SEC_CAP (FI_MULTI_RECV | \
+			   FI_SOURCE | \
+			   FI_FENCE | FI_TRIGGER)
 
 #define SOCK_EP_MSG_ORDER (FI_ORDER_RAR | FI_ORDER_RAW | FI_ORDER_RAS|	\
 			   FI_ORDER_WAR | FI_ORDER_WAW | FI_ORDER_WAS |	\
diff --git a/prov/sockets/src/sock_ep.c b/prov/sockets/src/sock_ep.c
index 0968eca..e3e01d8 100644
--- a/prov/sockets/src/sock_ep.c
+++ b/prov/sockets/src/sock_ep.c
@@ -61,7 +61,7 @@ extern const struct fi_domain_attr sock_domain_attr;
 extern const struct fi_fabric_attr sock_fabric_attr;
 
 const struct fi_tx_attr sock_stx_attr = {
-	.caps = SOCK_EP_RDM_CAP,
+	.caps = SOCK_EP_RDM_PRI_CAP | SOCK_EP_RDM_SEC_CAP,
 	.mode = SOCK_MODE,
 	.op_flags = FI_TRANSMIT_COMPLETE,
 	.msg_order = SOCK_EP_MSG_ORDER,
@@ -72,7 +72,7 @@ const struct fi_tx_attr sock_stx_attr = {
 };
 
 const struct fi_rx_attr sock_srx_attr = {
-	.caps = SOCK_EP_RDM_CAP,
+	.caps = SOCK_EP_RDM_PRI_CAP | SOCK_EP_RDM_SEC_CAP,
 	.mode = SOCK_MODE,
 	.op_flags = 0,
 	.msg_order = SOCK_EP_MSG_ORDER,
diff --git a/prov/sockets/src/sock_ep_dgram.c b/prov/sockets/src/sock_ep_dgram.c
index 4b5ad55..8151124 100644
--- a/prov/sockets/src/sock_ep_dgram.c
+++ b/prov/sockets/src/sock_ep_dgram.c
@@ -73,7 +73,7 @@ const struct fi_ep_attr sock_dgram_ep_attr = {
 };
 
 const struct fi_tx_attr sock_dgram_tx_attr = {
-	.caps = SOCK_EP_DGRAM_CAP,
+	.caps = SOCK_EP_DGRAM_PRI_CAP | SOCK_EP_DGRAM_SEC_CAP,
 	.mode = SOCK_MODE,
 	.op_flags = SOCK_EP_DEFAULT_OP_FLAGS,
 	.msg_order = SOCK_EP_MSG_ORDER,
@@ -84,7 +84,7 @@ const struct fi_tx_attr sock_dgram_tx_attr = {
 };
 
 const struct fi_rx_attr sock_dgram_rx_attr = {
-	.caps = SOCK_EP_DGRAM_CAP,
+	.caps = SOCK_EP_DGRAM_PRI_CAP | SOCK_EP_DGRAM_SEC_CAP,
 	.mode = SOCK_MODE,
 	.op_flags = 0,
 	.msg_order = SOCK_EP_MSG_ORDER,
@@ -99,7 +99,7 @@ static int sock_dgram_verify_rx_attr(const struct fi_rx_attr *attr)
 	if (!attr)
 		return 0;
 
-	if ((attr->caps | SOCK_EP_DGRAM_CAP) != SOCK_EP_DGRAM_CAP)
+	if ((attr->caps | SOCK_EP_DGRAM_PRI_CAP | SOCK_EP_DGRAM_SEC_CAP) != (SOCK_EP_DGRAM_PRI_CAP | SOCK_EP_DGRAM_SEC_CAP))
 		return -FI_ENODATA;
 
 	if ((attr->msg_order | SOCK_EP_MSG_ORDER) != SOCK_EP_MSG_ORDER)
@@ -125,7 +125,7 @@ static int sock_dgram_verify_tx_attr(const struct fi_tx_attr *attr)
 	if (!attr)
 		return 0;
 
-	if ((attr->caps | SOCK_EP_DGRAM_CAP) != SOCK_EP_DGRAM_CAP)
+	if ((attr->caps | SOCK_EP_DGRAM_PRI_CAP | SOCK_EP_DGRAM_SEC_CAP) != (SOCK_EP_DGRAM_PRI_CAP | SOCK_EP_DGRAM_SEC_CAP))
 		return -FI_ENODATA;
 
 	if ((attr->msg_order | SOCK_EP_MSG_ORDER) != SOCK_EP_MSG_ORDER)
@@ -215,20 +215,20 @@ int sock_dgram_fi_info(void *src_addr, void *dest_addr, struct fi_info *hints,
 
 	if (hints && hints->rx_attr) {
 		(*info)->rx_attr->op_flags |= hints->rx_attr->op_flags;
-		if(hints->rx_attr->caps)
-			(*info)->rx_attr->caps = hints->rx_attr->caps;
+		if (hints->rx_attr->caps)
+			(*info)->rx_attr->caps = SOCK_EP_DGRAM_SEC_CAP | hints->rx_attr->caps;
 	}
 
 	if (hints && hints->tx_attr) {
 		(*info)->tx_attr->op_flags |= hints->tx_attr->op_flags;
-		if(hints->tx_attr->caps)
-			(*info)->tx_attr->caps = hints->tx_attr->caps;
+		if (hints->tx_attr->caps)
+			(*info)->tx_attr->caps = SOCK_EP_DGRAM_SEC_CAP | hints->tx_attr->caps;
 	}
 
-	(*info)->caps = SOCK_EP_DGRAM_CAP |
+	(*info)->caps = SOCK_EP_DGRAM_PRI_CAP | SOCK_EP_DGRAM_SEC_CAP |
                        (*info)->rx_attr->caps | (*info)->tx_attr->caps;
-        if(hints->caps)
-                (*info)->caps = hints->caps;
+        if (hints->caps)
+                (*info)->caps = SOCK_EP_DGRAM_SEC_CAP | hints->caps;
 
 	return 0;
 }
diff --git a/prov/sockets/src/sock_ep_msg.c b/prov/sockets/src/sock_ep_msg.c
index 6f349e1..6c2c751 100644
--- a/prov/sockets/src/sock_ep_msg.c
+++ b/prov/sockets/src/sock_ep_msg.c
@@ -75,7 +75,7 @@ static const struct fi_ep_attr sock_msg_ep_attr = {
 };
 
 static const struct fi_tx_attr sock_msg_tx_attr = {
-	.caps = SOCK_EP_MSG_CAP,
+	.caps = SOCK_EP_MSG_PRI_CAP | SOCK_EP_MSG_SEC_CAP,
 	.mode = SOCK_MODE,
 	.op_flags = SOCK_EP_DEFAULT_OP_FLAGS,
 	.msg_order = SOCK_EP_MSG_ORDER,
@@ -86,7 +86,7 @@ static const struct fi_tx_attr sock_msg_tx_attr = {
 };
 
 static const struct fi_rx_attr sock_msg_rx_attr = {
-	.caps = SOCK_EP_MSG_CAP,
+	.caps = SOCK_EP_MSG_PRI_CAP | SOCK_EP_MSG_SEC_CAP,
 	.mode = SOCK_MODE,
 	.op_flags = 0,
 	.msg_order = SOCK_EP_MSG_ORDER,
@@ -101,7 +101,7 @@ static int sock_msg_verify_rx_attr(const struct fi_rx_attr *attr)
 	if (!attr)
 		return 0;
 
-	if ((attr->caps | SOCK_EP_MSG_CAP) != SOCK_EP_MSG_CAP)
+	if ((attr->caps | SOCK_EP_MSG_PRI_CAP | SOCK_EP_MSG_SEC_CAP) != (SOCK_EP_MSG_PRI_CAP | SOCK_EP_MSG_SEC_CAP))
 		return -FI_ENODATA;
 
 	if ((attr->msg_order | SOCK_EP_MSG_ORDER) != SOCK_EP_MSG_ORDER)
@@ -127,7 +127,7 @@ static int sock_msg_verify_tx_attr(const struct fi_tx_attr *attr)
 	if (!attr)
 		return 0;
 
-	if ((attr->caps | SOCK_EP_MSG_CAP) != SOCK_EP_MSG_CAP)
+	if ((attr->caps | SOCK_EP_MSG_PRI_CAP | SOCK_EP_MSG_SEC_CAP) != (SOCK_EP_MSG_PRI_CAP | SOCK_EP_MSG_SEC_CAP))
 		return -FI_ENODATA;
 
 	if ((attr->msg_order | SOCK_EP_MSG_ORDER) != SOCK_EP_MSG_ORDER)
@@ -217,20 +217,20 @@ int sock_msg_fi_info(void *src_addr, void *dest_addr, struct fi_info *hints,
 
 	if (hints && hints->rx_attr) {
 		(*info)->rx_attr->op_flags |= hints->rx_attr->op_flags;
-		if(hints->rx_attr->caps)
-			(*info)->rx_attr->caps = hints->rx_attr->caps;
+		if (hints->rx_attr->caps)
+			(*info)->rx_attr->caps = SOCK_EP_MSG_SEC_CAP | hints->rx_attr->caps;
 	}
 
 	if (hints && hints->tx_attr) {
 		(*info)->tx_attr->op_flags |= hints->tx_attr->op_flags;
-		if(hints->tx_attr->caps)
-			(*info)->tx_attr->caps = hints->tx_attr->caps;
+		if (hints->tx_attr->caps)
+			(*info)->tx_attr->caps = SOCK_EP_MSG_SEC_CAP | hints->tx_attr->caps;
 	}
 
-	(*info)->caps = SOCK_EP_MSG_CAP |
+	(*info)->caps = SOCK_EP_MSG_PRI_CAP | SOCK_EP_MSG_SEC_CAP |
                        (*info)->rx_attr->caps | (*info)->tx_attr->caps;
-        if(hints->caps)
-                (*info)->caps = hints->caps;
+        if (hints->caps)
+                (*info)->caps = SOCK_EP_MSG_SEC_CAP | hints->caps;
 
 	return 0;
 }
diff --git a/prov/sockets/src/sock_ep_rdm.c b/prov/sockets/src/sock_ep_rdm.c
index ca1af3e..cd7c07a 100644
--- a/prov/sockets/src/sock_ep_rdm.c
+++ b/prov/sockets/src/sock_ep_rdm.c
@@ -74,7 +74,7 @@ const struct fi_ep_attr sock_rdm_ep_attr = {
 };
 
 const struct fi_tx_attr sock_rdm_tx_attr = {
-	.caps = SOCK_EP_RDM_CAP,
+	.caps = SOCK_EP_RDM_PRI_CAP | SOCK_EP_RDM_SEC_CAP,
 	.mode = SOCK_MODE,
 	.op_flags = SOCK_EP_DEFAULT_OP_FLAGS,
 	.msg_order = SOCK_EP_MSG_ORDER,
@@ -85,7 +85,7 @@ const struct fi_tx_attr sock_rdm_tx_attr = {
 };
 
 const struct fi_rx_attr sock_rdm_rx_attr = {
-	.caps = SOCK_EP_RDM_CAP,
+	.caps = SOCK_EP_RDM_PRI_CAP | SOCK_EP_RDM_SEC_CAP,
 	.mode = SOCK_MODE,
 	.op_flags = 0,
 	.msg_order = SOCK_EP_MSG_ORDER,
@@ -100,7 +100,7 @@ static int sock_rdm_verify_rx_attr(const struct fi_rx_attr *attr)
 	if (!attr)
 		return 0;
 
-	if ((attr->caps | SOCK_EP_RDM_CAP) != SOCK_EP_RDM_CAP) {
+	if ((attr->caps | SOCK_EP_RDM_PRI_CAP | SOCK_EP_RDM_SEC_CAP) != (SOCK_EP_RDM_PRI_CAP | SOCK_EP_RDM_SEC_CAP)) {
 		SOCK_LOG_DBG("Unsupported RDM rx caps\n");
 		return -FI_ENODATA;
 	}
@@ -138,7 +138,7 @@ static int sock_rdm_verify_tx_attr(const struct fi_tx_attr *attr)
 	if (!attr)
 		return 0;
 
-	if ((attr->caps | SOCK_EP_RDM_CAP) != SOCK_EP_RDM_CAP) {
+	if ((attr->caps | SOCK_EP_RDM_PRI_CAP | SOCK_EP_RDM_SEC_CAP) != (SOCK_EP_RDM_PRI_CAP | SOCK_EP_RDM_SEC_CAP)) {
 		SOCK_LOG_DBG("Unsupported RDM tx caps\n");
 		return -FI_ENODATA;
 	}
@@ -260,20 +260,20 @@ int sock_rdm_fi_info(void *src_addr, void *dest_addr, struct fi_info *hints,
 
 	if (hints && hints->rx_attr) {
 		(*info)->rx_attr->op_flags |= hints->rx_attr->op_flags;
-		if(hints->rx_attr->caps)
-			(*info)->rx_attr->caps = hints->rx_attr->caps;
+		if (hints->rx_attr->caps)
+			(*info)->rx_attr->caps = SOCK_EP_RDM_SEC_CAP | hints->rx_attr->caps;
 	}
 
 	if (hints && hints->tx_attr) {
 		(*info)->tx_attr->op_flags |= hints->tx_attr->op_flags;
-		if(hints->tx_attr->caps)
-			(*info)->tx_attr->caps = hints->tx_attr->caps;
+		if (hints->tx_attr->caps)
+			(*info)->tx_attr->caps = SOCK_EP_RDM_SEC_CAP | hints->tx_attr->caps;
 	}
 
-	(*info)->caps = SOCK_EP_RDM_CAP |
-                       (*info)->rx_attr->caps | (*info)->tx_attr->caps;
-	if(hints->caps)
-		(*info)->caps = hints->caps;
+	(*info)->caps = SOCK_EP_RDM_PRI_CAP | SOCK_EP_RDM_SEC_CAP |
+			(*info)->rx_attr->caps | (*info)->tx_attr->caps;
+	if (hints->caps)
+		(*info)->caps = SOCK_EP_RDM_SEC_CAP | hints->caps;
 
 	return 0;
 }
diff --git a/prov/sockets/src/sock_fabric.c b/prov/sockets/src/sock_fabric.c
index f12d663..7726f38 100644
--- a/prov/sockets/src/sock_fabric.c
+++ b/prov/sockets/src/sock_fabric.c
@@ -208,19 +208,19 @@ int sock_verify_info(struct fi_info *hints)
 	switch (ep_type) {
 	case FI_EP_UNSPEC:
 	case FI_EP_MSG:
-		caps = SOCK_EP_MSG_CAP;
+		caps = SOCK_EP_MSG_PRI_CAP | SOCK_EP_MSG_SEC_CAP;
 		ret = sock_msg_verify_ep_attr(hints->ep_attr,
 					      hints->tx_attr,
 					      hints->rx_attr);
 		break;
 	case FI_EP_DGRAM:
-		caps = SOCK_EP_DGRAM_CAP;
+		caps = SOCK_EP_DGRAM_PRI_CAP | SOCK_EP_DGRAM_SEC_CAP;
 		ret = sock_dgram_verify_ep_attr(hints->ep_attr,
 						hints->tx_attr,
 						hints->rx_attr);
 		break;
 	case FI_EP_RDM:
-		caps = SOCK_EP_RDM_CAP;
+		caps = SOCK_EP_RDM_PRI_CAP | SOCK_EP_RDM_SEC_CAP;
 		ret = sock_rdm_verify_ep_attr(hints->ep_attr,
 					      hints->tx_attr,
 					      hints->rx_attr);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ofed/libfabric.git



More information about the Pkg-ofed-commits mailing list