refresh

diff --git a/meta b/meta
index 0a0fde8ba2b7aae020aedb0b30f2ab308ed809ce..7d3257179c208f2032475ad17930a4c0ba3bc7b9 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: 0010cf62dedb79ef6b24faed5a25a055bc915dd4
-Head: e793a678cae5ecbdecc38b060de1aef720f0962d
+Previous: abe8ebe2427a7320836ec38852215db8f76114a0
+Head: 06b4820665299eec70aebcd7c1b6555fc43c4f4f
 Applied:
   sa_family: 79ecff9afd483c22821eca679e7ed668035ab4c1
   af_ib: ed14c624d882d21df3e2d0c022cffab0b7f664b9
   ren-copy-rai: a7ae817991416863772d28d97839ee8daeefb07e
-  addrinfo-af-ib: 85f5450d0f68ce36d85b46e31a45c6e4bbee333a
-  refresh-temp: e793a678cae5ecbdecc38b060de1aef720f0962d
+  addrinfo-af-ib: 06b4820665299eec70aebcd7c1b6555fc43c4f4f
 Unapplied:
   addrtype: 4beef92e939dd9c77d84075fd34475ac9386a2be
   dbg-fork: 5679a32af8305db3c0406f9abb961259304a384a

diff --git a/patches/addrinfo-af-ib b/patches/addrinfo-af-ib
index bc73ae5ac2b44466fc213b90ed73d995b2245744..336bff45e41a4a4c098d13becc3e0aed8acea98e 100644 (file)
--- a/patches/addrinfo-af-ib
+++ b/patches/addrinfo-af-ib
@@ -1,5 +1,5 @@
 Bottom: 4e01eb8a1c0681cd7bcca9c1bf3502036b929d4b
-Top:    6b67ab7929dea022d63f78b08828f18a26afca60
+Top:    cb8a166a49d92dc3423d11cc9eb021147c9b424a
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-08-28 12:33:04 -0700
 
@@ -121,7 +121,7 @@ index 95eee73..3d8c912 100755
  }
  
 diff --git a/src/addrinfo.c b/src/addrinfo.c
-index 2da35f0..0582955 100755
+index 2da35f0..e7643f7 100755
 --- a/src/addrinfo.c
 +++ b/src/addrinfo.c
 @@ -53,12 +53,17 @@
@@ -145,7 +145,7 @@ index 2da35f0..0582955 100755
  
        switch (rai->ai_qp_type) {
        case IBV_QPT_RC:
-@@ -99,15 +104,58 @@ static void ucma_convert_to_ai(struct addrinfo *ai, struct rdma_addrinfo *rai)
+@@ -99,15 +104,60 @@ static void ucma_convert_to_ai(struct addrinfo *ai, struct rdma_addrinfo *rai)
        ai->ai_next = NULL;
  }
  
@@ -170,7 +170,7 @@ index 2da35f0..0582955 100755
 +      sib->sib_sid = htonll(((uint64_t) ps << 16) + ntohs(port));
 +
 +      if (ps)
-+              sib->sib_sid_mask = htonll(RDMA_IB_IP_PORT_MASK);
++              sib->sib_sid_mask = htonll(RDMA_IB_IP_PS_MASK);
 +      if (port)
 +              sib->sib_sid_mask |= htonll(RDMA_IB_IP_PORT_MASK);
 +}
@@ -181,6 +181,7 @@ index 2da35f0..0582955 100755
 +      *dst = calloc(1, sizeof(struct sockaddr_ib));
 +      if (!(*dst))
 +              return ERR(ENOMEM);
++printf("converting ipv6 to ib\n");
 +
 +      (*dst)->sib_family = AF_IB;
 +      (*dst)->sib_pkey = 0xFFFF;
@@ -189,6 +190,7 @@ index 2da35f0..0582955 100755
 +                  src->sin6_addr.s6_addr32[1], src->sin6_addr.s6_addr32[2],
 +                  src->sin6_addr.s6_addr32[3]);
 +      ucma_set_sid(ps, (struct sockaddr *) src, *dst);
++printf("sid %llx %llx\n", (*dst)->sib_sid, (*dst)->sib_sid_mask);
 +      (*dst)->sib_scope_id = src->sin6_scope_id;
 +
 +      *dst_len = sizeof(struct sockaddr_ib);
