From cb0cb2d7d2084b9d7cd75290ab46c7a01a855ff8 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Thu, 18 Jul 2013 10:36:35 -0700 Subject: [PATCH] refresh --- meta | 7 +-- patches/acm_msg | 122 ++++++++++++++++++++++++++++++++++++++++- patches/refresh-temp | 128 ------------------------------------------- 3 files changed, 123 insertions(+), 134 deletions(-) delete mode 100644 patches/refresh-temp diff --git a/meta b/meta index d3743412..e9e471d0 100644 --- a/meta +++ b/meta @@ -1,10 +1,9 @@ Version: 1 -Previous: 14a06fa210b64d6097bd55cec6f0abd2d0650395 -Head: 101d3d10249933b3934d4f0ad37dbc81e84ea190 +Previous: 6949be275d04ecf6d6fb7101ed11026d4d55bedf +Head: ed570abcdfe9ab333217afe77dba81f261cf75c6 Applied: addrtype: c8173d50d1a8c2bbfb0c4459e05d3941175676b2 - acm_msg: 746c141c044d959f28555535639d5c8bfa024aaf - refresh-temp: 101d3d10249933b3934d4f0ad37dbc81e84ea190 + acm_msg: ed570abcdfe9ab333217afe77dba81f261cf75c6 Unapplied: use-acm: b38f4c985b3f1e442dec303886515c816aab43ec old-af-ib: d71ebf70cf74111cfd5f0982d9abe6ec68fb38e3 diff --git a/patches/acm_msg b/patches/acm_msg index b5ce5a47..198e1871 100644 --- a/patches/acm_msg +++ b/patches/acm_msg @@ -1,5 +1,5 @@ Bottom: 0f2efee48a61eb345a7f7dd4ebbf0df79e739ea9 -Top: 0f2efee48a61eb345a7f7dd4ebbf0df79e739ea9 +Top: 6be22fb12cd012007970e989a47c996ed8d0a55d Author: Sean Hefty Date: 2013-06-10 11:07:12 -0700 @@ -23,4 +23,122 @@ Signed-off-by: Sean Hefty --- - +diff --git a/configure.ac b/configure.ac +index 31b1a0e..59c5eb1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -70,14 +70,6 @@ AC_CHECK_HEADER(valgrind/memcheck.h, [], + fi + fi + +-AC_CHECK_HEADER(infiniband/acm.h, +- AC_DEFINE([USE_IB_ACM], 1, [setting IBACM support]), []) +- +-AC_CHECK_HEADER(infiniband/acm.h, +- AC_CHECK_MEMBER(struct acm_msg.resolve_data, [], +- AC_DEFINE(DEFINE_ACM_MSG, 1, [adding ACM message definition]), +- [#include ]), []) +- + dnl Checks close on exec support + AC_CHECK_HEADERS([fcntl.h sys/socket.h]) + +diff --git a/src/acm.c b/src/acm.c +index 6e8e173..09c5d4e 100644 +--- a/src/acm.c ++++ b/src/acm.c +@@ -46,19 +46,71 @@ + #include + + #ifdef USE_IB_ACM +-#include ++#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_NODELAY (1<<30) ++ ++#define ACM_MSG_HDR_LENGTH 16 ++#define ACM_MAX_ADDRESS 64 ++#define ACM_MSG_EP_LENGTH 72 ++#define ACM_MSG_DATA_LENGTH (ACM_MSG_EP_LENGTH * 8) ++ ++struct acm_hdr { ++ uint8_t version; ++ uint8_t opcode; ++ uint8_t status; ++ uint8_t data[3]; ++ uint16_t length; ++ uint64_t tid; ++}; ++ ++#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 ++ ++union acm_ep_info { ++ uint8_t addr[ACM_MAX_ADDRESS]; ++ uint8_t name[ACM_MAX_ADDRESS]; ++ struct ibv_path_record path; ++}; ++ ++#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; ++}; ++ ++struct acm_resolve_msg { ++ struct acm_hdr hdr; ++ struct acm_ep_addr_data data[0]; ++}; ++ ++struct acm_msg { + struct acm_hdr hdr; + union{ + uint8_t data[ACM_MSG_DATA_LENGTH]; + struct acm_ep_addr_data resolve_data[0]; + }; +-} cma_acm_msg_t; +-#else +-typedef struct acm_msg cma_acm_msg_t; +-#endif ++}; + + static pthread_mutex_t acm_lock = PTHREAD_MUTEX_INITIALIZER; + static int sock = -1; +@@ -242,7 +294,7 @@ err: + rdma_freeaddrinfo(ib_rai); + } + +-static void ucma_ib_save_resp(struct rdma_addrinfo *rai, cma_acm_msg_t *msg) ++static void ucma_ib_save_resp(struct rdma_addrinfo *rai, struct acm_msg *msg) + { + struct acm_ep_addr_data *ep_data; + struct ibv_path_data *path_data = NULL; +@@ -326,7 +378,7 @@ static int ucma_ib_addr(struct sockaddr *addr, socklen_t len) + + void ucma_ib_resolve(struct rdma_addrinfo **rai, struct rdma_addrinfo *hints) + { +- cma_acm_msg_t msg; ++ struct acm_msg msg; + struct acm_ep_addr_data *data; + int ret; diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index 7f95f1e6..00000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,128 +0,0 @@ -Bottom: 0f2efee48a61eb345a7f7dd4ebbf0df79e739ea9 -Top: 6be22fb12cd012007970e989a47c996ed8d0a55d -Author: Sean Hefty -Date: 2013-07-18 10:36:34 -0700 - -Refresh of acm_msg - ---- - -diff --git a/configure.ac b/configure.ac -index 31b1a0e..59c5eb1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -70,14 +70,6 @@ AC_CHECK_HEADER(valgrind/memcheck.h, [], - fi - fi - --AC_CHECK_HEADER(infiniband/acm.h, -- AC_DEFINE([USE_IB_ACM], 1, [setting IBACM support]), []) -- --AC_CHECK_HEADER(infiniband/acm.h, -- AC_CHECK_MEMBER(struct acm_msg.resolve_data, [], -- AC_DEFINE(DEFINE_ACM_MSG, 1, [adding ACM message definition]), -- [#include ]), []) -- - dnl Checks close on exec support - AC_CHECK_HEADERS([fcntl.h sys/socket.h]) - -diff --git a/src/acm.c b/src/acm.c -index 6e8e173..09c5d4e 100644 ---- a/src/acm.c -+++ b/src/acm.c -@@ -46,19 +46,71 @@ - #include - - #ifdef USE_IB_ACM --#include -+#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_NODELAY (1<<30) -+ -+#define ACM_MSG_HDR_LENGTH 16 -+#define ACM_MAX_ADDRESS 64 -+#define ACM_MSG_EP_LENGTH 72 -+#define ACM_MSG_DATA_LENGTH (ACM_MSG_EP_LENGTH * 8) -+ -+struct acm_hdr { -+ uint8_t version; -+ uint8_t opcode; -+ uint8_t status; -+ uint8_t data[3]; -+ uint16_t length; -+ uint64_t tid; -+}; -+ -+#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 -+ -+union acm_ep_info { -+ uint8_t addr[ACM_MAX_ADDRESS]; -+ uint8_t name[ACM_MAX_ADDRESS]; -+ struct ibv_path_record path; -+}; -+ -+#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; -+}; -+ -+struct acm_resolve_msg { -+ struct acm_hdr hdr; -+ struct acm_ep_addr_data data[0]; -+}; -+ -+struct acm_msg { - struct acm_hdr hdr; - union{ - uint8_t data[ACM_MSG_DATA_LENGTH]; - struct acm_ep_addr_data resolve_data[0]; - }; --} cma_acm_msg_t; --#else --typedef struct acm_msg cma_acm_msg_t; --#endif -+}; - - static pthread_mutex_t acm_lock = PTHREAD_MUTEX_INITIALIZER; - static int sock = -1; -@@ -242,7 +294,7 @@ err: - rdma_freeaddrinfo(ib_rai); - } - --static void ucma_ib_save_resp(struct rdma_addrinfo *rai, cma_acm_msg_t *msg) -+static void ucma_ib_save_resp(struct rdma_addrinfo *rai, struct acm_msg *msg) - { - struct acm_ep_addr_data *ep_data; - struct ibv_path_data *path_data = NULL; -@@ -326,7 +378,7 @@ static int ucma_ib_addr(struct sockaddr *addr, socklen_t len) - - void ucma_ib_resolve(struct rdma_addrinfo **rai, struct rdma_addrinfo *hints) - { -- cma_acm_msg_t msg; -+ struct acm_msg msg; - struct acm_ep_addr_data *data; - int ret; -- 2.46.0