Update to latest from build 10.9.0.3.1

cornelisnetworks · Feb 11, 2019 · d5ea7f9 · d5ea7f9
1 parent 8113bea
commit d5ea7f9
Show file tree

Hide file tree

Showing 80 changed files with 84 additions and 21 deletions.
diff --git a/Esm/ib/include/cs_g.h b/Esm/ib/include/cs_g.h
diff --git a/Esm/ib/include/cs_log.h b/Esm/ib/include/cs_log.h
diff --git a/Esm/ib/include/hsm_com_srvr_api.h b/Esm/ib/include/hsm_com_srvr_api.h
diff --git a/Esm/ib/include/hsm_config_srvr_api.h b/Esm/ib/include/hsm_config_srvr_api.h
diff --git a/Esm/ib/include/hsm_config_srvr_data.h b/Esm/ib/include/hsm_config_srvr_data.h
diff --git a/Esm/ib/include/ib_const.h b/Esm/ib/include/ib_const.h
diff --git a/Esm/ib/include/ib_macros.h b/Esm/ib/include/ib_macros.h
diff --git a/Esm/ib/include/ib_mad.h b/Esm/ib/include/ib_mad.h
diff --git a/Esm/ib/include/ib_sa.h b/Esm/ib/include/ib_sa.h
diff --git a/Esm/ib/include/ib_sm.h b/Esm/ib/include/ib_sm.h
diff --git a/Esm/ib/include/ib_status.h b/Esm/ib/include/ib_status.h
diff --git a/Esm/ib/include/ib_types.h b/Esm/ib/include/ib_types.h
diff --git a/Esm/ib/include/if3.h b/Esm/ib/include/if3.h
diff --git a/Esm/ib/include/ifs_g.h b/Esm/ib/include/ifs_g.h
diff --git a/Esm/ib/include/mai_g.h b/Esm/ib/include/mai_g.h
diff --git a/Esm/ib/include/os_g.h b/Esm/ib/include/os_g.h
diff --git a/Esm/ib/include/vfi_g.h b/Esm/ib/include/vfi_g.h
diff --git a/Esm/ib/include/vs_g.h b/Esm/ib/include/vs_g.h
diff --git a/Esm/ib/src/cs/cs_sema.c b/Esm/ib/src/cs/cs_sema.c
diff --git a/Esm/ib/src/cs/cs_string.c b/Esm/ib/src/cs/cs_string.c
diff --git a/Esm/ib/src/cs/cs_utility.c b/Esm/ib/src/cs/cs_utility.c
diff --git a/Esm/ib/src/cs/vs_pool_common.c b/Esm/ib/src/cs/vs_pool_common.c
diff --git a/Esm/ib/src/cs/vs_thr_common.c b/Esm/ib/src/cs/vs_thr_common.c
diff --git a/Esm/ib/src/ibaccess/vs_lck.c b/Esm/ib/src/ibaccess/vs_lck.c
diff --git a/Esm/ib/src/ibaccess/vs_pool.c b/Esm/ib/src/ibaccess/vs_pool.c
diff --git a/Esm/ib/src/ibaccess/vs_thr.c b/Esm/ib/src/ibaccess/vs_thr.c
diff --git a/Esm/ib/src/ibaccess/vs_utility.c b/Esm/ib/src/ibaccess/vs_utility.c
diff --git a/Esm/ib/src/linux/log/common/vslog.c b/Esm/ib/src/linux/log/common/vslog.c
diff --git a/Esm/ib/src/linux/startup/fm_config/config_convert.c b/Esm/ib/src/linux/startup/fm_config/config_convert.c
@@ -1300,7 +1300,7 @@ is_special (void) {
 		StringCopy ((void *)subnetSize, equals + 1, sizeof(subnetSize));
 		/* add SUBNET_SIZE to each manager environment */
 		memset (line_key, 0, 100);
-		strncpy ((void *)line_key, "SUBNET_SIZE", 11);
+		StringCopy ((void *)line_key, "SUBNET_SIZE", strlen("SUBNET_SIZE") + 1);
 		memset (line_value, 0, 200);
 		strncpy ((void *)line_value, (void *)subnetSize, 128);
 		for (i = 0; i < MAX_INSTANCES; i++) {
@@ -1319,7 +1319,7 @@ is_special (void) {
 		/* add SYSLOG_MODE to each manager's environment */
 		StringCopy ((void *)syslogMode, equals + 1, sizeof(syslogMode));
 		memset (line_key, 0, 100);
-		strncpy ((void *)line_key, "SYSLOG_MODE", 11);
+		StringCopy ((void *)line_key, "SYSLOG_MODE", strlen("SYSLOG_MODE") + 1);
 		memset (line_value, 0, 200);
 		strncpy ((void *)line_value, (void *)syslogMode, 16);
 		for (i = 0; i < MAX_INSTANCES; i++) {

diff --git a/IbAccess/Common/Inc/stl_helper.h b/IbAccess/Common/Inc/stl_helper.h
@@ -904,20 +904,20 @@ void StlCableInfoDecodeCableType(uint8_t cableType, uint8_t mediaConnType, uint8
 
 	if ((cableType <= STL_CIB_STD_TXTECH_1490_DFB) && (cableType != STL_CIB_STD_TXTECH_OTHER)) {
 		if (mediaConnType == STL_CIB_STD_CONNECTOR_NO_SEP) {
-			strncat(cableTypeInfo->cableTypeShortDesc, " AOC", 4);
+			strncat(cableTypeInfo->cableTypeShortDesc, " AOC", strlen(" AOC") + 1);
 			cableTypeInfo->cableLengthValid = 1;
 		} else {
-			strncat(cableTypeInfo->cableTypeShortDesc, " Xcvr", 5);
+			strncat(cableTypeInfo->cableTypeShortDesc, " Xcvr", strlen(" Xcvr") + 1);
 			cableTypeInfo->cableLengthValid = 0;
 		}
 		cableTypeInfo->activeCable = 1;
 	} else {
 		if (cableType >= STL_CIB_STD_TXTECH_CU_UNEQ) {
 			if (cableType <= STL_CIB_STD_TXTECH_CU_PASSIVEQ) {
-				strncat(cableTypeInfo->cableTypeShortDesc, " Copper", 7);
+				strncat(cableTypeInfo->cableTypeShortDesc, " Copper", strlen(" Copper") + 1);
 				cableTypeInfo->activeCable = 0;
 			} else {
-				strncat(cableTypeInfo->cableTypeShortDesc, " ActCu", 6);
+				strncat(cableTypeInfo->cableTypeShortDesc, " ActCu", strlen(" ActCu") + 1);
 				cableTypeInfo->activeCable = 1;
 			}
 			cableTypeInfo->cableLengthValid = 1;

diff --git a/IbPrint/stl_sma.c b/IbPrint/stl_sma.c
@@ -1832,7 +1832,7 @@ void PrintStlCableInfoLowPage(PrintDest_t *dest, int indent, const uint8_t *cabl
 		case CABLEINFO_DETAIL_VERBOSE:
 			if (printLineByLine) {
 				StringCopy(tempBuf, tempBuf2, strlen(tempBuf2));
-				strncat(tempBuf2, ": Direct CableInfo", strlen(": Direct CableInfo"));
+				strncat(tempBuf2, ": Direct CableInfo", strlen(": Direct CableInfo") + 1);
 				PrintStrWithDots(dest, indent, tempBuf2, "");
 				PrintStrWithDots(dest, indent, "Temperature", temperature);
 				PrintStrWithDots(dest, indent, "Supply Voltage", vcc);
@@ -1848,7 +1848,7 @@ void PrintStlCableInfoLowPage(PrintDest_t *dest, int indent, const uint8_t *cabl
 		default:
 			if (printLineByLine) {
 				StringCopy(tempBuf, tempBuf2, strlen(tempBuf2));
-				strncat(tempBuf2, ": Direct CableInfo", strlen(": Direct CableInfo"));
+				strncat(tempBuf2, ": Direct CableInfo", strlen(": Direct CableInfo") + 1);
 				PrintStrWithDots(dest, indent, tempBuf2, "");
 				PrintStrWithDots(dest, indent, "Temperature", temperature);
 				PrintStrWithDots(dest, indent, "Supply Voltage", vcc);

diff --git a/IbaTools/FastFabric/chassis_fmconfig.exp b/IbaTools/FastFabric/chassis_fmconfig.exp
diff --git a/IbaTools/FastFabric/chassis_fmcontrol.exp b/IbaTools/FastFabric/chassis_fmcontrol.exp
diff --git a/IbaTools/FastFabric/chassis_fmgetconfig.exp b/IbaTools/FastFabric/chassis_fmgetconfig.exp
diff --git a/IbaTools/FastFabric/chassis_fmgetsecurityfiles.exp b/IbaTools/FastFabric/chassis_fmgetsecurityfiles.exp
diff --git a/IbaTools/FastFabric/chassis_fmsecurityfiles.exp b/IbaTools/FastFabric/chassis_fmsecurityfiles.exp
diff --git a/IbaTools/FastFabric/chassis_reboot.exp b/IbaTools/FastFabric/chassis_reboot.exp
diff --git a/IbaTools/FastFabric/chassis_upgrade.exp b/IbaTools/FastFabric/chassis_upgrade.exp
diff --git a/IbaTools/FastFabric/configipoib.exp b/IbaTools/FastFabric/configipoib.exp
diff --git a/IbaTools/FastFabric/ff_function.exp b/IbaTools/FastFabric/ff_function.exp
diff --git a/IbaTools/FastFabric/ipoibping.exp b/IbaTools/FastFabric/ipoibping.exp
diff --git a/IbaTools/FastFabric/load.exp b/IbaTools/FastFabric/load.exp
diff --git a/IbaTools/FastFabric/mpiperf.exp b/IbaTools/FastFabric/mpiperf.exp
diff --git a/IbaTools/FastFabric/mpiperfdeviation.exp b/IbaTools/FastFabric/mpiperfdeviation.exp
diff --git a/IbaTools/FastFabric/reboot.exp b/IbaTools/FastFabric/reboot.exp
diff --git a/IbaTools/FastFabric/sacache.exp b/IbaTools/FastFabric/sacache.exp
diff --git a/IbaTools/FastFabric/switch_capture.exp b/IbaTools/FastFabric/switch_capture.exp
diff --git a/IbaTools/FastFabric/switch_dump.exp b/IbaTools/FastFabric/switch_dump.exp
diff --git a/IbaTools/FastFabric/switch_fwverify.exp b/IbaTools/FastFabric/switch_fwverify.exp
diff --git a/IbaTools/FastFabric/switch_getconfig.exp b/IbaTools/FastFabric/switch_getconfig.exp
diff --git a/IbaTools/FastFabric/switch_hwvpd.exp b/IbaTools/FastFabric/switch_hwvpd.exp
diff --git a/IbaTools/FastFabric/switch_info.exp b/IbaTools/FastFabric/switch_info.exp
diff --git a/IbaTools/FastFabric/switch_ping.exp b/IbaTools/FastFabric/switch_ping.exp
diff --git a/IbaTools/FastFabric/switch_reboot.exp b/IbaTools/FastFabric/switch_reboot.exp
diff --git a/IbaTools/FastFabric/switch_upgrade.exp b/IbaTools/FastFabric/switch_upgrade.exp
diff --git a/IbaTools/FastFabric/upgrade.exp b/IbaTools/FastFabric/upgrade.exp
diff --git a/IbaTools/opagenchassis/opachassisip.c b/IbaTools/opagenchassis/opachassisip.c
diff --git a/IbaTools/opareport/opareport.c b/IbaTools/opareport/opareport.c
@@ -11828,9 +11828,9 @@ void ShowCableHealthReport(Point *focus, Format_t format, int indent, int detail
 
 			PrintFunc(&destFile, "%s%s\n",
 				(FSUCCESS == status1)?tempBuf1:
-					strncat(tempBuf1,CABLEHEALTH_EMPTY_FIELD,strlen(CABLEHEALTH_EMPTY_FIELD)),
+					strncat(tempBuf1,CABLEHEALTH_EMPTY_FIELD,strlen(CABLEHEALTH_EMPTY_FIELD) + 1),
 				(FSUCCESS == status2)?tempBuf2:
-					strncat(tempBuf2,CABLEHEALTH_EMPTY_FIELD,strlen(CABLEHEALTH_EMPTY_FIELD)));
+					strncat(tempBuf2,CABLEHEALTH_EMPTY_FIELD,strlen(CABLEHEALTH_EMPTY_FIELD) + 1));
 		}
 	}
 }

diff --git a/MakeTools/funcs-ext.sh b/MakeTools/funcs-ext.sh
@@ -722,6 +722,9 @@ function os_vendor()
             centos)
                 rval=redhat
                 ;;
+            fedora)
+                rval=redhat
+                ;;
             *)
                 rval=""
                 ;;

diff --git a/MpiApps/apps/deviation/deviation.c b/MpiApps/apps/deviation/deviation.c
diff --git a/MpiApps/apps/groupstress/mpi_groupstress.c b/MpiApps/apps/groupstress/mpi_groupstress.c
diff --git a/MpiApps/apps/groupstress/mpi_latencystress.c b/MpiApps/apps/groupstress/mpi_latencystress.c
diff --git a/OpenIb_Host/build.env b/OpenIb_Host/build.env
@@ -1,5 +1,5 @@
 # Adjust the environment variables if necessary
 export PRODUCT=OPENIB_FF
-export RELEASE_TAG=10_9_0_2_1
+export RELEASE_TAG=10_9_0_3_1
 export BUILD_CONFIG=${BUILD_CONFIG:-"release"}
 export BUILD_WITH_STACK=OPENIB
diff --git a/OpenIb_Host/build_label b/OpenIb_Host/build_label
@@ -1 +1 @@
-Build of OPENIB_FF 02/05/19 11:27 Tag: OPENIB_FF_LINUX_opa-10_9_0_2_10_9_0_2_1
+Build of OPENIB_FF 02/08/19 16:57 Tag: OPENIB_FF_LINUX_opa-10_9_0_2_10_9_0_3_1
diff --git a/OpenIb_Host/mpi-apps.spec.in b/OpenIb_Host/mpi-apps.spec.in
@@ -16,6 +16,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Contains applications and source for testing MPI performance in conjunction with opa-fastfabric or stand alone.
 IFSComponent: Tools_FF __RPM_VERSION.__RPM_RELEASE
 
+__RPM_DBG
+
 %prep
 %setup -q -c
 

diff --git a/OpenIb_Host/update_mpi_spec.sh b/OpenIb_Host/update_mpi_spec.sh
@@ -36,9 +36,15 @@ versionid=$(./get_id_and_versionid.sh | cut -f2 -d' ')
 if [ "$id" = "rhel" -o "$id" = "centos" ]
 then
 	sed -i "s/__RPM_REQ/Requires: atlas/" mpi-apps.spec
+	sed -i "/__RPM_DBG/,+1d" mpi-apps.spec
+elif [ "$id" = "fedora" ]
+then
+	sed -i "s/__RPM_REQ/Requires: atlas/" mpi-apps.spec
+	sed -i "s/__RPM_DBG/%global debug_package %{nil}/" mpi-apps.spec
 elif [ "$id" = "sles" ]
 then
 	sed -i "/__RPM_REQ/,+1d" mpi-apps.spec
+	sed -i "/__RPM_DBG/,+1d" mpi-apps.spec
 else
 	echo ERROR: Unsupported distribution: $id $versionid
 	exit 1

diff --git a/OpenIb_Host/update_opa_spec.sh.base b/OpenIb_Host/update_opa_spec.sh.base
@@ -108,6 +108,31 @@ then
 	#Cleanup EPOCH macros from sles spec.
 	#Note that SUSE discourages and does not use epochs
 	sed -i "/__RPM_EPOCH_*/d" opa.spec
+
+elif [ "$id" = "fedora" ]
+then
+	# __RPM_REQ_BASIC1 -
+	sed -i "s/__RPM_REQ_BASIC1/expect%{?_isa}, tcl%{?_isa}, openssl%{?_isa}, expat%{?_isa}, libibumad%{?_isa}, libibverbs%{?_isa}/g" opa.spec
+	sed -i "/__RPM_REQ_BASIC2/d" opa.spec
+
+	# __RPM_REQ_OPAMGT_DEV - different for RHEL7.4 and greater
+	sed -i "s/__RPM_REQ_OPAMGT_DEV/rdma-core-devel, openssl-devel, opa-libopamgt,/g" opa.spec
+
+	# __RPM_BLDREQ1 - different for RHEL 7.5, RHEL7.4, or earlier
+	sed -i "s/__RPM_BLDREQ1/expat-devel, gcc-c++, openssl-devel, ncurses-devel, tcl-devel, rdma-core-devel, ibacm-devel/g" opa.spec
+	sed -i "/__RPM_BLDREQ2/d" opa.spec
+
+	# __RPM_REQ_ADDR_RES,__RPM_REQ_OPAMGT and __RPM_DEBUG same for all RHEL versions
+	sed -i "s/__RPM_REQ_OPAMGT/libibumad%{?_isa}, libibverbs%{?_isa}, openssl%{?_isa}/g" opa.spec
+	sed -i "s/__RPM_REQ_ADDR_RES/opa-basic-tools ibacm/g" opa.spec
+	sed -i "/__RPM_DEBUG_PKG/,+1d" opa.spec
+
+	#Setup Epoch tags for RHEL rpms
+	sed -i "s/__RPM_EPOCH_BASIC/Epoch: 1/g" opa.spec
+	sed -i "s/__RPM_EPOCH_FF/Epoch: 1/g" opa.spec
+	sed -i "s/__RPM_EPOCH_ADDR_RES/Epoch: 1/g" opa.spec
+	sed -i "s/__RPM_EPOCH_LIBOPAMGT/Epoch: 1/g" opa.spec
+
 else
 	echo ERROR: Unsupported distribution: $id $versionid
 	exit 1

diff --git a/TestTools/basic.exp b/TestTools/basic.exp
diff --git a/TestTools/chassis.exp b/TestTools/chassis.exp
diff --git a/TestTools/extmng.exp b/TestTools/extmng.exp
diff --git a/TestTools/ib.exp b/TestTools/ib.exp
diff --git a/TestTools/install.exp b/TestTools/install.exp
diff --git a/TestTools/mpi.exp b/TestTools/mpi.exp
diff --git a/TestTools/network.exp b/TestTools/network.exp
diff --git a/TestTools/proc_mgr.exp b/TestTools/proc_mgr.exp
diff --git a/TestTools/sm_control.exp b/TestTools/sm_control.exp
diff --git a/TestTools/target.exp b/TestTools/target.exp
diff --git a/TestTools/tools.exp b/TestTools/tools.exp
diff --git a/opa-ff.spec.in b/opa-ff.spec.in
@@ -1,5 +1,5 @@
 Name: opa
-Version: 10.9.0.2
+Version: 10.9.0.3
 Release: 1%{?dist}
 Summary: Intel Omni-Path basic tools and libraries for fabric managment.
 
@@ -18,7 +18,7 @@ __RPM_DEBUG_PKG
 
 %description
 This package contains the tools necessary to manage an Intel(R) Omni-Path Architecture fabric.
-IFSComponent: Tools_FF 10.9.0.2.1%{?dist}
+IFSComponent: Tools_FF 10.9.0.3.1%{?dist}
 
 %package basic-tools
 Summary: Managment level tools and scripts.
@@ -35,7 +35,7 @@ Epoch: 1
 
 %description basic-tools
 Contains basic tools for fabric managment necessary on all compute nodes.
-IFSComponent: Tools_FF 10.9.0.2.1%{?dist}
+IFSComponent: Tools_FF 10.9.0.3.1%{?dist}
 
 %package fastfabric
 Summary: Management level tools and scripts.
@@ -48,7 +48,7 @@ Epoch: 1
 
 %description fastfabric
 Contains tools for managing fabric on a managment node.
-IFSComponent: Tools_FF 10.9.0.2.1%{?dist}
+IFSComponent: Tools_FF 10.9.0.3.1%{?dist}
 
 %package address-resolution
 Summary: Contains Address Resolution manager
@@ -62,7 +62,7 @@ Epoch: 1
 %description address-resolution
 This package contains the ibacm distributed SA provider (dsap) for name and address resolution on OPA platform.
 It also contains the library and tools to access the shared memory database exported by dsap.
-IFSComponent: Tools_FF 10.9.0.2.1%{?dist}
+IFSComponent: Tools_FF 10.9.0.3.1%{?dist}
 
 #opasnapconfig
 %package snapconfig
@@ -73,7 +73,7 @@ Requires: opa-fastfabric
 
 %description snapconfig
 Parse information from provided snapshot file and issue packets to program
-IFSComponent: Tools_FF 10.9.0.2.1%{?dist}
+IFSComponent: Tools_FF 10.9.0.3.1%{?dist}
 
 %package libopamgt
 Summary: Omni-Path management API library
@@ -82,7 +82,7 @@ Requires: __RPM_REQ_OPAMGT
 
 %description libopamgt
 This package contains the library necessary to build applications that interface with an Omni-Path FM.
-IFSComponent: Tools_FF 10.9.0.2.1%{?dist}
+IFSComponent: Tools_FF 10.9.0.3.1%{?dist}
 
 
 %package libopamgt-devel
@@ -92,7 +92,7 @@ Requires: __RPM_REQ_OPAMGT_DEV
 
 %description libopamgt-devel
 This package contains the necessary headers for opamgt development.
-IFSComponent: Tools_FF 10.9.0.2.1%{?dist}
+IFSComponent: Tools_FF 10.9.0.3.1%{?dist}
 
 %prep
 #rm -rf %{_builddir}/*
@@ -145,14 +145,18 @@ __RPM_FF_FILES
 %{_bindir}/opa_osd_exercise
 %{_bindir}/opa_osd_perf
 %{_bindir}/opa_osd_query
+%{_bindir}/opa_osd_query_many
+%{_bindir}/opa_osd_load
 %{_libdir}/ibacm
-%{_libdir}/libopasadb.so.*
+%{_libdir}/libopasadb.so*
 %{_includedir}/infiniband
 %{_mandir}/man1/opa_osd_dump.1*
 %{_mandir}/man1/opa_osd_exercise.1*
 %{_mandir}/man1/opa_osd_perf.1*
 %{_mandir}/man1/opa_osd_query.1*
 %config(noreplace) %{_sysconfdir}/rdma/dsap.conf
+%config(noreplace) %{_sysconfdir}/rdma/op_path_rec.conf
+%{_sysconfdir}/rdma/opasadb.xml
 
 %files snapconfig
 __RPM_SNAP_FILES

diff --git a/update_opa_spec.sh b/update_opa_spec.sh
@@ -122,6 +122,29 @@ then
 	#Cleanup EPOCH macros from sles spec.
 	#Note that SUSE discourages and does not use epochs
 	sed -i "/__RPM_EPOCH_*/d" $to
+
+elif [ "$id" = "fedora" ]
+then
+	# __RPM_REQ_BASIC -
+	sed -i "s/__RPM_REQ_BASIC/expect%{?_isa}, tcl%{?_isa}, openssl%{?_isa}, expat%{?_isa}, libibumad%{?_isa}, libibverbs%{?_isa}/g" $to
+
+	# __RPM_REQ_OPAMGT_DEV - different for RHEL7.4 and greater
+	sed -i "s/__RPM_REQ_OPAMGT_DEV/rdma-core-devel, openssl-devel, opa-libopamgt,/g" $to
+
+	# __RPM_BLDREQ - different for RHEL 7.5, RHEL7.4, or earlier
+	sed -i "s/__RPM_BLDREQ/expat-devel, gcc-c++, openssl-devel, ncurses-devel, tcl-devel, rdma-core-devel, ibacm-devel/g" $to
+
+	# __RPM_REQ_ADDR_RES,__RPM_REQ_OPAMGT and __RPM_DEBUG same for all RHEL versions
+	sed -i "s/__RPM_REQ_ADDR_RES/opa-basic-tools ibacm/g" $to
+	sed -i "s/__RPM_REQ_OPAMGT/libibumad%{?_isa}, libibverbs%{?_isa}, openssl%{?_isa}/g" $to
+	sed -i "/__RPM_DEBUG_PKG/,+1d" $to
+
+	#Setup Epoch tags for RHEL rpms
+	sed -i "s/__RPM_EPOCH_BASIC/Epoch: 1/g" $to
+	sed -i "s/__RPM_EPOCH_FF/Epoch: 1/g" $to
+	sed -i "s/__RPM_EPOCH_ADDR_RES/Epoch: 1/g" $to
+	sed -i "s/__RPM_EPOCH_LIBOPAMGT/Epoch: 1/g" $to
+
 else
 	echo ERROR: Unsupported distribution: $id $versionid
 	exit 1