@@ -209,19 +211,22 @@ index 2da35f0..0582955 100755
                rai->ai_qp_type = hints->ai_qp_type;
        } else {
                switch (ai->ai_socktype) {
-@@ -120,7 +168,7 @@ static int ucma_convert_to_rai(struct rdma_addrinfo *rai,
+@@ -119,8 +169,9 @@ static int ucma_convert_to_rai(struct rdma_addrinfo *rai,
+                       break;
                }
        }
++printf("qp type %d\n", rai->ai_qp_type);
  
 -      if (hints && hints->ai_port_space) {
 +      if (hints->ai_port_space) {
                rai->ai_port_space = hints->ai_port_space;
        } else {
                switch (ai->ai_protocol) {
-@@ -133,43 +181,59 @@ static int ucma_convert_to_rai(struct rdma_addrinfo *rai,
+@@ -132,44 +183,63 @@ static int ucma_convert_to_rai(struct rdma_addrinfo *rai,
+                       break;
                }
        }
- 
+-
 -      addr = malloc(ai->ai_addrlen);
 -      if (!addr)
 -              return ERR(ENOMEM);
@@ -233,6 +238,8 @@ index 2da35f0..0582955 100755
 -              rai->ai_src_addr = addr;
 -              rai->ai_src_len = ai->ai_addrlen;
 -              rai->ai_src_canonname = canonname;
++printf("port space %d\n", rai->ai_port_space);
++
 +      if (ai->ai_flags & AI_PASSIVE) {
 +              rai->ai_flags = RAI_PASSIVE;
 +              if (ai->ai_canonname)
@@ -246,8 +253,10 @@ index 2da35f0..0582955 100755
 +                                             &rai->ai_src_len,
 +                                             (struct sockaddr_in6 *) ai->ai_addr,
 +                                             ai->ai_addrlen);
++printf("using af ib \n");
 +              } else {
 +                      rai->ai_family = ai->ai_family;
++printf("af %d\n", rai->ai_family);
 +                      ret = ucma_copy_addr(&rai->ai_src_addr, &rai->ai_src_len,
 +                                           ai->ai_addr, ai->ai_addrlen);
 +              }
@@ -302,7 +311,7 @@ index 2da35f0..0582955 100755
        if (ret)
                return ret;
  
-@@ -178,18 +242,6 @@ static int ucma_convert_gai(char *node, char *service,
+@@ -178,18 +248,6 @@ static int ucma_convert_gai(char *node, char *service,
        return ret;
  }
  
@@ -321,7 +330,7 @@ index 2da35f0..0582955 100755
  int rdma_getaddrinfo(char *node, char *service,
                     struct rdma_addrinfo *hints,
                     struct rdma_addrinfo **res)
-@@ -208,24 +260,27 @@ int rdma_getaddrinfo(char *node, char *service,
+@@ -208,24 +266,27 @@ int rdma_getaddrinfo(char *node, char *service,
        if (!rai)
                return ERR(ENOMEM);
  

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 10b7ee4..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,65 +0,0 @@
-Bottom: 6b67ab7929dea022d63f78b08828f18a26afca60
-Top:    cb8a166a49d92dc3423d11cc9eb021147c9b424a
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-08-31 14:57:48 -0700
-
-Refresh of addrinfo-af-ib
-
----
-
-diff --git a/src/addrinfo.c b/src/addrinfo.c
-index 0582955..e7643f7 100755
---- a/src/addrinfo.c
-+++ b/src/addrinfo.c
-@@ -125,7 +125,7 @@ void ucma_set_sid(enum rdma_port_space ps, struct sockaddr *addr,
-       sib->sib_sid = htonll(((uint64_t) ps << 16) + ntohs(port));
- 
-       if (ps)
--              sib->sib_sid_mask = htonll(RDMA_IB_IP_PORT_MASK);
-+              sib->sib_sid_mask = htonll(RDMA_IB_IP_PS_MASK);
-       if (port)
-               sib->sib_sid_mask |= htonll(RDMA_IB_IP_PORT_MASK);
- }
-@@ -136,6 +136,7 @@ static int ucma_convert_in6(int ps, struct sockaddr_ib **dst, socklen_t *dst_len
-       *dst = calloc(1, sizeof(struct sockaddr_ib));
-       if (!(*dst))
-               return ERR(ENOMEM);
-+printf("converting ipv6 to ib\n");
- 
-       (*dst)->sib_family = AF_IB;
-       (*dst)->sib_pkey = 0xFFFF;
-@@ -144,6 +145,7 @@ static int ucma_convert_in6(int ps, struct sockaddr_ib **dst, socklen_t *dst_len
-                   src->sin6_addr.s6_addr32[1], src->sin6_addr.s6_addr32[2],
-                   src->sin6_addr.s6_addr32[3]);
-       ucma_set_sid(ps, (struct sockaddr *) src, *dst);
-+printf("sid %llx %llx\n", (*dst)->sib_sid, (*dst)->sib_sid_mask);
-       (*dst)->sib_scope_id = src->sin6_scope_id;
- 
-       *dst_len = sizeof(struct sockaddr_ib);
-@@ -167,6 +169,7 @@ static int ucma_convert_to_rai(struct rdma_addrinfo *rai,
-                       break;
-               }
-       }
-+printf("qp type %d\n", rai->ai_qp_type);
- 
-       if (hints->ai_port_space) {
-               rai->ai_port_space = hints->ai_port_space;
-@@ -180,6 +183,7 @@ static int ucma_convert_to_rai(struct rdma_addrinfo *rai,
-                       break;
-               }
-       }
-+printf("port space %d\n", rai->ai_port_space);
- 
-       if (ai->ai_flags & AI_PASSIVE) {
-               rai->ai_flags = RAI_PASSIVE;
-@@ -194,8 +198,10 @@ static int ucma_convert_to_rai(struct rdma_addrinfo *rai,
-                                              &rai->ai_src_len,
-                                              (struct sockaddr_in6 *) ai->ai_addr,
-                                              ai->ai_addrlen);
-+printf("using af ib \n");
-               } else {
-                       rai->ai_family = ai->ai_family;
-+printf("af %d\n", rai->ai_family);
-                       ret = ucma_copy_addr(&rai->ai_src_addr, &rai->ai_src_len,
-                                            ai->ai_addr, ai->ai_addrlen);
-               }