rename

diff --git a/meta b/meta
index 96e9b5e3fe23e6c5be31f678fc0f9abcfe173c9b..41ceded3402a2981a4778e2b3b2da385541d0b9d 100644 (file)
--- a/meta
+++ b/meta
@@ -1,5 +1,5 @@
 Version: 1
-Previous: 8a80c8f75943dec9435a4a0a1dd928d4971e15dc
+Previous: 9dcd897041182d28233f50329a1321479c5ee6a8
 Head: 8d7ff5ef8dd0af977baac97976103a7494c2f3e0
 Applied:
   ex-ib: d71ebf70cf74111cfd5f0982d9abe6ec68fb38e3
@@ -17,7 +17,7 @@ Unapplied:
   ibpath: 372986c005605c497bebd250b2d8e2bfe9608315
   seterr: 47eb0c419687c2690292c1910acae83a46e5388c
   clisvr: 0db572abcf3d78374a5ea0f91b709136948809cc
-  af_ib_hack_loopback: e755d041f218772a8323936176c8f10e2024ae0f
+  old-hack-af-ib-loopback: e755d041f218772a8323936176c8f10e2024ae0f
   af-ib-conn: cf7b9e73d471477d4c7dff2592e5b0d3a7dea8ae
   addrtype: 23a84fed89ba3f6b0eb63e5f8b37c0df504d0d3e
   old-resv-rs-len: 7b6ff5c4894f54b221d877adcd709795dffb2fe9

