refresh

diff --git a/meta b/meta
index 74745dd1ecc84c4335e4fb1baec496fab2efd145..f2e014dbfc478e27ee24f12a0c0f0ca09b3e476a 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 4e63f2134ab0831383fab75ff1d24b438d378326
-Head: 628588f1442e9ab1d90a7f5bb7308b075c76bcf2
+Previous: f5fecbe46d2ce49b89fef717767c63350c246fc1
+Head: 5d2141db6afad683ee4979635c9a12bf1cf91a6d
 Applied:
-  dsocket: 62b2303fc5fdbbf9cc712e04662f80970e662563
-  refresh-temp: 628588f1442e9ab1d90a7f5bb7308b075c76bcf2
+  dsocket: 5d2141db6afad683ee4979635c9a12bf1cf91a6d
 Unapplied:
   udpong: c2b5689508747b6ae32bb5dd499e298e41e660a6
   test-udp: f6c78ad2a26f452cf166aff1baa7b76160bd8bf7

diff --git a/patches/dsocket b/patches/dsocket
index 88acc0a7fab84a1be898e785bfaf4b1a99126153..1e93bc4e27e64e33f21ea1fb482bfc488dd414cf 100644 (file)
--- a/patches/dsocket
+++ b/patches/dsocket
@@ -1,5 +1,5 @@
 Bottom: 1fa07c62817ac4b6cb8d9c5e327ea2cdc75dbd21
-Top:    149a333bd2b79ef125e96607d91fa8f10b9155e8
+Top:    0a9005e21ff77f266c98c49bb8473c3d295a6c35
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-11-09 10:26:38 -0800
 
