refresh

diff --git a/meta b/meta
index eba380bbaa1f80181807aca35653837b70e17225..bf1e9f894b9fb84db2515ffc2ca90dd4efae4af7 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: 9507f6e2a4081308ef3140a88ec2de08e64a1a35
-Head: 03f60aaed54dd5ac00976eb47bea09919931a235
+Previous: b93afdcffa7c480a204acc5958c2aca158f07a60
+Head: d773152eb29fb2ec905ccb8ad4683ef36581e637
 Applied:
   rs_wrid: 0d6ca1300d88377ae7f9162457e64c541a4630eb
-  rs-iwarp: 21a157ca83b54ae7a61861c8eb87c39d3f31dd3e
-  refresh-temp: 03f60aaed54dd5ac00976eb47bea09919931a235
+  rs-iwarp: d773152eb29fb2ec905ccb8ad4683ef36581e637
 Unapplied:
   seterr: 47eb0c419687c2690292c1910acae83a46e5388c
   clisvr: 0db572abcf3d78374a5ea0f91b709136948809cc

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 70d1fb8..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,68 +0,0 @@
-Bottom: 3612aa65b26b315fdd6f5107e52c41cda33fe4ae
-Top:    65636beb13b8ae7b28da070da7c6de6af4e4ef9b
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2013-04-14 09:52:05 -0700
-
-Refresh of rs-iwarp
-
----
-
-diff --git a/src/rsocket.c b/src/rsocket.c
-index f9c31cd..79aa53b 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -1597,7 +1597,6 @@ static int rs_post_write_msg(struct rsocket *rs,
- 
-               return rdma_seterrno(ibv_post_send(rs->cm_id->qp, &wr, &bad));
-       } else {
--              /* TODO: adjust sqe_avail and ctrl_avail for extra post */
-               ret = rs_post_write(rs, sgl, nsge, msg, flags, addr, rkey);
-               if (!ret)
-                       ret = rs_post_msg(rs, msg);
-@@ -1636,6 +1635,8 @@ static int rs_write_data(struct rsocket *rs,
- 
-       rs->sseq_no++;
-       rs->sqe_avail--;
-+      if (rs->opts & RS_OPT_MSG_SEND)
-+              rs->sqe_avail--;
-       rs->sbuf_bytes_avail -= length;
- 
-       addr = rs->target_sgl[rs->target_sge].addr;
-@@ -1673,6 +1674,8 @@ static int rs_write_iomap(struct rsocket *rs, struct rs_iomap_mr *iomr,
- 
-       rs->sseq_no++;
-       rs->sqe_avail--;
-+      if (rs->opts & RS_OPT_MSG_SEND)
-+              rs->sqe_avail--;
-       rs->sbuf_bytes_avail -= sizeof(struct rs_iomap);
- 
-       addr = rs->remote_iomap.addr + iomr->index * sizeof(struct rs_iomap);
-@@ -1694,6 +1697,9 @@ static void rs_send_credits(struct rsocket *rs)
-       rs->ctrl_avail--;
-       rs->rseq_comp = rs->rseq_no + (rs->rq_size >> 1);
-       if (rs->rbuf_bytes_avail >= (rs->rbuf_size >> 1)) {
-+              if (rs->opts & RS_OPT_MSG_SEND)
-+                      rs->ctrl_avail--;
-+
-               if (!(rs->opts & RS_OPT_SWAP_SGL)) {
-                       sge.addr = (uintptr_t) &rs->rbuf[rs->rbuf_free_offset];
-                       sge.key = rs->rmr->rkey;
-@@ -1728,9 +1734,15 @@ static void rs_send_credits(struct rsocket *rs)
- 
- static int rs_give_credits(struct rsocket *rs)
- {
--      return ((rs->rbuf_bytes_avail >= (rs->rbuf_size >> 1)) ||
--              ((short) ((short) rs->rseq_no - (short) rs->rseq_comp) >= 0)) &&
--             rs->ctrl_avail && (rs->state & rs_connected);
-+      if (!(rs->opts & RS_OPT_MSG_SEND)) {
-+              return ((rs->rbuf_bytes_avail >= (rs->rbuf_size >> 1)) ||
-+                      ((short) ((short) rs->rseq_no - (short) rs->rseq_comp) >= 0)) &&
-+                     rs->ctrl_avail && (rs->state & rs_connected);
-+      } else {
-+              return ((rs->rbuf_bytes_avail >= (rs->rbuf_size >> 1)) ||
-+                      ((short) ((short) rs->rseq_no - (short) rs->rseq_comp) >= 0)) &&
-+                     (rs->ctrl_avail > 1) && (rs->state & rs_connected);
-+      }
- }
- 
- static void rs_update_credits(struct rsocket *rs)

diff --git a/patches/rs-iwarp b/patches/rs-iwarp
index d8ec6ed875d0cd385ef3ea17937923b340a1e708..56dccc9dbc6902ab8ad331f86b0de2df127e0da7 100644 (file)
--- a/patches/rs-iwarp
+++ b/patches/rs-iwarp
@@ -1,5 +1,5 @@
 Bottom: e8c026d3862906d30200710fcc27654d4fb2d580
-Top:    3612aa65b26b315fdd6f5107e52c41cda33fe4ae
+Top:    65636beb13b8ae7b28da070da7c6de6af4e4ef9b
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2013-04-11 10:05:29 -0700
 
@@ -15,7 +15,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/rsocket.c b/src/rsocket.c
-index ca77116..f9c31cd 100644
+index ca77116..79aa53b 100644
 --- a/src/rsocket.c
 +++ b/src/rsocket.c
 @@ -123,6 +123,7 @@ enum {
@@ -180,7 +180,7 @@ index ca77116..f9c31cd 100644
  
        return rdma_seterrno(ibv_post_send(rs->cm_id->qp, &wr, &bad));
  }
-@@ -1547,6 +1576,35 @@ static int rs_post_write(struct rsocket *rs,
+@@ -1547,6 +1576,34 @@ static int rs_post_write(struct rsocket *rs,
        return rdma_seterrno(ibv_post_send(rs->cm_id->qp, &wr, &bad));
  }
  
@@ -205,7 +205,6 @@ index ca77116..f9c31cd 100644
 +
 +              return rdma_seterrno(ibv_post_send(rs->cm_id->qp, &wr, &bad));
 +      } else {
-+              /* TODO: adjust sqe_avail and ctrl_avail for extra post */
 +              ret = rs_post_write(rs, sgl, nsge, msg, flags, addr, rkey);
 +              if (!ret)
 +                      ret = rs_post_msg(rs, msg);
@@ -216,7 +215,35 @@ index ca77116..f9c31cd 100644
  static int ds_post_send(struct rsocket *rs, struct ibv_sge *sge,
                        uint32_t wr_data)
  {
-@@ -1664,9 +1722,7 @@ static void rs_send_credits(struct rsocket *rs)
+@@ -1578,6 +1635,8 @@ static int rs_write_data(struct rsocket *rs,
+ 
+       rs->sseq_no++;
+       rs->sqe_avail--;
++      if (rs->opts & RS_OPT_MSG_SEND)
++              rs->sqe_avail--;
+       rs->sbuf_bytes_avail -= length;
+ 
+       addr = rs->target_sgl[rs->target_sge].addr;
+@@ -1615,6 +1674,8 @@ static int rs_write_iomap(struct rsocket *rs, struct rs_iomap_mr *iomr,
+ 
+       rs->sseq_no++;
+       rs->sqe_avail--;
++      if (rs->opts & RS_OPT_MSG_SEND)
++              rs->sqe_avail--;
+       rs->sbuf_bytes_avail -= sizeof(struct rs_iomap);
+ 
+       addr = rs->remote_iomap.addr + iomr->index * sizeof(struct rs_iomap);
+@@ -1636,6 +1697,9 @@ static void rs_send_credits(struct rsocket *rs)
+       rs->ctrl_avail--;
+       rs->rseq_comp = rs->rseq_no + (rs->rq_size >> 1);
+       if (rs->rbuf_bytes_avail >= (rs->rbuf_size >> 1)) {
++              if (rs->opts & RS_OPT_MSG_SEND)
++                      rs->ctrl_avail--;
++
+               if (!(rs->opts & RS_OPT_SWAP_SGL)) {
+                       sge.addr = (uintptr_t) &rs->rbuf[rs->rbuf_free_offset];
+                       sge.key = rs->rmr->rkey;
+@@ -1664,17 +1728,21 @@ static void rs_send_credits(struct rsocket *rs)
                if (++rs->remote_sge == rs->remote_sgl.length)
                        rs->remote_sge = 0;
        } else {
@@ -227,7 +254,24 @@ index ca77116..f9c31cd 100644
        }
  }
  
-@@ -1686,7 +1742,7 @@ static void rs_update_credits(struct rsocket *rs)
+ static int rs_give_credits(struct rsocket *rs)
+ {
+-      return ((rs->rbuf_bytes_avail >= (rs->rbuf_size >> 1)) ||
+-              ((short) ((short) rs->rseq_no - (short) rs->rseq_comp) >= 0)) &&
+-             rs->ctrl_avail && (rs->state & rs_connected);
++      if (!(rs->opts & RS_OPT_MSG_SEND)) {
++              return ((rs->rbuf_bytes_avail >= (rs->rbuf_size >> 1)) ||
++                      ((short) ((short) rs->rseq_no - (short) rs->rseq_comp) >= 0)) &&
++                     rs->ctrl_avail && (rs->state & rs_connected);
++      } else {
++              return ((rs->rbuf_bytes_avail >= (rs->rbuf_size >> 1)) ||
++                      ((short) ((short) rs->rseq_no - (short) rs->rseq_comp) >= 0)) &&
++                     (rs->ctrl_avail > 1) && (rs->state & rs_connected);
++      }
+ }
+ 
+ static void rs_update_credits(struct rsocket *rs)
+@@ -1686,7 +1754,7 @@ static void rs_update_credits(struct rsocket *rs)
  static int rs_poll_cq(struct rsocket *rs)
  {
        struct ibv_wc wc;
@@ -236,7 +280,7 @@ index ca77116..f9c31cd 100644
        int ret, rcnt = 0;
  
        while ((ret = ibv_poll_cq(rs->cm_id->recv_cq, 1, &wc)) > 0) {
-@@ -1695,19 +1751,25 @@ static int rs_poll_cq(struct rsocket *rs)
+@@ -1695,19 +1763,25 @@ static int rs_poll_cq(struct rsocket *rs)
                                continue;
                        rcnt++;
  
@@ -267,7 +311,7 @@ index ca77116..f9c31cd 100644
                                        rs->state &= ~rs_readable;
                                }
                                break;
-@@ -1715,8 +1777,8 @@ static int rs_poll_cq(struct rsocket *rs)
+@@ -1715,8 +1789,8 @@ static int rs_poll_cq(struct rsocket *rs)
                                /* We really shouldn't be here. */
                                break;
                        default:
@@ -278,7 +322,7 @@ index ca77116..f9c31cd 100644
                                if (++rs->rmsg_tail == rs->rq_size + 1)
                                        rs->rmsg_tail = 0;
                                break;
-@@ -2037,9 +2099,15 @@ static int rs_poll_all(struct rsocket *rs)
+@@ -2037,9 +2111,15 @@ static int rs_poll_all(struct rsocket *rs)
   */
  static int rs_can_send(struct rsocket *rs)
  {
@@ -297,7 +341,7 @@ index ca77116..f9c31cd 100644
  }
  
  static int ds_can_send(struct rsocket *rs)
-@@ -3011,8 +3079,7 @@ int rshutdown(int socket, int how)
+@@ -3011,8 +3091,7 @@ int rshutdown(int socket, int how)
  
                if ((rs->state & rs_connected) && rs->ctrl_avail) {
                        rs->ctrl_avail--;