Version: 1
-Previous: 9199966d0567c35a122ef2fd2b6054e1327df1e6
-Head: 2dc2520e59520e86d047f2bc8ea30b476e88cecf
+Previous: 5a37a8afdfd549f03fc17284eee74143f22593d9
+Head: 6f476e59fb0d21824643039a0679e24a07d4733c
Applied:
rmcfg: 977896dc127018271adae25f7d637e098bad33d5
acm_notes-txt-change-dos-forma: b07f140dd83b881c922f4c6b70cfa7145727044f
increase-buffer-space-for-inet: 229be37676bff70a54464f09ac0604fafe77e820
ib_acme-c-support-ipv6-address: aa33290c7f81d8eb39ca1d2531eb2f15fe6f5490
convert-linux-header-files-fro: 5b940e35239149600253ba80d5086855dd67aa44
- add-support-for-preloading-ipv: 0485b1254df8249a739bc5d7b7143f3125ea0337
- refresh-temp: 2dc2520e59520e86d047f2bc8ea30b476e88cecf
+ add-support-for-preloading-ipv: 6f476e59fb0d21824643039a0679e24a07d4733c
Unapplied:
add-option-to-allow-for-acm-ca: d70c340b1b7bb3d64d81768f4185b08415fbab55
notes-fmt: 988d784b42cdb9db05b1608a5cdb29c51215bd9e
Bottom: e1c84462b334facb3ab18f778540e29fdb917e65
-Top: e1c84462b334facb3ab18f778540e29fdb917e65
+Top: 9decf32b2f8211eb48c3c4e180d20f6f43514428
Author: Hal Rosenstock <hal@mellanox.com>
Date: 2013-06-27 21:48:11 +0300
---
-
+diff --git a/Makefile.am b/Makefile.am
+index a0274f7..0de7799 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -19,7 +19,7 @@ man_MANS = \
+ man/ibacm.7
+
+ EXTRA_DIST = src/acm_mad.h src/libacm.h ibacm.init.in \
+- linux/osd.h linux/dlist.h ibacm.spec.in $(man_MANS)
++ linux/osd.h linux/dlist.h ibacm.spec.in $(man_MANS) ibacm_hosts.cfg
+
+ install-exec-hook:
+ install -D -m 755 ibacm.init $(DESTDIR)$(sysconfdir)/init.d/ibacm;
+diff --git a/acm_notes.txt b/acm_notes.txt
+index fac0920..3903b8a 100644
+--- a/acm_notes.txt
++++ b/acm_notes.txt
+@@ -135,3 +135,7 @@ be set to opensm_full_v1 for this file format. Default format is
+ none which does not preload these caches. See dump_pr.notes.txt in dump_pr
+ for more information on the opensm_full_v1 file format and how to configure
+ OpenSM to generate this file.
++
++Additional IPv4 and IPv6 caches can be be preloaded by using the
++addr_preload option. The default is "none" which does not preload these
++caches.
+diff --git a/ibacm_hosts.cfg b/ibacm_hosts.cfg
+new file mode 100644
+index 0000000..9011691
+--- /dev/null
++++ b/ibacm_hosts.cfg
+@@ -0,0 +1,12 @@
++# InfiniBand Communication Management Assistant for clusters hosts file
++#
++# Entry format is:
++# address IB GID
++#
++# address - IPv4 or IPv6 formatted address
++#
++# There can be multiple entries for a single IB GID
++#
++# Samples:
++# 192.168.1.3 fe80::8:f104:39a:169
++# fe80::208:f104:39a:169 fe80::8:f104:39a:169
+diff --git a/man/ibacm.1 b/man/ibacm.1
+index ec97b35..2ca7eec 100644
+--- a/man/ibacm.1
++++ b/man/ibacm.1
+@@ -156,5 +156,9 @@ format. Default format is none which does not preload these caches.
+ See dump_pr.notes.txt in dump_pr for more information on the
+ full_opensm_v1 file format and how to configure OpenSM to
+ generate this file.
++.P
++Additional IPv4 and IPv6 caches can be be preloaded by using the
++hosts_file option. The default is "none" which does not preload these
++caches.
+ .SH "SEE ALSO"
+ ibacm(7), ib_acme(1), rdma_cm(7)
+diff --git a/src/acm.c b/src/acm.c
+index a37ebaa..f55ebc0 100644
+--- a/src/acm.c
++++ b/src/acm.c
+@@ -82,6 +82,11 @@ enum acm_route_preload {
+ ACM_ROUTE_PRELOAD_OSM_FULL_V1
+ };
+
++enum acm_addr_preload {
++ ACM_ADDR_PRELOAD_NONE,
++ ACM_ADDR_PRELOAD_HOSTS
++};
++
+ /*
+ * Nested locking order: dest -> ep, dest -> port
+ */
+@@ -219,6 +224,7 @@ static char *acme = BINDIR "/ib_acme -A";
+ static char *opts_file = ACM_CONF_DIR "/" ACM_OPTS_FILE;
+ static char *addr_file = ACM_CONF_DIR "/" ACM_ADDR_FILE;
+ static char route_data_file[128] = ACM_CONF_DIR "/ibacm_route.data";
++static char addr_data_file[128] = ACM_CONF_DIR "/ibacm_hosts.data";
+ static char log_file[128] = "/var/log/ibacm.log";
+ static int log_level = 0;
+ static char lock_file[128] = "/var/run/ibacm.pid";
+@@ -237,6 +243,7 @@ static int recv_depth = 1024;
+ static uint8_t min_mtu = IBV_MTU_2048;
+ static uint8_t min_rate = IBV_RATE_10_GBPS;
+ static enum acm_route_preload route_preload;
++static enum acm_addr_preload addr_preload;
+
+ #define acm_log(level, format, ...) \
+ acm_write(level, "%s: "format, __func__, ## __VA_ARGS__)
+@@ -2464,6 +2471,16 @@ static enum acm_route_preload acm_convert_route_preload(char *param)
+ return route_preload;
+ }
+
++static enum acm_route_preload acm_convert_addr_preload(char *param)
++{
++ if (!stricmp("none", param) || !stricmp("no", param))
++ return ACM_ADDR_PRELOAD_NONE;
++ else if (!stricmp("acm_hosts", param))
++ return ACM_ADDR_PRELOAD_HOSTS;
++
++ return addr_preload;
++}
++
+ static enum ibv_rate acm_get_rate(uint8_t width, uint8_t speed)
+ {
+ switch (width) {
+@@ -2788,6 +2805,73 @@ err:
+ return ret;
+ }
+
++static void acm_parse_hosts_file(struct acm_ep *ep)
++{
++ FILE *f;
++ char s[120];
++ char addr[INET6_ADDRSTRLEN], gid[INET6_ADDRSTRLEN];
++ uint8_t name[ACM_MAX_ADDRESS];
++ struct in6_addr ip_addr, ib_addr;
++ struct acm_dest *dest, *new_dest;
++ uint8_t addr_type;
++
++ if (!(f = fopen(addr_data_file, "r"))) {
++ acm_log(0, "ERROR - couldn't open %s\n", addr_data_file);
++ return;
++ }
++
++ while (fgets(s, sizeof s, f)) {
++ if (s[0] == '#')
++ continue;
++
++ if (sscanf(s, "%46s%46s", addr, gid) != 2)
++ continue;
++
++ acm_log(2, "%s", s);
++ if (inet_pton(AF_INET6, gid, &ib_addr) <= 0) {
++ acm_log(0, "ERROR - %s is not IB GID\n", gid);
++ continue;
++ }
++ if (inet_pton(AF_INET, addr, &ip_addr) > 0)
++ addr_type = ACM_ADDRESS_IP;
++ else if (inet_pton(AF_INET6, addr, &ip_addr) > 0)
++ addr_type = ACM_ADDRESS_IP6;
++ else {
++ acm_log(0, "ERROR - %s is not IP address\n", addr);
++ continue;
++ }
++
++ memset(name, 0, ACM_MAX_ADDRESS);
++ memcpy(name, &ib_addr, sizeof(ib_addr));
++ dest = acm_get_dest(ep, ACM_ADDRESS_GID, name);
++ if (!dest) {
++ acm_log(0, "ERROR - IB GID %s not found in cache\n", gid);
++ continue;
++ }
++
++ memset(name, 0, ACM_MAX_ADDRESS);
++ if (addr_type == ACM_ADDRESS_IP)
++ memcpy(name, &ip_addr, 4);
++ else
++ memcpy(name, &ip_addr, sizeof(ip_addr));
++ new_dest = acm_acquire_dest(ep, addr_type, name);
++ if (!new_dest) {
++ acm_log(0, "ERROR - unable to create dest %s\n", addr);
++ continue;
++ }
++ new_dest->path = dest->path;
++ new_dest->remote_qpn = dest->remote_qpn;
++ new_dest->addr_timeout = dest->addr_timeout;
++ new_dest->route_timeout = dest->route_timeout;
++ new_dest->state = dest->state;
++ acm_put_dest(new_dest);
++ acm_log(1, "added host %s address type %d IB GID %s\n",
++ addr, addr_type, gid);
++ }
++
++ fclose(f);
++}
++
+ static int acm_assign_ep_names(struct acm_ep *ep)
+ {
+ FILE *faddr;
+@@ -2856,6 +2940,11 @@ static int acm_assign_ep_names(struct acm_ep *ep)
+ return !index;
+ }
+
++/*
++ * We currently require that the routing data be preloaded in order to
++ * load the address data. This is backwards from normal operation, which
++ * usually resolves the address before the route.
++ */
+ static void acm_ep_preload(struct acm_ep *ep)
+ {
+ switch (route_preload) {
+@@ -2864,6 +2953,14 @@ static void acm_ep_preload(struct acm_ep *ep)
+ acm_log(0, "ERROR - failed to preload EP\n");
+ break;
+ default:
++ return;
++ }
++
++ switch (addr_preload) {
++ case ACM_ADDR_PRELOAD_HOSTS:
++ acm_parse_hosts_file(ep);
++ break;
++ default:
+ break;
+ }
+ }
+@@ -3366,6 +3463,10 @@ static void acm_set_options(void)
+ route_preload = acm_convert_route_preload(value);
+ else if (!stricmp("route_data_file", opt))
+ strcpy(route_data_file, value);
++ else if (!stricmp("addr_preload", opt))
++ addr_preload = acm_convert_addr_preload(value);
++ else if (!stricmp("addr_data_file", opt))
++ strcpy(addr_data_file, opt);
+ }
+
+ fclose(f);
+@@ -3391,6 +3492,8 @@ static void acm_log_options(void)
+ acm_log(0, "minimum rate %d\n", min_rate);
+ acm_log(0, "route preload %d\n", route_preload);
+ acm_log(0, "route data file %s\n", route_data_file);
++ acm_log(0, "address preload %d\n", addr_preload);
++ acm_log(0, "address data file %s\n", addr_data_file);
+ }
+
+ static FILE *acm_open_log(void)
+diff --git a/src/acme.c b/src/acme.c
+index 0f1c53a..cb2128c 100644
+--- a/src/acme.c
++++ b/src/acme.c
+@@ -260,6 +260,22 @@ static void gen_opts_temp(FILE *f)
+ fprintf(f, "# Default is ACM_CONF_DIR/ibacm_route.data\n");
+ fprintf(f, "# /etc/rdma/ibacm_route.data\n");
+ fprintf(f, "\n");
++ fprintf(f, "# addr_preload:\n");
++ fprintf(f, "# Specifies if the ACM address cache should be preloaded, or built on demand.\n");
++ fprintf(f, "# If preloaded, indicates the method used to build the cache.\n");
++ fprintf(f, "# Supported preload values are:\n");
++ fprintf(f, "# none - The address cache is not pre-built (default)\n");
++ fprintf(f, "# acm_hosts - ACM address to GID file format\n");
++ fprintf(f, "\n");
++ fprintf(f, "addr_preload none\n");
++ fprintf(f, "\n");
++ fprintf(f, "# addr_data_file:\n");
++ fprintf(f, "# Specifies the location of the address data file to use when preloading\n");
++ fprintf(f, "# the ACM cache. This option is only valid if addr_preload\n");
++ fprintf(f, "# indicates that address data should be read from a file.\n");
++ fprintf(f, "# Default is ACM_CONF_DIR/ibacm_hosts.data\n");
++ fprintf(f, "# /etc/rdma/ibacm_hosts.data\n");
++ fprintf(f, "\n");
+ }
+
+ static int open_dir(void)
+++ /dev/null
-Bottom: e1c84462b334facb3ab18f778540e29fdb917e65
-Top: 9decf32b2f8211eb48c3c4e180d20f6f43514428
-Author: Sean Hefty <sean.hefty@intel.com>
-Date: 2013-06-28 10:14:19 -0700
-
-Refresh of add-support-for-preloading-ipv
-
----
-
-diff --git a/Makefile.am b/Makefile.am
-index a0274f7..0de7799 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -19,7 +19,7 @@ man_MANS = \
- man/ibacm.7
-
- EXTRA_DIST = src/acm_mad.h src/libacm.h ibacm.init.in \
-- linux/osd.h linux/dlist.h ibacm.spec.in $(man_MANS)
-+ linux/osd.h linux/dlist.h ibacm.spec.in $(man_MANS) ibacm_hosts.cfg
-
- install-exec-hook:
- install -D -m 755 ibacm.init $(DESTDIR)$(sysconfdir)/init.d/ibacm;
-diff --git a/acm_notes.txt b/acm_notes.txt
-index fac0920..3903b8a 100644
---- a/acm_notes.txt
-+++ b/acm_notes.txt
-@@ -135,3 +135,7 @@ be set to opensm_full_v1 for this file format. Default format is
- none which does not preload these caches. See dump_pr.notes.txt in dump_pr
- for more information on the opensm_full_v1 file format and how to configure
- OpenSM to generate this file.
-+
-+Additional IPv4 and IPv6 caches can be be preloaded by using the
-+addr_preload option. The default is "none" which does not preload these
-+caches.
-diff --git a/ibacm_hosts.cfg b/ibacm_hosts.cfg
-new file mode 100644
-index 0000000..9011691
---- /dev/null
-+++ b/ibacm_hosts.cfg
-@@ -0,0 +1,12 @@
-+# InfiniBand Communication Management Assistant for clusters hosts file
-+#
-+# Entry format is:
-+# address IB GID
-+#
-+# address - IPv4 or IPv6 formatted address
-+#
-+# There can be multiple entries for a single IB GID
-+#
-+# Samples:
-+# 192.168.1.3 fe80::8:f104:39a:169
-+# fe80::208:f104:39a:169 fe80::8:f104:39a:169
-diff --git a/man/ibacm.1 b/man/ibacm.1
-index ec97b35..2ca7eec 100644
---- a/man/ibacm.1
-+++ b/man/ibacm.1
-@@ -156,5 +156,9 @@ format. Default format is none which does not preload these caches.
- See dump_pr.notes.txt in dump_pr for more information on the
- full_opensm_v1 file format and how to configure OpenSM to
- generate this file.
-+.P
-+Additional IPv4 and IPv6 caches can be be preloaded by using the
-+hosts_file option. The default is "none" which does not preload these
-+caches.
- .SH "SEE ALSO"
- ibacm(7), ib_acme(1), rdma_cm(7)
-diff --git a/src/acm.c b/src/acm.c
-index a37ebaa..f55ebc0 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -82,6 +82,11 @@ enum acm_route_preload {
- ACM_ROUTE_PRELOAD_OSM_FULL_V1
- };
-
-+enum acm_addr_preload {
-+ ACM_ADDR_PRELOAD_NONE,
-+ ACM_ADDR_PRELOAD_HOSTS
-+};
-+
- /*
- * Nested locking order: dest -> ep, dest -> port
- */
-@@ -219,6 +224,7 @@ static char *acme = BINDIR "/ib_acme -A";
- static char *opts_file = ACM_CONF_DIR "/" ACM_OPTS_FILE;
- static char *addr_file = ACM_CONF_DIR "/" ACM_ADDR_FILE;
- static char route_data_file[128] = ACM_CONF_DIR "/ibacm_route.data";
-+static char addr_data_file[128] = ACM_CONF_DIR "/ibacm_hosts.data";
- static char log_file[128] = "/var/log/ibacm.log";
- static int log_level = 0;
- static char lock_file[128] = "/var/run/ibacm.pid";
-@@ -237,6 +243,7 @@ static int recv_depth = 1024;
- static uint8_t min_mtu = IBV_MTU_2048;
- static uint8_t min_rate = IBV_RATE_10_GBPS;
- static enum acm_route_preload route_preload;
-+static enum acm_addr_preload addr_preload;
-
- #define acm_log(level, format, ...) \
- acm_write(level, "%s: "format, __func__, ## __VA_ARGS__)
-@@ -2464,6 +2471,16 @@ static enum acm_route_preload acm_convert_route_preload(char *param)
- return route_preload;
- }
-
-+static enum acm_route_preload acm_convert_addr_preload(char *param)
-+{
-+ if (!stricmp("none", param) || !stricmp("no", param))
-+ return ACM_ADDR_PRELOAD_NONE;
-+ else if (!stricmp("acm_hosts", param))
-+ return ACM_ADDR_PRELOAD_HOSTS;
-+
-+ return addr_preload;
-+}
-+
- static enum ibv_rate acm_get_rate(uint8_t width, uint8_t speed)
- {
- switch (width) {
-@@ -2788,6 +2805,73 @@ err:
- return ret;
- }
-
-+static void acm_parse_hosts_file(struct acm_ep *ep)
-+{
-+ FILE *f;
-+ char s[120];
-+ char addr[INET6_ADDRSTRLEN], gid[INET6_ADDRSTRLEN];
-+ uint8_t name[ACM_MAX_ADDRESS];
-+ struct in6_addr ip_addr, ib_addr;
-+ struct acm_dest *dest, *new_dest;
-+ uint8_t addr_type;
-+
-+ if (!(f = fopen(addr_data_file, "r"))) {
-+ acm_log(0, "ERROR - couldn't open %s\n", addr_data_file);
-+ return;
-+ }
-+
-+ while (fgets(s, sizeof s, f)) {
-+ if (s[0] == '#')
-+ continue;
-+
-+ if (sscanf(s, "%46s%46s", addr, gid) != 2)
-+ continue;
-+
-+ acm_log(2, "%s", s);
-+ if (inet_pton(AF_INET6, gid, &ib_addr) <= 0) {
-+ acm_log(0, "ERROR - %s is not IB GID\n", gid);
-+ continue;
-+ }
-+ if (inet_pton(AF_INET, addr, &ip_addr) > 0)
-+ addr_type = ACM_ADDRESS_IP;
-+ else if (inet_pton(AF_INET6, addr, &ip_addr) > 0)
-+ addr_type = ACM_ADDRESS_IP6;
-+ else {
-+ acm_log(0, "ERROR - %s is not IP address\n", addr);
-+ continue;
-+ }
-+
-+ memset(name, 0, ACM_MAX_ADDRESS);
-+ memcpy(name, &ib_addr, sizeof(ib_addr));
-+ dest = acm_get_dest(ep, ACM_ADDRESS_GID, name);
-+ if (!dest) {
-+ acm_log(0, "ERROR - IB GID %s not found in cache\n", gid);
-+ continue;
-+ }
-+
-+ memset(name, 0, ACM_MAX_ADDRESS);
-+ if (addr_type == ACM_ADDRESS_IP)
-+ memcpy(name, &ip_addr, 4);
-+ else
-+ memcpy(name, &ip_addr, sizeof(ip_addr));
-+ new_dest = acm_acquire_dest(ep, addr_type, name);
-+ if (!new_dest) {
-+ acm_log(0, "ERROR - unable to create dest %s\n", addr);
-+ continue;
-+ }
-+ new_dest->path = dest->path;
-+ new_dest->remote_qpn = dest->remote_qpn;
-+ new_dest->addr_timeout = dest->addr_timeout;
-+ new_dest->route_timeout = dest->route_timeout;
-+ new_dest->state = dest->state;
-+ acm_put_dest(new_dest);
-+ acm_log(1, "added host %s address type %d IB GID %s\n",
-+ addr, addr_type, gid);
-+ }
-+
-+ fclose(f);
-+}
-+
- static int acm_assign_ep_names(struct acm_ep *ep)
- {
- FILE *faddr;
-@@ -2856,6 +2940,11 @@ static int acm_assign_ep_names(struct acm_ep *ep)
- return !index;
- }
-
-+/*
-+ * We currently require that the routing data be preloaded in order to
-+ * load the address data. This is backwards from normal operation, which
-+ * usually resolves the address before the route.
-+ */
- static void acm_ep_preload(struct acm_ep *ep)
- {
- switch (route_preload) {
-@@ -2864,6 +2953,14 @@ static void acm_ep_preload(struct acm_ep *ep)
- acm_log(0, "ERROR - failed to preload EP\n");
- break;
- default:
-+ return;
-+ }
-+
-+ switch (addr_preload) {
-+ case ACM_ADDR_PRELOAD_HOSTS:
-+ acm_parse_hosts_file(ep);
-+ break;
-+ default:
- break;
- }
- }
-@@ -3366,6 +3463,10 @@ static void acm_set_options(void)
- route_preload = acm_convert_route_preload(value);
- else if (!stricmp("route_data_file", opt))
- strcpy(route_data_file, value);
-+ else if (!stricmp("addr_preload", opt))
-+ addr_preload = acm_convert_addr_preload(value);
-+ else if (!stricmp("addr_data_file", opt))
-+ strcpy(addr_data_file, opt);
- }
-
- fclose(f);
-@@ -3391,6 +3492,8 @@ static void acm_log_options(void)
- acm_log(0, "minimum rate %d\n", min_rate);
- acm_log(0, "route preload %d\n", route_preload);
- acm_log(0, "route data file %s\n", route_data_file);
-+ acm_log(0, "address preload %d\n", addr_preload);
-+ acm_log(0, "address data file %s\n", addr_data_file);
- }
-
- static FILE *acm_open_log(void)
-diff --git a/src/acme.c b/src/acme.c
-index 0f1c53a..cb2128c 100644
---- a/src/acme.c
-+++ b/src/acme.c
-@@ -260,6 +260,22 @@ static void gen_opts_temp(FILE *f)
- fprintf(f, "# Default is ACM_CONF_DIR/ibacm_route.data\n");
- fprintf(f, "# /etc/rdma/ibacm_route.data\n");
- fprintf(f, "\n");
-+ fprintf(f, "# addr_preload:\n");
-+ fprintf(f, "# Specifies if the ACM address cache should be preloaded, or built on demand.\n");
-+ fprintf(f, "# If preloaded, indicates the method used to build the cache.\n");
-+ fprintf(f, "# Supported preload values are:\n");
-+ fprintf(f, "# none - The address cache is not pre-built (default)\n");
-+ fprintf(f, "# acm_hosts - ACM address to GID file format\n");
-+ fprintf(f, "\n");
-+ fprintf(f, "addr_preload none\n");
-+ fprintf(f, "\n");
-+ fprintf(f, "# addr_data_file:\n");
-+ fprintf(f, "# Specifies the location of the address data file to use when preloading\n");
-+ fprintf(f, "# the ACM cache. This option is only valid if addr_preload\n");
-+ fprintf(f, "# indicates that address data should be read from a file.\n");
-+ fprintf(f, "# Default is ACM_CONF_DIR/ibacm_hosts.data\n");
-+ fprintf(f, "# /etc/rdma/ibacm_hosts.data\n");
-+ fprintf(f, "\n");
- }
-
- static int open_dir(void)
projects / ~shefty / ibacm.git / commitdiff