refresh (create temporary patch)

diff --git a/meta b/meta
index ada18b21fa20b178dc5688a8e9e1eb51e66fa47f..90dec0b45b56c1ee83bf713b723482aa0fca9016 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,9 @@
 Version: 1
-Previous: b2da860f9dd72b220346e24d6caca35dd54d4cf5
-Head: a47c9bbdcee748fe45eb9206989bd243c4c800ef
+Previous: 2c0c7360408b9106d2dfd1d58c097247ebadc425
+Head: 4f37b7a09e20fef5ba6d1063f00f3808098ce620
 Applied:
   timeout: a47c9bbdcee748fe45eb9206989bd243c4c800ef
+  refresh-temp: 4f37b7a09e20fef5ba6d1063f00f3808098ce620
 Unapplied:
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c
   dev-addrsize: 8de02c47fbf595132105a7050ad6f755f49f9a7a

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..406a940
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,176 @@
+Bottom: 422919c089c623304ae1940eb6bdae4237feb5ab
+Top:    73024cf0fe32007e791c40697c2b40c1e344876e
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-10-08 23:27:51 -0700
+
+Refresh of timeout
+
+---
+
+diff --git a/linux/osd.h b/linux/osd.h
+index e2424b4..8723ff5 100644
+--- a/linux/osd.h
++++ b/linux/osd.h
+@@ -155,7 +155,9 @@ static inline uint64_t time_stamp_us(void)
+       return (uint64_t) curtime.tv_sec * 1000000 + (uint64_t) curtime.tv_usec;\r
+ }\r
+ \r
+-#define time_stamp_ms() (time_stamp_us() / 1000)\r
++#define time_stamp_ms()  (time_stamp_us() / 1000)\r
++#define time_stamp_sec() (time_stamp_ms() / 1000)\r
++#define time_stamp_min() (time_stamp_sec() / 60)\r
+ \r
+ #define PER_THREAD __thread\r
+ static inline int beginthread(void (*func)(void *), void *arg)\r
+diff --git a/src/acm.c b/src/acm.c
+index b6fa32f..32ed4b6 100644
+--- a/src/acm.c
++++ b/src/acm.c
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2009-2010 Intel Corporation. All rights reserved.
++ * Copyright (c) 2009-2012 Intel Corporation. All rights reserved.
+  *
+  * This software is available to you under the OpenIB.org BSD license
+  * below:
+@@ -90,6 +90,8 @@ struct acm_dest {
+       lock_t                 lock;
+       enum acm_state         state;
+       atomic_t               refcnt;
++      uint64_t               addr_timeout;
++      uint64_t               route_timeout;
+       uint8_t                addr_type;
+ };
+ 
+@@ -212,7 +214,9 @@ static char log_file[128] = "/var/log/ibacm.log";
+ static int log_level = 0;
+ static char lock_file[128] = "/var/run/ibacm.pid";
+ static enum acm_addr_prot addr_prot = ACM_ADDR_PROT_ACM;
++static int addr_timeout = 1440;
+ static enum acm_route_prot route_prot = ACM_ROUTE_PROT_SA;
++static int route_timeout = -1;
+ static enum acm_loopback_prot loopback_prot = ACM_LOOPBACK_PROT_LOCAL;
+ static short server_port = 6125;
+ static int timeout = 2000;
+@@ -805,6 +809,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);
++      dest->addr_timeout = time_stamp_min() + (uint64_t) addr_timeout;
++      dest->route_timeout = time_stamp_min() + (uint64_t) route_timeout;
+       dest->state = ACM_READY;
+       return ACM_STATUS_SUCCESS;
+ }
+@@ -1111,6 +1117,8 @@ 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);
++              dest->addr_timeout = time_stamp_min() + (uint64_t) addr_timeout;
++              dest->route_timeout = time_stamp_min() + (uint64_t) route_timeout;
+               dest->state = ACM_READY;
+       } else {
+               dest->state = ACM_INIT;
+@@ -2085,6 +2093,22 @@ acm_svr_queue_req(struct acm_dest *dest, struct acm_client *client,
+       return ACM_STATUS_SUCCESS;
+ }
+ 
++static int acm_dest_timeout(struct acm_dest *dest)
++{
++      uint64_t timestamp = time_stamp_min();
++
++      if (timestamp > dest->addr_timeout) {
++              acm_log(2, "%s address timed out\n", dest->name);
++              dest->state = ACM_INIT;
++              return 1;
++      } else if (timestamp > dest->route_timeout) {
++              acm_log(2, "%s route timed out\n", dest->name);
++              dest->state = ACM_ADDR_RESOLVED;
++              return 1;
++      }
++      return 0;
++}
++
+ static int
+ acm_svr_resolve_dest(struct acm_client *client, struct acm_msg *msg)
+ {
+@@ -2127,8 +2151,11 @@ acm_svr_resolve_dest(struct acm_client *client, struct acm_msg *msg)
+       }
+ 
+       lock_acquire(&dest->lock);
++test:
+       switch (dest->state) {
+       case ACM_READY:
++              if (acm_dest_timeout(dest))
++                      goto test;
+               acm_log(2, "request satisfied from local cache\n");
+               atomic_inc(&counter[ACM_CNTR_ROUTE_CACHE]);
+               status = ACM_STATUS_SUCCESS;
+@@ -2222,8 +2249,11 @@ acm_svr_resolve_path(struct acm_client *client, struct acm_msg *msg)
+       }
+ 
+       lock_acquire(&dest->lock);
++test:
+       switch (dest->state) {
+       case ACM_READY:
++              if (acm_dest_timeout(dest))
++                      goto test;
+               acm_log(2, "request satisfied from local cache\n");
+               atomic_inc(&counter[ACM_CNTR_ROUTE_CACHE]);
+               status = ACM_STATUS_SUCCESS;
+@@ -2620,6 +2650,8 @@ static int acm_init_ep_loopback(struct acm_ep *ep)
+               dest->path.rate = (uint8_t) ep->port->rate;
+ 
+               dest->remote_qpn = ep->qp->qp_num;
++              dest->addr_timeout = (uint64_t) -1;
++              dest->route_timeout = (uint64_t) -1;
+               dest->state = ACM_READY;
+               acm_put_dest(dest);
+               acm_log(1, "added loopback dest %s\n", dest->name);
+@@ -3055,8 +3087,12 @@ static void acm_set_options(void)
+                       strcpy(lock_file, value);
+               else if (!stricmp("addr_prot", opt))
+                       addr_prot = acm_convert_addr_prot(value);
++              else if (!stricmp("addr_timeout", opt))
++                      addr_timeout = aoti(value);
+               else if (!stricmp("route_prot", opt))
+                       route_prot = acm_convert_route_prot(value);
++              else if (!strcmp("route_timeout", opt))
++                      route_timeout = atoi(value);
+               else if (!stricmp("loopback_prot", opt))
+                       loopback_prot = acm_convert_loopback_prot(value);
+               else if (!stricmp("server_port", opt))
+diff --git a/src/acme.c b/src/acme.c
+index 0e1d4ed..5bc9c01 100644
+--- a/src/acme.c
++++ b/src/acme.c
+@@ -132,6 +132,14 @@ static void gen_opts_temp(FILE *f)
+       fprintf(f, "\n");
+       fprintf(f, "addr_prot acm\n");
+       fprintf(f, "\n");
++      fprintf(f, "# addr_timeout:\n");
++      fprintf(f, "# Number of minutes to maintain IP address to GID mapping before\n");
++      fprintf(f, "# repeating address resolution.  A value of -1 indicates that the\n");
++      fprintf(f, "# mapping will not time out.\n");
++      fprintf(f, "# 1 hour = 60, 1 day = 1440, 1 week = 10080, 1 month ~ 43200")
++      fprintf(f, "\n");
++      fprintf(f, "addr_timeout 1440\n");
++      fprintf(f, "\n");
+       fprintf(f, "# route_prot:\n");
+       fprintf(f, "# Default resolution protocol to resolve IB routing information.\n");
+       fprintf(f, "# Supported protocols are:\n");
+@@ -140,6 +148,15 @@ static void gen_opts_temp(FILE *f)
+       fprintf(f, "\n");
+       fprintf(f, "route_prot sa\n");
+       fprintf(f, "\n");
++      fprintf(f, "# route_timeout:\n");
++      fprintf(f, "# Number of minutes to maintain IB routing information before\n");
++      fprintf(f, "# repeating route resolution.  A value of -1 indicates that the\n");
++      fprintf(f, "# mapping will not time out.  However, the route will\n");
++      fprintf(f, "# automatically time out when the address times out.\n");
++      fprintf(f, "# 1 hour = 60, 1 day = 1440, 1 week = 10080, 1 month ~ 43200")
++      fprintf(f, "\n");
++      fprintf(f, "route_timeout -1\n");
++      fprintf(f, "\n");
+       fprintf(f, "# loopback_prot:\n");
+       fprintf(f, "# Address and route resolution protocol to resolve local addresses\n");
+       fprintf(f, "# Supported protocols are:\n");