Version: 1
-Previous: d53021942903fea99bb60ab45c695d5f728b0e68
-Head: 1e0eebe59b15b3710c09529b60f8c3871e0234f0
+Previous: 0f3862662437dca805d1063715e3b7c79359f68e
+Head: b0b25c1578855bfa6eb245bf9c5cb605401fce9c
Applied:
- rs-1sge: 90967867486464337355af88619c00907bd6c85a
- refresh-temp: 1e0eebe59b15b3710c09529b60f8c3871e0234f0
+ rs-1sge: b0b25c1578855bfa6eb245bf9c5cb605401fce9c
Unapplied:
ip6-opt: 7e43a759255e9890d1e41f1edf71792836f53941
Hidden:
+++ /dev/null
-Bottom: 19653040b4f6827e46b2b5079ab41e32a223fc76
-Top: 5e3e6b71c501cb8ea673381a8c35aabaa2c3c924
-Author: Sean Hefty <sean.hefty@intel.com>
-Date: 2012-06-08 17:11:57 -0700
-
-Refresh of rs-1sge
-
----
-
-diff --git a/src/rsocket.c b/src/rsocket.c
-index a3c2c6a..4781e81 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -95,6 +95,10 @@ enum {
- #define rs_msg_op(imm_data) (imm_data >> 29)
- #define rs_msg_data(imm_data) (imm_data & 0x1FFFFFFF)
-
-+#define rs_wrid_set(sqe, length) ((((uint64_t) sqe) << 32) | ((uint64_t) length))
-+#define rs_wrid_len(wrid) ((uint32_t) wrid)
-+#define rs_wrid_sqe(wrid) 1
-+
- enum {
- RS_CTRL_DISCONNECT
- };
-@@ -123,14 +127,6 @@ struct rs_conn_data {
- struct rs_sge data_buf;
- };
-
--union rs_wr_id {
-- uint64_t wr_id;
-- struct {
-- uint32_t reserved; /* sqe_count; */
-- uint32_t length;
-- };
--};
--
- /*
- * rsocket states are ordered as passive, connecting, connected, disconnected.
- */
-@@ -197,7 +193,7 @@ struct rsocket {
-
- uint32_t sbuf_size;
- struct ibv_mr *smr;
-- struct ibv_sge ssgl[2];
-+ struct ibv_sge ssge;
- uint8_t *sbuf;
- };
-
-@@ -256,17 +252,6 @@ out:
- pthread_mutex_unlock(&mut);
- }
-
--/*
-- * We currently generate a completion per send. sqe_count = 1
-- */
--static union rs_wr_id rs_wrid(uint32_t sqe_count, uint32_t length)
--{
-- union rs_wr_id wrid;
-- /* wrid.reserved = sqe_count; */
-- wrid.length = length;
-- return wrid;
--}
--
- static int rs_insert(struct rsocket *rs)
- {
- pthread_mutex_lock(&mut);
-@@ -372,9 +357,9 @@ static int rs_init_bufs(struct rsocket *rs)
- if (!rs->rmr)
- return -1;
-
-- rs->ssgl[0].addr = rs->ssgl[1].addr = (uintptr_t) rs->sbuf;
-+ rs->ssge.addr = (uintptr_t) rs->sbuf;
- rs->sbuf_bytes_avail = rs->sbuf_size;
-- rs->ssgl[0].lkey = rs->ssgl[1].lkey = rs->smr->lkey;
-+ rs->ssge.lkey = rs->smr->lkey;
-
- rs->rbuf_free_offset = rs->rbuf_size >> 1;
- rs->rbuf_bytes_avail = rs->rbuf_size >> 1;
-@@ -434,7 +419,7 @@ static int rs_create_ep(struct rsocket *rs)
- qp_attr.sq_sig_all = 1;
- qp_attr.cap.max_send_wr = rs->sq_size;
- qp_attr.cap.max_recv_wr = rs->rq_size;
-- qp_attr.cap.max_send_sge = 2;
-+ qp_attr.cap.max_send_sge = 1;
- qp_attr.cap.max_recv_sge = 1;
- qp_attr.cap.max_inline_data = rs->sq_inline;
-
-@@ -775,35 +760,35 @@ static int rs_post_write(struct rsocket *rs, uint64_t wr_id,
- * Update target SGE before sending data. Otherwise the remote side may
- * update the entry before we do.
- */
--static int rs_write_data(struct rsocket *rs, union rs_wr_id wr_id,
-- struct ibv_sge *sgl, int nsge,
-- uint32_t imm_data, int flags)
-+static int rs_write_data(struct rsocket *rs, struct ibv_sge *sge, int flags)
- {
- uint64_t addr;
- uint32_t rkey;
-+ uint32_t len = sge->length;
-
- rs->sseq_no++;
- rs->sqe_avail--;
-- rs->sbuf_bytes_avail -= wr_id.length;
-+ rs->sbuf_bytes_avail -= len;
-
- addr = rs->target_sgl[rs->target_sge].addr;
- rkey = rs->target_sgl[rs->target_sge].key;
-
-- rs->target_sgl[rs->target_sge].addr += wr_id.length;
-- rs->target_sgl[rs->target_sge].length -= wr_id.length;
-+ rs->target_sgl[rs->target_sge].addr += len;
-+ rs->target_sgl[rs->target_sge].length -= len;
-
- if (!rs->target_sgl[rs->target_sge].length) {
- if (++rs->target_sge == RS_SGL_SIZE)
- rs->target_sge = 0;
- }
-
-- return rs_post_write(rs, wr_id.wr_id, sgl, nsge, imm_data, flags, addr, rkey);
-+ return rs_post_write(rs, rs_wrid_set(1, len), sge, 1,
-+ rs_msg_set(RS_OP_DATA, len), flags, addr, rkey);
- }
-
- static uint32_t rs_sbuf_left(struct rsocket *rs)
- {
- return (uint32_t) (((uint64_t) (uintptr_t) &rs->sbuf[rs->sbuf_size]) -
-- rs->ssgl[0].addr);
-+ rs->ssge.addr);
- }
-
- static void rs_send_credits(struct rsocket *rs)
-@@ -863,7 +848,6 @@ static void rs_update_credits(struct rsocket *rs)
- static int rs_poll_cq(struct rsocket *rs)
- {
- struct ibv_wc wc;
-- union rs_wr_id *wr_id;
- uint32_t imm_data;
- int ret, rcnt = 0;
-
-@@ -893,9 +877,8 @@ static int rs_poll_cq(struct rsocket *rs)
- }
- } else {
- if (wc.wr_id) {
-- wr_id = (union rs_wr_id *) &wc.wr_id;
-- rs->sqe_avail++; /* += wr_id->sqe_count; */
-- rs->sbuf_bytes_avail += wr_id->length;
-+ rs->sqe_avail += rs_wrid_sqe(wc.wr_id);
-+ rs->sbuf_bytes_avail += rs_wrid_len(wc.wr_id);
- } else {
- rs->ctrl_avail++;
- }
-@@ -1246,34 +1229,24 @@ ssize_t rsend(int socket, const void *buf, size_t len, int flags)
- xfer_size = rs->sbuf_bytes_avail;
- if (xfer_size > rs->target_sgl[rs->target_sge].length)
- xfer_size = rs->target_sgl[rs->target_sge].length;
-+ if (xfer_size > rs_sbuf_left(rs))
-+ xfer_size = rs_sbuf_left(rs);
-
- if (xfer_size <= rs->sq_inline) {
- sge.addr = (uintptr_t) buf;
- sge.length = xfer_size;
- sge.lkey = 0;
-- ret = rs_write_data(rs, rs_wrid(1, xfer_size),
-- &sge, 1, rs_msg_set(RS_OP_DATA, xfer_size),
-- IBV_SEND_INLINE);
-- } else if (xfer_size <= rs_sbuf_left(rs)) {
-- memcpy((void *) (uintptr_t) rs->ssgl[0].addr, buf, xfer_size);
-- rs->ssgl[0].length = xfer_size;
-- ret = rs_write_data(rs, rs_wrid(1, xfer_size),
-- rs->ssgl, 1,
-- rs_msg_set(RS_OP_DATA, xfer_size), 0);
-+ ret = rs_write_data(rs, &sge, IBV_SEND_INLINE);
-+ if (xfer_size == rs_sbuf_left(rs))
-+ rs->ssge.addr = (uintptr_t) rs->sbuf;
-+ } else {
-+ memcpy((void *) (uintptr_t) rs->ssge.addr, buf, xfer_size);
-+ rs->ssge.length = xfer_size;
-+ ret = rs_write_data(rs, &rs->ssge, 0);
- if (xfer_size < rs_sbuf_left(rs))
-- rs->ssgl[0].addr += xfer_size;
-+ rs->ssge.addr += xfer_size;
- else
-- rs->ssgl[0].addr = (uintptr_t) rs->sbuf;
-- } else {
-- rs->ssgl[0].length = rs_sbuf_left(rs);
-- memcpy((void *) (uintptr_t) rs->ssgl[0].addr, buf,
-- rs->ssgl[0].length);
-- rs->ssgl[1].length = xfer_size - rs->ssgl[0].length;
-- memcpy(rs->sbuf, buf + rs->ssgl[0].length, rs->ssgl[1].length);
-- ret = rs_write_data(rs, rs_wrid(1, xfer_size),
-- rs->ssgl, 2,
-- rs_msg_set(RS_OP_DATA, xfer_size), 0);
-- rs->ssgl[0].addr = (uintptr_t) rs->sbuf + rs->ssgl[1].length;
-+ rs->ssge.addr = (uintptr_t) rs->sbuf;
- }
- if (ret)
- break;
-@@ -1360,33 +1333,21 @@ static ssize_t rsendv(int socket, const struct iovec *iov, int iovcnt, int flags
- xfer_size = rs->sbuf_bytes_avail;
- if (xfer_size > rs->target_sgl[rs->target_sge].length)
- xfer_size = rs->target_sgl[rs->target_sge].length;
--
-- if (xfer_size <= rs_sbuf_left(rs)) {
-- rs_copy_iov((void *) (uintptr_t) rs->ssgl[0].addr,
-- &cur_iov, &offset, xfer_size);
-- rs->ssgl[0].length = xfer_size;
-- ret = rs_write_data(rs, rs_wrid(1, xfer_size),
-- rs->ssgl, 1,
-- rs_msg_set(RS_OP_DATA, xfer_size),
-- xfer_size <= rs->sq_inline ? IBV_SEND_INLINE : 0);
-- if (xfer_size < rs_sbuf_left(rs))
-- rs->ssgl[0].addr += xfer_size;
-- else
-- rs->ssgl[0].addr = (uintptr_t) rs->sbuf;
-- } else {
-- rs->ssgl[0].length = rs_sbuf_left(rs);
-- rs_copy_iov((void *) (uintptr_t) rs->ssgl[0].addr, &cur_iov,
-- &offset, rs->ssgl[0].length);
-- rs->ssgl[1].length = xfer_size - rs->ssgl[0].length;
-- rs_copy_iov(rs->sbuf, &cur_iov, &offset, rs->ssgl[1].length);
-- ret = rs_write_data(rs, rs_wrid(1, xfer_size),
-- rs->ssgl, 2,
-- rs_msg_set(RS_OP_DATA, xfer_size),
-- xfer_size <= rs->sq_inline ? IBV_SEND_INLINE : 0);
-- rs->ssgl[0].addr = (uintptr_t) rs->sbuf + rs->ssgl[1].length;
-- }
-+ if (xfer_size > rs_sbuf_left(rs))
-+ xfer_size = rs_sbuf_left(rs);
-+
-+ rs_copy_iov((void *) (uintptr_t) rs->ssge.addr,
-+ &cur_iov, &offset, xfer_size);
-+ rs->ssge.length = xfer_size;
-+ ret = rs_write_data(rs, &rs->ssge, xfer_size <= rs->sq_inline ?
-+ IBV_SEND_INLINE : 0);
- if (ret)
- break;
-+
-+ if (xfer_size < rs_sbuf_left(rs))
-+ rs->ssge.addr += xfer_size;
-+ else
-+ rs->ssge.addr = (uintptr_t) rs->sbuf;
- }
- fastlock_release(&rs->slock);
Bottom: 19653040b4f6827e46b2b5079ab41e32a223fc76
-Top: 19653040b4f6827e46b2b5079ab41e32a223fc76
+Top: 5e3e6b71c501cb8ea673381a8c35aabaa2c3c924
Author: Sean Hefty <sean.hefty@intel.com>
Date: 2012-05-24 14:36:41 -0700
---
-
+diff --git a/src/rsocket.c b/src/rsocket.c
+index a3c2c6a..4781e81 100644
+--- a/src/rsocket.c
++++ b/src/rsocket.c
+@@ -95,6 +95,10 @@ enum {
+ #define rs_msg_op(imm_data) (imm_data >> 29)
+ #define rs_msg_data(imm_data) (imm_data & 0x1FFFFFFF)
+
++#define rs_wrid_set(sqe, length) ((((uint64_t) sqe) << 32) | ((uint64_t) length))
++#define rs_wrid_len(wrid) ((uint32_t) wrid)
++#define rs_wrid_sqe(wrid) 1
++
+ enum {
+ RS_CTRL_DISCONNECT
+ };
+@@ -123,14 +127,6 @@ struct rs_conn_data {
+ struct rs_sge data_buf;
+ };
+
+-union rs_wr_id {
+- uint64_t wr_id;
+- struct {
+- uint32_t reserved; /* sqe_count; */
+- uint32_t length;
+- };
+-};
+-
+ /*
+ * rsocket states are ordered as passive, connecting, connected, disconnected.
+ */
+@@ -197,7 +193,7 @@ struct rsocket {
+
+ uint32_t sbuf_size;
+ struct ibv_mr *smr;
+- struct ibv_sge ssgl[2];
++ struct ibv_sge ssge;
+ uint8_t *sbuf;
+ };
+
+@@ -256,17 +252,6 @@ out:
+ pthread_mutex_unlock(&mut);
+ }
+
+-/*
+- * We currently generate a completion per send. sqe_count = 1
+- */
+-static union rs_wr_id rs_wrid(uint32_t sqe_count, uint32_t length)
+-{
+- union rs_wr_id wrid;
+- /* wrid.reserved = sqe_count; */
+- wrid.length = length;
+- return wrid;
+-}
+-
+ static int rs_insert(struct rsocket *rs)
+ {
+ pthread_mutex_lock(&mut);
+@@ -372,9 +357,9 @@ static int rs_init_bufs(struct rsocket *rs)
+ if (!rs->rmr)
+ return -1;
+
+- rs->ssgl[0].addr = rs->ssgl[1].addr = (uintptr_t) rs->sbuf;
++ rs->ssge.addr = (uintptr_t) rs->sbuf;
+ rs->sbuf_bytes_avail = rs->sbuf_size;
+- rs->ssgl[0].lkey = rs->ssgl[1].lkey = rs->smr->lkey;
++ rs->ssge.lkey = rs->smr->lkey;
+
+ rs->rbuf_free_offset = rs->rbuf_size >> 1;
+ rs->rbuf_bytes_avail = rs->rbuf_size >> 1;
+@@ -434,7 +419,7 @@ static int rs_create_ep(struct rsocket *rs)
+ qp_attr.sq_sig_all = 1;
+ qp_attr.cap.max_send_wr = rs->sq_size;
+ qp_attr.cap.max_recv_wr = rs->rq_size;
+- qp_attr.cap.max_send_sge = 2;
++ qp_attr.cap.max_send_sge = 1;
+ qp_attr.cap.max_recv_sge = 1;
+ qp_attr.cap.max_inline_data = rs->sq_inline;
+
+@@ -775,35 +760,35 @@ static int rs_post_write(struct rsocket *rs, uint64_t wr_id,
+ * Update target SGE before sending data. Otherwise the remote side may
+ * update the entry before we do.
+ */
+-static int rs_write_data(struct rsocket *rs, union rs_wr_id wr_id,
+- struct ibv_sge *sgl, int nsge,
+- uint32_t imm_data, int flags)
++static int rs_write_data(struct rsocket *rs, struct ibv_sge *sge, int flags)
+ {
+ uint64_t addr;
+ uint32_t rkey;
++ uint32_t len = sge->length;
+
+ rs->sseq_no++;
+ rs->sqe_avail--;
+- rs->sbuf_bytes_avail -= wr_id.length;
++ rs->sbuf_bytes_avail -= len;
+
+ addr = rs->target_sgl[rs->target_sge].addr;
+ rkey = rs->target_sgl[rs->target_sge].key;
+
+- rs->target_sgl[rs->target_sge].addr += wr_id.length;
+- rs->target_sgl[rs->target_sge].length -= wr_id.length;
++ rs->target_sgl[rs->target_sge].addr += len;
++ rs->target_sgl[rs->target_sge].length -= len;
+
+ if (!rs->target_sgl[rs->target_sge].length) {
+ if (++rs->target_sge == RS_SGL_SIZE)
+ rs->target_sge = 0;
+ }
+
+- return rs_post_write(rs, wr_id.wr_id, sgl, nsge, imm_data, flags, addr, rkey);
++ return rs_post_write(rs, rs_wrid_set(1, len), sge, 1,
++ rs_msg_set(RS_OP_DATA, len), flags, addr, rkey);
+ }
+
+ static uint32_t rs_sbuf_left(struct rsocket *rs)
+ {
+ return (uint32_t) (((uint64_t) (uintptr_t) &rs->sbuf[rs->sbuf_size]) -
+- rs->ssgl[0].addr);
++ rs->ssge.addr);
+ }
+
+ static void rs_send_credits(struct rsocket *rs)
+@@ -863,7 +848,6 @@ static void rs_update_credits(struct rsocket *rs)
+ static int rs_poll_cq(struct rsocket *rs)
+ {
+ struct ibv_wc wc;
+- union rs_wr_id *wr_id;
+ uint32_t imm_data;
+ int ret, rcnt = 0;
+
+@@ -893,9 +877,8 @@ static int rs_poll_cq(struct rsocket *rs)
+ }
+ } else {
+ if (wc.wr_id) {
+- wr_id = (union rs_wr_id *) &wc.wr_id;
+- rs->sqe_avail++; /* += wr_id->sqe_count; */
+- rs->sbuf_bytes_avail += wr_id->length;
++ rs->sqe_avail += rs_wrid_sqe(wc.wr_id);
++ rs->sbuf_bytes_avail += rs_wrid_len(wc.wr_id);
+ } else {
+ rs->ctrl_avail++;
+ }
+@@ -1246,34 +1229,24 @@ ssize_t rsend(int socket, const void *buf, size_t len, int flags)
+ xfer_size = rs->sbuf_bytes_avail;
+ if (xfer_size > rs->target_sgl[rs->target_sge].length)
+ xfer_size = rs->target_sgl[rs->target_sge].length;
++ if (xfer_size > rs_sbuf_left(rs))
++ xfer_size = rs_sbuf_left(rs);
+
+ if (xfer_size <= rs->sq_inline) {
+ sge.addr = (uintptr_t) buf;
+ sge.length = xfer_size;
+ sge.lkey = 0;
+- ret = rs_write_data(rs, rs_wrid(1, xfer_size),
+- &sge, 1, rs_msg_set(RS_OP_DATA, xfer_size),
+- IBV_SEND_INLINE);
+- } else if (xfer_size <= rs_sbuf_left(rs)) {
+- memcpy((void *) (uintptr_t) rs->ssgl[0].addr, buf, xfer_size);
+- rs->ssgl[0].length = xfer_size;
+- ret = rs_write_data(rs, rs_wrid(1, xfer_size),
+- rs->ssgl, 1,
+- rs_msg_set(RS_OP_DATA, xfer_size), 0);
++ ret = rs_write_data(rs, &sge, IBV_SEND_INLINE);
++ if (xfer_size == rs_sbuf_left(rs))
++ rs->ssge.addr = (uintptr_t) rs->sbuf;
++ } else {
++ memcpy((void *) (uintptr_t) rs->ssge.addr, buf, xfer_size);
++ rs->ssge.length = xfer_size;
++ ret = rs_write_data(rs, &rs->ssge, 0);
+ if (xfer_size < rs_sbuf_left(rs))
+- rs->ssgl[0].addr += xfer_size;
++ rs->ssge.addr += xfer_size;
+ else
+- rs->ssgl[0].addr = (uintptr_t) rs->sbuf;
+- } else {
+- rs->ssgl[0].length = rs_sbuf_left(rs);
+- memcpy((void *) (uintptr_t) rs->ssgl[0].addr, buf,
+- rs->ssgl[0].length);
+- rs->ssgl[1].length = xfer_size - rs->ssgl[0].length;
+- memcpy(rs->sbuf, buf + rs->ssgl[0].length, rs->ssgl[1].length);
+- ret = rs_write_data(rs, rs_wrid(1, xfer_size),
+- rs->ssgl, 2,
+- rs_msg_set(RS_OP_DATA, xfer_size), 0);
+- rs->ssgl[0].addr = (uintptr_t) rs->sbuf + rs->ssgl[1].length;
++ rs->ssge.addr = (uintptr_t) rs->sbuf;
+ }
+ if (ret)
+ break;
+@@ -1360,33 +1333,21 @@ static ssize_t rsendv(int socket, const struct iovec *iov, int iovcnt, int flags
+ xfer_size = rs->sbuf_bytes_avail;
+ if (xfer_size > rs->target_sgl[rs->target_sge].length)
+ xfer_size = rs->target_sgl[rs->target_sge].length;
+-
+- if (xfer_size <= rs_sbuf_left(rs)) {
+- rs_copy_iov((void *) (uintptr_t) rs->ssgl[0].addr,
+- &cur_iov, &offset, xfer_size);
+- rs->ssgl[0].length = xfer_size;
+- ret = rs_write_data(rs, rs_wrid(1, xfer_size),
+- rs->ssgl, 1,
+- rs_msg_set(RS_OP_DATA, xfer_size),
+- xfer_size <= rs->sq_inline ? IBV_SEND_INLINE : 0);
+- if (xfer_size < rs_sbuf_left(rs))
+- rs->ssgl[0].addr += xfer_size;
+- else
+- rs->ssgl[0].addr = (uintptr_t) rs->sbuf;
+- } else {
+- rs->ssgl[0].length = rs_sbuf_left(rs);
+- rs_copy_iov((void *) (uintptr_t) rs->ssgl[0].addr, &cur_iov,
+- &offset, rs->ssgl[0].length);
+- rs->ssgl[1].length = xfer_size - rs->ssgl[0].length;
+- rs_copy_iov(rs->sbuf, &cur_iov, &offset, rs->ssgl[1].length);
+- ret = rs_write_data(rs, rs_wrid(1, xfer_size),
+- rs->ssgl, 2,
+- rs_msg_set(RS_OP_DATA, xfer_size),
+- xfer_size <= rs->sq_inline ? IBV_SEND_INLINE : 0);
+- rs->ssgl[0].addr = (uintptr_t) rs->sbuf + rs->ssgl[1].length;
+- }
++ if (xfer_size > rs_sbuf_left(rs))
++ xfer_size = rs_sbuf_left(rs);
++
++ rs_copy_iov((void *) (uintptr_t) rs->ssge.addr,
++ &cur_iov, &offset, xfer_size);
++ rs->ssge.length = xfer_size;
++ ret = rs_write_data(rs, &rs->ssge, xfer_size <= rs->sq_inline ?
++ IBV_SEND_INLINE : 0);
+ if (ret)
+ break;
++
++ if (xfer_size < rs_sbuf_left(rs))
++ rs->ssge.addr += xfer_size;
++ else
++ rs->ssge.addr = (uintptr_t) rs->sbuf;
+ }
+ fastlock_release(&rs->slock);
projects / ~shefty / librdmacm.git / commitdiff