From 25d3429917aa7b9c1bbc279dc7d9a978c848ac8a Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Fri, 1 Apr 2011 17:52:36 -0700 Subject: [PATCH] refresh --- meta | 7 +++---- patches/dyn_ah | 26 +++++++++++++++++--------- patches/refresh-temp | 21 --------------------- 3 files changed, 20 insertions(+), 34 deletions(-) delete mode 100644 patches/refresh-temp diff --git a/meta b/meta index ab39679..ca64cd6 100644 --- a/meta +++ b/meta @@ -1,11 +1,10 @@ Version: 1 -Previous: 08fe5c2556b5e3dfc592ad6b0b9b6cedbc3f9cf3 -Head: 82e5616c17aa5ae50098c4e26dc49654bfe42060 +Previous: e992b740f48dbe7ee1581026e336ca7a98f31bf3 +Head: 5fbe7e58a578d4a4e353e3477aa9051013c3eb4c Applied: opt_mc_av: 3f78a720520be5f98889b3b88dbb6344fa227466 one_mc_join: 1058fcd62957c0ba92ef1965ae6dc8b2aa8f1ec4 - dyn_ah: f82f398daa70118b436b050d37686c44f7255c26 - refresh-temp: 82e5616c17aa5ae50098c4e26dc49654bfe42060 + dyn_ah: 5fbe7e58a578d4a4e353e3477aa9051013c3eb4c Unapplied: addr_size: 8de02c47fbf595132105a7050ad6f755f49f9a7a Hidden: diff --git a/patches/dyn_ah b/patches/dyn_ah index 18c8101..180f1e9 100644 --- a/patches/dyn_ah +++ b/patches/dyn_ah @@ -1,5 +1,5 @@ Bottom: 0e56d97e8e6ce359a7d2f4979f99fcc197cb8302 -Top: b4ceef9d5c09998f0ae526f1c77ac77af9ee95e1 +Top: e8b5bb1cf92f403d8767fc1d61cb8c538da64fe3 Author: Sean Hefty Date: 2011-04-01 16:03:40 -0700 @@ -22,10 +22,18 @@ Signed-off-by: Sean Hefty --- diff --git a/src/acm.c b/src/acm.c -index fe42498..8719074 100644 +index fe42498..53a8e7b 100644 --- a/src/acm.c +++ b/src/acm.c -@@ -449,20 +449,30 @@ acm_alloc_send(struct acm_ep *ep, struct acm_dest *dest, size_t size) +@@ -164,6 +164,7 @@ struct acm_send_msg + DLIST_ENTRY entry; + struct acm_ep *ep; + struct acm_dest *dest; ++ struct ibv_ah *ah; + void *context; + void (*resp_handler)(struct acm_send_msg *req, + struct ibv_wc *wc, struct acm_mad *resp); +@@ -449,20 +450,30 @@ acm_alloc_send(struct acm_ep *ep, struct acm_dest *dest, size_t size) msg->mr = ibv_reg_mr(ep->port->dev->pd, msg->data, size, 0); if (!msg->mr) { acm_log(0, "ERROR - failed to register send buffer\n"); @@ -62,7 +70,7 @@ index fe42498..8719074 100644 msg->wr.wr.ud.remote_qpn = dest->remote_qpn; msg->wr.wr.ud.remote_qkey = ACM_QKEY; -@@ -471,7 +481,10 @@ acm_alloc_send(struct acm_ep *ep, struct acm_dest *dest, size_t size) +@@ -471,7 +482,10 @@ acm_alloc_send(struct acm_ep *ep, struct acm_dest *dest, size_t size) msg->sge.addr = (uintptr_t) msg->data; acm_log(2, "%p\n", msg); return msg; @@ -74,7 +82,7 @@ index fe42498..8719074 100644 free(msg); return NULL; } -@@ -490,6 +503,8 @@ acm_init_send_req(struct acm_send_msg *msg, void *context, +@@ -490,6 +504,8 @@ acm_init_send_req(struct acm_send_msg *msg, void *context, static void acm_free_send(struct acm_send_msg *msg) { acm_log(2, "%p\n", msg); @@ -83,7 +91,7 @@ index fe42498..8719074 100644 ibv_dereg_mr(msg->mr); acm_put_dest(msg->dest); free(msg); -@@ -774,7 +789,6 @@ static uint8_t +@@ -774,7 +790,6 @@ static uint8_t acm_record_acm_route(struct acm_ep *ep, struct acm_dest *dest) { int i; @@ -91,7 +99,7 @@ index fe42498..8719074 100644 acm_log(2, "\n"); for (i = 0; i < MAX_EP_MC; i++) { -@@ -789,18 +803,8 @@ acm_record_acm_route(struct acm_ep *ep, struct acm_dest *dest) +@@ -789,18 +804,8 @@ acm_record_acm_route(struct acm_ep *ep, struct acm_dest *dest) dest->path = ep->mc_dest[i].path; dest->path.dgid = dest->av.grh.dgid; dest->path.dlid = htons(dest->av.dlid); @@ -112,7 +120,7 @@ index fe42498..8719074 100644 } static void acm_init_path_query(struct ib_sa_mad *mad) -@@ -1096,15 +1100,6 @@ acm_dest_sa_resp(struct acm_send_msg *msg, struct ibv_wc *wc, struct acm_mad *ma +@@ -1096,15 +1101,6 @@ acm_dest_sa_resp(struct acm_send_msg *msg, struct ibv_wc *wc, struct acm_mad *ma if (!status) { memcpy(&dest->path, sa_mad->data, sizeof(dest->path)); acm_init_path_av(msg->ep->port, dest); @@ -128,7 +136,7 @@ index fe42498..8719074 100644 dest->state = ACM_READY; } else { dest->state = ACM_INIT; -@@ -1164,7 +1159,6 @@ acm_process_addr_req(struct acm_ep *ep, struct ibv_wc *wc, struct acm_mad *mad) +@@ -1164,7 +1160,6 @@ acm_process_addr_req(struct acm_ep *ep, struct ibv_wc *wc, struct acm_mad *mad) break; acm_log(2, "src service has new qp, resetting\n"); diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index 7ba47f7..0000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,21 +0,0 @@ -Bottom: b4ceef9d5c09998f0ae526f1c77ac77af9ee95e1 -Top: e8b5bb1cf92f403d8767fc1d61cb8c538da64fe3 -Author: Sean Hefty -Date: 2011-04-01 17:52:36 -0700 - -Refresh of dyn_ah - ---- - -diff --git a/src/acm.c b/src/acm.c -index 8719074..53a8e7b 100644 ---- a/src/acm.c -+++ b/src/acm.c -@@ -164,6 +164,7 @@ struct acm_send_msg - DLIST_ENTRY entry; - struct acm_ep *ep; - struct acm_dest *dest; -+ struct ibv_ah *ah; - void *context; - void (*resp_handler)(struct acm_send_msg *req, - struct ibv_wc *wc, struct acm_mad *resp); -- 2.46.0