From 140b9b1ac496e7992ec067e2cd39a9572bb17673 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Thu, 22 Aug 2013 12:34:34 -0700 Subject: [PATCH] commit --- meta | 5 +-- patches/cmtime-bind | 70 -------------------------------- patches/cmtime-ret | 97 --------------------------------------------- patches/cmtime-to | 68 ------------------------------- 4 files changed, 1 insertion(+), 239 deletions(-) delete mode 100644 patches/cmtime-bind delete mode 100644 patches/cmtime-ret delete mode 100644 patches/cmtime-to diff --git a/meta b/meta index 3895fae5..ea7a72d8 100644 --- a/meta +++ b/meta @@ -1,10 +1,7 @@ Version: 1 -Previous: 8e8dabcde25f681158d820be8749c5b84f597149 +Previous: 3a6ccc4d4d97a45ee9b48cb229cc42cac81da035 Head: 5a5ec3458c67b1b431a18a0acbc950ef4e31f87f Applied: - cmtime-bind: afd49dcc2bb13052075e07a7593f6593b43606ce - cmtime-to: b031fead061eb0d2874be8f259c84e21433e4505 - cmtime-ret: 5a5ec3458c67b1b431a18a0acbc950ef4e31f87f Unapplied: shutdown: 358b798ae3566d0803f8e0fcdea9805ad24cb2fe old-af-ib: d71ebf70cf74111cfd5f0982d9abe6ec68fb38e3 diff --git a/patches/cmtime-bind b/patches/cmtime-bind deleted file mode 100644 index 2c84af46..00000000 --- a/patches/cmtime-bind +++ /dev/null @@ -1,70 +0,0 @@ -Bottom: 668ddd4271538fc243a888fad972f12f0e1bf29d -Top: f01c97374c3848a7f7eb3898418ec74afe2e5b64 -Author: Sean Hefty -Date: 2013-08-22 11:30:33 -0700 - -cmtime: Add ability to time rdma_bind_addr calls - -Signed-off-by: Sean Hefty - - ---- - -diff --git a/examples/cmtime.c b/examples/cmtime.c -index f97ab9e..e083ac2 100644 ---- a/examples/cmtime.c -+++ b/examples/cmtime.c -@@ -54,6 +54,7 @@ static char *src_addr; - - enum step { - STEP_CREATE_ID, -+ STEP_BIND, - STEP_RESOLVE_ADDR, - STEP_RESOLVE_ROUTE, - STEP_CREATE_QP, -@@ -65,6 +66,7 @@ enum step { - - static char *step_str[] = { - "create id", -+ "bind addr", - "resolve addr", - "resolve route", - "create qp", -@@ -123,6 +125,9 @@ static void show_perf(void) - - printf("step total ms max ms min us us / conn\n"); - for (i = 0; i < STEP_CNT; i++) { -+ if (i == STEP_BIND && !src_addr) -+ continue; -+ - us = diff_us(×[i][1], ×[i][0]); - printf("%-13s: %11.2f%11.2f%11.2f%11.2f\n", step_str[i], us / 1000., - max[i] / 1000., min[i], us / connections); -@@ -348,9 +353,27 @@ static int run_client(void) - conn_param.private_data = rai->ai_connect; - conn_param.private_data_len = rai->ai_connect_len; - -+ if (src_addr) { -+ printf("binding source address\n"); -+ start_time(STEP_BIND); -+ for (i = 0; i < connections; i++) { -+ start_perf(&nodes[i], STEP_BIND); -+ ret = rdma_bind_addr(nodes[i].id, rai->ai_src_addr); -+ if (ret) { -+ perror("failure bind addr"); -+ nodes[i].error = 1; -+ continue; -+ } -+ end_perf(&nodes[i], STEP_BIND); -+ } -+ end_time(STEP_BIND); -+ } -+ - printf("resolving address\n"); - start_time(STEP_RESOLVE_ADDR); - for (i = 0; i < connections; i++) { -+ if (nodes[i].error) -+ continue; - start_perf(&nodes[i], STEP_RESOLVE_ADDR); - ret = rdma_resolve_addr(nodes[i].id, rai->ai_src_addr, - rai->ai_dst_addr, 2000); diff --git a/patches/cmtime-ret b/patches/cmtime-ret deleted file mode 100644 index 40d26974..00000000 --- a/patches/cmtime-ret +++ /dev/null @@ -1,97 +0,0 @@ -Bottom: 4e28c06a2606dd99557b8d56fae4cb73eb704c83 -Top: 085f7c15662b316080106da090760de1b5abe8c5 -Author: Sean Hefty -Date: 2013-08-22 12:00:54 -0700 - -cmtime: Add retry support for address and route resolution - -Signed-off-by: Sean Hefty - - ---- - -diff --git a/examples/cmtime.c b/examples/cmtime.c -index 5ed83b5..6761f2c 100644 ---- a/examples/cmtime.c -+++ b/examples/cmtime.c -@@ -52,6 +52,7 @@ static char *port = "7471"; - static char *dst_addr; - static char *src_addr; - static int timeout = 2000; -+static int retries = 2; - - enum step { - STEP_CREATE_ID, -@@ -80,6 +81,7 @@ struct node { - struct rdma_cm_id *id; - struct timeval times[STEP_CNT][2]; - int error; -+ int retries; - }; - - static struct node *nodes; -@@ -205,11 +207,20 @@ static void cma_handler(struct rdma_cm_id *id, struct rdma_cm_event *event) - conn_handler(n); - break; - case RDMA_CM_EVENT_ADDR_ERROR: -+ if (n->retries--) { -+ if (!rdma_resolve_addr(n->id, rai->ai_src_addr, -+ rai->ai_dst_addr, timeout)) -+ break; -+ } - printf("RDMA_CM_EVENT_ADDR_ERROR, error: %d\n", event->status); - addr_handler(n); - n->error = 1; - break; - case RDMA_CM_EVENT_ROUTE_ERROR: -+ if (n->retries--) { -+ if (!rdma_resolve_route(n->id, timeout)) -+ break; -+ } - printf("RDMA_CM_EVENT_ROUTE_ERROR, error: %d\n", event->status); - route_handler(n); - n->error = 1; -@@ -350,7 +361,7 @@ static int run_client(void) - - conn_param.responder_resources = 1; - conn_param.initiator_depth = 1; -- conn_param.retry_count = 5; -+ conn_param.retry_count = retries; - conn_param.private_data = rai->ai_connect; - conn_param.private_data_len = rai->ai_connect_len; - -@@ -375,6 +386,7 @@ static int run_client(void) - for (i = 0; i < connections; i++) { - if (nodes[i].error) - continue; -+ nodes[i].retries = retries; - start_perf(&nodes[i], STEP_RESOLVE_ADDR); - ret = rdma_resolve_addr(nodes[i].id, rai->ai_src_addr, - rai->ai_dst_addr, timeout); -@@ -395,6 +407,7 @@ static int run_client(void) - for (i = 0; i < connections; i++) { - if (nodes[i].error) - continue; -+ nodes[i].retries = retries; - start_perf(&nodes[i], STEP_RESOLVE_ROUTE); - ret = rdma_resolve_route(nodes[i].id, timeout); - if (ret) { -@@ -467,7 +480,7 @@ int main(int argc, char **argv) - - hints.ai_port_space = RDMA_PS_TCP; - hints.ai_qp_type = IBV_QPT_RC; -- while ((op = getopt(argc, argv, "s:b:c:p:t:")) != -1) { -+ while ((op = getopt(argc, argv, "s:b:c:p:r:t:")) != -1) { - switch (op) { - case 's': - dst_addr = optarg; -@@ -481,6 +494,9 @@ int main(int argc, char **argv) - case 'p': - port = optarg; - break; -+ case 'r': -+ retries = atoi(optarg); -+ break; - case 't': - timeout = atoi(optarg); - break; diff --git a/patches/cmtime-to b/patches/cmtime-to deleted file mode 100644 index a0140f52..00000000 --- a/patches/cmtime-to +++ /dev/null @@ -1,68 +0,0 @@ -Bottom: f01c97374c3848a7f7eb3898418ec74afe2e5b64 -Top: 4e28c06a2606dd99557b8d56fae4cb73eb704c83 -Author: Sean Hefty -Date: 2013-08-22 11:54:56 -0700 - -cmtime: Allow user to specify timeout values - -Signed-off-by: Sean Hefty - - ---- - -diff --git a/examples/cmtime.c b/examples/cmtime.c -index e083ac2..5ed83b5 100644 ---- a/examples/cmtime.c -+++ b/examples/cmtime.c -@@ -51,6 +51,7 @@ static struct rdma_event_channel *channel; - static char *port = "7471"; - static char *dst_addr; - static char *src_addr; -+static int timeout = 2000; - - enum step { - STEP_CREATE_ID, -@@ -376,7 +377,7 @@ static int run_client(void) - continue; - start_perf(&nodes[i], STEP_RESOLVE_ADDR); - ret = rdma_resolve_addr(nodes[i].id, rai->ai_src_addr, -- rai->ai_dst_addr, 2000); -+ rai->ai_dst_addr, timeout); - if (ret) { - perror("failure getting addr"); - nodes[i].error = 1; -@@ -395,7 +396,7 @@ static int run_client(void) - if (nodes[i].error) - continue; - start_perf(&nodes[i], STEP_RESOLVE_ROUTE); -- ret = rdma_resolve_route(nodes[i].id, 2000); -+ ret = rdma_resolve_route(nodes[i].id, timeout); - if (ret) { - perror("failure resolving route"); - nodes[i].error = 1; -@@ -466,7 +467,7 @@ int main(int argc, char **argv) - - hints.ai_port_space = RDMA_PS_TCP; - hints.ai_qp_type = IBV_QPT_RC; -- while ((op = getopt(argc, argv, "s:b:c:p:")) != -1) { -+ while ((op = getopt(argc, argv, "s:b:c:p:t:")) != -1) { - switch (op) { - case 's': - dst_addr = optarg; -@@ -480,12 +481,16 @@ int main(int argc, char **argv) - case 'p': - port = optarg; - break; -+ case 't': -+ timeout = atoi(optarg); -+ break; - default: - printf("usage: %s\n", argv[0]); - printf("\t[-s server_address]\n"); - printf("\t[-b bind_address]\n"); - printf("\t[-c connections]\n"); - printf("\t[-p port_number]\n"); -+ printf("\t[-t timeout_ms]\n"); - exit(1); - } - } -- 2.41.0