@@ -112,7 +112,7 @@ index 0a0370e..7135a61 100644
  {
        errno = err;
 diff --git a/src/rsocket.c b/src/rsocket.c
-index a060f66..56f6f39 100644
+index a060f66..7dc5409 100644
 --- a/src/rsocket.c
 +++ b/src/rsocket.c
 @@ -47,6 +47,8 @@
@@ -664,20 +664,15 @@ index a060f66..56f6f39 100644
  
 -static int rs_create_cq(struct rsocket *rs)
 +static int ds_init_bufs(struct ds_qp *qp)
- {
--      rs->cm_id->recv_cq_channel = ibv_create_comp_channel(rs->cm_id->verbs);
--      if (!rs->cm_id->recv_cq_channel)
++{
 +      qp->rbuf = calloc(qp->rs->rbuf_size, sizeof(*qp->rbuf));
 +      if (!qp->rbuf)
 +              return ERR(ENOMEM);
 +
 +      qp->smr = rdma_reg_msgs(qp->cm_id, qp->rs->sbuf, qp->rs->sbuf_size);
 +      if (!qp->smr)
-               return -1;
- 
--      rs->cm_id->recv_cq = ibv_create_cq(rs->cm_id->verbs, rs->sq_size + rs->rq_size,
--                                         rs->cm_id, rs->cm_id->recv_cq_channel, 0);
--      if (!rs->cm_id->recv_cq)
++              return -1;
++
 +      qp->rmr = rdma_reg_msgs(qp->cm_id, qp->rbuf, qp->rs->rbuf_size);
 +      if (!qp->rmr)
 +              return -1;
@@ -686,11 +681,16 @@ index a060f66..56f6f39 100644
 +}
 +
 +static int rs_create_cq(struct rsocket *rs, struct rdma_cm_id *cm_id)
-+{
+ {
+-      rs->cm_id->recv_cq_channel = ibv_create_comp_channel(rs->cm_id->verbs);
+-      if (!rs->cm_id->recv_cq_channel)
 +      cm_id->recv_cq_channel = ibv_create_comp_channel(cm_id->verbs);
 +      if (!cm_id->recv_cq_channel)
-+              return -1;
-+
+               return -1;
+ 
+-      rs->cm_id->recv_cq = ibv_create_cq(rs->cm_id->verbs, rs->sq_size + rs->rq_size,
+-                                         rs->cm_id, rs->cm_id->recv_cq_channel, 0);
+-      if (!rs->cm_id->recv_cq)
 +      cm_id->recv_cq = ibv_create_cq(cm_id->verbs, rs->sq_size + rs->rq_size,
 +                                     cm_id, cm_id->recv_cq_channel, 0);
 +      if (!cm_id->recv_cq)
@@ -843,7 +843,7 @@ index a060f66..56f6f39 100644
        fastlock_destroy(&rs->cq_wait_lock);
        fastlock_destroy(&rs->cq_lock);
        fastlock_destroy(&rs->rlock);
-@@ -636,29 +1003,55 @@ static void rs_save_conn_data(struct rsocket *rs, struct rs_conn_data *conn)
+@@ -636,29 +1003,54 @@ static void rs_save_conn_data(struct rsocket *rs, struct rs_conn_data *conn)
        rs->sseq_comp = ntohs(conn->credits);
  }
  
@@ -891,7 +891,6 @@ index a060f66..56f6f39 100644
 +              rs->cm_id->route.addr.src_addr.sa_family = domain;
 +              index = rs->cm_id->channel->fd;
 +      } else {
-+printf("rsocket DGRAM\n");
 +              ret = ds_init(rs, domain);
 +              if (ret)
 +                      goto err;
@@ -907,7 +906,7 @@ index a060f66..56f6f39 100644
        return rs->index;
  
  err:
-@@ -672,9 +1065,18 @@ int rbind(int socket, const struct sockaddr *addr, socklen_t addrlen)
+@@ -672,9 +1064,18 @@ int rbind(int socket, const struct sockaddr *addr, socklen_t addrlen)
        int ret;
  
        rs = idm_at(&idm, socket);
@@ -929,7 +928,7 @@ index a060f66..56f6f39 100644
        return ret;
  }
  
-@@ -710,7 +1112,7 @@ int raccept(int socket, struct sockaddr *addr, socklen_t *addrlen)
+@@ -710,7 +1111,7 @@ int raccept(int socket, struct sockaddr *addr, socklen_t *addrlen)
        int ret;
  
        rs = idm_at(&idm, socket);
@@ -938,7 +937,7 @@ index a060f66..56f6f39 100644
        if (!new_rs)
                return ERR(ENOMEM);
  
-@@ -718,7 +1120,7 @@ int raccept(int socket, struct sockaddr *addr, socklen_t *addrlen)
+@@ -718,7 +1119,7 @@ int raccept(int socket, struct sockaddr *addr, socklen_t *addrlen)
        if (ret)
                goto err;
  
@@ -947,7 +946,7 @@ index a060f66..56f6f39 100644
        if (ret < 0)
                goto err;
  
-@@ -855,13 +1257,268 @@ connected:
+@@ -855,13 +1256,268 @@ connected:
        return ret;
  }
  
@@ -1218,7 +1217,7 @@ index a060f66..56f6f39 100644
  }
  
  static int rs_post_write_msg(struct rsocket *rs,
-@@ -903,6 +1560,24 @@ static int rs_post_write(struct rsocket *rs,
+@@ -903,6 +1559,24 @@ static int rs_post_write(struct rsocket *rs,
        return rdma_seterrno(ibv_post_send(rs->cm_id->qp, &wr, &bad));
  }
  
@@ -1243,7 +1242,7 @@ index a060f66..56f6f39 100644
  /*
   * Update target SGE before sending data.  Otherwise the remote side may
   * update the entry before we do.
-@@ -1046,7 +1721,7 @@ static int rs_poll_cq(struct rsocket *rs)
+@@ -1046,7 +1720,7 @@ static int rs_poll_cq(struct rsocket *rs)
                                        rs->state = rs_disconnected;
                                        return 0;
                                } else if (rs_msg_data(imm_data) == RS_CTRL_SHUTDOWN) {
@@ -1252,7 +1251,7 @@ index a060f66..56f6f39 100644
                                }
                                break;
                        case RS_OP_WRITE:
-@@ -1133,46 +1808,205 @@ static int rs_get_cq_event(struct rsocket *rs)
+@@ -1133,46 +1807,208 @@ static int rs_get_cq_event(struct rsocket *rs)
   */
  static int rs_process_cq(struct rsocket *rs, int nonblock, int (*test)(struct rsocket *rs))
  {
@@ -1336,6 +1335,9 @@ index a060f66..56f6f39 100644
 +      int ret, cnt;
 +
 +      qp = rs->qp_list;
++      if (!qp)
++              return;
++
 +      do {
 +              cnt = 0;
 +              do {
@@ -1468,7 +1470,7 @@ index a060f66..56f6f39 100644
                if (!ret || nonblock || errno != EWOULDBLOCK)
                        return ret;
  
-@@ -1184,7 +2018,7 @@ static int rs_get_comp(struct rsocket *rs, int nonblock, int (*test)(struct rsoc
+@@ -1184,7 +2020,7 @@ static int rs_get_comp(struct rsocket *rs, int nonblock, int (*test)(struct rsoc
                            (e.tv_usec - s.tv_usec) + 1;
        } while (poll_time <= polling_time);
  
@@ -1477,7 +1479,7 @@ index a060f66..56f6f39 100644
        return ret;
  }
  
-@@ -1219,9 +2053,19 @@ static int rs_can_send(struct rsocket *rs)
+@@ -1219,9 +2055,19 @@ static int rs_can_send(struct rsocket *rs)
               (rs->target_sgl[rs->target_sge].length != 0);
  }
  
@@ -1498,7 +1500,7 @@ index a060f66..56f6f39 100644
  }
  
  static int rs_conn_can_send_ctrl(struct rsocket *rs)
-@@ -1236,7 +2080,7 @@ static int rs_have_rdata(struct rsocket *rs)
+@@ -1236,7 +2082,7 @@ static int rs_have_rdata(struct rsocket *rs)
  
  static int rs_conn_have_rdata(struct rsocket *rs)
  {
@@ -1507,7 +1509,7 @@ index a060f66..56f6f39 100644
  }
  
  static int rs_conn_all_sends_done(struct rsocket *rs)
-@@ -1245,6 +2089,66 @@ static int rs_conn_all_sends_done(struct rsocket *rs)
+@@ -1245,6 +2091,66 @@ static int rs_conn_all_sends_done(struct rsocket *rs)
               !(rs->state & rs_connected);
  }
  
@@ -1574,7 +1576,7 @@ index a060f66..56f6f39 100644
  static ssize_t rs_peek(struct rsocket *rs, void *buf, size_t len)
  {
        size_t left = len;
-@@ -1290,6 +2194,13 @@ ssize_t rrecv(int socket, void *buf, size_t len, int flags)
+@@ -1290,6 +2196,13 @@ ssize_t rrecv(int socket, void *buf, size_t len, int flags)
        int ret;
  
        rs = idm_at(&idm, socket);
@@ -1588,7 +1590,7 @@ index a060f66..56f6f39 100644
        if (rs->state & rs_opening) {
                ret = rs_do_connect(rs);
                if (ret) {
-@@ -1339,7 +2250,7 @@ ssize_t rrecv(int socket, void *buf, size_t len, int flags)
+@@ -1339,7 +2252,7 @@ ssize_t rrecv(int socket, void *buf, size_t len, int flags)
                        rs->rbuf_bytes_avail += rsize;
                }
  
@@ -1597,7 +1599,7 @@ index a060f66..56f6f39 100644
  
        fastlock_release(&rs->rlock);
        return ret ? ret : len - left;
-@@ -1348,8 +2259,17 @@ ssize_t rrecv(int socket, void *buf, size_t len, int flags)
+@@ -1348,8 +2261,17 @@ ssize_t rrecv(int socket, void *buf, size_t len, int flags)
  ssize_t rrecvfrom(int socket, void *buf, size_t len, int flags,
                  struct sockaddr *src_addr, socklen_t *addrlen)
  {
@@ -1615,7 +1617,7 @@ index a060f66..56f6f39 100644
        ret = rrecv(socket, buf, len, flags);
        if (ret > 0 && src_addr)
                rgetpeername(socket, src_addr, addrlen);
-@@ -1391,14 +2311,14 @@ static int rs_send_iomaps(struct rsocket *rs, int flags)
+@@ -1391,14 +2313,14 @@ static int rs_send_iomaps(struct rsocket *rs, int flags)
        struct rs_iomap iom;
        int ret;
  
@@ -1632,7 +1634,7 @@ index a060f66..56f6f39 100644
                                ret = ERR(ECONNRESET);
                                break;
                        }
-@@ -1447,10 +2367,90 @@ static int rs_send_iomaps(struct rsocket *rs, int flags)
+@@ -1447,10 +2369,90 @@ static int rs_send_iomaps(struct rsocket *rs, int flags)
        }
  
        rs->iomap_pending = !dlist_empty(&rs->iomap_queue);
@@ -1724,7 +1726,7 @@ index a060f66..56f6f39 100644
  /*
   * We overlap sending the data, by posting a small work request immediately,
   * then increasing the size of the send on each iteration.
-@@ -1464,6 +2464,13 @@ ssize_t rsend(int socket, const void *buf, size_t len, int flags)
+@@ -1464,6 +2466,13 @@ ssize_t rsend(int socket, const void *buf, size_t len, int flags)
        int ret = 0;
  
        rs = idm_at(&idm, socket);
@@ -1738,7 +1740,7 @@ index a060f66..56f6f39 100644
        if (rs->state & rs_opening) {
                ret = rs_do_connect(rs);
                if (ret) {
-@@ -1485,7 +2492,7 @@ ssize_t rsend(int socket, const void *buf, size_t len, int flags)
+@@ -1485,7 +2494,7 @@ ssize_t rsend(int socket, const void *buf, size_t len, int flags)
                                          rs_conn_can_send);
                        if (ret)
                                break;
@@ -1747,7 +1749,7 @@ index a060f66..56f6f39 100644
                                ret = ERR(ECONNRESET);
                                break;
                        }
-@@ -1538,10 +2545,27 @@ out:
+@@ -1538,10 +2547,27 @@ out:
  ssize_t rsendto(int socket, const void *buf, size_t len, int flags,
                const struct sockaddr *dest_addr, socklen_t addrlen)
  {
@@ -1778,7 +1780,7 @@ index a060f66..56f6f39 100644
  }
  
  static void rs_copy_iov(void *dst, const struct iovec **iov, size_t *offset, size_t len)
-@@ -1600,7 +2624,7 @@ static ssize_t rsendv(int socket, const struct iovec *iov, int iovcnt, int flags
+@@ -1600,7 +2626,7 @@ static ssize_t rsendv(int socket, const struct iovec *iov, int iovcnt, int flags
                                          rs_conn_can_send);
                        if (ret)
                                break;
@@ -1787,7 +1789,7 @@ index a060f66..56f6f39 100644
                                ret = ERR(ECONNRESET);
                                break;
                        }
-@@ -1653,7 +2677,7 @@ ssize_t rsendmsg(int socket, const struct msghdr *msg, int flags)
+@@ -1653,7 +2679,7 @@ ssize_t rsendmsg(int socket, const struct msghdr *msg, int flags)
        if (msg->msg_control && msg->msg_controllen)
                return ERR(ENOTSUP);
  
@@ -1796,7 +1798,7 @@ index a060f66..56f6f39 100644
  }
  
  ssize_t rwrite(int socket, const void *buf, size_t count)
-@@ -1690,8 +2714,8 @@ static int rs_poll_rs(struct rsocket *rs, int events,
+@@ -1690,8 +2716,8 @@ static int rs_poll_rs(struct rsocket *rs, int events,
        int ret;
  
  check_cq:
@@ -1807,7 +1809,7 @@ index a060f66..56f6f39 100644
                rs_process_cq(rs, nonblock, test);
  
                revents = 0;
-@@ -1707,6 +2731,16 @@ check_cq:
+@@ -1707,6 +2733,16 @@ check_cq:
                }
  
                return revents;
@@ -1824,7 +1826,7 @@ index a060f66..56f6f39 100644
        }
  
        if (rs->state == rs_listening) {
-@@ -1766,11 +2800,14 @@ static int rs_poll_arm(struct pollfd *rfds, struct pollfd *fds, nfds_t nfds)
+@@ -1766,11 +2802,14 @@ static int rs_poll_arm(struct pollfd *rfds, struct pollfd *fds, nfds_t nfds)
                        if (fds[i].revents)
                                return 1;
  
@@ -1844,7 +1846,7 @@ index a060f66..56f6f39 100644
                        rfds[i].events = POLLIN;
                } else {
                        rfds[i].fd = fds[i].fd;
-@@ -1793,7 +2830,10 @@ static int rs_poll_events(struct pollfd *rfds, struct pollfd *fds, nfds_t nfds)
+@@ -1793,7 +2832,10 @@ static int rs_poll_events(struct pollfd *rfds, struct pollfd *fds, nfds_t nfds)
  
                rs = idm_lookup(&idm, fds[i].fd);
                if (rs) {
@@ -1856,7 +1858,7 @@ index a060f66..56f6f39 100644
                        fds[i].revents = rs_poll_rs(rs, fds[i].events, 1, rs_poll_all);
                } else {
                        fds[i].revents = rfds[i].revents;
-@@ -1949,7 +2989,7 @@ int rshutdown(int socket, int how)
+@@ -1949,7 +2991,7 @@ int rshutdown(int socket, int how)
  
        rs = idm_at(&idm, socket);
        if (how == SHUT_RD) {
@@ -1865,7 +1867,7 @@ index a060f66..56f6f39 100644
                return 0;
        }
  
-@@ -1959,10 +2999,10 @@ int rshutdown(int socket, int how)
+@@ -1959,10 +3001,10 @@ int rshutdown(int socket, int how)
        if (rs->state & rs_connected) {
                if (how == SHUT_RDWR) {
                        ctrl = RS_CTRL_DISCONNECT;
@@ -1879,7 +1881,7 @@ index a060f66..56f6f39 100644
                                RS_CTRL_SHUTDOWN : RS_CTRL_DISCONNECT;
                }
                if (!rs->ctrl_avail) {
-@@ -1987,13 +3027,29 @@ int rshutdown(int socket, int how)
+@@ -1987,13 +3029,29 @@ int rshutdown(int socket, int how)
        return 0;
  }
  
@@ -1911,7 +1913,7 @@ index a060f66..56f6f39 100644
  
        rs_free(rs);
        return 0;
-@@ -2018,8 +3074,12 @@ int rgetpeername(int socket, struct sockaddr *addr, socklen_t *addrlen)
+@@ -2018,8 +3076,12 @@ int rgetpeername(int socket, struct sockaddr *addr, socklen_t *addrlen)
        struct rsocket *rs;
  
        rs = idm_at(&idm, socket);
@@ -1926,7 +1928,7 @@ index a060f66..56f6f39 100644
  }
  
  int rgetsockname(int socket, struct sockaddr *addr, socklen_t *addrlen)
-@@ -2027,8 +3087,12 @@ int rgetsockname(int socket, struct sockaddr *addr, socklen_t *addrlen)
+@@ -2027,8 +3089,12 @@ int rgetsockname(int socket, struct sockaddr *addr, socklen_t *addrlen)
        struct rsocket *rs;
  
        rs = idm_at(&idm, socket);
@@ -1941,7 +1943,7 @@ index a060f66..56f6f39 100644
  }
  
  int rsetsockopt(int socket, int level, int optname,
-@@ -2040,18 +3104,26 @@ int rsetsockopt(int socket, int level, int optname,
+@@ -2040,18 +3106,26 @@ int rsetsockopt(int socket, int level, int optname,
  
        ret = ERR(ENOTSUP);
        rs = idm_at(&idm, socket);
@@ -1975,7 +1977,7 @@ index a060f66..56f6f39 100644
                        opt_on = *(int *) optval;
                        break;
                case SO_RCVBUF:
-@@ -2101,9 +3173,11 @@ int rsetsockopt(int socket, int level, int optname,
+@@ -2101,9 +3175,11 @@ int rsetsockopt(int socket, int level, int optname,
                opts = &rs->ipv6_opts;
                switch (optname) {
                case IPV6_V6ONLY:
@@ -1990,7 +1992,7 @@ index a060f66..56f6f39 100644
                        opt_on = *(int *) optval;
                        break;
                default:
-@@ -2315,7 +3389,7 @@ off_t riomap(int socket, void *buf, size_t len, int prot, int flags, off_t offse
+@@ -2315,7 +3391,7 @@ off_t riomap(int socket, void *buf, size_t len, int prot, int flags, off_t offse
        if (!rs->cm_id->pd || (prot & ~(PROT_WRITE | PROT_NONE)))
                return ERR(EINVAL);
  
@@ -1999,7 +2001,7 @@ index a060f66..56f6f39 100644
        if (prot & PROT_WRITE) {
                iomr = rs_get_iomap_mr(rs);
                access |= IBV_ACCESS_REMOTE_WRITE;
-@@ -2349,7 +3423,7 @@ off_t riomap(int socket, void *buf, size_t len, int prot, int flags, off_t offse
+@@ -2349,7 +3425,7 @@ off_t riomap(int socket, void *buf, size_t len, int prot, int flags, off_t offse
                dlist_insert_tail(&iomr->entry, &rs->iomap_list);
        }
  out:
@@ -2008,7 +2010,7 @@ index a060f66..56f6f39 100644
        return offset;
  }
  
-@@ -2361,7 +3435,7 @@ int riounmap(int socket, void *buf, size_t len)
+@@ -2361,7 +3437,7 @@ int riounmap(int socket, void *buf, size_t len)
        int ret = 0;
  
        rs = idm_at(&idm, socket);
@@ -2017,7 +2019,7 @@ index a060f66..56f6f39 100644
  
        for (entry = rs->iomap_list.next; entry != &rs->iomap_list;
             entry = entry->next) {
-@@ -2382,7 +3456,7 @@ int riounmap(int socket, void *buf, size_t len)
+@@ -2382,7 +3458,7 @@ int riounmap(int socket, void *buf, size_t len)
        }
        ret = ERR(EINVAL);
  out:
@@ -2026,7 +2028,7 @@ index a060f66..56f6f39 100644
        return ret;
  }
  
-@@ -2426,7 +3500,7 @@ size_t riowrite(int socket, const void *buf, size_t count, off_t offset, int fla
+@@ -2426,7 +3502,7 @@ size_t riowrite(int socket, const void *buf, size_t count, off_t offset, int fla
                                          rs_conn_can_send);
                        if (ret)
                                break;
@@ -2035,7 +2037,7 @@ index a060f66..56f6f39 100644
                                ret = ERR(ECONNRESET);
                                break;
                        }
-@@ -2476,3 +3550,269 @@ out:
+@@ -2476,3 +3552,269 @@ out:
  
        return (ret && left == count) ? ret : count - left;
  }

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 7bd34c1..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,31 +0,0 @@
-Bottom: 149a333bd2b79ef125e96607d91fa8f10b9155e8
-Top:    0a9005e21ff77f266c98c49bb8473c3d295a6c35
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-12-10 15:48:09 -0800
-
-Refresh of dsocket
-
----
-
-diff --git a/src/rsocket.c b/src/rsocket.c
-index 56f6f39..7dc5409 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -1040,7 +1040,6 @@ int rsocket(int domain, int type, int protocol)
-               rs->cm_id->route.addr.src_addr.sa_family = domain;
-               index = rs->cm_id->channel->fd;
-       } else {
--printf("rsocket DGRAM\n");
-               ret = ds_init(rs, domain);
-               if (ret)
-                       goto err;
-@@ -1887,6 +1886,9 @@ static void ds_poll_cqs(struct rsocket *rs)
-       int ret, cnt;
- 
-       qp = rs->qp_list;
-+      if (!qp)
-+              return;
-+
-       do {
-               cnt = 0;
-               do {