From d7edcf2c692150971e32ef5124ce649dd6c99166 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Mon, 10 Jun 2013 11:26:57 -0700 Subject: [PATCH] refresh --- meta | 7 ++-- patches/acm_msg | 56 +++++++++++----------------- patches/refresh-temp | 88 -------------------------------------------- 3 files changed, 24 insertions(+), 127 deletions(-) delete mode 100644 patches/refresh-temp diff --git a/meta b/meta index f8cff626..77792830 100644 --- a/meta +++ b/meta @@ -1,11 +1,10 @@ Version: 1 -Previous: 55236eb9e8bcee1c40bce196ca03944b898a8fee -Head: b9e2016b9170ec1dbf26ae573a05470fb714c134 +Previous: 0f5bb286c9e9195f2bb6e5c398aa1bf9adadeac6 +Head: 2754edc839f94608e3116068fa7b13936e074d37 Applied: ex-ib: d71ebf70cf74111cfd5f0982d9abe6ec68fb38e3 use_acm: 282058197859038e66b5bc42cccc12f6fb9bbd93 - acm_msg: ca9220081ab1c41172516fe4be5890c6fd6d152f - refresh-temp: b9e2016b9170ec1dbf26ae573a05470fb714c134 + acm_msg: 2754edc839f94608e3116068fa7b13936e074d37 Unapplied: seterr: 47eb0c419687c2690292c1910acae83a46e5388c clisvr: 0db572abcf3d78374a5ea0f91b709136948809cc diff --git a/patches/acm_msg b/patches/acm_msg index b9e89a50..05ed8aca 100644 --- a/patches/acm_msg +++ b/patches/acm_msg @@ -1,5 +1,5 @@ Bottom: 08cdb9a8cfd429d8b0018d91813c88ace4431342 -Top: ac7a8b594dbde179439d51d04b7a4fbafbf49d2a +Top: bc6153f2f25296a1bb53d2aebfc1f6494d365986 Author: Sean Hefty Date: 2013-06-10 11:07:12 -0700 @@ -40,10 +40,10 @@ index 3ce7a6e..327f85b 100644 if test -n "`$LD --help < /dev/null 2>/dev/null | grep version-script`"; then ac_cv_version_script=yes diff --git a/src/acm.c b/src/acm.c -index c423bb7..58cea7c 100755 +index c423bb7..93c9d9e 100755 --- a/src/acm.c +++ b/src/acm.c -@@ -45,19 +45,85 @@ +@@ -45,19 +45,71 @@ #include #include @@ -51,29 +51,24 @@ index c423bb7..58cea7c 100755 +#define ACM_VERSION 1 + +#define ACM_OP_RESOLVE 0x01 -+//#define ACM_OP_ACK 0x80 ++#define ACM_OP_ACK 0x80 + -+//#define ACM_STATUS_SUCCESS 0 -+//#define ACM_STATUS_ENOMEM 1 -+//#define ACM_STATUS_EINVAL 2 -+//#define ACM_STATUS_ENODATA 3 -+//#define ACM_STATUS_ENOTCONN 5 -+//#define ACM_STATUS_ETIMEDOUT 6 -+//#define ACM_STATUS_ESRCADDR 7 -+//#define ACM_STATUS_ESRCTYPE 8 -+//#define ACM_STATUS_EDESTADDR 9 -+//#define ACM_STATUS_EDESTTYPE 10 ++#define ACM_STATUS_SUCCESS 0 ++#define ACM_STATUS_ENOMEM 1 ++#define ACM_STATUS_EINVAL 2 ++#define ACM_STATUS_ENODATA 3 ++#define ACM_STATUS_ENOTCONN 5 ++#define ACM_STATUS_ETIMEDOUT 6 ++#define ACM_STATUS_ESRCADDR 7 ++#define ACM_STATUS_ESRCTYPE 8 ++#define ACM_STATUS_EDESTADDR 9 ++#define ACM_STATUS_EDESTTYPE 10 + -+//#define ACM_FLAGS_QUERY_SA (1<<31) +#define ACM_FLAGS_NODELAY (1<<30) + +#define ACM_MSG_HDR_LENGTH 16 +#define ACM_MAX_ADDRESS 64 +#define ACM_MSG_EP_LENGTH 72 -+/* -+ * Support up to 6 path records (primary and alternate CM paths, -+ * inbound and outbound primary and alternate data paths), plus CM data. -+ */ +#define ACM_MSG_DATA_LENGTH (ACM_MSG_EP_LENGTH * 8) + +struct acm_hdr { @@ -85,7 +80,7 @@ index c423bb7..58cea7c 100755 + uint64_t tid; +}; + -+//#define ACM_EP_INFO_NAME 0x0001 ++#define ACM_EP_INFO_NAME 0x0001 +#define ACM_EP_INFO_ADDRESS_IP 0x0002 +#define ACM_EP_INFO_ADDRESS_IP6 0x0003 +#define ACM_EP_INFO_PATH 0x0010 @@ -98,22 +93,16 @@ index c423bb7..58cea7c 100755 + +#define ACM_EP_FLAG_SOURCE (1<<0) +#define ACM_EP_FLAG_DEST (1<<1) -+ + +-#if DEFINE_ACM_MSG +-typedef struct cma_acm_msg { +struct acm_ep_addr_data { + uint32_t flags; + uint16_t type; + uint16_t reserved; + union acm_ep_info info; +}; - --#if DEFINE_ACM_MSG --typedef struct cma_acm_msg { -+/* -+ * Resolve messages with the opcode set to ACM_OP_RESOLVE are only -+ * used to communicate with the local ib_acm service. Message fields -+ * in this case are not byte swapped, but note that the acm_ep_info -+ * data is in network order. -+ */ ++ +struct acm_resolve_msg { + struct acm_hdr hdr; + struct acm_ep_addr_data data[0]; @@ -130,13 +119,10 @@ index c423bb7..58cea7c 100755 -typedef struct acm_msg cma_acm_msg_t; -#endif +}; -+ -+ -+ static pthread_mutex_t acm_lock = PTHREAD_MUTEX_INITIALIZER; static int sock = -1; -@@ -241,7 +307,7 @@ err: +@@ -241,7 +293,7 @@ err: rdma_freeaddrinfo(ib_rai); } @@ -145,7 +131,7 @@ index c423bb7..58cea7c 100755 { struct acm_ep_addr_data *ep_data; struct ibv_path_data *path_data = NULL; -@@ -325,7 +391,7 @@ static int ucma_ib_addr(struct sockaddr *addr, socklen_t len) +@@ -325,7 +377,7 @@ static int ucma_ib_addr(struct sockaddr *addr, socklen_t len) void ucma_ib_resolve(struct rdma_addrinfo **rai, struct rdma_addrinfo *hints) { diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index 495a8fcd..00000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,88 +0,0 @@ -Bottom: ac7a8b594dbde179439d51d04b7a4fbafbf49d2a -Top: bc6153f2f25296a1bb53d2aebfc1f6494d365986 -Author: Sean Hefty -Date: 2013-06-10 11:26:57 -0700 - -Refresh of acm_msg - ---- - -diff --git a/src/acm.c b/src/acm.c -index 58cea7c..93c9d9e 100755 ---- a/src/acm.c -+++ b/src/acm.c -@@ -48,29 +48,24 @@ - #define ACM_VERSION 1 - - #define ACM_OP_RESOLVE 0x01 --//#define ACM_OP_ACK 0x80 -- --//#define ACM_STATUS_SUCCESS 0 --//#define ACM_STATUS_ENOMEM 1 --//#define ACM_STATUS_EINVAL 2 --//#define ACM_STATUS_ENODATA 3 --//#define ACM_STATUS_ENOTCONN 5 --//#define ACM_STATUS_ETIMEDOUT 6 --//#define ACM_STATUS_ESRCADDR 7 --//#define ACM_STATUS_ESRCTYPE 8 --//#define ACM_STATUS_EDESTADDR 9 --//#define ACM_STATUS_EDESTTYPE 10 -- --//#define ACM_FLAGS_QUERY_SA (1<<31) -+#define ACM_OP_ACK 0x80 -+ -+#define ACM_STATUS_SUCCESS 0 -+#define ACM_STATUS_ENOMEM 1 -+#define ACM_STATUS_EINVAL 2 -+#define ACM_STATUS_ENODATA 3 -+#define ACM_STATUS_ENOTCONN 5 -+#define ACM_STATUS_ETIMEDOUT 6 -+#define ACM_STATUS_ESRCADDR 7 -+#define ACM_STATUS_ESRCTYPE 8 -+#define ACM_STATUS_EDESTADDR 9 -+#define ACM_STATUS_EDESTTYPE 10 -+ - #define ACM_FLAGS_NODELAY (1<<30) - - #define ACM_MSG_HDR_LENGTH 16 - #define ACM_MAX_ADDRESS 64 - #define ACM_MSG_EP_LENGTH 72 --/* -- * Support up to 6 path records (primary and alternate CM paths, -- * inbound and outbound primary and alternate data paths), plus CM data. -- */ - #define ACM_MSG_DATA_LENGTH (ACM_MSG_EP_LENGTH * 8) - - struct acm_hdr { -@@ -82,7 +77,7 @@ struct acm_hdr { - uint64_t tid; - }; - --//#define ACM_EP_INFO_NAME 0x0001 -+#define ACM_EP_INFO_NAME 0x0001 - #define ACM_EP_INFO_ADDRESS_IP 0x0002 - #define ACM_EP_INFO_ADDRESS_IP6 0x0003 - #define ACM_EP_INFO_PATH 0x0010 -@@ -103,12 +98,6 @@ struct acm_ep_addr_data { - union acm_ep_info info; - }; - --/* -- * Resolve messages with the opcode set to ACM_OP_RESOLVE are only -- * used to communicate with the local ib_acm service. Message fields -- * in this case are not byte swapped, but note that the acm_ep_info -- * data is in network order. -- */ - struct acm_resolve_msg { - struct acm_hdr hdr; - struct acm_ep_addr_data data[0]; -@@ -122,9 +111,6 @@ struct acm_msg { - }; - }; - -- -- -- - static pthread_mutex_t acm_lock = PTHREAD_MUTEX_INITIALIZER; - static int sock = -1; - static short server_port; -- 2.46.0