|
 |
642951 |
diff -up opensm-3.3.13/man/opensm.8.in.prefix opensm-3.3.13/man/opensm.8.in
|
|
|
642951 |
--- opensm-3.3.13/man/opensm.8.in.prefix 2012-02-28 18:27:33.297714661 -0500
|
|
|
642951 |
+++ opensm-3.3.13/man/opensm.8.in 2012-02-28 18:31:00.957696942 -0500
|
|
|
642951 |
@@ -11,6 +11,7 @@ opensm \- InfiniBand subnet manager and
|
|
|
642951 |
[\-g(uid) <GUID in hex>]
|
|
|
642951 |
[\-l(mc) <LMC>]
|
|
|
642951 |
[\-p(riority) <PRIORITY>]
|
|
|
642951 |
+[\-\-subnet_prefix <PREFIX in hex>]
|
|
|
642951 |
[\-smkey <SM_Key>]
|
|
|
642951 |
[\-\-sm_sl <SL number>]
|
|
|
642951 |
[\-r(eassign_lids)]
|
|
|
642951 |
@@ -130,6 +131,13 @@ This will effect the handover cases, whe
|
|
|
642951 |
is chosen by priority and GUID. Range goes from 0
|
|
|
642951 |
(default and lowest priority) to 15 (highest).
|
|
|
642951 |
.TP
|
|
|
642951 |
+\fB\-\-subnet_prefix\fR <PREFIX in hex>
|
|
|
642951 |
+This option specifies the subnet prefix to use in
|
|
|
642951 |
+on the fabric. The default prefix is
|
|
|
642951 |
+0xfe80000000000000. OpenMPI in particular requires
|
|
|
642951 |
+separate fabrics plugged into different ports to
|
|
|
642951 |
+have different prefixes or else it won't run.
|
|
|
642951 |
+.TP
|
|
|
642951 |
\fB\-smkey\fR <SM_Key value>
|
|
|
642951 |
This option specifies the SM\'s SM_Key (64 bits).
|
|
|
642951 |
This will effect SM authentication.
|
|
|
642951 |
diff -up opensm-3.3.13/opensm/main.c.prefix opensm-3.3.13/opensm/main.c
|
|
|
642951 |
--- opensm-3.3.13/opensm/main.c.prefix 2012-01-17 08:22:40.000000000 -0500
|
|
|
642951 |
+++ opensm-3.3.13/opensm/main.c 2012-02-28 18:31:34.224694111 -0500
|
|
|
642951 |
@@ -156,6 +156,9 @@ static void show_usage(void)
|
|
|
642951 |
" This will effect the handover cases, where master\n"
|
|
|
642951 |
" is chosen by priority and GUID. Range goes\n"
|
|
|
642951 |
" from 0 (lowest priority) to 15 (highest).\n\n");
|
|
|
642951 |
+ printf("--subnet_prefix <prefix>\n"
|
|
|
642951 |
+ " Set the subnet prefix to something other than the\n"
|
|
|
642951 |
+ " default value of 0xfe80000000000000\n\n");
|
|
|
642951 |
printf("--smkey, -k <SM_Key>\n"
|
|
|
642951 |
" This option specifies the SM's SM_Key (64 bits).\n"
|
|
|
642951 |
" This will effect SM authentication.\n"
|
|
|
642951 |
@@ -607,6 +610,7 @@ int main(int argc, char *argv[])
|
|
|
642951 |
{"once", 0, NULL, 'o'},
|
|
|
642951 |
{"reassign_lids", 0, NULL, 'r'},
|
|
|
642951 |
{"priority", 1, NULL, 'p'},
|
|
|
642951 |
+ {"subnet_prefix", 1, NULL, 13},
|
|
|
642951 |
{"smkey", 1, NULL, 'k'},
|
|
|
642951 |
{"routing_engine", 1, NULL, 'R'},
|
|
|
642951 |
{"ucast_cache", 0, NULL, 'A'},
|
|
|
642951 |
@@ -911,6 +915,11 @@ int main(int argc, char *argv[])
|
|
|
642951 |
printf(" Priority = %d\n", temp);
|
|
|
642951 |
break;
|
|
|
642951 |
|
|
|
642951 |
+ case 13:
|
|
|
642951 |
+ opt.subnet_prefix = cl_hton64(strtoull(optarg, NULL, 16));
|
|
|
642951 |
+ printf(" Subnet_Prefix = <0x%" PRIx64 ">\n", cl_hton64(opt.subnet_prefix));
|
|
|
642951 |
+ break;
|
|
|
642951 |
+
|
|
|
642951 |
case 'k':
|
|
|
642951 |
sm_key = cl_hton64(strtoull(optarg, NULL, 16));
|
|
|
642951 |
printf(" SM Key <0x%" PRIx64 ">\n", cl_hton64(sm_key));
|