From 36b0f2df232f14a8a847549d2db2e254316ace9b Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Thu, 13 Dec 2012 13:20:14 -0800 Subject: [PATCH] refresh --- meta | 7 ++-- patches/dsocket | 26 +++++++----- patches/refresh-temp | 98 -------------------------------------------- 3 files changed, 19 insertions(+), 112 deletions(-) delete mode 100644 patches/refresh-temp diff --git a/meta b/meta index 93703717..fe319e49 100644 --- a/meta +++ b/meta @@ -1,9 +1,8 @@ Version: 1 -Previous: de97c057e42f13e273fa3ac24de73d86fca0f076 -Head: 6859b010b2a9f2d56b94e8e158b577cb60f0083a +Previous: 0dc1c982c853cf6079b776deb8050d0a849a23aa +Head: 152ed1d8cb5d62607a834e4c94a36e0b69cd58f8 Applied: - dsocket: b2ae615cc6c0119babd24414c657cb1962392e02 - refresh-temp: 6859b010b2a9f2d56b94e8e158b577cb60f0083a + dsocket: 152ed1d8cb5d62607a834e4c94a36e0b69cd58f8 Unapplied: udpong: a42957509acbde99a7d8469e0819b7d75af51289 test-udp: f6c78ad2a26f452cf166aff1baa7b76160bd8bf7 diff --git a/patches/dsocket b/patches/dsocket index 25e35aa6..617543d6 100644 --- a/patches/dsocket +++ b/patches/dsocket @@ -1,5 +1,5 @@ Bottom: 1fa07c62817ac4b6cb8d9c5e327ea2cdc75dbd21 -Top: 136936c0a82503ee0da9daccd8b948cd09e58b64 +Top: 49030a049bcacc4789ad20b05e6a7a3ee28c5e0d Author: Sean Hefty Date: 2012-11-09 10:26:38 -0800 @@ -113,7 +113,7 @@ index 0a0370e..7135a61 100644 { errno = err; diff --git a/src/rsocket.c b/src/rsocket.c -index a060f66..6fa4c68 100644 +index a060f66..04f00dd 100644 --- a/src/rsocket.c +++ b/src/rsocket.c @@ -47,6 +47,8 @@ @@ -1628,9 +1628,9 @@ index a060f66..6fa4c68 100644 rs = idm_at(&idm, socket); + if (rs->type == SOCK_DGRAM) { -+ fastlock_acquire(&rs->slock); ++ fastlock_acquire(&rs->rlock); + ret = ds_recvfrom(rs, buf, len, flags, NULL, 0); -+ fastlock_release(&rs->slock); ++ fastlock_release(&rs->rlock); + return ret; + } + @@ -1655,9 +1655,9 @@ index a060f66..6fa4c68 100644 + rs = idm_at(&idm, socket); + if (rs->type == SOCK_DGRAM) { -+ fastlock_acquire(&rs->slock); ++ fastlock_acquire(&rs->rlock); + ret = ds_recvfrom(rs, buf, len, flags, src_addr, addrlen); -+ fastlock_release(&rs->slock); ++ fastlock_release(&rs->rlock); + return ret; + } + @@ -1772,7 +1772,7 @@ index a060f66..6fa4c68 100644 + memcpy((void *) msg + rs->conn_dest->qp->hdr.length, buf, len); + sge.addr = (uintptr_t) msg; + sge.length = rs->conn_dest->qp->hdr.length + len; -+ sge.lkey = rs->smr->lkey; ++ sge.lkey = rs->conn_dest->qp->smr->lkey; + offset = (uint8_t *) msg - rs->sbuf; + + ret = ds_post_send(rs, &sge, ds_send_wr_id(offset, sge.length)); @@ -2105,7 +2105,7 @@ index a060f66..6fa4c68 100644 ret = ERR(ECONNRESET); break; } -@@ -2476,3 +3618,296 @@ out: +@@ -2476,3 +3618,302 @@ out: return (ret && left == count) ? ret : count - left; } @@ -2232,6 +2232,7 @@ index a060f66..6fa4c68 100644 + } + + ret = rdma_create_id(NULL, &id, NULL, dest->qp->cm_id->ps); ++ printf("%s rdma_create_id %d %s\n",__func__, ret, strerror(errno)); + if (ret) + return; + @@ -2242,10 +2243,12 @@ index a060f66..6fa4c68 100644 + else + saddr.sin6.sin6_port = 0; + ret = rdma_resolve_addr(id, &saddr.sa, &dest->addr.sa, 2000); ++ printf("%s rdma_resolve_addr %d %s\n",__func__, ret, strerror(errno)); + if (ret) + goto out; + + ret = rdma_resolve_route(id, 2000); ++ printf("%s rdma_resolve_route %d %s\n",__func__, ret, strerror(errno)); + if (ret) + goto out; + @@ -2264,9 +2267,12 @@ index a060f66..6fa4c68 100644 + attr.static_rate = id->route.path_rec->rate; + attr.port_num = id->port_num; + ++ printf("%s getting slock \n",__func__); + fastlock_acquire(&rs->slock); ++ printf("%s why am I not here? \n",__func__); + dest->qpn = qpn; + dest->ah = ibv_create_ah(dest->qp->cm_id->pd, &attr); ++ printf("%s ibv_create_ah %p %s\n",__func__, dest->ah, strerror(errno)); + fastlock_release(&rs->slock); +out: + rdma_destroy_id(id); @@ -2316,7 +2322,7 @@ index a060f66..6fa4c68 100644 + memcpy((void *) msg + hdr.length, buf, len); + sge.addr = (uintptr_t) msg; + sge.length = hdr.length + len; -+ sge.lkey = rs->smr->lkey; ++ sge.lkey = rs->conn_dest->qp->smr->lkey; + offset = (uint8_t *) msg - rs->sbuf; + + ds_post_send(rs, &sge, ds_send_wr_id(offset, sge.length)); @@ -2363,7 +2369,7 @@ index a060f66..6fa4c68 100644 + + rs->conn_dest = dest; + printf("%s sending resp\n",__func__); -+ ds_send_udp(rs, svc_buf + udp_hdr->length, len, 0, RS_OP_CTRL); ++ ds_send_udp(rs, NULL, 0, 0, RS_OP_CTRL); + rs->conn_dest = cur_dest; + fastlock_release(&rs->slock); +} diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index 03b4a65d..00000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,98 +0,0 @@ -Bottom: 136936c0a82503ee0da9daccd8b948cd09e58b64 -Top: 49030a049bcacc4789ad20b05e6a7a3ee28c5e0d -Author: Sean Hefty -Date: 2012-12-13 13:20:13 -0800 - -Refresh of dsocket - ---- - -diff --git a/src/rsocket.c b/src/rsocket.c -index 6fa4c68..04f00dd 100644 ---- a/src/rsocket.c -+++ b/src/rsocket.c -@@ -2242,9 +2242,9 @@ ssize_t rrecv(int socket, void *buf, size_t len, int flags) - - rs = idm_at(&idm, socket); - if (rs->type == SOCK_DGRAM) { -- fastlock_acquire(&rs->slock); -+ fastlock_acquire(&rs->rlock); - ret = ds_recvfrom(rs, buf, len, flags, NULL, 0); -- fastlock_release(&rs->slock); -+ fastlock_release(&rs->rlock); - return ret; - } - -@@ -2311,9 +2311,9 @@ ssize_t rrecvfrom(int socket, void *buf, size_t len, int flags, - - rs = idm_at(&idm, socket); - if (rs->type == SOCK_DGRAM) { -- fastlock_acquire(&rs->slock); -+ fastlock_acquire(&rs->rlock); - ret = ds_recvfrom(rs, buf, len, flags, src_addr, addrlen); -- fastlock_release(&rs->slock); -+ fastlock_release(&rs->rlock); - return ret; - } - -@@ -2500,7 +2500,7 @@ static ssize_t dsend(struct rsocket *rs, const void *buf, size_t len, int flags) - memcpy((void *) msg + rs->conn_dest->qp->hdr.length, buf, len); - sge.addr = (uintptr_t) msg; - sge.length = rs->conn_dest->qp->hdr.length + len; -- sge.lkey = rs->smr->lkey; -+ sge.lkey = rs->conn_dest->qp->smr->lkey; - offset = (uint8_t *) msg - rs->sbuf; - - ret = ds_post_send(rs, &sge, ds_send_wr_id(offset, sge.length)); -@@ -3741,6 +3741,7 @@ static void rs_svc_create_ah(struct rsocket *rs, struct ds_dest *dest, uint32_t - } - - ret = rdma_create_id(NULL, &id, NULL, dest->qp->cm_id->ps); -+ printf("%s rdma_create_id %d %s\n",__func__, ret, strerror(errno)); - if (ret) - return; - -@@ -3751,10 +3752,12 @@ static void rs_svc_create_ah(struct rsocket *rs, struct ds_dest *dest, uint32_t - else - saddr.sin6.sin6_port = 0; - ret = rdma_resolve_addr(id, &saddr.sa, &dest->addr.sa, 2000); -+ printf("%s rdma_resolve_addr %d %s\n",__func__, ret, strerror(errno)); - if (ret) - goto out; - - ret = rdma_resolve_route(id, 2000); -+ printf("%s rdma_resolve_route %d %s\n",__func__, ret, strerror(errno)); - if (ret) - goto out; - -@@ -3773,9 +3776,12 @@ static void rs_svc_create_ah(struct rsocket *rs, struct ds_dest *dest, uint32_t - attr.static_rate = id->route.path_rec->rate; - attr.port_num = id->port_num; - -+ printf("%s getting slock \n",__func__); - fastlock_acquire(&rs->slock); -+ printf("%s why am I not here? \n",__func__); - dest->qpn = qpn; - dest->ah = ibv_create_ah(dest->qp->cm_id->pd, &attr); -+ printf("%s ibv_create_ah %p %s\n",__func__, dest->ah, strerror(errno)); - fastlock_release(&rs->slock); - out: - rdma_destroy_id(id); -@@ -3825,7 +3831,7 @@ static void rs_svc_forward(struct rsocket *rs, void *buf, size_t len, - memcpy((void *) msg + hdr.length, buf, len); - sge.addr = (uintptr_t) msg; - sge.length = hdr.length + len; -- sge.lkey = rs->smr->lkey; -+ sge.lkey = rs->conn_dest->qp->smr->lkey; - offset = (uint8_t *) msg - rs->sbuf; - - ds_post_send(rs, &sge, ds_send_wr_id(offset, sge.length)); -@@ -3872,7 +3878,7 @@ static void rs_svc_process_rs(struct rsocket *rs) - - rs->conn_dest = dest; - printf("%s sending resp\n",__func__); -- ds_send_udp(rs, svc_buf + udp_hdr->length, len, 0, RS_OP_CTRL); -+ ds_send_udp(rs, NULL, 0, 0, RS_OP_CTRL); - rs->conn_dest = cur_dest; - fastlock_release(&rs->slock); - } -- 2.46.0