diff --git a/patches/af_ib_hack_loopback b/patches/af_ib_hack_loopback
deleted file mode 100644 (file)
index 9c8c6e6..0000000
--- a/patches/af_ib_hack_loopback
+++ /dev/null
@@ -1,115 +0,0 @@
-Bottom: 03e0d857be2abeca4aaf50a1c372dc983b1332dc
-Top:    68f3badb82fe0b5ae6c9289d7eb0c8a6d7313e6b
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2013-04-05 10:36:59 -0700
-
-Avoid address resolution by using the loopback address as the
-destination when we know the remote GID.
-
-
----
-
-diff --git a/src/cma.c b/src/cma.c
-index 2fb9913..cb60422 100755
---- a/src/cma.c
-+++ b/src/cma.c
-@@ -49,6 +49,7 @@
- #include <stddef.h>
- #include <netdb.h>
- #include <syslog.h>
-+#include <arpa/inet.h>
- 
- #include "cma.h"
- #include "indexer.h"
-@@ -128,6 +129,13 @@ int af_ib_support;
- static struct index_map ucma_idm;
- static fastlock_t idm_lock;
- 
-+static char *ucma_addr_str(struct sockaddr *addr)
-+{
-+      static char buf[32];
-+
-+      return inet_ntop(addr->sa_family, &((struct sockaddr_in *) addr)->sin_addr, buf, sizeof buf);
-+}
-+
- static void ucma_cleanup(void)
- {
-       ucma_ib_cleanup();
-@@ -835,6 +843,37 @@ static int rdma_resolve_addr2(struct rdma_cm_id *id, struct sockaddr *src_addr,
-       return ucma_complete(id);
- }
- 
-+static int ucma_get_ib_route(struct cma_id_private *id_priv,
-+                           struct sockaddr *src_addr, struct sockaddr *dst_addr)
-+{
-+      struct rdma_addrinfo hint, *rai;
-+      int ret;
-+
-+      memset(&hint, 0, sizeof hint);
-+      hint.ai_flags = RAI_ROUTEONLY;
-+      hint.ai_family = dst_addr->sa_family;
-+      hint.ai_src_len = ucma_addrlen(src_addr);
-+      hint.ai_src_addr = src_addr;
-+      hint.ai_dst_len = ucma_addrlen(dst_addr);
-+      hint.ai_dst_addr = dst_addr;
-+
-+      ret = rdma_getaddrinfo(NULL, NULL, &hint, &rai);
-+      if (ret)
-+              return ret;
-+
-+      if (rai->ai_route_len) {
-+              id_priv->connect = rai->ai_route;
-+              id_priv->connect_len = rai->ai_route_len;
-+              rai->ai_route = NULL;
-+              rai->ai_route_len = 0;
-+      } else {
-+              ret = -1;
-+      }
-+
-+      rdma_freeaddrinfo(rai);
-+      return ret;
-+}
-+
- int rdma_resolve_addr(struct rdma_cm_id *id, struct sockaddr *src_addr,
-                     struct sockaddr *dst_addr, int timeout_ms)
- {
-@@ -842,6 +881,7 @@ int rdma_resolve_addr(struct rdma_cm_id *id, struct sockaddr *src_addr,
-       struct cma_id_private *id_priv;
-       int ret, dst_len, src_len;
-       
-+printf("rdma_resolve_addr init dest %s\n", ucma_addr_str(dst_addr));
-       dst_len = ucma_addrlen(dst_addr);
-       if (!dst_len)
-               return ERR(EINVAL);
-@@ -862,6 +902,14 @@ int rdma_resolve_addr(struct rdma_cm_id *id, struct sockaddr *src_addr,
-       memcpy(&cmd.dst_addr, dst_addr, dst_len);
-       cmd.timeout_ms = timeout_ms;
- 
-+      ret = ucma_get_ib_route(id_priv, src_addr, dst_addr);
-+      if (!ret) {
-+              ((struct sockaddr_in *) &cmd.dst_addr)->sin_addr.s_addr = 0;
-+              printf("rdma_resolve_addr dest %s\n", ucma_addr_str(&cmd.dst_addr));
-+      }
-+
-+if (src_addr)
-+   printf("rdma_resolve_addr src %s\n", ucma_addr_str(src_addr));
-       ret = write(id->channel->fd, &cmd, sizeof cmd);
-       if (ret != sizeof cmd)
-               return (ret >= 0) ? ERR(ENODATA) : -1;
-@@ -874,6 +922,16 @@ static int ucma_set_ib_route(struct rdma_cm_id *id)
- {
-       struct rdma_addrinfo hint, *rai;
-       int ret;
-+      struct cma_id_private *id_priv;
-+
-+      id_priv = container_of(id, struct cma_id_private, id);
-+      if (id_priv->connect_len) {
-+              ret = rdma_set_option(id, RDMA_OPTION_IB, RDMA_OPTION_IB_PATH,
-+                                    id_priv->connect, id_priv->connect_len);
-+              free(id_priv->connect);
-+              id_priv->connect_len = 0;
-+              return ret;
-+      }
- 
-       memset(&hint, 0, sizeof hint);
-       hint.ai_flags = RAI_ROUTEONLY;

diff --git a/patches/old-hack-af-ib-loopback b/patches/old-hack-af-ib-loopback
new file mode 100644 (file)
index 0000000..9c8c6e6
--- /dev/null
+++ b/patches/old-hack-af-ib-loopback
@@ -0,0 +1,115 @@
+Bottom: 03e0d857be2abeca4aaf50a1c372dc983b1332dc
+Top:    68f3badb82fe0b5ae6c9289d7eb0c8a6d7313e6b
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2013-04-05 10:36:59 -0700
+
+Avoid address resolution by using the loopback address as the
+destination when we know the remote GID.
+
+
+---
+
+diff --git a/src/cma.c b/src/cma.c
+index 2fb9913..cb60422 100755
+--- a/src/cma.c
++++ b/src/cma.c
+@@ -49,6 +49,7 @@
+ #include <stddef.h>
+ #include <netdb.h>
+ #include <syslog.h>
++#include <arpa/inet.h>
+ 
+ #include "cma.h"
+ #include "indexer.h"
+@@ -128,6 +129,13 @@ int af_ib_support;
+ static struct index_map ucma_idm;
+ static fastlock_t idm_lock;
+ 
++static char *ucma_addr_str(struct sockaddr *addr)
++{
++      static char buf[32];
++
++      return inet_ntop(addr->sa_family, &((struct sockaddr_in *) addr)->sin_addr, buf, sizeof buf);
++}
++
+ static void ucma_cleanup(void)
+ {
+       ucma_ib_cleanup();
+@@ -835,6 +843,37 @@ static int rdma_resolve_addr2(struct rdma_cm_id *id, struct sockaddr *src_addr,
+       return ucma_complete(id);
+ }
+ 
++static int ucma_get_ib_route(struct cma_id_private *id_priv,
++                           struct sockaddr *src_addr, struct sockaddr *dst_addr)
++{
++      struct rdma_addrinfo hint, *rai;
++      int ret;
++
++      memset(&hint, 0, sizeof hint);
++      hint.ai_flags = RAI_ROUTEONLY;
++      hint.ai_family = dst_addr->sa_family;
++      hint.ai_src_len = ucma_addrlen(src_addr);
++      hint.ai_src_addr = src_addr;
++      hint.ai_dst_len = ucma_addrlen(dst_addr);
++      hint.ai_dst_addr = dst_addr;
++
++      ret = rdma_getaddrinfo(NULL, NULL, &hint, &rai);
++      if (ret)
++              return ret;
++
++      if (rai->ai_route_len) {
++              id_priv->connect = rai->ai_route;
++              id_priv->connect_len = rai->ai_route_len;
++              rai->ai_route = NULL;
++              rai->ai_route_len = 0;
++      } else {
++              ret = -1;
++      }
++
++      rdma_freeaddrinfo(rai);
++      return ret;
++}
++
+ int rdma_resolve_addr(struct rdma_cm_id *id, struct sockaddr *src_addr,
+                     struct sockaddr *dst_addr, int timeout_ms)
+ {
+@@ -842,6 +881,7 @@ int rdma_resolve_addr(struct rdma_cm_id *id, struct sockaddr *src_addr,
+       struct cma_id_private *id_priv;
+       int ret, dst_len, src_len;
+       
++printf("rdma_resolve_addr init dest %s\n", ucma_addr_str(dst_addr));
+       dst_len = ucma_addrlen(dst_addr);
+       if (!dst_len)
+               return ERR(EINVAL);
+@@ -862,6 +902,14 @@ int rdma_resolve_addr(struct rdma_cm_id *id, struct sockaddr *src_addr,
+       memcpy(&cmd.dst_addr, dst_addr, dst_len);
+       cmd.timeout_ms = timeout_ms;
+ 
++      ret = ucma_get_ib_route(id_priv, src_addr, dst_addr);
++      if (!ret) {
++              ((struct sockaddr_in *) &cmd.dst_addr)->sin_addr.s_addr = 0;
++              printf("rdma_resolve_addr dest %s\n", ucma_addr_str(&cmd.dst_addr));
++      }
++
++if (src_addr)
++   printf("rdma_resolve_addr src %s\n", ucma_addr_str(src_addr));
+       ret = write(id->channel->fd, &cmd, sizeof cmd);
+       if (ret != sizeof cmd)
+               return (ret >= 0) ? ERR(ENODATA) : -1;
+@@ -874,6 +922,16 @@ static int ucma_set_ib_route(struct rdma_cm_id *id)
+ {
+       struct rdma_addrinfo hint, *rai;
+       int ret;
++      struct cma_id_private *id_priv;
++
++      id_priv = container_of(id, struct cma_id_private, id);
++      if (id_priv->connect_len) {
++              ret = rdma_set_option(id, RDMA_OPTION_IB, RDMA_OPTION_IB_PATH,
++                                    id_priv->connect, id_priv->connect_len);
++              free(id_priv->connect);
++              id_priv->connect_len = 0;
++              return ret;
++      }
+ 
+       memset(&hint, 0, sizeof hint);
+       hint.ai_flags = RAI_ROUTEONLY;