Dataset Viewer
commit_id
string | repo
string | commit_message
string | diff
string | label
int64 |
|---|---|---|---|---|
0236727e70cbec41b5700d2cca25e998015fa278
|
01org/opa-fm
|
Update to latest from build 10.9.3.1.1 (IFS 10.9.3.1.1)
|
commit 0236727e70cbec41b5700d2cca25e998015fa278
Author: Scott Breyer <[email protected]>
Date: Mon Jun 24 11:55:57 2019 -0400
Update to latest from build 10.9.3.1.1 (IFS 10.9.3.1.1)
diff --git a/CommonInstall/Makefile b/CommonInstall/Makefile
index d568643..cf43ebc 100644
--- a/CommonInstall/Makefile
+++ b/CommonInstall/Makefile
@@ -96,7 +96,10 @@ CMD_TARGETS_MISC =
CLEAN_TARGETS_MISC =
CLEAN_TARGETS = $(OBJECTS) $(RSCOBJECTS) $(IDL_TARGETS) $(CLEAN_TARGETS_MISC)
# other files to remove during clobber phase
-CLOBBER_TARGETS_MISC= comp_ff_of_prereq_RHEL72.pl comp_ff_of_prereq_RHEL73.pl comp_ff_of_prereq_RHEL74.pl comp_ff_of_prereq_RHEL75.pl comp_ff_of_prereq_RHEL76.pl comp_ff_of_prereq_SLES122.pl comp_ff_of_prereq_SLES123.pl comp_ff_of_prereq_SLES124.pl comp_ff_of_prereq_SLES15.pl comp_fm_prereq_RHEL72.pl comp_fm_prereq_RHEL73.pl comp_fm_prereq_RHEL74.pl comp_fm_prereq_RHEL75.pl comp_fm_prereq_RHEL76.pl comp_fm_prereq_SLES122.pl comp_fm_prereq_SLES123.pl comp_fm_prereq_SLES124.pl comp_fm_prereq_SLES15.pl
+CLOBBER_TARGETS_MISC= comp_ff_of_prereq_RHEL72.pl comp_ff_of_prereq_RHEL73.pl comp_ff_of_prereq_RHEL74.pl comp_ff_of_prereq_RHEL75.pl comp_ff_of_prereq_RHEL76.pl comp_ff_of_prereq_RHEL8.pl \
+ comp_ff_of_prereq_SLES122.pl comp_ff_of_prereq_SLES123.pl comp_ff_of_prereq_SLES124.pl comp_ff_of_prereq_SLES15.pl comp_ff_of_prereq_SLES151.pl \
+ comp_fm_prereq_RHEL72.pl comp_fm_prereq_RHEL73.pl comp_fm_prereq_RHEL74.pl comp_fm_prereq_RHEL75.pl comp_fm_prereq_RHEL76.pl comp_fm_prereq_RHEL8.pl \
+ comp_fm_prereq_SLES122.pl comp_fm_prereq_SLES123.pl comp_fm_prereq_SLES124.pl comp_fm_prereq_SLES15.pl comp_fm_prereq_SLES151.pl
# sub-directory to install to within bin
BIN_SUBDIR =
# sub-directory to install to within include
@@ -123,11 +126,13 @@ INCLUDE_SUBDIR =
LOCALDEPLIBS =
FF_FILES = comp_ff_of_prereq_RHEL72.pl comp_ff_of_prereq_RHEL73.pl comp_ff_of_prereq_RHEL74.pl \
- comp_ff_of_prereq_RHEL75.pl comp_ff_of_prereq_RHEL76.pl comp_ff_of_prereq_SLES122.pl \
- comp_ff_of_prereq_SLES123.pl comp_ff_of_prereq_SLES124.pl comp_ff_of_prereq_SLES15.pl
+ comp_ff_of_prereq_RHEL75.pl comp_ff_of_prereq_RHEL76.pl comp_ff_of_prereq_RHEL8.pl \
+ comp_ff_of_prereq_SLES122.pl comp_ff_of_prereq_SLES123.pl comp_ff_of_prereq_SLES124.pl \
+ comp_ff_of_prereq_SLES15.pl comp_ff_of_prereq_SLES151.pl
FM_FILES = comp_fm_prereq_RHEL72.pl comp_fm_prereq_RHEL73.pl comp_fm_prereq_RHEL74.pl \
- comp_fm_prereq_RHEL75.pl comp_fm_prereq_RHEL76.pl comp_fm_prereq_SLES122.pl \
- comp_fm_prereq_SLES123.pl comp_fm_prereq_SLES124.pl comp_fm_prereq_SLES15.pl
+ comp_fm_prereq_RHEL75.pl comp_fm_prereq_RHEL76.pl comp_fm_prereq_RHEL8.pl \
+ comp_fm_prereq_SLES122.pl comp_fm_prereq_SLES123.pl comp_fm_prereq_SLES124.pl \
+ comp_fm_prereq_SLES15.pl comp_fm_prereq_SLES151.pl
# Include Make Rules definitions and rules
include $(TL_DIR)/$(PROJ_FILE_DIR)/Makerules.project
diff --git a/CommonInstall/comp_delta.pl b/CommonInstall/comp_delta.pl
index 894674d..6da2387 100755
--- a/CommonInstall/comp_delta.pl
+++ b/CommonInstall/comp_delta.pl
@@ -74,10 +74,12 @@ my @delta_kernel_srpms_sles12_sp2 = ( 'ifs-kernel-updates-kmp-default' );
my @delta_kernel_srpms_sles12_sp3 = ( 'ifs-kernel-updates-kmp-default' );
my @delta_kernel_srpms_sles12_sp4 = ( 'ifs-kernel-updates-kmp-default' );
my @delta_kernel_srpms_sles15 = ( 'ifs-kernel-updates-kmp-default' );
+my @delta_kernel_srpms_sles15_sp1 = ( 'ifs-kernel-updates-kmp-default' );
my @delta_kernel_srpms_rhel73 = ( 'kmod-ifs-kernel-updates' );
my @delta_kernel_srpms_rhel74 = ( 'kmod-ifs-kernel-updates' );
my @delta_kernel_srpms_rhel75 = ( 'kmod-ifs-kernel-updates' );
my @delta_kernel_srpms_rhel76 = ( 'kmod-ifs-kernel-updates' );
+my @delta_kernel_srpms_rhel8 = ( 'kmod-ifs-kernel-updates' );
my @delta_kernel_srpms = ( );
# This provides information for all kernel srpms
@@ -146,12 +148,17 @@ sub init_delta_info($)
} elsif ("$CUR_DISTRO_VENDOR" eq 'SuSE'
&& "$CUR_VENDOR_VER" eq 'ES15') {
@delta_kernel_srpms = ( @delta_kernel_srpms_sles15 );
+ } elsif ("$CUR_DISTRO_VENDOR" eq 'SuSE'
+ && "$CUR_VENDOR_VER" eq 'ES151') {
+ @delta_kernel_srpms = ( @delta_kernel_srpms_sles15_sp1 );
} elsif ( "$CUR_VENDOR_VER" eq "ES74" ) {
if ($HFI2_INSTALL) {
@delta_kernel_srpms = (@delta_kernel_srpms_rhel74_hfi2);
} else {
@delta_kernel_srpms = (@delta_kernel_srpms_rhel74);
}
+ } elsif ( "$CUR_VENDOR_VER" eq "ES8" ) {
+ @delta_kernel_srpms = ( @delta_kernel_srpms_rhel8 );
} elsif ( "$CUR_VENDOR_VER" eq "ES76" ) {
@delta_kernel_srpms = ( @delta_kernel_srpms_rhel76 );
} elsif ( "$CUR_VENDOR_VER" eq "ES75" ) {
@@ -779,6 +786,9 @@ sub installed_delta_opa_stack()
return ( has_version_delta()
&& rpm_is_installed("kmod-ifs-kernel-updates", $CUR_OS_VER));
}
+ } elsif ( "$CUR_VENDOR_VER" eq "ES8" ) {
+ return ( has_version_delta()
+ && rpm_is_installed("kmod-ifs-kernel-updates", $CUR_OS_VER));
} elsif ( "$CUR_VENDOR_VER" eq "ES76" ) {
return ( has_version_delta()
&& rpm_is_installed("kmod-ifs-kernel-updates", $CUR_OS_VER));
@@ -797,6 +807,9 @@ sub installed_delta_opa_stack()
} elsif ( "$CUR_VENDOR_VER" eq 'ES15' ) {
return ( has_version_delta()
&& rpm_is_installed("ifs-kernel-updates-kmp-default", $CUR_OS_VER));
+ } elsif ( "$CUR_VENDOR_VER" eq 'ES151' ) {
+ return ( has_version_delta()
+ && rpm_is_installed("ifs-kernel-updates-kmp-default", $CUR_OS_VER));
} else {
return 0;
}
@@ -1081,6 +1094,9 @@ sub installed_intel_hfi()
} elsif ( "$CUR_VENDOR_VER" eq "ES76" ) {
return (has_version_delta()
&& rpm_is_installed("kmod-ifs-kernel-updates", $CUR_OS_VER));
+ } elsif ( "$CUR_VENDOR_VER" eq "ES8" ) {
+ return (has_version_delta()
+ && rpm_is_installed("kmod-ifs-kernel-updates", $CUR_OS_VER));
} elsif ( "$CUR_VENDOR_VER" eq "ES123" ) {
return (has_version_delta()
&& rpm_is_installed("ifs-kernel-updates-kmp-default", $CUR_OS_VER));
@@ -1090,6 +1106,9 @@ sub installed_intel_hfi()
} elsif ( "$CUR_VENDOR_VER" eq "ES15" ) {
return (has_version_delta()
&& rpm_is_installed("ifs-kernel-updates-kmp-default", $CUR_OS_VER));
+ } elsif ( "$CUR_VENDOR_VER" eq "ES151" ) {
+ return (has_version_delta()
+ && rpm_is_installed("ifs-kernel-updates-kmp-default", $CUR_OS_VER));
} else {
return 0;
}
diff --git a/CommonInstall/comp_delta_prereq_RHEL8.pl b/CommonInstall/comp_delta_prereq_RHEL8.pl
new file mode 100644
index 0000000..804443d
--- /dev/null
+++ b/CommonInstall/comp_delta_prereq_RHEL8.pl
@@ -0,0 +1,137 @@
+#!/usr/bin/perl
+## BEGIN_ICS_COPYRIGHT8 ****************************************
+#
+# Copyright (c) 2015-2019, Intel Corporation
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# * Neither the name of Intel Corporation nor the names of its contributors
+# may be used to endorse or promote products derived from this software
+# without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+## END_ICS_COPYRIGHT8 ****************************************
+#
+## [ICS VERSION STRING: unknown]
+#use strict;
+##use Term::ANSIColor;
+##use Term::ANSIColor qw(:constants);
+##use File::Basename;
+##use Math::BigInt;
+#
+## ==========================================================================
+#
+#Installation Prequisites array for delta components
+my @opa_stack_prereq = (
+ "bash",
+ "kernel",
+ "kmod",
+ "rdma-core",
+ "systemd",
+ "glibc",
+ "pciutils",
+ "opensm-libs",
+ "libibumad",
+ "rdma-core-devel",
+);
+$comp_prereq_hash{'opa_stack_prereq'} = \@opa_stack_prereq;
+
+my @mpi_selector_prereq = (
+ "bash",
+ "coreutils",
+ "perl",
+ "perl-Getopt-Long",
+ "tcsh",
+);
+$comp_prereq_hash{'mpi_selector_prereq'} = \@mpi_selector_prereq;
+
+my @intel_hfi_prereq = (
+ "bash",
+ "glibc",
+ "libgcc",
+ "python2",
+ "systemd",
+ "numactl-libs",
+ "irqbalance",
+ "libatomic",
+);
+$comp_prereq_hash{'intel_hfi_prereq'} = \@intel_hfi_prereq;
+
+my @mvapich2_prereq = (
+ "bash",
+ "libibverbs",
+ "librdmacm",
+ "glibc",
+ "zlib",
+ "sysfsutils",
+);
+$comp_prereq_hash{'mvapich2_prereq'} = \@mvapich2_prereq;
+
+my @openmpi_prereq = (
+ "bash",
+ "glibc",
+ "libgcc",
+ "libgfortran",
+ "gcc-gfortran",
+ "libgomp",
+ "libibverbs",
+ "libquadmath",
+ "librdmacm",
+ "libstdc++",
+ "libstdc++-devel",
+ "opensm-libs",
+ "pkgconf",
+ "zlib",
+);
+$comp_prereq_hash{'openmpi_prereq'} = \@openmpi_prereq;
+
+my @mvapich2_gcc_hfi_prereq = (
+ "bash",
+ "zlib",
+ "glibc",
+);
+$comp_prereq_hash{'mvapich2_gcc_hfi_prereq'} = \@mvapich2_gcc_hfi_prereq;
+
+my @mvapich2_intel_hfi_prereq = (
+ "bash",
+);
+$comp_prereq_hash{'mvapich2_intel_hfi_prereq'} = \@mvapich2_intel_hfi_prereq;
+
+my @openmpi_gcc_hfi_prereq = (
+ "bash",
+ "glibc",
+ "libgcc",
+ "libgfortran",
+ "gcc-gfortran",
+ "libgomp",
+ "libibverbs",
+ "libquadmath",
+ "librdmacm",
+ "libstdc++",
+ "libstdc++-devel",
+ "opensm-libs",
+ "pkgconf",
+ "zlib",
+);
+$comp_prereq_hash{'openmpi_gcc_hfi_prereq'} = \@openmpi_gcc_hfi_prereq;
+
+my @openmpi_intel_hfi_prereq = (
+ "bash",
+);
+$comp_prereq_hash{'openmpi_intel_hfi_prereq'} = \@openmpi_intel_hfi_prereq;
diff --git a/CommonInstall/comp_delta_prereq_SLES151.pl b/CommonInstall/comp_delta_prereq_SLES151.pl
new file mode 100644
index 0000000..172a3ca
--- /dev/null
+++ b/CommonInstall/comp_delta_prereq_SLES151.pl
@@ -0,0 +1,138 @@
+#!/usr/bin/perl
+## BEGIN_ICS_COPYRIGHT8 ****************************************
+#
+# Copyright (c) 2015-2019, Intel Corporation
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# * Neither the name of Intel Corporation nor the names of its contributors
+# may be used to endorse or promote products derived from this software
+# without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+## END_ICS_COPYRIGHT8 ****************************************
+#
+## [ICS VERSION STRING: unknown]
+#use strict;
+##use Term::ANSIColor;
+##use Term::ANSIColor qw(:constants);
+##use File::Basename;
+##use Math::BigInt;
+#
+## ==========================================================================
+#
+#Installation Prequisites array for delta components
+my @opa_stack_prereq = (
+ "bash",
+ "kmod",
+ "rdma-core",
+ "rdma-ndd",
+ "systemd",
+ "coreutils",
+ "grep",
+ "libosmcomp4",
+ "libibmad5",
+ "libibumad3",
+ "rdma-core-devel",
+);
+$comp_prereq_hash{'opa_stack_prereq'} = \@opa_stack_prereq;
+
+my @intel_hfi_prereq = (
+ "glibc",
+ "libgcc_s1",
+ "bash",
+ "udev",
+ "libudev-devel",
+ "python-base",
+ "libedit0",
+ "libncurses6",
+ "libnuma1",
+ "irqbalance",
+ "libatomic1",
+);
+$comp_prereq_hash{'intel_hfi_prereq'} = \@intel_hfi_prereq;
+
+my @mvapich2_gcc_hfi_prereq = (
+ "bash",
+ "glibc",
+ "libz1",
+ "mpi-selector",
+);
+$comp_prereq_hash{'mvapich2_gcc_hfi_prereq'} = \@mvapich2_gcc_hfi_prereq;
+
+my @mvapich2_intel_hfi_prereq = (
+ "bash",
+ "mpi-selector",
+);
+$comp_prereq_hash{'mvapich2_intel_hfi_prereq'} = \@mvapich2_intel_hfi_prereq;
+
+my @openmpi_gcc_hfi_prereq = (
+ "glibc",
+ "bash",
+ "libpsm_infinipath1",
+ "pkg-config",
+ "libgcc_s1",
+ "libgfortran4",
+ "gcc-fortran",
+ "libgomp1",
+ "libibverbs1",
+ "libquadmath0",
+ "librdmacm1",
+ "libstdc++6",
+ "libz1",
+ "opensm-devel",
+ "mpi-selector",
+);
+$comp_prereq_hash{'openmpi_gcc_hfi_prereq'} = \@openmpi_gcc_hfi_prereq;
+
+my @openmpi_intel_hfi_prereq = (
+ "bash",
+ "mpi-selector",
+);
+$comp_prereq_hash{'openmpi_intel_hfi_prereq'} = \@openmpi_intel_hfi_prereq;
+
+my @mvapich2_prereq = (
+ "bash",
+ "libibverbs1",
+ "librdmacm1",
+ "glibc",
+ "libz1",
+ "mpi-selector",
+);
+$comp_prereq_hash{'mvapich2_prereq'} = \@mvapich2_prereq;
+
+my @openmpi_prereq = (
+ "glibc",
+ "bash",
+ "libz1",
+ "pkg-config",
+ "libgcc_s1",
+ "libgfortran3",
+ "gcc-fortran",
+ "libgomp1",
+ "libibverbs1",
+ "libquadmath0",
+ "librdmacm1",
+ "libstdc++6",
+ "libz1",
+ "opensm-libs3",
+ "opensm-devel",
+ "mpi-selector",
+);
+$comp_prereq_hash{'openmpi_prereq'} = \@openmpi_prereq;
diff --git a/CommonInstall/comp_ff_of_prereq_RHEL8.pl b/CommonInstall/comp_ff_of_prereq_RHEL8.pl
new file mode 100644
index 0000000..ee2fa78
--- /dev/null
+++ b/CommonInstall/comp_ff_of_prereq_RHEL8.pl
@@ -0,0 +1,87 @@
+#!/usr/bin/perl
+## BEGIN_ICS_COPYRIGHT8 ****************************************
+#
+# Copyright (c) 2015-2019, Intel Corporation
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# * Neither the name of Intel Corporation nor the names of its contributors
+# may be used to endorse or promote products derived from this software
+# without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+## END_ICS_COPYRIGHT8 ****************************************
+#
+## [ICS VERSION STRING: unknown]
+#use strict;
+##use Term::ANSIColor;
+##use Term::ANSIColor qw(:constants);
+##use File::Basename;
+##use Math::BigInt;
+#
+## ==========================================================================
+#
+#Installation Prequisites array for fast fabric
+#and of tools component
+my @oftools_prereq = (
+ "glibc",
+ "libgcc",
+ "libibumad",
+ "libibverbs",
+ "libstdc++",
+ "ibacm",
+ "rdma-core",
+);
+$comp_prereq_hash{'oftools_prereq'} = \@oftools_prereq;
+
+my @fastfabric_prereq = (
+ "atlas",
+ "bash",
+ "bc",
+ "expat",
+ "expect",
+ "glibc",
+ "libgcc",
+ "libibumad",
+ "libibverbs",
+ "libstdc++",
+ "ncurses-libs",
+ "openssl-libs",
+ "perl",
+ "perl-Getopt-Long",
+ "perl-Socket",
+ "rdma-core",
+ "tcl",
+ "zlib",
+);
+$comp_prereq_hash{'fastfabric_prereq'} = \@fastfabric_prereq;
+
+my @opamgt_sdk_prereq = (
+ "bash",
+ "glibc",
+ "libgcc",
+ "libibumad",
+ "libibverbs",
+ "libstdc++",
+ "openssl",
+ "openssl-devel",
+ "openssl-libs",
+ "rdma-core-devel",
+);
+$comp_prereq_hash{'opamgt_sdk_prereq'} = \@opamgt_sdk_prereq;
diff --git a/CommonInstall/comp_ff_of_prereq_RHEL8.pl.base b/CommonInstall/comp_ff_of_prereq_RHEL8.pl.base
new file mode 100644
index 0000000..ee2fa78
--- /dev/null
+++ b/CommonInstall/comp_ff_of_prereq_RHEL8.pl.base
@@ -0,0 +1,87 @@
+#!/usr/bin/perl
+## BEGIN_ICS_COPYRIGHT8 ****************************************
+#
+# Copyright (c) 2015-2019, Intel Corporation
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# * Neither the name of Intel Corporation nor the names of its contributors
+# may be used to endorse or promote products derived from this software
+# without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+## END_ICS_COPYRIGHT8 ****************************************
+#
+## [ICS VERSION STRING: unknown]
+#use strict;
+##use Term::ANSIColor;
+##use Term::ANSIColor qw(:constants);
+##use File::Basename;
+##use Math::BigInt;
+#
+## ==========================================================================
+#
+#Installation Prequisites array for fast fabric
+#and of tools component
+my @oftools_prereq = (
+ "glibc",
+ "libgcc",
+ "libibumad",
+ "libibverbs",
+ "libstdc++",
+ "ibacm",
+ "rdma-core",
+);
+$comp_prereq_hash{'oftools_prereq'} = \@oftools_prereq;
+
+my @fastfabric_prereq = (
+ "atlas",
+ "bash",
+ "bc",
+ "expat",
+ "expect",
+ "glibc",
+ "libgcc",
+ "libibumad",
+ "libibverbs",
+ "libstdc++",
+ "ncurses-libs",
+ "openssl-libs",
+ "perl",
+ "perl-Getopt-Long",
+ "perl-Socket",
+ "rdma-core",
+ "tcl",
+ "zlib",
+);
+$comp_prereq_hash{'fastfabric_prereq'} = \@fastfabric_prereq;
+
+my @opamgt_sdk_prereq = (
+ "bash",
+ "glibc",
+ "libgcc",
+ "libibumad",
+ "libibverbs",
+ "libstdc++",
+ "openssl",
+ "openssl-devel",
+ "openssl-libs",
+ "rdma-core-devel",
+);
+$comp_prereq_hash{'opamgt_sdk_prereq'} = \@opamgt_sdk_prereq;
diff --git a/CommonInstall/comp_ff_of_prereq_SLES151.pl b/CommonInstall/comp_ff_of_prereq_SLES151.pl
new file mode 100644
index 0000000..d51d011
--- /dev/null
+++ b/CommonInstall/comp_ff_of_prereq_SLES151.pl
@@ -0,0 +1,90 @@
+#!/usr/bin/perl
+## BEGIN_ICS_COPYRIGHT8 ****************************************
+#
+# Copyright (c) 2015-2019, Intel Corporation
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# * Neither the name of Intel Corporation nor the names of its contributors
+# may be used to endorse or promote products derived from this software
+# without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+## END_ICS_COPYRIGHT8 ****************************************
+#
+## [ICS VERSION STRING: unknown]
+#use strict;
+##use Term::ANSIColor;
+##use Term::ANSIColor qw(:constants);
+##use File::Basename;
+##use Math::BigInt;
+#
+## ==========================================================================
+#
+#Installation Prequisites array for fast fabric
+#and of tools component
+
+my @oftools_prereq = (
+ "glibc",
+ "libgcc_s1",
+ "libibmad5",
+ "libibumad3",
+ "libibverbs1",
+ "libstdc++6",
+ "ibacm",
+);
+$comp_prereq_hash{'oftools_prereq'} = \@oftools_prereq;
+
+my @fastfabric_prereq = (
+ "glibc",
+ "bash",
+ "expect",
+ "perl-base",
+ "tcl",
+ "libexpat1",
+ "libgcc_s1",
+ "libibmad5",
+ "libibumad3",
+ "libibverbs1",
+ "libncurses6",
+ "libopenssl1_1",
+ "libstdc++6",
+ "libz1",
+ "bc",
+ "rdma-core",
+ "rdma-ndd",
+ "qperf",
+ "perftest",
+);
+$comp_prereq_hash{'fastfabric_prereq'} = \@fastfabric_prereq;
+
+my @opamgt_sdk_prereq = (
+ "bash",
+ "glibc",
+ "libgcc_s1",
+ "libibumad3",
+ "libibverbs1",
+ "libopenssl-devel",
+ "libopenssl1_1",
+ "libstdc++6",
+ "openssl",
+ "rdma-core-devel",
+ "rdma-ndd",
+);
+$comp_prereq_hash{'opamgt_sdk_prereq'} = \@opamgt_sdk_prereq;
diff --git a/CommonInstall/comp_ff_of_prereq_SLES151.pl.base b/CommonInstall/comp_ff_of_prereq_SLES151.pl.base
new file mode 100644
index 0000000..d51d011
--- /dev/null
+++ b/CommonInstall/comp_ff_of_prereq_SLES151.pl.base
@@ -0,0 +1,90 @@
+#!/usr/bin/perl
+## BEGIN_ICS_COPYRIGHT8 ****************************************
+#
+# Copyright (c) 2015-2019, Intel Corporation
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# * Neither the name of Intel Corporation nor the names of its contributors
+# may be used to endorse or promote products derived from this software
+# without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+## END_ICS_COPYRIGHT8 ****************************************
+#
+## [ICS VERSION STRING: unknown]
+#use strict;
+##use Term::ANSIColor;
+##use Term::ANSIColor qw(:constants);
+##use File::Basename;
+##use Math::BigInt;
+#
+## ==========================================================================
+#
+#Installation Prequisites array for fast fabric
+#and of tools component
+
+my @oftools_prereq = (
+ "glibc",
+ "libgcc_s1",
+ "libibmad5",
+ "libibumad3",
+ "libibverbs1",
+ "libstdc++6",
+ "ibacm",
+);
+$comp_prereq_hash{'oftools_prereq'} = \@oftools_prereq;
+
+my @fastfabric_prereq = (
+ "glibc",
+ "bash",
+ "expect",
+ "perl-base",
+ "tcl",
+ "libexpat1",
+ "libgcc_s1",
+ "libibmad5",
+ "libibumad3",
+ "libibverbs1",
+ "libncurses6",
+ "libopenssl1_1",
+ "libstdc++6",
+ "libz1",
+ "bc",
+ "rdma-core",
+ "rdma-ndd",
+ "qperf",
+ "perftest",
+);
+$comp_prereq_hash{'fastfabric_prereq'} = \@fastfabric_prereq;
+
+my @opamgt_sdk_prereq = (
+ "bash",
+ "glibc",
+ "libgcc_s1",
+ "libibumad3",
+ "libibverbs1",
+ "libopenssl-devel",
+ "libopenssl1_1",
+ "libstdc++6",
+ "openssl",
+ "rdma-core-devel",
+ "rdma-ndd",
+);
+$comp_prereq_hash{'opamgt_sdk_prereq'} = \@opamgt_sdk_prereq;
diff --git a/CommonInstall/comp_fm_prereq_RHEL8.pl b/CommonInstall/comp_fm_prereq_RHEL8.pl
new file mode 100644
index 0000000..c16ef21
--- /dev/null
+++ b/CommonInstall/comp_fm_prereq_RHEL8.pl
@@ -0,0 +1,52 @@
+#!/usr/bin/perl
+## BEGIN_ICS_COPYRIGHT8 ****************************************
+#
+# Copyright (c) 2015-2019, Intel Corporation
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# * Neither the name of Intel Corporation nor the names of its contributors
+# may be used to endorse or promote products derived from this software
+# without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+## END_ICS_COPYRIGHT8 ****************************************
+#
+## [ICS VERSION STRING: unknown]
+#use strict;
+##use Term::ANSIColor;
+##use Term::ANSIColor qw(:constants);
+##use File::Basename;
+##use Math::BigInt;
+#
+## ==========================================================================
+#
+#Installation Prequisites array for opafm
+my @opafm_prereq = (
+ "bash",
+ "expat",
+ "glibc",
+ "libibumad",
+ "libibverbs",
+ "openssl-libs",
+ "rdma-core",
+ "systemd",
+ "zlib",
+);
+$comp_prereq_hash{'opafm_prereq'} = \@opafm_prereq;
diff --git a/CommonInstall/comp_fm_prereq_RHEL8.pl.base b/CommonInstall/comp_fm_prereq_RHEL8.pl.base
new file mode 100644
index 0000000..c16ef21
--- /dev/null
+++ b/CommonInstall/comp_fm_prereq_RHEL8.pl.base
@@ -0,0 +1,52 @@
+#!/usr/bin/perl
+## BEGIN_ICS_COPYRIGHT8 ****************************************
+#
+# Copyright (c) 2015-2019, Intel Corporation
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# * Neither the name of Intel Corporation nor the names of its contributors
+# may be used to endorse or promote products derived from this software
+# without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+## END_ICS_COPYRIGHT8 ****************************************
+#
+## [ICS VERSION STRING: unknown]
+#use strict;
+##use Term::ANSIColor;
+##use Term::ANSIColor qw(:constants);
+##use File::Basename;
+##use Math::BigInt;
+#
+## ==========================================================================
+#
+#Installation Prequisites array for opafm
+my @opafm_prereq = (
+ "bash",
+ "expat",
+ "glibc",
+ "libibumad",
+ "libibverbs",
+ "openssl-libs",
+ "rdma-core",
+ "systemd",
+ "zlib",
+);
+$comp_prereq_hash{'opafm_prereq'} = \@opafm_prereq;
diff --git a/CommonInstall/comp_fm_prereq_SLES151.pl b/CommonInstall/comp_fm_prereq_SLES151.pl
new file mode 100644
index 0000000..289eddb
--- /dev/null
+++ b/CommonInstall/comp_fm_prereq_SLES151.pl
@@ -0,0 +1,54 @@
+#!/usr/bin/perl
+## BEGIN_ICS_COPYRIGHT8 ****************************************
+#
+# Copyright (c) 2015-2019, Intel Corporation
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# * Neither the name of Intel Corporation nor the names of its contributors
+# may be used to endorse or promote products derived from this software
+# without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+## END_ICS_COPYRIGHT8 ****************************************
+#
+## [ICS VERSION STRING: unknown]
+#use strict;
+##use Term::ANSIColor;
+##use Term::ANSIColor qw(:constants);
+##use File::Basename;
+##use Math::BigInt;
+#
+## ==========================================================================
+#
+##Installation Prequisites array for opafm
+my @opafm_prereq = (
+ "glibc",
+ "bash",
+ "rdma-core",
+ "rdma-ndd",
+ "systemd",
+ "libexpat1",
+ "libibmad5",
+ "libibumad3",
+ "libibverbs1",
+ "libopenssl1_1",
+ "libz1",
+);
+$comp_prereq_hash{'opafm_prereq'} = \@opafm_prereq;
diff --git a/CommonInstall/comp_fm_prereq_SLES151.pl.base b/CommonInstall/comp_fm_prereq_SLES151.pl.base
new file mode 100644
index 0000000..289eddb
--- /dev/null
+++ b/CommonInstall/comp_fm_prereq_SLES151.pl.base
@@ -0,0 +1,54 @@
+#!/usr/bin/perl
+## BEGIN_ICS_COPYRIGHT8 ****************************************
+#
+# Copyright (c) 2015-2019, Intel Corporation
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# * Neither the name of Intel Corporation nor the names of its contributors
+# may be used to endorse or promote products derived from this software
+# without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+## END_ICS_COPYRIGHT8 ****************************************
+#
+## [ICS VERSION STRING: unknown]
+#use strict;
+##use Term::ANSIColor;
+##use Term::ANSIColor qw(:constants);
+##use File::Basename;
+##use Math::BigInt;
+#
+## ==========================================================================
+#
+##Installation Prequisites array for opafm
+my @opafm_prereq = (
+ "glibc",
+ "bash",
+ "rdma-core",
+ "rdma-ndd",
+ "systemd",
+ "libexpat1",
+ "libibmad5",
+ "libibumad3",
+ "libibverbs1",
+ "libopenssl1_1",
+ "libz1",
+);
+$comp_prereq_hash{'opafm_prereq'} = \@opafm_prereq;
diff --git a/CommonInstall/do_mvapich2_build.sh b/CommonInstall/do_mvapich2_build.sh
index 6d85cb7..ddc5dce 100755
--- a/CommonInstall/do_mvapich2_build.sh
+++ b/CommonInstall/do_mvapich2_build.sh
@@ -511,6 +511,9 @@ logfile=make.mvapich2.$interface.$compiler
mvapich2_comp_env='CC="gcc -m64" CXX="g++ -m64" F77="gfortran -m64" FC="gfortran -m64"'
else
mvapich2_comp_env='CC=gcc CXX=g++ F77=gfortran FC=gfortran'
+ if [[ ( "$ID" == "rhel" && $(echo "$VERSION_ID == 8.0" | bc -l) == 1 ) ]]; then
+ mvapich2_comp_env="$mvapich2_comp_env CFLAGS='-fPIC'"
+ fi
fi
else
if [ "$ARCH" = "PPC64" ]
@@ -518,6 +521,9 @@ logfile=make.mvapich2.$interface.$compiler
mvapich2_comp_env='CC="gcc -m64" CXX="g++ -m64" F77="g77 -m64" FC="/bin/false"'
else
mvapich2_comp_env='CC=gcc CXX=g++ F77=g77 FC=/bin/false'
+ if [[ ( "$ID" == "rhel" && $(echo "$VERSION_ID == 8.0" | bc -l) == 1 ) ]]; then
+ mvapich2_comp_env="$mvapich2_comp_env CFLAGS='-fPIC'"
+ fi
fi
fi;;
diff --git a/CommonInstall/do_openmpi_build.sh b/CommonInstall/do_openmpi_build.sh
index 6e68fd4..e7aea1a 100755
--- a/CommonInstall/do_openmpi_build.sh
+++ b/CommonInstall/do_openmpi_build.sh
@@ -492,7 +492,11 @@ logfile=make.openmpi.$interface.$compiler
case "$compiler" in
gcc)
- openmpi_comp_env="$openmpi_comp_env CC=gcc CFLAGS=-O3"
+ if [[ ( "$ID" == "rhel" && $(echo "$VERSION_ID == 8.0" | bc -l) == 1 ) ]]; then
+ openmpi_comp_env="$openmpi_comp_env CC=gcc CFLAGS="-O3 -fPIC""
+ else
+ openmpi_comp_env="$openmpi_comp_env CC=gcc CFLAGS=-O3"
+ fi
if have_comp g++
then
openmpi_comp_env="$openmpi_comp_env CXX=g++"
@@ -727,7 +731,7 @@ egrep 'warning:' $logfile.res |sort -u |
#egrep 'error:|Error | Stop' $logfile.res| sort -u |
# egrep -v 'error: this file was generated for autoconf 2.61.' > $logfile.err
egrep 'error:|Error | Stop' $logfile.res| sort -u |
- egrep -v 'configure: error: no BPatch.h found; check path for Dyninst package|configure: error: no vtf3.h found; check path for VTF3 package|configure: error: MPI Correctness Checking support cannot be built inside Open MPI|configure: error: no bmi.h found; check path for BMI package first...|configure: error: no ctool/ctool.h found; check path for CTool package first...|configure: error: no cuda.h found; check path for CUDA Toolkit first...|configure: error: no cuda_runtime_api.h found; check path for CUDA Toolkit first...|configure: error: no cupti.h found; check path for CUPTI package first...|configure: error: no f2c.h found; check path for CLAPACK package first...|configure: error: no jvmti.h found; check path for JVMTI package first...|configure: error: no libcpc.h found; check path for CPC package first...|configure: error: no tau_instrumentor found; check path for PDToolkit first...|configure: error: no unimci-config found; check path for UniMCI package first...|"Error code:|"Unknown error:|strerror_r|configure: error: CUPTI API version could not be determined...' > $logfile.err
+ egrep -v 'configure: error: no BPatch.h found; check path for Dyninst package|configure: error: no vtf3.h found; check path for VTF3 package|configure: error: MPI Correctness Checking support cannot be built inside Open MPI|configure: error: no bmi.h found; check path for BMI package first...|configure: error: no ctool/ctool.h found; check path for CTool package first...|configure: error: no cuda.h found; check path for CUDA Toolkit first...|configure: error: no cuda_runtime_api.h found; check path for CUDA Toolkit first...|configure: error: no cupti.h found; check path for CUPTI package first...|configure: error: no f2c.h found; check path for CLAPACK package first...|configure: error: no jvmti.h found; check path for JVMTI package first...|configure: error: no libcpc.h found; check path for CPC package first...|configure: error: no tau_instrumentor found; check path for PDToolkit first...|configure: error: no unimci-config found; check path for UniMCI package first...|"Error code:|"Unknown error:|strerror_r|configure: error: CUPTI API version could not be determined...|asprintf(&msg, "Unexpected sendto() error: errno=%d (%s)",' > $logfile.err
if [ -s $logfile.err ]
then
diff --git a/CommonInstall/main_omnipathwrap_delta.pl b/CommonInstall/main_omnipathwrap_delta.pl
index f242a61..f84b431 100644
--- a/CommonInstall/main_omnipathwrap_delta.pl
+++ b/CommonInstall/main_omnipathwrap_delta.pl
@@ -70,13 +70,17 @@ my @Components_sles12_sp3 = ( "opa_stack",
@OmniPathAllComponents );
my @Components_sles12_sp4 = ( "opa_stack",
@OmniPathAllComponents );
+my @Components_sles15 = ( "opa_stack",
+ @OmniPathAllComponents );
+my @Components_sles15_sp1 = ( "opa_stack",
+ @OmniPathAllComponents );
my @Components_rhel74 = ( "opa_stack", "mpi_selector",
@OmniPathAllComponents );
my @Components_rhel75 = ( "opa_stack", "mpi_selector",
@OmniPathAllComponents );
my @Components_rhel76 = ( "opa_stack", "mpi_selector",
@OmniPathAllComponents );
-my @Components_sles15 = ( "opa_stack",
+my @Components_rhel8 = ( "opa_stack", "mpi_selector",
@OmniPathAllComponents );
@Components = ( );
@@ -684,7 +688,7 @@ my %opa_stack_sles12_sp4_comp_info = (
},
);
-# for SLES15
+# for SLES15.x
my %opa_stack_sles15_comp_info = (
"opa_stack" => { Name => "OFA OPA Stack",
DefaultInstall => $State_Install,
@@ -809,6 +813,37 @@ my %intel_hfi_comp_info = (
StartupParams => [ ]
},
);
+#
+# for RHEL8, which does not currently support opa_stack and does not require libfabric-psm
+my %intel_hfi_rhel8_comp_info = (
+ "intel_hfi" => { Name => "Intel HFI Components",
+ DefaultInstall => $State_Install,
+ SrcDir => file_glob("./IntelOPA-OFA_DELTA.*"),
+ PreReq => " opa_stack ", CoReq => " oftools ",
+ # TBD - HasFirmware - FW update
+ Hidden => 0, Disabled => 0, IsOFA => 1,
+ KernelRpms => [ ],
+ FirmwareRpms => [
+ "hfi1-firmware", "hfi1-firmware_debug"
+ ],
+ UserRpms => [ #"libhfi1", "libhfi1-static",
+ "libpsm2",
+ "libpsm2-devel", "libpsm2-compat",
+ "libfabric", "libfabric-devel",
+ "libfabric-psm2", "libfabric-verbs",
+ "hfi1-diagtools-sw", "hfidiags",
+ ],
+ DebugRpms => [ #"hfi1_debuginfo",
+ "hfi1-diagtools-sw-debuginfo",
+ "libpsm2-debuginfo", #"libhfi1-debuginfo"
+ ],
+ HasStart => 1, HasFirmware => 0, DefaultStart => 1,
+ StartPreReq => " opa_stack ",
+ StartComponents => [ "intel_hfi" ],
+ StartupScript => "",
+ StartupParams => [ ]
+ },
+);
# For SLES12sp3 that has different name for libpsm2
my %intel_hfi_sles123_comp_info = (
@@ -870,7 +905,7 @@ my %intel_hfi_sles124_comp_info = (
},
);
-# For SLES15 that has different name for libpsm2
+# For SLES15.x that has different name for libpsm2
my %intel_hfi_sles15_comp_info = (
"intel_hfi" => { Name => "Intel HFI Components",
DefaultInstall => $State_Install,
@@ -1105,6 +1140,14 @@ sub init_components
%opa_stack_dev_comp_info,
%opa_stack_rhel_comp_info,
);
+ } elsif ( "$CUR_VENDOR_VER" eq "ES8" ) {
+ @Components = ( @Components_rhel8 );
+ @SubComponents = ( @SubComponents_newer );
+ %ComponentInfo = ( %ComponentInfo, %ibacm_comp_info,
+ %intel_hfi_rhel8_comp_info,
+ %opa_stack_dev_comp_info,
+ %opa_stack_rhel_comp_info,
+ );
} elsif ( "$CUR_VENDOR_VER" eq "ES15" ) {
@Components = ( @Components_sles15 );
@SubComponents = ( @SubComponents_newer );
@@ -1113,6 +1156,14 @@ sub init_components
%opa_stack_dev_comp_info,
%opa_stack_sles15_comp_info,
);
+ } elsif ( "$CUR_VENDOR_VER" eq "ES151" ) {
+ @Components = ( @Components_sles15_sp1 );
+ @SubComponents = ( @SubComponents_newer );
+ %ComponentInfo = ( %ComponentInfo, %ibacm_comp_info,
+ %intel_hfi_sles15_comp_info,
+ %opa_stack_dev_comp_info,
+ %opa_stack_sles15_comp_info,
+ );
} else {
# unknown or unsupported distro, leave lists empty
# verify_distrib_files will catch unsupported distro
diff --git a/CommonInstall/overrides_delta.pl b/CommonInstall/overrides_delta.pl
index a1487b3..ef75a31 100644
--- a/CommonInstall/overrides_delta.pl
+++ b/CommonInstall/overrides_delta.pl
@@ -78,11 +78,21 @@ my @delta_Components_rhel76 = ( "opa_stack", "mpi_selector", "intel_hfi",
"delta_ipoib",
"sandiashmem",
"delta_debug", );
+my @delta_Components_rhel8 = ( "opa_stack", "mpi_selector", "intel_hfi",
+ "opa_stack_dev",
+ "delta_ipoib",
+ "sandiashmem",
+ "delta_debug", );
my @delta_Components_sles15 = ( "opa_stack", "intel_hfi",
"opa_stack_dev",
"delta_ipoib",
"sandiashmem",
"delta_debug", );
+my @delta_Components_sles15_sp1 = ( "opa_stack", "intel_hfi",
+ "opa_stack_dev",
+ "delta_ipoib",
+ "sandiashmem",
+ "delta_debug", );
@Components = ( );
# RHEL7.2, ibacm is a full component with rpms to install
@@ -111,8 +121,12 @@ sub overrides()
@Components = ( @delta_Components_rhel75 );
} elsif ( "$CUR_VENDOR_VER" eq "ES76" ) {
@Components = ( @delta_Components_rhel76 );
+ } elsif ( "$CUR_VENDOR_VER" eq "ES8" ) {
+ @Components = ( @delta_Components_rhel8 );
} elsif ( "$CUR_VENDOR_VER" eq "ES15" ) {
@Components = ( @delta_Components_sles15 );
+ } elsif ( "$CUR_VENDOR_VER" eq "ES151" ) {
+ @Components = ( @delta_Components_sles15_sp1 );
} else {
# unsupported OS
@Components = ( );
diff --git a/CommonInstall/util_components.pl b/CommonInstall/util_components.pl
index 4022c8a..f19e822 100755
--- a/CommonInstall/util_components.pl
+++ b/CommonInstall/util_components.pl
@@ -1061,7 +1061,7 @@ sub show_install_menu($)
}
}
- while() {
+ do {{
if ( $Default_Install) {
# setstate set UnInstall or DoNotInstall for those not available
# force install for all available even if UpToDate
@@ -1433,7 +1433,7 @@ sub show_install_menu($)
}
if (! $have_all_os_prereqs) {
HitKeyCont;
- return
+ last;
}
# run pre-install for all components which will be installed
@@ -1444,7 +1444,7 @@ sub show_install_menu($)
if (0 != comp_preinstall($comp,$install_list,$installing_list)) {
NormalPrint "Unable to Prepare $ComponentInfo{$comp}{'Name'} for Install\n";
HitKeyCont;
- return
+ last;
}
}
}
@@ -1519,13 +1519,10 @@ sub show_install_menu($)
HitKeyCont;
}
return;
- # we had an error above
- if ( $Default_Prompt ) {
- $exit_code = 1;
- return
- }
}
- }
+ }} until ($Default_Prompt);
+ # we had an error above
+ $exit_code = 1;
}
sub show_installed($)
diff --git a/CommonInstall/util_rpm.pl b/CommonInstall/util_rpm.pl
index ea5abeb..05d5746 100755
--- a/CommonInstall/util_rpm.pl
+++ b/CommonInstall/util_rpm.pl
@@ -727,7 +727,7 @@ sub rpm_resolve($$)
} else {
my $osver = rpm_tr_os_version("$mode"); # OS version
# we expect 1 match, ignore all other filenames returned
- if ( "$CUR_VENDOR_VER" eq 'ES122' || "$CUR_VENDOR_VER" eq 'ES123' || "$CUR_VENDOR_VER" eq 'ES124' || "$CUR_VENDOR_VER" eq 'ES15') {
+ if ( "$CUR_VENDOR_VER" eq 'ES122' || "$CUR_VENDOR_VER" eq 'ES123' || "$CUR_VENDOR_VER" eq 'ES124' || "$CUR_VENDOR_VER" eq 'ES15' || "$CUR_VENDOR_VER" eq 'ES151') {
DebugPrint("Checking for Kernel Rpm: ${rpmpath}-${osver}_k*.${cpu}.rpm\n");
$rpmfile = file_glob("${rpmpath}-${osver}_k*.${cpu}.rpm");
} else {
diff --git a/Esm/Makefile.linux b/Esm/Makefile.linux
index 4cc042f..adaa9df 100644
--- a/Esm/Makefile.linux
+++ b/Esm/Makefile.linux
@@ -130,6 +130,9 @@ endif
ifeq "$(BUILD_TARGET_OS_VENDOR_VERSION)" "ES76"
PREREQ_SOURCE= $(TL_DIR)/CommonInstall/comp_fm_prereq_RHEL76.pl
endif
+ifeq "$(BUILD_TARGET_OS_VENDOR_VERSION)" "ES8"
+ PREREQ_SOURCE= $(TL_DIR)/CommonInstall/comp_fm_prereq_RHEL8.pl
+endif
ifeq "$(BUILD_TARGET_OS_VENDOR_VERSION)" "ES122"
PREREQ_SOURCE= $(TL_DIR)/CommonInstall/comp_fm_prereq_SLES122.pl
endif
@@ -142,6 +145,9 @@ endif
ifeq "$(BUILD_TARGET_OS_VENDOR_VERSION)" "ES15"
PREREQ_SOURCE= $(TL_DIR)/CommonInstall/comp_fm_prereq_SLES15.pl
endif
+ifeq "$(BUILD_TARGET_OS_VENDOR_VERSION)" "ES151"
+ PREREQ_SOURCE= $(TL_DIR)/CommonInstall/comp_fm_prereq_SLES151.pl
+endif
# Source files to include in DSP File
diff --git a/Esm/build.env b/Esm/build.env
index f0e0499..e4f7b18 100644
--- a/Esm/build.env
+++ b/Esm/build.env
@@ -1,6 +1,6 @@
# Adjust the environment variables if necessary
export PRODUCT=VIEO_HOST
-export RELEASE_TAG=10_9_2_2_1
+export RELEASE_TAG=10_9_3_1_1
export BUILD_CONFIG=${BUILD_CONFIG:-"release"}
export BUILD_WITH_STACK=OPENIB
export LDENVFS=
diff --git a/Esm/build_label b/Esm/build_label
index 3647992..473b697 100644
--- a/Esm/build_label
+++ b/Esm/build_label
@@ -1 +1 @@
-Build of VIEO_HOST 06/07/19 16:21 Tag: VIEO_HOST_LINUX_opa-10_9_2_1_10_9_2_2_1
+Build of VIEO_HOST 06/11/19 17:57 Tag: VIEO_HOST_LINUX_opa-10_9_10_9_3_1_1
diff --git a/Esm/ib/Makerules.module b/Esm/ib/Makerules.module
index 1171176..d370bca 100644
--- a/Esm/ib/Makerules.module
+++ b/Esm/ib/Makerules.module
@@ -85,6 +85,10 @@ RSCMOD =
# Platform specific definitions:
#-----------------------------------------------------------------------------#
ifeq "$(BUILD_TARGET_OS)" "VXWORKS"
+MOD_INCLUDE_DIRS += \
+ $(TL_DIR)/BSP/bspcommon/wrs/config \
+ $(TGT_DIR)/components/ip_net2-6.9/ipcrypto/include \
+ $(TGT_DIR)/components/ip_net2-6.9/ipcrypto/$(OPENSSL_VER)/include
# FIXME, change uses of __VXWORKS__ to VXWORKS
CMOD += -DCAL_IBACCESS -D__VXWORKS__
ifeq "$(BUILD_TARGET)" "ATOM"
diff --git a/Esm/ib/include/ib_sm.h b/Esm/ib/include/ib_sm.h
index 6e184c7..e84b630 100644
--- a/Esm/ib/include/ib_sm.h
+++ b/Esm/ib/include/ib_sm.h
@@ -279,7 +279,8 @@ typedef SMDBSync_t *SMDBSyncp; /* SM DBSYNC pointer type */
// version 9 - 10.7 release
// version 10 - 10.8 release
// version 11 - 10.9 release
-#define FM_PROTOCOL_VERSION 11
+// version 12 - 10.9.3 release
+#define FM_PROTOCOL_VERSION 12
typedef struct {
diff --git a/Esm/ib/src/config/Makefile b/Esm/ib/src/config/Makefile
index 86f025b..0d524df 100644
--- a/Esm/ib/src/config/Makefile
+++ b/Esm/ib/src/config/Makefile
@@ -44,7 +44,7 @@ DIRS =
# C files (.c)
CFILES = \
fm_xml.c \
- fm_md5.c \
+ fm_digest.c \
# Add more c files here
# C++ files (.cpp)
CCFILES = \
@@ -62,7 +62,7 @@ IDLFILE =
DEFFILE =
# targets to build during INCLUDES phase (add public includes here)
INCLUDE_TARGETS = \
- fm_md5.h \
+ fm_digest.h \
# Add more h hpp files here
# Non-compiled files
MISC_FILES =
diff --git a/Esm/ib/src/config/fm_md5.c b/Esm/ib/src/config/fm_digest.c
similarity index 74%
rename from Esm/ib/src/config/fm_md5.c
rename to Esm/ib/src/config/fm_digest.c
index e2457f8..7a2b295 100644
--- a/Esm/ib/src/config/fm_md5.c
+++ b/Esm/ib/src/config/fm_digest.c
@@ -27,44 +27,44 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ** END_ICS_COPYRIGHT5 ****************************************/
+#include "fm_digest.h"
+
+#include <assert.h>
#include <stdio.h>
-#include <stdlib.h>
#include <stdarg.h>
#include <unistd.h>
#include <sys/stat.h>
#include <sys/types.h>
#include "ib_types.h"
-#ifndef __VXWORKS__
-#include <openssl/md5.h>
-#else
-#include <Md5.h>
-#endif
-
-void fm_md5_start(void *ctx)
+fm_digest_t * fm_digest_start(void)
{
-#ifndef __VXWORKS__
- MD5_Init((MD5_CTX *)ctx);
-#else
- Md5_Start((Md5_Context_t *)ctx);
-#endif
+ fm_digest_t * ctx = EVP_MD_CTX_create();
+ if (!ctx) return NULL;
+ if (!EVP_DigestInit_ex(ctx, EVP_sha256(), NULL)) {
+ EVP_MD_CTX_destroy(ctx);
+ return NULL;
+ }
+ return ctx;
}
-void fm_md5_update(void *ctx, const void *data, size_t len)
+int fm_digest_update(fm_digest_t *ctx, const void *data, size_t len)
{
-#ifndef __VXWORKS__
- MD5_Update((MD5_CTX *)ctx, data, len);
-#else
- Md5_Update((Md5_Context_t *)ctx, (unsigned char *)data, len);
-#endif
+ return EVP_DigestUpdate(ctx, data, len);
}
-void fm_md5_finish(void *ctx, uint8_t *computedMd5)
+int fm_digest_finish(fm_digest_t *ctx, uint8_t *digest)
{
-#ifndef __VXWORKS__
- MD5_Final(computedMd5, (MD5_CTX *)ctx);
-#else
- Md5_Finish((Md5_Context_t *)ctx, computedMd5);
-#endif
+ unsigned int len;
+ if (EVP_DigestFinal_ex(ctx, digest, &len) != 1)
+ return 0;
+ EVP_MD_CTX_destroy(ctx);
+ return 1;
+
+}
+int fm_digest_len(fm_digest_t *ctx)
+{
+ return EVP_MD_CTX_size(ctx);
}
+
diff --git a/Esm/ib/src/config/fm_md5.h b/Esm/ib/src/config/fm_digest.h
similarity index 78%
rename from Esm/ib/src/config/fm_md5.h
rename to Esm/ib/src/config/fm_digest.h
index 57cda5e..7d6a41e 100644
--- a/Esm/ib/src/config/fm_md5.h
+++ b/Esm/ib/src/config/fm_digest.h
@@ -29,25 +29,22 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
/* [ICS VERSION STRING: unknown] */
-#ifndef _FM_MD5_HELPER_H_
-#define _FM_MD5_HELPER_H_
+#ifndef _FM_DIGEST_HELPER_H_
+#define _FM_DIGEST_HELPER_H_
-#ifndef __VXWORKS__
-#include <openssl/md5.h>
-#else
-#include <Md5.h>
-#endif
-
-#ifndef __VXWORKS__
-typedef MD5_CTX ctx_t;
-#else
-typedef Md5_Context_t ctx_t;
-#endif
+#include <stdint.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <openssl/evp.h>
+typedef EVP_MD_CTX fm_digest_t;
-void fm_md5_start(void *ctx);
-void fm_md5_update(void *ctx, const void *data, size_t len);
-void fm_md5_finish(void *ctx, uint8_t *computedMd5);
+// maximum length in bytes of a hash across all supported digests
+#define FM_DIGEST_MAX 32
+fm_digest_t * fm_digest_start(void);
+int fm_digest_update(fm_digest_t *ctx, const void *data, size_t len);
+int fm_digest_finish(fm_digest_t *ctx, uint8_t *digest);
+int fm_digest_len(fm_digest_t * ctx);
#endif
diff --git a/Esm/ib/src/config/fm_xml.c b/Esm/ib/src/config/fm_xml.c
index 9aea419..6cd1b7c 100644
--- a/Esm/ib/src/config/fm_xml.c
+++ b/Esm/ib/src/config/fm_xml.c
@@ -51,7 +51,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <fm_xml.h>
#define _GNU_SOURCE
-#include "fm_md5.h"
+#include "fm_digest.h"
#ifdef __VXWORKS__
#include "Ism_Idb.h"
@@ -379,12 +379,12 @@ uint32_t xml_compute_pool_size(uint8_t full)
static void *cksumBegin(void)
{
- ctx_t *ctx;
+ fm_digest_t *ctx = fm_digest_start();
- ctx = getXmlMemory(sizeof(ctx_t), "ctx_t cksumBegin()");
- if (!ctx) return NULL;
-
- fm_md5_start((void *)ctx);
+ if (!ctx) {
+ fprintf(stderr, "%s: checksum algorithm initialization failed\n", __func__);
+ return NULL;
+ }
return (void *)ctx;
}
@@ -393,29 +393,21 @@ static void cksumData(void *ctx, void *block, uint32_t length)
{
if (!ctx || !block || !length) return;
- // MD5 checksum
- fm_md5_update((void *)ctx, block, length);
+ fm_digest_update(ctx, block, length);
}
static uint32_t cksumEnd(void *ctx)
{
- uint8_t computedMd5[16];
- uint32_t sum = 0;
- uint32_t *word;
- uint32_t i;
+ uint8_t digest[FM_DIGEST_MAX];
+ uint32_t checksum = 0;
if (!ctx) return 0;
+ fm_digest_finish(ctx, digest);
- // MD5 checksum
- fm_md5_finish((void *)ctx, computedMd5);
+ checksum = *(uint32_t *)digest;
- word = (uint32_t*)computedMd5;
- for (i = 0; i < 4; i++) {
- sum += word[i];
- }
- freeXmlMemory(ctx, sizeof(ctx_t), "ctx_t cksumEnd()");
- return sum;
+ return checksum;
}
#define CKSUM_MAX 3
@@ -444,12 +436,6 @@ static uint32_t cksumEnd(void *ctx)
#define CKSUM_FILE(file, flags)
#endif
-#ifdef CHECKSUM_DEBUG
-#define CKSUM_BEGIN { printf("CKSUM_BEGIN %s\n",__func__); BeginCksums(); }
-#else
-#define CKSUM_BEGIN { BeginCksums(); }
-#endif
-
/*
* Generic 'DEFAULT' macro for all integer types.
*/
@@ -466,19 +452,16 @@ static uint32_t cksumEnd(void *ctx)
#define DEFAULT_STR(data, default) { if (!strlen(data)) StringCopy(data,default,sizeof(data)); }
#define DEFAULT_AND_CKSUM_STR(data, default, flags) { DEFAULT_STR(data, default); AddToCksums(#data, &data, strlen(data), flags); }
-#ifdef CHECKSUM_DEBUG
-#define CKSUM_END(overall, disruptive, consistency) { EndCksums(&overall, &disruptive, &consistency); printf("CKSUM_END %s %d, %d, %d\n",__func__,overall,disruptive,consistency); }
-#else
-#define CKSUM_END(overall, disruptive, consistency) { EndCksums(&overall, &disruptive, &consistency); }
-#endif
-
+static fm_digest_t *cksum_ctx[CKSUM_MAX];
-static ctx_t *cksum_ctx[CKSUM_MAX];
-
-static boolean BeginCksums(void)
+static boolean BeginCksums(const char * scope)
{
uint32_t i;
+#ifdef CHECKSUM_DEBUG
+ printf("CKSUM_BEGIN %s\n", scope);
+#endif
+
for (i = 0; i < CKSUM_MAX; i++) {
if (!(cksum_ctx[i] = cksumBegin())) {
while(i > 0) {
@@ -507,19 +490,23 @@ static void AddToCksums(char *txt, void *block, uint32_t length, uint32_t flags)
}
}
-static void EndCksums(uint32_t *overall_checksum, uint32_t *disruptive_checksum, uint32_t *consistency_checksum)
+static void EndCksums(const char * scope, uint32_t *overall_checksum, uint32_t *disruptive_checksum, uint32_t *consistency_checksum)
{
- uint32_t csum;
+ uint32_t csum0, csum1, csum2;
- csum = cksumEnd(cksum_ctx[0]);
+ csum0 = cksumEnd(cksum_ctx[0]);
if (overall_checksum)
- *overall_checksum = csum;
- csum = cksumEnd(cksum_ctx[1]);
+ *overall_checksum = csum0;
+ csum1 = cksumEnd(cksum_ctx[1]);
if (disruptive_checksum)
- *disruptive_checksum = csum;
- csum = cksumEnd(cksum_ctx[2]);
+ *disruptive_checksum = csum1;
+ csum2 = cksumEnd(cksum_ctx[2]);
if (consistency_checksum)
- *consistency_checksum = csum;
+ *consistency_checksum = csum2;
+
+#ifdef CHECKSUM_DEBUG
+ printf("CKSUM_END %s %d, %d, %d\n", scope, csum0, csum1, csum2);
+#endif
}
// Map handling routines
@@ -1212,14 +1199,16 @@ boolean startPmChecksum(PMXmlConfig_t *pmp)
return 0;
}
- CKSUM_BEGIN;
+ if (!BeginCksums(__func__))
+ return 0;
+
return 1;
}
void endPmChecksum(PMXmlConfig_t *pmp, uint32_t instance)
{
- CKSUM_END(pmp->overall_checksum, pmp->disruptive_checksum, pmp->consistency_checksum);
+ EndCksums(__func__, &pmp->overall_checksum, &pmp->disruptive_checksum, &pmp->consistency_checksum);
if (xml_parse_debug)
fprintf(stdout, "Pm instance %u checksum overall %u disruptive %u consistency %u\n", (unsigned int)instance,
@@ -1700,7 +1689,9 @@ boolean startSmChecksum(SMXmlConfig_t *smp)
return 0;
}
- CKSUM_BEGIN;
+ if (!BeginCksums(__func__))
+ return 0;
+
return 1;
}
@@ -1711,7 +1702,7 @@ boolean endSmChecksum(SMXmlConfig_t *smp, uint32_t instance)
if (!smp)
return 0;
- CKSUM_END(smp->overall_checksum, smp->disruptive_checksum, smp->consistency_checksum);
+ EndCksums(__func__, &smp->overall_checksum, &smp->disruptive_checksum, &smp->consistency_checksum);
if (xml_parse_debug)
fprintf(stdout, "Sm instance %u checksum overall %u disruptive %u consistency %u\n", (unsigned int)instance,
(unsigned int)smp->overall_checksum, (unsigned int)smp->disruptive_checksum, (unsigned int)smp->consistency_checksum);
@@ -3781,25 +3772,28 @@ void checksumOneVirtualFabricsConfig(VFConfig_t *vf, VF_t *vfp, uint8_t requires
}
// create a total checksum for the Virtual Fabric database
-void checksumVirtualFabricsConfig(VFXmlConfig_t *vf_config, VirtualFabrics_t *vfsip)
+static boolean checksumVirtualFabricsConfig(VFXmlConfig_t *vf_config, VirtualFabrics_t *vfsip)
{
VF_t *vfp;
uint32_t i;
if (!vfsip)
- return;
+ return FALSE;
// Checksum each individual Virtual Fabric
for (i = 0; i < vfsip->number_of_vfs_all; i++) {
vfp = &vfsip->v_fabric_all[i];
- CKSUM_BEGIN;
+ if (!BeginCksums(__func__))
+ return FALSE;
+
checksumOneVirtualFabricsConfig(vf_config->vf[i], vfp, vfsip->qos_all[vfp->qos_index].requires_resp_sl);
- CKSUM_END(vfp->overall_checksum, vfp->disruptive_checksum, vfp->consistency_checksum);
+ EndCksums(__func__, &vfp->overall_checksum, &vfp->disruptive_checksum, &vfp->consistency_checksum);
}
// Checksum all of the Virtual Fabrics together
- CKSUM_BEGIN;
+ if (!BeginCksums(__func__))
+ return FALSE;
// vfsip->securityEnabled // setup by SM
// vfsip->qosEnabled // setup by SM
@@ -3809,9 +3803,9 @@ void checksumVirtualFabricsConfig(VFXmlConfig_t *vf_config, VirtualFabrics_t *vf
checksumOneVirtualFabricsConfig(vf_config->vf[i], vfp, vfsip->qos_all[vfp->qos_index].requires_resp_sl);
}
- CKSUM_END(vfsip->overall_checksum, vfsip->disruptive_checksum, vfsip->consistency_checksum);
+ EndCksums(__func__, &vfsip->overall_checksum, &vfsip->disruptive_checksum, &vfsip->consistency_checksum);
- return;
+ return TRUE;
}
// find a pointer to a Application given the name
@@ -4968,8 +4962,10 @@ VirtualFabrics_t* reRenderVirtualFabricsConfig(uint32_t fm, VirtualFabrics_t *ol
fprintf(stdout, "Number of Virtual Fabrics %u\n", (unsigned int)vfsip->number_of_vfs_all);
// calculate Virtual Fabric database checksum
- if (vfsip)
- checksumVirtualFabricsConfig(&fm_instance->vf_config, vfsip);
+ if (vfsip) {
+ if (!checksumVirtualFabricsConfig(&fm_instance->vf_config, vfsip))
+ goto fail;
+ }
if (xml_memory_debug)
fprintf(stdout, "Memory level %u after reRenderVirtualFabricsConfig()\n", (unsigned int)memory);
diff --git a/Esm/ib/src/pm/pa/pa_access.c b/Esm/ib/src/pm/pa/pa_access.c
index 174b274..c441ead 100644
--- a/Esm/ib/src/pm/pa/pa_access.c
+++ b/Esm/ib/src/pm/pa/pa_access.c
@@ -1888,27 +1888,35 @@ error:
goto done;
}
-// Add to the list only once. Add only if localStatus is set or when neighborStatus is set and local lid is lesser than neighbor lid.
-#define CHECK_UNEXPECTED_CLEAR_STATUS() \
- ((STL_PA_SELECT_UNEXP_CLR_PORT == select) && \
- (((STL_PA_FOCUS_STATUS_UNEXPECTED_CLEAR == localStatus ) && (STL_PA_FOCUS_STATUS_UNEXPECTED_CLEAR != neighborStatus)) || \
- ((STL_PA_FOCUS_STATUS_UNEXPECTED_CLEAR == localStatus) && (STL_PA_FOCUS_STATUS_UNEXPECTED_CLEAR == neighborStatus) && \
- (lid < nbrPt->pmnodep->Image[imageIndex].lid))))
-// Add to the list only once. Add only if localStatus is set or when neighborStatus is set and local lid is lesser than neighbor lid.
-#define CHECK_PMA_NRSP_STATUS() \
- ((STL_PA_SELECT_NO_RESP_PORT == select) && \
- (((STL_PA_FOCUS_STATUS_PMA_FAILURE == localStatus) && (STL_PA_FOCUS_STATUS_PMA_FAILURE != neighborStatus)) || \
- ((STL_PA_FOCUS_STATUS_PMA_FAILURE == localStatus) && (STL_PA_FOCUS_STATUS_PMA_FAILURE == neighborStatus) && \
- (lid < nbrPt->pmnodep->Image[imageIndex].lid))))
+static __inline uint8 SelectToStatus(uint32 select) {
+ switch (select) {
+ case STL_PA_SELECT_UNEXP_CLR_PORT: return STL_PA_FOCUS_STATUS_UNEXPECTED_CLEAR;
+ case STL_PA_SELECT_NO_RESP_PORT: return STL_PA_FOCUS_STATUS_PMA_FAILURE;
+ case STL_PA_SELECT_SKIPPED_PORT: return STL_PA_FOCUS_STATUS_PMA_IGNORE;
+ default:
+ return STL_PA_FOCUS_STATUS_OK;
+ }
+ return STL_PA_FOCUS_STATUS_OK;
+}
// Add to the list only once. Add only if localStatus is set or when neighborStatus is set and local lid is lesser than neighbor lid.
-#define CHECK_SKIPPED_STATUS() \
- ((STL_PA_SELECT_SKIPPED_PORT == select) && \
- (((STL_PA_FOCUS_STATUS_PMA_IGNORE == localStatus) && (STL_PA_FOCUS_STATUS_PMA_IGNORE != neighborStatus)) || \
- ((STL_PA_FOCUS_STATUS_PMA_IGNORE == localStatus) && (STL_PA_FOCUS_STATUS_PMA_IGNORE == neighborStatus) && \
- (lid < nbrPt->pmnodep->Image[imageIndex].lid))))
+static __inline boolean isExtFocusSelect(uint32 select, uint32 imageIndex, PmPort_t *pmportp, STL_LID lid) {
+ PmPortImage_t *portImage = &pmportp->Image[imageIndex];
+ uint8 selectStatus, localStatus, neighborStatus;
+ PmPort_t *nbrPt = portImage->neighbor;
+ selectStatus = SelectToStatus(select);
+ localStatus = pa_get_port_status(pmportp, imageIndex);
+ neighborStatus = (pmportp->portNum == 0 ?
+ STL_PA_FOCUS_STATUS_OK : pa_get_port_status(nbrPt, imageIndex));
+
+ return (
+ ((selectStatus == localStatus ) && (selectStatus != neighborStatus))
+ || ((selectStatus == localStatus) && (selectStatus == neighborStatus)
+ && (lid < nbrPt->pmnodep->Image[imageIndex].lid))
+ );
+}
FSTATUS processExtFocusPort(uint32 imageIndex, PmPort_t *pmportp, uint32 select, PmFocusPorts_t *pmFocusPorts, STL_LID lid)
{
@@ -1920,7 +1928,7 @@ FSTATUS processExtFocusPort(uint32 imageIndex, PmPort_t *pmportp, uint32 select,
neighborStatus = (pmportp->portNum == 0 ?
STL_PA_FOCUS_STATUS_OK : pa_get_port_status(nbrPt, imageIndex));
- if((CHECK_UNEXPECTED_CLEAR_STATUS()) || (CHECK_SKIPPED_STATUS()) || (CHECK_PMA_NRSP_STATUS())){
+ if(isExtFocusSelect(select, imageIndex, pmportp, lid)){
pmFocusPorts->portList[pmFocusPorts->portCntr].lid = lid;
pmFocusPorts->portList[pmFocusPorts->portCntr].portNum = pmportp->portNum;
pmFocusPorts->portList[pmFocusPorts->portCntr].localStatus = localStatus;
@@ -2030,12 +2038,16 @@ FSTATUS paGetExtFocusPorts(Pm_t *pm, char *groupName, PmFocusPorts_t *pmFocusPor
// If Success, but Index is still -1, then it is All Group
if (groupIndex == -1) isGroupAll = TRUE;
- if(select == STL_PA_SELECT_UNEXP_CLR_PORT){
- allocatedItems = pmimagep->UnexpectedClearPorts;
- } else if( select == STL_PA_SELECT_NO_RESP_PORT) {
- allocatedItems = pmimagep->NoRespNodes;
- } else {
- allocatedItems = pmimagep->SkippedNodes;
+ // Get number of links
+ for_all_pmnodes(pmimagep, pmnodep, lid) {
+ for_all_pmports(pmnodep, pmportp, portnum, !requiresLock) {
+ portImage = &pmportp->Image[imageIndex];
+ if (PmIsPortInGroup(pmimagep, portImage, groupIndex, isGroupAll, NULL)) {
+ if (isExtFocusSelect(select, imageIndex, pmportp, lid)){
+ allocatedItems++;
+ }
+ }
+ }
}
if(allocatedItems == 0) {
@@ -2733,12 +2745,16 @@ FSTATUS paGetExtVFFocusPorts(Pm_t *pm, char *vfName, PmFocusPorts_t *pmVFFocusPo
goto done;
}
- if(select == STL_PA_SELECT_UNEXP_CLR_PORT){
- allocatedItems = pmimagep->UnexpectedClearPorts;
- } else if( select == STL_PA_SELECT_NO_RESP_PORT) {
- allocatedItems = pmimagep->NoRespNodes;
- } else {
- allocatedItems = pmimagep->SkippedNodes;
+ // Get number of links
+ for_all_pmnodes(pmimagep, pmnodep, lid) {
+ for_all_pmports(pmnodep, pmportp, portnum, !requiresLock) {
+ portImage = &pmportp->Image[imageIndex];
+ if (PmIsPortInVF(pmimagep, portImage, vfIdx)) {
+ if (isExtFocusSelect(select, imageIndex, pmportp, lid)){
+ allocatedItems++;
+ }
+ }
+ }
}
if(allocatedItems == 0) {
diff --git a/Esm/ib/src/pm/pm/pm_sweep.c b/Esm/ib/src/pm/pm/pm_sweep.c
index 3b7fd1e..a42cbb1 100644
--- a/Esm/ib/src/pm/pm/pm_sweep.c
+++ b/Esm/ib/src/pm/pm/pm_sweep.c
@@ -835,10 +835,7 @@ void update_pmport(Pm_t *pm, PmPort_t *pmportp, Node_t *nodep, Port_t *portp, Pm
portImage->u.s.mtu = portp->portData->maxVlMtu;
portImage->u.s.txActiveWidth = portp->portData->portInfo.LinkWidthDowngrade.TxActive;
portImage->u.s.rxActiveWidth = portp->portData->portInfo.LinkWidthDowngrade.RxActive;
- portImage->StlPortCounters.lq.s.NumLanesDown =
- (portp->portData->portInfo.LinkWidthDowngrade.RxActive < portp->portData->portInfo.LinkWidth.Active ?
- StlLinkWidthToInt(portp->portData->portInfo.LinkWidth.Active) -
- StlLinkWidthToInt(portp->portData->portInfo.LinkWidthDowngrade.RxActive) : 0);
+ portImage->StlPortCounters.lq.s.NumLanesDown = StlGetNumLanesDown(&portp->portData->portInfo);
portImage->u.s.activeSpeed = portp->portData->portInfo.LinkSpeed.Active;
if (recalc_flags & PM_TOPO_RECALC_VFS) {
bitset_copy(&pmportp->dgMember, &portp->portData->dgMember);
diff --git a/Esm/update_opa-fm_spec.sh b/Esm/update_opa-fm_spec.sh
index 75334b8..a923bac 100755
--- a/Esm/update_opa-fm_spec.sh
+++ b/Esm/update_opa-fm_spec.sh
@@ -54,9 +54,9 @@ then
GE_7_5=$(echo "$versionid >= 7.5" | bc)
if [ $GE_7_4 = 1 ]
then
- sed -i "s/__RPM_BLDRQ1/expat-devel, rdma-core-devel, openssl-devel/g" $to
+ sed -i "s/__RPM_BLDRQ1/expat-devel, rdma-core-devel, zlib-devel, openssl-devel/g" $to
else
- sed -i "s/__RPM_BLDRQ1/expat-devel, libibumad-devel, libibverbs-devel, openssl-devel/g" $to
+ sed -i "s/__RPM_BLDRQ1/expat-devel, libibumad-devel, libibverbs-devel, zlib-devel, openssl-devel/g" $to
fi
if [ $GE_7_0 = 1 ]
then
@@ -78,9 +78,9 @@ then
GE_12_3=$(echo "$versionid >= 12.3" | bc)
if [ $GE_12_3 = 1 ]
then
- sed -i "s/__RPM_BLDRQ1/libexpat-devel, rdma-core-devel, openssl-devel/g" $to
+ sed -i "s/__RPM_BLDRQ1/libexpat-devel, rdma-core-devel, zlib-devel, openssl-devel/g" $to
else
- sed -i "s/__RPM_BLDRQ1/libexpat-devel, libibumad-devel, libibverbs-devel, openssl-devel/g" $to
+ sed -i "s/__RPM_BLDRQ1/libexpat-devel, libibumad-devel, libibverbs-devel, zlib-devel, openssl-devel/g" $to
fi
if [ $GE_12_1 = 1 ]
then
@@ -101,7 +101,7 @@ then
sed -i "s/__RPM_RQ2/Requires: libibumad3, libibverbs1, rdma, libexpat1, openssl/g" $to
elif [ "$id" = "fedora" ]
then
- sed -i "s/__RPM_BLDRQ1/expat-devel, rdma-core-devel, openssl-devel/g" $to
+ sed -i "s/__RPM_BLDRQ1/expat-devel, rdma-core-devel, zlib-devel, openssl-devel/g" $to
sed -i "s/__RPM_BLDRQ2/BuildRequires: systemd %{?systemd_requires} %{?BuildRequires}/g" $to
sed -i "s/__RPM_RQ1/Requires: systemd %{?systemd_requires}/g" $to
sed -i "/__RPM_SYSCONF/,+1d" $to
diff --git a/Esm/update_opa-fm_spec.sh.base b/Esm/update_opa-fm_spec.sh.base
index 75334b8..a923bac 100755
--- a/Esm/update_opa-fm_spec.sh.base
+++ b/Esm/update_opa-fm_spec.sh.base
@@ -54,9 +54,9 @@ then
GE_7_5=$(echo "$versionid >= 7.5" | bc)
if [ $GE_7_4 = 1 ]
then
- sed -i "s/__RPM_BLDRQ1/expat-devel, rdma-core-devel, openssl-devel/g" $to
+ sed -i "s/__RPM_BLDRQ1/expat-devel, rdma-core-devel, zlib-devel, openssl-devel/g" $to
else
- sed -i "s/__RPM_BLDRQ1/expat-devel, libibumad-devel, libibverbs-devel, openssl-devel/g" $to
+ sed -i "s/__RPM_BLDRQ1/expat-devel, libibumad-devel, libibverbs-devel, zlib-devel, openssl-devel/g" $to
fi
if [ $GE_7_0 = 1 ]
then
@@ -78,9 +78,9 @@ then
GE_12_3=$(echo "$versionid >= 12.3" | bc)
if [ $GE_12_3 = 1 ]
then
- sed -i "s/__RPM_BLDRQ1/libexpat-devel, rdma-core-devel, openssl-devel/g" $to
+ sed -i "s/__RPM_BLDRQ1/libexpat-devel, rdma-core-devel, zlib-devel, openssl-devel/g" $to
else
- sed -i "s/__RPM_BLDRQ1/libexpat-devel, libibumad-devel, libibverbs-devel, openssl-devel/g" $to
+ sed -i "s/__RPM_BLDRQ1/libexpat-devel, libibumad-devel, libibverbs-devel, zlib-devel, openssl-devel/g" $to
fi
if [ $GE_12_1 = 1 ]
then
@@ -101,7 +101,7 @@ then
sed -i "s/__RPM_RQ2/Requires: libibumad3, libibverbs1, rdma, libexpat1, openssl/g" $to
elif [ "$id" = "fedora" ]
then
- sed -i "s/__RPM_BLDRQ1/expat-devel, rdma-core-devel, openssl-devel/g" $to
+ sed -i "s/__RPM_BLDRQ1/expat-devel, rdma-core-devel, zlib-devel, openssl-devel/g" $to
sed -i "s/__RPM_BLDRQ2/BuildRequires: systemd %{?systemd_requires} %{?BuildRequires}/g" $to
sed -i "s/__RPM_RQ1/Requires: systemd %{?systemd_requires}/g" $to
sed -i "/__RPM_SYSCONF/,+1d" $to
diff --git a/IbAccess/Common/Inc/stl_helper.h b/IbAccess/Common/Inc/stl_helper.h
index 5831057..04309e9 100644
--- a/IbAccess/Common/Inc/stl_helper.h
+++ b/IbAccess/Common/Inc/stl_helper.h
@@ -1720,8 +1720,9 @@ FormatStlCounterSelectMask(char buf[128], CounterSelectMask_t mask) {
/**
* Compute difference of two sets of Port Counters
*
- * @param data1 - pointer to later set of STL_PORT_COUNTERS_DATA counters
- * @param data2 - pointer to earlier set of STL_PORT_COUNTERS_DATA counters
+ * @param data1 - pointer to later (end) set of STL_PORT_COUNTERS_DATA counters
+ * @param data2 - pointer to earlier (begin) set of STL_PORT_COUNTERS_DATA
+ * counters
* @param result - pointer to where result of data1 - data2 will be stored
*
* Note: data1 should be >= data2. If this is not the case, result will be
@@ -1829,6 +1830,14 @@ static __inline CounterSelectMask_t DiffPAVFCounters(STL_PA_VF_PORT_COUNTERS_DAT
PgftTable[i/NUM_PGFT_ELEMENTS_BLOCK].PgftBlock[i%NUM_PGFT_ELEMENTS_BLOCK]
+static __inline uint8
+StlGetNumLanesDown(STL_PORT_INFO *portInfo) {
+ return (portInfo->LinkWidthDowngrade.RxActive < portInfo->LinkWidth.Active ?
+ StlLinkWidthToInt(portInfo->LinkWidth.Active) -
+ StlLinkWidthToInt(portInfo->LinkWidthDowngrade.RxActive) : 0);
+}
+
+
#ifdef __cplusplus
};
#endif
diff --git a/IbAccess/Common/Inc/stl_pa_types.h b/IbAccess/Common/Inc/stl_pa_types.h
index 096a0f9..b003246 100644
--- a/IbAccess/Common/Inc/stl_pa_types.h
+++ b/IbAccess/Common/Inc/stl_pa_types.h
@@ -112,7 +112,13 @@ StlPaClassPortInfoCapMask2(char buf[80], uint32 cmask)
}
}
-// Check to see if the VF Focus select is an UTIL BW category
+// Check to see if the Focus Select has no Value
+#define IS_FOCUS_SELECT_NO_VAL(SELECT) \
+ ((SELECT == STL_PA_SELECT_UNEXP_CLR_PORT) || \
+ (SELECT == STL_PA_SELECT_NO_RESP_PORT) || \
+ (SELECT == STL_PA_SELECT_SKIPPED_PORT))
+
+// Check to see if the Focus select is an UTIL BW category
#define IS_FOCUS_SELECT_UTIL(SELECT) \
((SELECT == STL_PA_SELECT_UTIL_HIGH) || \
(SELECT == STL_PA_SELECT_UTIL_LOW) || \
diff --git a/IbAccess/Common/Inc/stl_pm.h b/IbAccess/Common/Inc/stl_pm.h
index d7f49e9..57627a9 100644
--- a/IbAccess/Common/Inc/stl_pm.h
+++ b/IbAccess/Common/Inc/stl_pm.h
@@ -35,6 +35,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "iba/ib_generalServices.h"
#include "iba/stl_types.h"
#include "iba/stl_pa_types.h"
+#include "iba/stl_helper.h"
#if defined (__cplusplus)
extern "C" {
@@ -754,43 +755,46 @@ BSWAP_STL_ERROR_INFO_RSP(STL_ERROR_INFO_RSP *Dest)
/**
- * Copy data in a STL_PORT_COUNTERS_DATA variable into a STL_PortStatusData_t variable
+ * Copy data in a STL_PORT_STATUS_RSP variable into a STL_PORT_COUNTERS_DATA variable
*
- * @param portCounters - pointer to STL_PORT_COUNTERS_DATA variable from which to copy
- * @param portStatusData - pointer to STL_PortStatusData_t variable to copy to
+ * @param SrcPortStatus - pointer to STL_PORT_STATUS_RSP variable from which to copy
+ * @param DestPortCounters - pointer to STL_PORT_COUNTERS_DATA variable to copy to
+ * @param portInfo - optional pointer to STL_PORT_INFO varaible to gather numLanesDown from
*
*/
-static __inline void StlPortCountersToPortStatus(STL_PORT_COUNTERS_DATA *portCounters, STL_PORT_STATUS_RSP *portStatusData)
+static __inline void StlPortStatusToPortCounters(STL_PORT_STATUS_RSP *SrcPortStatus, STL_PORT_COUNTERS_DATA *DestPortCounters, STL_PORT_INFO *portInfo)
{
- portStatusData->LinkErrorRecovery = portCounters->linkErrorRecovery;
- portStatusData->LinkDowned = portCounters->linkDowned;
- portStatusData->PortRcvErrors = portCounters->portRcvErrors;
- portStatusData->PortRcvRemotePhysicalErrors = portCounters->portRcvRemotePhysicalErrors;
- portStatusData->PortRcvSwitchRelayErrors = portCounters->portRcvSwitchRelayErrors;
- portStatusData->PortXmitDiscards = portCounters->portXmitDiscards;
- portStatusData->PortXmitConstraintErrors = portCounters->portXmitConstraintErrors;
- portStatusData->PortRcvConstraintErrors = portCounters->portRcvConstraintErrors;
- portStatusData->LocalLinkIntegrityErrors = portCounters->localLinkIntegrityErrors;
- portStatusData->ExcessiveBufferOverruns = portCounters->excessiveBufferOverruns;
- portStatusData->PortXmitData = portCounters->portXmitData;
- portStatusData->PortRcvData = portCounters->portRcvData;
- portStatusData->PortXmitPkts = portCounters->portXmitPkts;
- portStatusData->PortRcvPkts = portCounters->portRcvPkts;
- portStatusData->PortMulticastXmitPkts = portCounters->portMulticastXmitPkts;
- portStatusData->PortMulticastRcvPkts = portCounters->portMulticastRcvPkts;
- portStatusData->PortXmitWait = portCounters->portXmitWait;
- portStatusData->SwPortCongestion = portCounters->swPortCongestion;
- portStatusData->PortRcvFECN = portCounters->portRcvFECN;
- portStatusData->PortRcvBECN = portCounters->portRcvBECN;
- portStatusData->PortXmitTimeCong = portCounters->portXmitTimeCong;
- portStatusData->PortXmitWastedBW = portCounters->portXmitWastedBW;
- portStatusData->PortXmitWaitData = portCounters->portXmitWaitData;
- portStatusData->PortRcvBubble = portCounters->portRcvBubble;
- portStatusData->PortMarkFECN = portCounters->portMarkFECN;
- portStatusData->FMConfigErrors = portCounters->fmConfigErrors;
- portStatusData->UncorrectableErrors = portCounters->uncorrectableErrors;
- portStatusData->lq.AsReg8 = portCounters->lq.AsReg8;
-
+ DestPortCounters->linkErrorRecovery = SrcPortStatus->LinkErrorRecovery;
+ DestPortCounters->linkDowned = SrcPortStatus->LinkDowned;
+ DestPortCounters->portRcvErrors = SrcPortStatus->PortRcvErrors;
+ DestPortCounters->portRcvRemotePhysicalErrors = SrcPortStatus->PortRcvRemotePhysicalErrors;
+ DestPortCounters->portRcvSwitchRelayErrors = SrcPortStatus->PortRcvSwitchRelayErrors;
+ DestPortCounters->portXmitDiscards = SrcPortStatus->PortXmitDiscards;
+ DestPortCounters->portXmitConstraintErrors = SrcPortStatus->PortXmitConstraintErrors;
+ DestPortCounters->portRcvConstraintErrors = SrcPortStatus->PortRcvConstraintErrors;
+ DestPortCounters->localLinkIntegrityErrors = SrcPortStatus->LocalLinkIntegrityErrors;
+ DestPortCounters->excessiveBufferOverruns = SrcPortStatus->ExcessiveBufferOverruns;
+ DestPortCounters->portXmitData = SrcPortStatus->PortXmitData;
+ DestPortCounters->portRcvData = SrcPortStatus->PortRcvData;
+ DestPortCounters->portXmitPkts = SrcPortStatus->PortXmitPkts;
+ DestPortCounters->portRcvPkts = SrcPortStatus->PortRcvPkts;
+ DestPortCounters->portMulticastXmitPkts = SrcPortStatus->PortMulticastXmitPkts;
+ DestPortCounters->portMulticastRcvPkts = SrcPortStatus->PortMulticastRcvPkts;
+ DestPortCounters->portXmitWait = SrcPortStatus->PortXmitWait;
+ DestPortCounters->swPortCongestion = SrcPortStatus->SwPortCongestion;
+ DestPortCounters->portRcvFECN = SrcPortStatus->PortRcvFECN;
+ DestPortCounters->portRcvBECN = SrcPortStatus->PortRcvBECN;
+ DestPortCounters->portXmitTimeCong = SrcPortStatus->PortXmitTimeCong;
+ DestPortCounters->portXmitWastedBW = SrcPortStatus->PortXmitWastedBW;
+ DestPortCounters->portXmitWaitData = SrcPortStatus->PortXmitWaitData;
+ DestPortCounters->portRcvBubble = SrcPortStatus->PortRcvBubble;
+ DestPortCounters->portMarkFECN = SrcPortStatus->PortMarkFECN;
+ DestPortCounters->fmConfigErrors = SrcPortStatus->FMConfigErrors;
+ DestPortCounters->uncorrectableErrors = SrcPortStatus->UncorrectableErrors;
+ DestPortCounters->lq.s.linkQualityIndicator = SrcPortStatus->lq.s.LinkQualityIndicator;
+ if (portInfo) {
+ DestPortCounters->lq.s.numLanesDown = StlGetNumLanesDown(portInfo);
+ }
}
#include "iba/public/ipackoff.h"
diff --git a/IbPrint/stl_pa.c b/IbPrint/stl_pa.c
index bbce4ec..e2bc5e5 100644
--- a/IbPrint/stl_pa.c
+++ b/IbPrint/stl_pa.c
@@ -448,6 +448,7 @@ void PrintStlPMConfig(PrintDest_t *dest, int indent, const STL_PA_PM_CFG_DATA *p
return;
}
+
void PrintStlPAFocusPorts(PrintDest_t *dest, int indent, const char *groupName, const int numRecords, const uint32 select, const uint32 start, const uint32 range,
const STL_FOCUS_PORTS_RSP *pFocusPorts)
{
@@ -463,14 +464,14 @@ void PrintStlPAFocusPorts(PrintDest_t *dest, int indent, const char *groupName,
indent, "", i+start, pFocusPorts[i].nodeLid, pFocusPorts[i].portNumber,
StlStaticRateToText(pFocusPorts[i].rate), IbMTUToText(pFocusPorts[i].maxVlMtu),
pFocusPorts[i].neighborLid, pFocusPorts[i].neighborPortNumber);
- if ( ( (select >= STL_PA_SELECT_CATEGORY_INTEG) &&
- (select <= STL_PA_SELECT_CATEGORY_ROUT) ) ||
- (select == STL_PA_SELECT_UTIL_PKTS_HIGH) ) {
- PrintFunc(dest, "%*s Value: %16"PRIu64" nbrValue: %16"PRIu64"\n",
- indent, "", pFocusPorts[i].value, pFocusPorts[i].neighborValue);
+ if (IS_FOCUS_SELECT_UTIL(select)) {
+ PrintFunc(dest, "%*s Value: %16.1f nbrValue: %16.1f\n",
+ indent, "", (float)pFocusPorts[i].value/10.0, (float)pFocusPorts[i].neighborValue/10.0);
+ } else if (IS_FOCUS_SELECT_NO_VAL(select)) {
+ // Skip print of Values
} else {
- PrintFunc(dest, "%*s Value: %16.1f nbrValue: %16.1f\n",
- indent, "", (float)pFocusPorts[i].value/10.0, (float)pFocusPorts[i].neighborValue/10.0);
+ PrintFunc(dest, "%*s Value: %16"PRIu64" nbrValue: %16"PRIu64"\n",
+ indent, "", pFocusPorts[i].value, pFocusPorts[i].neighborValue);
}
PrintFunc(dest, "%*s GUID: 0x%016"PRIx64" nbrGuid: 0x%016"PRIx64"\n",
indent, "", pFocusPorts[i].nodeGUID, pFocusPorts[i].neighborGuid);
@@ -518,14 +519,12 @@ void PrintStlPAFocusPortsMultiSelect(PrintDest_t *dest, int indent, const char *
pFocusPorts[i].neighborPortNumber);
for (j = 0; j < MAX_NUM_FOCUS_PORT_TUPLES; j++) {
if (tuple[j].comparator != FOCUS_PORTS_COMPARATOR_INVALID) {
- if ( ( (tuple[j].select >= STL_PA_SELECT_CATEGORY_INTEG) &&
- tuple[j].select <= STL_PA_SELECT_CATEGORY_ROUT) ||
- (tuple[j].select == STL_PA_SELECT_UTIL_PKTS_HIGH) ) {
- PrintFunc(dest, "%*s %-22s Value: %16"PRIu64" nbrValue: %16"PRIu64"\n",
- indent, "", StlFocusAttributeToText(tuple[j].select), pFocusPorts[i].value[j], pFocusPorts[i].neighborValue[j]);
- } else {
+ if (IS_FOCUS_SELECT_UTIL(tuple[j].select)) {
PrintFunc(dest, "%*s %-22s Value: %16.1f" " nbrValue: %16.1f\n",
indent, "", StlFocusAttributeToText(tuple[j].select), (float)pFocusPorts[i].value[j]/10.0, (float)pFocusPorts[i].neighborValue[j]/10.0);
+ } else {
+ PrintFunc(dest, "%*s %-22s Value: %16"PRIu64" nbrValue: %16"PRIu64"\n",
+ indent, "", StlFocusAttributeToText(tuple[j].select), pFocusPorts[i].value[j], pFocusPorts[i].neighborValue[j]);
}
}
}
@@ -769,13 +768,15 @@ void PrintStlPAVFFocusPorts(PrintDest_t *dest, int indent, const char *vfName, c
pVFFocusPorts[i].neighborLid, pVFFocusPorts[i].neighborPortNumber);
if (IS_FOCUS_SELECT_UTIL(select)) {
- PrintFunc(dest, "%*s Value: %16.1f nbrValue: %16.1f\n",
- indent, "", (float)pVFFocusPorts[i].value / 10.0, (float)pVFFocusPorts[i].neighborValue / 10.0);
+ PrintFunc(dest, "%*s Value: %16.1f nbrValue: %16.1f\n",
+ indent, "", (float)pVFFocusPorts[i].value/10.0, (float)pVFFocusPorts[i].neighborValue/10.0);
+ } else if (IS_FOCUS_SELECT_NO_VAL(select)) {
+ // Skip print of Values
} else {
- PrintFunc(dest, "%*s Value: %16"PRIu64" nbrValue: %16"PRIu64"\n",
- indent, "", pVFFocusPorts[i].value, pVFFocusPorts[i].neighborValue);
+ PrintFunc(dest, "%*s Value: %16"PRIu64" nbrValue: %16"PRIu64"\n",
+ indent, "", pVFFocusPorts[i].value, pVFFocusPorts[i].neighborValue);
}
- PrintFunc(dest, "%*s GUID: 0x%016"PRIx64" nbrGuid: 0x%016"PRIx64"\n",
+ PrintFunc(dest, "%*s GUID: 0x%016"PRIx64" nbrGuid: 0x%016"PRIx64"\n",
indent, "", pVFFocusPorts[i].nodeGUID, pVFFocusPorts[i].neighborGuid);
PrintFunc(dest, "%*s Status: %s Name: %.*s\n",
indent, "",
diff --git a/IbaTools/FastFabric/opafastfabric.pl b/IbaTools/FastFabric/opafastfabric.pl
index ba5c8cc..dc96b76 100755
--- a/IbaTools/FastFabric/opafastfabric.pl
+++ b/IbaTools/FastFabric/opafastfabric.pl
@@ -653,7 +653,7 @@ DO_MENU:
if ($screens > 1 ) {
printf ("N) Next Screen\n");
}
- printf ( "X) Return to Previous Menu (or ESC)\n");
+ printf ( "X) Return to Previous Menu (or ESC or Q)\n");
$inp = getch();
if ($inp =~ /[qQ]/ || $inp =~ /[xX]/ || ord($inp) == $KEY_ESC) {
@@ -1485,7 +1485,7 @@ DO_SETUP:
}
printf ("\nP) Perform the Selected Actions N) Select None\n");
- printf ( "X) Return to Previous Menu (or ESC)\n");
+ printf ( "X) Return to Previous Menu (or ESC or Q)\n");
%statusMessage = ();
@@ -2036,7 +2036,7 @@ DO_SETUP:
}
printf ("\nP) Perform the Selected Actions N) Select None\n");
- printf ( "X) Return to Previous Menu (or ESC)\n");
+ printf ( "X) Return to Previous Menu (or ESC or Q)\n");
%statusMessage = ();
@@ -2113,7 +2113,7 @@ DO_SETUP:
}
printf ("\nP) Perform the Selected Actions N) Select None\n");
- printf ( "X) Return to Previous Menu (or ESC)\n");
+ printf ( "X) Return to Previous Menu (or ESC or Q)\n");
%statusMessage = ();
@@ -2879,7 +2879,7 @@ DO_SETUP:
}
printf ("\nP) Perform the Selected Actions N) Select None\n");
- printf ( "X) Return to Previous Menu (or ESC)\n");
+ printf ( "X) Return to Previous Menu (or ESC or Q)\n");
%statusMessage = ();
@@ -3233,7 +3233,7 @@ DO_SETUP:
}
printf ("\nP) Perform the Selected Actions N) Select None\n");
- printf ( "X) Return to Previous Menu (or ESC)\n");
+ printf ( "X) Return to Previous Menu (or ESC or Q)\n");
%statusMessage = ();
@@ -3295,7 +3295,7 @@ START:
printf (" 3) Host Setup\n");
printf (" 4) Host Verification/Admin\n");
printf (" 5) Fabric Monitoring\n");
- printf ("\n X) Exit\n");
+ printf ("\n X) Exit (or Q)\n");
$inp = getch();
diff --git a/IbaTools/FastFabric/opasetupssh.sh b/IbaTools/FastFabric/opasetupssh.sh
index e0cd965..35c93a4 100755
--- a/IbaTools/FastFabric/opasetupssh.sh
+++ b/IbaTools/FastFabric/opasetupssh.sh
@@ -587,14 +587,14 @@ process_chassis()
continue
fi
rm -f $tempfile $tempfile.2 2>/dev/null
- /usr/lib/opa/tools/tcl_proc chassis_sftp_cmd "sftp $user@\[${tchassis}\]" "get /firmware/$user/authorized_keys $tempfile" 2>&1| grep -q 'FAILED'
+ /usr/lib/opa/tools/tcl_proc chassis_sftp_cmd "sftp $user@\[${tchassis}\]:" "get /firmware/$user/authorized_keys $tempfile" 2>&1| grep -q 'FAILED'
if [ $? -eq 0 ] || [ ! -f $tempfile ]
then
echo "Unable to configure $tchassis for password-less ssh, skipping..."
continue
fi
cat ~/.ssh/id_rsa.pub $tempfile | sort -u > $tempfile.2
- /usr/lib/opa/tools/tcl_proc chassis_sftp_cmd "sftp $user@\[${tchassis}\]" "put $tempfile.2 /firmware/$user/authorized_keys" 2>&1| grep -q 'FAILED'
+ /usr/lib/opa/tools/tcl_proc chassis_sftp_cmd "sftp $user@\[${tchassis}\]:" "put $tempfile.2 /firmware/$user/authorized_keys" 2>&1| grep -q 'FAILED'
if [ $? -eq 0 ]
then
echo "$tchassis password-less ssh config failed, skipping..."
diff --git a/LICENSE b/LICENSE
index 7ef87da..d8eb6e5 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,7 @@
Copyright (c) 2015, Intel Corporation
All rights reserved.
+BSD 3-clause License:
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
- Redistributions of source code must retain the above copyright notice,
diff --git a/MakeTools/Makefile b/MakeTools/Makefile
index 2ba8f32..9682763 100644
--- a/MakeTools/Makefile
+++ b/MakeTools/Makefile
@@ -87,6 +87,10 @@ convert_releasetag: convert_releasetag.pl
cp $< $@
chmod 755 $@
+format_releasetag: format_releasetag.sh
+ cp $< $@
+ chmod 755 $@
+
include $(TL_DIR)/Makerules/Maketargets.stage
include $(TL_DIR)/Makerules/Maketargets.install
diff --git a/Topology/fabricdata.c b/Topology/fabricdata.c
index 4d513b8..b5e59b6 100644
--- a/Topology/fabricdata.c
+++ b/Topology/fabricdata.c
@@ -807,8 +807,8 @@ void PortDataFree(FabricData_t *fabricp, PortData *portp)
if (portp->PortGUID)
AllLidsRemove(fabricp, portp);
cl_qmap_remove_item(&nodep->Ports, &portp->NodePortsEntry);
- if (portp->pPortStatus)
- MemoryDeallocate(portp->pPortStatus);
+ if (portp->pPortCounters)
+ MemoryDeallocate(portp->pPortCounters);
PortDataFreeQOSData(fabricp, portp);
PortDataFreeBufCtrlTable(fabricp, portp);
PortDataFreePartitionTable(fabricp, portp);
diff --git a/Topology/mad.c b/Topology/mad.c
index d02a31c..26cca67 100644
--- a/Topology/mad.c
+++ b/Topology/mad.c
@@ -1772,7 +1772,7 @@ fail:
* portp is the port to issue PMA request to (can be port 0 of switch), it need
*/
FSTATUS STLPmGetPortStatus(struct omgt_port *port, PortData *portp, uint8 portNum,
- STL_PortStatusData_t *pPortStatus)
+ STL_PORT_STATUS_RSP *pPortStatus)
{
STL_PERF_MAD req;
STL_PERF_MAD resp;
@@ -1795,8 +1795,8 @@ FSTATUS STLPmGetPortStatus(struct omgt_port *port, PortData *portp, uint8 portNu
0x01000000, &req, &resp);
if (FSUCCESS != fstatus)
goto fail;
- BSWAP_STL_PORT_STATUS_RSP((STL_PORT_STATUS_RSP*)resp.PerfData);
- *pPortStatus = *(STL_PortStatusData_t*)resp.PerfData;
+ BSWAP_STL_PORT_STATUS_RSP((STL_PORT_STATUS_RSP *)resp.PerfData);
+ *pPortStatus = *(STL_PORT_STATUS_RSP *)resp.PerfData;
DBGPRINT("SendPkts=0x%16"PRIx64"\n", pPortStatus->PortXmitPkts);
fail:
return fstatus;
diff --git a/Topology/search.c b/Topology/search.c
index f6fc5fc..0fbe7f2 100644
--- a/Topology/search.c
+++ b/Topology/search.c
@@ -2122,17 +2122,17 @@ FSTATUS FindLinkQualityPoint(FabricData_t *fabricp, uint16 quality, LinkQualityC
PortData *portp = (PortData *)QListObj(p);
boolean match = FALSE;
- if (!portp->pPortStatus)
+ if (!portp->pPortCounters)
continue;
switch (comp) {
case QUAL_EQ:
- match = (uint16)(portp->pPortStatus->lq.s.LinkQualityIndicator) == quality;
+ match = (uint16)(portp->pPortCounters->lq.s.linkQualityIndicator) == quality;
break;
case QUAL_GE:
- match = (uint16)(portp->pPortStatus->lq.s.LinkQualityIndicator) >= quality;
+ match = (uint16)(portp->pPortCounters->lq.s.linkQualityIndicator) >= quality;
break;
case QUAL_LE:
- match = (uint16)(portp->pPortStatus->lq.s.LinkQualityIndicator) <= quality;
+ match = (uint16)(portp->pPortCounters->lq.s.linkQualityIndicator) <= quality;
break;
default:
break;
diff --git a/Topology/snapshot.c b/Topology/snapshot.c
index b2c9275..b2b3aee 100644
--- a/Topology/snapshot.c
+++ b/Topology/snapshot.c
@@ -41,7 +41,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
/* bitfields needs special handling: LinkQualityIndicator */
static void PortStatusDataXmlOutputLinkQualityIndicator(IXmlOutputState_t *state, const char *tag, void *data)
{
- IXmlOutputUint(state, tag, ((STL_PortStatusData_t *)data)->lq.s.LinkQualityIndicator);
+ IXmlOutputUint(state, tag, ((STL_PORT_COUNTERS_DATA *)data)->lq.s.linkQualityIndicator);
}
static void PortStatusDataXmlParserEndLinkQualityIndicator(IXmlParserState_t *state, const IXML_FIELD *field, void *object, void *parent, XML_Char *content, unsigned len, boolean valid)
@@ -49,70 +49,72 @@ static void PortStatusDataXmlParserEndLinkQualityIndicator(IXmlParserState_t *st
uint8 value;
if (IXmlParseUint8(state, content, len, &value))
- ((STL_PortStatusData_t *)object)->lq.s.LinkQualityIndicator = value;
+ ((STL_PORT_COUNTERS_DATA *)object)->lq.s.linkQualityIndicator = value;
}
IXML_FIELD PortStatusDataFields[] = {
- { tag:"XmitData", format:'U', IXML_FIELD_INFO(STL_PortStatusData_t, PortXmitData) },
- { tag:"RcvData", format:'U', IXML_FIELD_INFO(STL_PortStatusData_t, PortRcvData) },
- { tag:"XmitPkts", format:'U', IXML_FIELD_INFO(STL_PortStatusData_t, PortXmitPkts) },
- { tag:"RcvPkts", format:'U', IXML_FIELD_INFO(STL_PortStatusData_t, PortRcvPkts) },
- { tag:"MulticastXmitPkts", format:'U', IXML_FIELD_INFO(STL_PortStatusData_t, PortMulticastXmitPkts) },
- { tag:"MulticastRcvPkts", format:'U', IXML_FIELD_INFO(STL_PortStatusData_t, PortMulticastRcvPkts) },
- { tag:"XmitWait", format:'U', IXML_FIELD_INFO(STL_PortStatusData_t, PortXmitWait) },
- { tag:"CongDiscards", format:'U', IXML_FIELD_INFO(STL_PortStatusData_t, SwPortCongestion) },
- { tag:"RcvFECN", format:'U', IXML_FIELD_INFO(STL_PortStatusData_t, PortRcvFECN) },
- { tag:"RcvBECN", format:'U', IXML_FIELD_INFO(STL_PortStatusData_t, PortRcvBECN) },
- { tag:"XmitTimeCong", format:'U', IXML_FIELD_INFO(STL_PortStatusData_t, PortXmitTimeCong) },
- { tag:"XmitWastedBW", format:'U', IXML_FIELD_INFO(STL_PortStatusData_t, PortXmitWastedBW) },
- { tag:"XmitWaitData", format:'U', IXML_FIELD_INFO(STL_PortStatusData_t, PortXmitWaitData) },
- { tag:"RcvBubble", format:'U', IXML_FIELD_INFO(STL_PortStatusData_t, PortRcvBubble) },
- { tag:"MarkFECN", format:'U', IXML_FIELD_INFO(STL_PortStatusData_t, PortMarkFECN) },
- { tag:"RcvConstraintErrors", format:'U', IXML_FIELD_INFO(STL_PortStatusData_t, PortRcvConstraintErrors) },
- { tag:"RcvSwitchRelayErrors", format:'U', IXML_FIELD_INFO(STL_PortStatusData_t, PortRcvSwitchRelayErrors) },
- { tag:"XmitDiscards", format:'U', IXML_FIELD_INFO(STL_PortStatusData_t, PortXmitDiscards) },
- { tag:"XmitConstraintErrors", format:'U', IXML_FIELD_INFO(STL_PortStatusData_t, PortXmitConstraintErrors) },
- { tag:"RcvRemotePhysicalErrors", format:'U', IXML_FIELD_INFO(STL_PortStatusData_t, PortRcvRemotePhysicalErrors) },
- { tag:"LocalLinkIntegrityErrors", format:'U', IXML_FIELD_INFO(STL_PortStatusData_t, LocalLinkIntegrityErrors) },
- { tag:"RcvErrors", format:'U', IXML_FIELD_INFO(STL_PortStatusData_t, PortRcvErrors) },
- { tag:"ExcessiveBufferOverruns", format:'U', IXML_FIELD_INFO(STL_PortStatusData_t, ExcessiveBufferOverruns) },
- { tag:"FMConfigErrors", format:'U', IXML_FIELD_INFO(STL_PortStatusData_t, FMConfigErrors) },
- { tag:"LinkErrorRecovery", format:'U', IXML_FIELD_INFO(STL_PortStatusData_t, LinkErrorRecovery) },
- { tag:"LinkDowned", format:'U', IXML_FIELD_INFO(STL_PortStatusData_t, LinkDowned) },
- { tag:"UncorrectableErrors", format:'U', IXML_FIELD_INFO(STL_PortStatusData_t, UncorrectableErrors) },
+ { tag:"XmitData", format:'U', IXML_FIELD_INFO(STL_PORT_COUNTERS_DATA, portXmitData) },
+ { tag:"RcvData", format:'U', IXML_FIELD_INFO(STL_PORT_COUNTERS_DATA, portRcvData) },
+ { tag:"XmitPkts", format:'U', IXML_FIELD_INFO(STL_PORT_COUNTERS_DATA, portXmitPkts) },
+ { tag:"RcvPkts", format:'U', IXML_FIELD_INFO(STL_PORT_COUNTERS_DATA, portRcvPkts) },
+ { tag:"MulticastXmitPkts", format:'U', IXML_FIELD_INFO(STL_PORT_COUNTERS_DATA, portMulticastXmitPkts) },
+ { tag:"MulticastRcvPkts", format:'U', IXML_FIELD_INFO(STL_PORT_COUNTERS_DATA, portMulticastRcvPkts) },
+ { tag:"XmitWait", format:'U', IXML_FIELD_INFO(STL_PORT_COUNTERS_DATA, portXmitWait) },
+ { tag:"CongDiscards", format:'U', IXML_FIELD_INFO(STL_PORT_COUNTERS_DATA, swPortCongestion) },
+ { tag:"RcvFECN", format:'U', IXML_FIELD_INFO(STL_PORT_COUNTERS_DATA, portRcvFECN) },
+ { tag:"RcvBECN", format:'U', IXML_FIELD_INFO(STL_PORT_COUNTERS_DATA, portRcvBECN) },
+ { tag:"XmitTimeCong", format:'U', IXML_FIELD_INFO(STL_PORT_COUNTERS_DATA, portXmitTimeCong) },
+ { tag:"XmitWastedBW", format:'U', IXML_FIELD_INFO(STL_PORT_COUNTERS_DATA, portXmitWastedBW) },
+ { tag:"XmitWaitData", format:'U', IXML_FIELD_INFO(STL_PORT_COUNTERS_DATA, portXmitWaitData) },
+ { tag:"RcvBubble", format:'U', IXML_FIELD_INFO(STL_PORT_COUNTERS_DATA, portRcvBubble) },
+ { tag:"MarkFECN", format:'U', IXML_FIELD_INFO(STL_PORT_COUNTERS_DATA, portMarkFECN) },
+ { tag:"RcvConstraintErrors", format:'U', IXML_FIELD_INFO(STL_PORT_COUNTERS_DATA, portRcvConstraintErrors) },
+ { tag:"RcvSwitchRelayErrors", format:'U', IXML_FIELD_INFO(STL_PORT_COUNTERS_DATA, portRcvSwitchRelayErrors) },
+ { tag:"XmitDiscards", format:'U', IXML_FIELD_INFO(STL_PORT_COUNTERS_DATA, portXmitDiscards) },
+ { tag:"XmitConstraintErrors", format:'U', IXML_FIELD_INFO(STL_PORT_COUNTERS_DATA, portXmitConstraintErrors) },
+ { tag:"RcvRemotePhysicalErrors", format:'U', IXML_FIELD_INFO(STL_PORT_COUNTERS_DATA, portRcvRemotePhysicalErrors) },
+ { tag:"LocalLinkIntegrityErrors", format:'U', IXML_FIELD_INFO(STL_PORT_COUNTERS_DATA, localLinkIntegrityErrors) },
+ { tag:"RcvErrors", format:'U', IXML_FIELD_INFO(STL_PORT_COUNTERS_DATA, portRcvErrors) },
+ { tag:"ExcessiveBufferOverruns", format:'U', IXML_FIELD_INFO(STL_PORT_COUNTERS_DATA, excessiveBufferOverruns) },
+ { tag:"FMConfigErrors", format:'U', IXML_FIELD_INFO(STL_PORT_COUNTERS_DATA, fmConfigErrors) },
+ { tag:"LinkErrorRecovery", format:'U', IXML_FIELD_INFO(STL_PORT_COUNTERS_DATA, linkErrorRecovery) },
+ { tag:"LinkDowned", format:'U', IXML_FIELD_INFO(STL_PORT_COUNTERS_DATA, linkDowned) },
+ { tag:"UncorrectableErrors", format:'U', IXML_FIELD_INFO(STL_PORT_COUNTERS_DATA, uncorrectableErrors) },
{ tag:"LinkQualityIndicator", format:'K', format_func:PortStatusDataXmlOutputLinkQualityIndicator, end_func:PortStatusDataXmlParserEndLinkQualityIndicator }, // bitfield
{ NULL }
};
void PortStatusDataXmlOutput(IXmlOutputState_t *state, const char *tag, void *data)
{
- IXmlOutputStruct(state, tag, (STL_PortStatusData_t*)data, NULL, PortStatusDataFields);
+ IXmlOutputStruct(state, tag, (STL_PORT_COUNTERS_DATA *)data, NULL, PortStatusDataFields);
}
// only output if value != NULL
void PortStatusDataXmlOutputOptional(IXmlOutputState_t *state, const char *tag, void *data)
{
- IXmlOutputOptionalStruct(state, tag, (STL_PortStatusData_t*)data, NULL, PortStatusDataFields);
+ IXmlOutputOptionalStruct(state, tag, (STL_PORT_COUNTERS_DATA *)data, NULL, PortStatusDataFields);
}
static void PortStatusDataXmlParserEnd(IXmlParserState_t *state, const IXML_FIELD *field, void *object, void *parent, XML_Char *content, unsigned len, boolean valid)
{
- STL_PortStatusData_t *pPortStatusData = (STL_PortStatusData_t*)object;
+ STL_PORT_COUNTERS_DATA *pPortCountersData = (STL_PORT_COUNTERS_DATA *)object;
PortData *portp = (PortData*)parent;
if (! valid) // missing mandatory fields
goto failvalidate;
- if (portp->pPortStatus) {
+ if (portp->pPortCounters) {
IXmlParserPrintError(state, "More than 1 PortStatus for Port");
goto failinsert;
}
- portp->pPortStatus = pPortStatusData;
+ portp->pPortCounters = pPortCountersData;
+ // NumLanesDown is set in PortDataXmlParserEnd()
+
return;
failinsert:
failvalidate:
- MemoryDeallocate(pPortStatusData);
+ MemoryDeallocate(pPortCountersData);
}
/****************************************************************************/
@@ -2099,7 +2101,7 @@ static void PortDataXmlOutputPortStatusData(IXmlOutputState_t *state, const char
{
PortData *portp = (PortData*)data;
- PortStatusDataXmlOutputOptional(state, "PortStatus", portp->pPortStatus);
+ PortStatusDataXmlOutputOptional(state, "PortStatus", portp->pPortCounters);
}
/* bitfields needs special handling: PassThroughControlDRControl */
@@ -2852,7 +2854,7 @@ static IXML_FIELD PortDataFields[] = {
{ tag:"VLArbitrationPreemptElements", format:'k', format_func:PortDataXmlOutputVLArbPreemptElements, subfields:VLArbFields, start_func:VLArbPreemptElementsXmlParserStart, end_func:VLArbPreemptElementsXmlParserEnd },
{ tag:"VLArbitrationPreemptMatrix", format:'k', format_func:PortDataXmlOutputVLArbPreemptMatrix, subfields:VLArbPreemptMatrixFields, start_func:VLArbPreemptMatrixXmlParserStart, end_func:VLArbPreemptMatrixXmlParserEnd },
{ tag:"PKeyTable", format:'k', format_func:PortDataXmlOutputPKeyTable, subfields:PKeyTableFields, start_func:PKeyTableXmlParserStart, end_func:PKeyTableXmlParserEnd }, // structure
- { tag:"PortStatus", format:'k', size:sizeof(STL_PortStatusData_t), format_func:PortDataXmlOutputPortStatusData, subfields:PortStatusDataFields, start_func:IXmlParserStartStruct, end_func:PortStatusDataXmlParserEnd }, // structure
+ { tag:"PortStatus", format:'k', size:sizeof(STL_PORT_COUNTERS_DATA), format_func:PortDataXmlOutputPortStatusData, subfields:PortStatusDataFields, start_func:IXmlParserStartStruct, end_func:PortStatusDataXmlParserEnd }, // structure
{ tag:"CableInfo", format:'k', size:128, format_func:PortDataXmlOutputCableInfo, subfields:(IXML_FIELD*)CableInfoFields, start_func:CableInfoXmlParserStart},
{ tag:"LocalPortNum", format:'u', IXML_FIELD_INFO(PortData, PortInfo.LocalPortNum) },
{ tag:"PortStates", format:'h', IXML_FIELD_INFO(PortData, PortInfo.PortStates.AsReg32) },
@@ -3008,6 +3010,10 @@ static void PortDataXmlParserEnd(IXmlParserState_t *state, const IXML_FIELD *fie
portp->PortInfo.LinkSpeed.Active,
portp->PortInfo.LinkWidth.Active);
+ if (portp->pPortCounters) {
+ portp->pPortCounters->lq.s.numLanesDown = StlGetNumLanesDown(&portp->PortInfo);
+ }
+
if (parseCompleteFn) {
if (parseCompleteFn(state, object, parent) != FSUCCESS) {
goto failvalidate;
@@ -3030,8 +3036,8 @@ failvalidate:
*/
void Snapshot_PortDataFree(PortData * portp, FabricData_t * fabricp)
{
- if (portp->pPortStatus)
- MemoryDeallocate(portp->pPortStatus);
+ if (portp->pPortCounters)
+ MemoryDeallocate(portp->pPortCounters);
PortDataFreeQOSData(fabricp, portp);
PortDataFreePartitionTable(fabricp, portp);
}
diff --git a/Topology/sweep.c b/Topology/sweep.c
index 0fe1396..1283130 100644
--- a/Topology/sweep.c
+++ b/Topology/sweep.c
@@ -2611,13 +2611,15 @@ FSTATUS GetAllPortCounters(EUI64 portGuid, IB_GID localGid, FabricData_t *fabric
cl_map_item_t *p;
#ifdef PRODUCT_OPENIB_FF
STL_LID lid = 0;
+ STL_PA_IMAGE_ID_DATA img_id_end = {0};
+ STL_PA_IMAGE_ID_DATA img_id_begin = {0};
#endif
int i=0;
int num_nodes = cl_qmap_count(&fabricp->AllNodes);
uint32 node_count = 0;
uint32 nrsp_node_count = 0;
uint32 nrsp_port_count = 0;
- STL_PortStatusData_t PortStatusData = { 0 };
+ STL_PORT_COUNTERS_DATA PortCountersData = { 0 };
if (! quiet) ProgressPrint(TRUE, "Getting All Port Counters...");
@@ -2635,6 +2637,50 @@ FSTATUS GetAllPortCounters(EUI64 portGuid, IB_GID localGid, FabricData_t *fabric
return FERROR;
}
}
+
+ //verify pa has necessary capabilities
+ if (!(fabricp->flags & FF_PMADIRECT)) {
+ STL_CLASS_PORT_INFO *cpi;
+
+ if (omgt_pa_get_classportinfo(g_portHandle, &cpi) == FSUCCESS) {
+ STL_PA_CLASS_PORT_INFO_CAPABILITY_MASK paCap;
+
+ memcpy(&paCap, &cpi->CapMask, sizeof(STL_PA_CLASS_PORT_INFO_CAPABILITY_MASK));
+ MemoryDeallocate(cpi);
+ //if trying to query by time, check if feature available
+ if (begin || end) {
+ if (!(paCap.s.IsAbsTimeQuerySupported)) {
+ fprintf(stderr, "%s: PA does not support time queries\n", __func__);
+ return FERROR;
+ }
+ }
+ } else {
+ fprintf(stderr, "%s: failed to determine PA capabilities\n", __func__);
+ return FERROR;
+ }
+
+ // Verify Images exist before querying
+ if (end || begin) {
+ STL_PA_IMAGE_INFO_DATA img_info_end = {{0}};
+
+ img_id_end.imageNumber = PACLIENT_IMAGE_TIMED;
+ img_id_end.imageTime.absoluteTime = end ? end : begin;
+ status = omgt_pa_get_image_info(g_portHandle, img_id_end, &img_info_end);
+ if (status != FSUCCESS) {
+ fprintf(stderr, "%s: failed to get image info at %s\n", __func__, ctime((time_t *)&img_id_end.imageTime.absoluteTime));
+ return status;
+ }
+ img_id_end = img_info_end.imageId;
+
+ status = omgt_pa_freeze_image(g_portHandle, img_id_end, &img_id_end);
+ if (status != FSUCCESS) {
+ fprintf(stderr, "%s: failed to freeze image at %s\n", __func__, ctime((time_t *)&img_id_end.imageTime.absoluteTime));
+ return status;
+ }
+ }
+ } else if (begin || end) {
+ DBGPRINT("%s: Ignoring begin and/or end as we are getting counters direct from PMA", __func__);
+ }
#endif
for (p=cl_qmap_head(&fabricp->AllNodes); p != cl_qmap_end(&fabricp->AllNodes); p = cl_qmap_next(p),i++) {
NodeData *nodep = PARENT_STRUCT(p, NodeData, AllNodesEntry);
@@ -2685,78 +2731,22 @@ FSTATUS GetAllPortCounters(EUI64 portGuid, IB_GID localGid, FabricData_t *fabric
continue;
#ifdef PRODUCT_OPENIB_FF
-
/* use PaClient if available */
- if (g_paclient_state == OMGT_SERVICE_STATE_OPERATIONAL)
- {
- if (!first_portp)
- lid = portp->PortInfo.LID;
+ if (g_paclient_state == OMGT_SERVICE_STATE_OPERATIONAL) {
+ if (!first_portp) lid = portp->PortInfo.LID;
//if getting port counters by time, get latest counters first
STL_PORT_COUNTERS_DATA portCounters1 = {0};
- STL_PA_IMAGE_ID_DATA imageIdQuery1 = {0};
-
- imageIdQuery1.imageNumber = (end || begin) ? PACLIENT_IMAGE_TIMED : PACLIENT_IMAGE_CURRENT;
- imageIdQuery1.imageTime.absoluteTime = end ? end : begin;
-
- status = FERROR;
- //verify pa has necessary capabilities
- STL_CLASS_PORT_INFO * portInfo;
- if (omgt_pa_get_classportinfo(g_portHandle, &portInfo) == FSUCCESS){
- STL_PA_CLASS_PORT_INFO_CAPABILITY_MASK paCap;
- memcpy(&paCap, &portInfo->CapMask, sizeof(STL_PA_CLASS_PORT_INFO_CAPABILITY_MASK));
- //if trying to query by time, check if feature available
- if (begin || end){
- if (!(paCap.s.IsAbsTimeQuerySupported)){
- DBGPRINT("PA does not support time queries\n");
- status = FERROR;
- }else{
- status = FSUCCESS;
- }
- }
- MemoryDeallocate(portInfo);
- }else {
- DBGPRINT("failed to determine PA capabilities\n");
- status = FERROR;
- }
-
-
- status = omgt_pa_get_port_stats2(g_portHandle, imageIdQuery1, lid, portp->PortNum,
- NULL, &portCounters1, NULL, 0, !(end || begin)); //last param is user_counters flag,
- //if begin or end set we want raw
- //counters
- if (FSUCCESS == status){
- if (begin && end){// need to perform another query
- STL_PA_IMAGE_ID_DATA imageIdQuery2 = {0};
- imageIdQuery2.imageNumber = PACLIENT_IMAGE_TIMED;
- imageIdQuery2.imageTime.absoluteTime = begin; //we got counters for end first
-
- STL_PORT_COUNTERS_DATA portCounters2 = {0};
-
- status = omgt_pa_get_port_stats2(g_portHandle, imageIdQuery2, lid, portp->PortNum,
- NULL, &portCounters2, NULL, 0, 0);
-
- if (FSUCCESS == status){
- CounterSelectMask_t clearedCounters = DiffPACounters(&portCounters1, &portCounters2, &portCounters1);
- if (clearedCounters.AsReg32){
- char counterBuf[128];
- FormatStlCounterSelectMask(counterBuf, clearedCounters);
- fprintf(stderr, "Counters reset, reporting latest count: %s\n", counterBuf);
- }
- StlPortCountersToPortStatus(&portCounters1, &PortStatusData);
- }
- }else{
- StlPortCountersToPortStatus(&portCounters1, &PortStatusData);
- }
+ status = omgt_pa_get_port_stats2(g_portHandle, img_id_end, lid, portp->PortNum,
+ NULL, &portCounters1, NULL, 0, !(end || begin)); //last param is user_counters flag,
+ //if begin or end set we want raw counters
+ if (FSUCCESS == status) {
+ PortCountersData = portCounters1;
}
}
#endif
- /* issue direct PMA query */
- else {
- if (begin || end){
- continue;
- }
+ else { /* issue direct PMA query */
STL_PORT_STATUS_RSP PortStatus;
if (! PortHasPma(portp))
@@ -2783,37 +2773,7 @@ FSTATUS GetAllPortCounters(EUI64 portGuid, IB_GID localGid, FabricData_t *fabric
}
}
if (FSUCCESS == status) {
- PortStatusData.PortXmitData = PortStatus.PortXmitData;
- PortStatusData.PortRcvData = PortStatus.PortRcvData;
- PortStatusData.PortXmitPkts = PortStatus.PortXmitPkts;
- PortStatusData.PortRcvPkts = PortStatus.PortRcvPkts;
- PortStatusData.PortMulticastXmitPkts = PortStatus.PortMulticastXmitPkts;
- PortStatusData.PortMulticastRcvPkts = PortStatus.PortMulticastRcvPkts;
- PortStatusData.LocalLinkIntegrityErrors = PortStatus.LocalLinkIntegrityErrors;
- PortStatusData.FMConfigErrors = PortStatus.FMConfigErrors;
- PortStatusData.PortRcvErrors = PortStatus.PortRcvErrors;
- PortStatusData.ExcessiveBufferOverruns = PortStatus.ExcessiveBufferOverruns;
- PortStatusData.PortRcvConstraintErrors = PortStatus.PortRcvConstraintErrors;
- PortStatusData.PortRcvSwitchRelayErrors = PortStatus.PortRcvSwitchRelayErrors;
- PortStatusData.PortXmitDiscards = PortStatus.PortXmitDiscards;
- PortStatusData.PortXmitConstraintErrors = PortStatus.PortXmitConstraintErrors;
- PortStatusData.PortRcvRemotePhysicalErrors = PortStatus.PortRcvRemotePhysicalErrors;
- PortStatusData.SwPortCongestion = PortStatus.SwPortCongestion;
- PortStatusData.PortXmitWait = PortStatus.PortXmitWait;
- PortStatusData.PortRcvFECN = PortStatus.PortRcvFECN;
- PortStatusData.PortRcvBECN = PortStatus.PortRcvBECN;
- PortStatusData.PortXmitTimeCong = PortStatus.PortXmitTimeCong;
- PortStatusData.PortXmitWastedBW = PortStatus.PortXmitWastedBW;
- PortStatusData.PortXmitWaitData = PortStatus.PortXmitWaitData;
- PortStatusData.PortRcvBubble = PortStatus.PortRcvBubble;
- PortStatusData.PortMarkFECN = PortStatus.PortMarkFECN;
- PortStatusData.LinkErrorRecovery = PortStatus.LinkErrorRecovery;
- PortStatusData.LinkDowned = PortStatus.LinkDowned;
- PortStatusData.UncorrectableErrors = PortStatus.UncorrectableErrors;
- PortStatusData.lq = PortStatus.lq;
- PortStatusData.lq.AsReg8 |= ((portp->PortInfo.LinkWidthDowngrade.RxActive < portp->PortInfo.LinkWidth.Active ?
- StlLinkWidthToInt(portp->PortInfo.LinkWidth.Active) -
- StlLinkWidthToInt(portp->PortInfo.LinkWidthDowngrade.RxActive) : 0) << 4);
+ StlPortStatusToPortCounters(&PortStatus, &PortCountersData, &portp->PortInfo);
}
}
@@ -2829,8 +2789,9 @@ FSTATUS GetAllPortCounters(EUI64 portGuid, IB_GID localGid, FabricData_t *fabric
continue;
}
- portp->pPortStatus = (STL_PortStatusData_t*)MemoryAllocate2AndClear(sizeof(STL_PortStatusData_t), IBA_MEM_FLAG_PREMPTABLE, MYTAG);
- if (! portp->pPortStatus) {
+ portp->pPortCounters = (STL_PORT_COUNTERS_DATA *)MemoryAllocate2AndClear(sizeof(STL_PORT_COUNTERS_DATA),
+ IBA_MEM_FLAG_PREMPTABLE, MYTAG);
+ if (! portp->pPortCounters) {
DBGPRINT("Unable to allocate memory for Port Counters for Port %d LID 0x%08x Node 0x%016"PRIx64"\n",
portp->PortNum, portp->EndPortLID,
portp->nodep->NodeInfo.NodeGUID);
@@ -2842,7 +2803,7 @@ FSTATUS GetAllPortCounters(EUI64 portGuid, IB_GID localGid, FabricData_t *fabric
continue;
}
- *(portp->pPortStatus) = PortStatusData;
+ *(portp->pPortCounters) = PortCountersData;
got = TRUE;
}
if (got)
@@ -2850,6 +2811,91 @@ FSTATUS GetAllPortCounters(EUI64 portGuid, IB_GID localGid, FabricData_t *fabric
if (fail)
nrsp_node_count++;
}
+#ifdef PRODUCT_OPENIB_FF
+ if ((begin || end) && (g_paclient_state == OMGT_SERVICE_STATE_OPERATIONAL)) {
+ status = omgt_pa_release_image(g_portHandle, img_id_end);
+ if (status != FSUCCESS) {
+ fprintf(stderr, "%s: failed to release frozen image at %s\n", __func__, ctime((time_t *)&img_id_end.imageTime.absoluteTime));
+ return status;
+ }
+ }
+ if (begin && end && (g_paclient_state == OMGT_SERVICE_STATE_OPERATIONAL)) {
+ STL_PA_IMAGE_INFO_DATA img_info_begin = {{0}};
+ // Verify Image exists
+ img_id_begin.imageNumber = PACLIENT_IMAGE_TIMED;
+ img_id_begin.imageTime.absoluteTime = begin;
+ status = omgt_pa_get_image_info(g_portHandle, img_id_begin, &img_info_begin);
+ if (status != FSUCCESS) {
+ fprintf(stderr, "%s: failed to get image info at %s\n", __func__, ctime((time_t *)&img_id_begin.imageTime.absoluteTime));
+ return status;
+ }
+ img_id_begin = img_info_begin.imageId;
+
+ status = omgt_pa_freeze_image(g_portHandle, img_id_begin, &img_id_begin);
+ if (status == FSUCCESS) {
+ for (i = 0, p = cl_qmap_head(&fabricp->AllNodes); p != cl_qmap_end(&fabricp->AllNodes); p = cl_qmap_next(p), i++)
+ {
+ NodeData *nodep = PARENT_STRUCT(p, NodeData, AllNodesEntry);
+ PortData *first_portp;
+ cl_map_item_t *q;
+
+ if (limitstats && focus && ! CompareNodePoint(nodep, focus))
+ continue;
+ if (i%PROGRESS_FREQ == 0)
+ if (! quiet) ProgressPrint(FALSE, "Processed %6d of %6d Nodes...", i, num_nodes);
+ if (cl_qmap_head(&nodep->Ports) == cl_qmap_end(&nodep->Ports))
+ continue; /* no ports */
+ /* issue all switch PMA requests to port 0, its only one with a LID */
+ if (nodep->NodeInfo.NodeType == STL_NODE_SW) {
+ first_portp = PARENT_STRUCT(cl_qmap_head(&nodep->Ports), PortData, NodePortsEntry);
+ lid = first_portp->PortInfo.LID;
+ } else {
+ first_portp = NULL;
+ }
+
+ for (q=cl_qmap_head(&nodep->Ports); q != cl_qmap_end(&nodep->Ports); q = cl_qmap_next(q)) {
+ PortData *portp = PARENT_STRUCT(q, PortData, NodePortsEntry);
+
+ if (focus && ! ComparePortPoint(portp, focus)
+ && (limitstats || ! portp->neighbor || ! ComparePortPoint(portp->neighbor, focus)))
+ continue;
+ if (!portp->pPortCounters) continue;
+
+ if (!first_portp) lid = portp->PortInfo.LID;
+
+ STL_PORT_COUNTERS_DATA portCounters2 = {0};
+
+ status = omgt_pa_get_port_stats2(g_portHandle, img_id_begin, lid, portp->PortNum,
+ NULL, &portCounters2, NULL, 0, 0);
+ if (FSUCCESS == status) {
+
+ CounterSelectMask_t clearedCounters = DiffPACounters(
+ portp->pPortCounters, &portCounters2, portp->pPortCounters);
+
+ if (clearedCounters.AsReg32) {
+ char counterBuf[128];
+
+ FormatStlCounterSelectMask(counterBuf, clearedCounters);
+ fprintf(stderr, "Counters reset on LID 0x%x port %u Node 0x%016"PRIx64" Name: %.*s, reporting latest count: %s\n",
+ lid, portp->PortNum, portp->nodep->NodeInfo.NodeGUID,
+ STL_NODE_DESCRIPTION_ARRAY_SIZE, (char *)portp->nodep->NodeDesc.NodeString,
+ counterBuf);
+ }
+ }
+ }
+ } // END: for all nodes
+ status = omgt_pa_release_image(g_portHandle, img_id_begin);
+ if (status != FSUCCESS) {
+ fprintf(stderr, "%s: failed to release frozen image at %s\n", __func__, ctime((time_t *)&img_id_begin.imageTime.absoluteTime));
+ return status;
+ }
+ } else if (status != FSUCCESS) {
+ fprintf(stderr, "%s: failed to freeze image at %s\n", __func__, ctime((time_t *)&img_id_begin.imageTime.absoluteTime));
+ return status;
+ }
+ }
+#endif
+
//Close the opamgt port handle
if (g_portHandle) {
diff --git a/Topology/topology.h b/Topology/topology.h
index 2a1cb81..8cec6f5 100644
--- a/Topology/topology.h
+++ b/Topology/topology.h
@@ -99,8 +99,6 @@ typedef struct QOSData_s {
} QOSData;
-typedef STL_PORT_STATUS_RSP STL_PortStatusData_t;
-
// How many STL_CABLE_INFO structs to store per port
#define PORTDATA_CABLEINFO_SIZE 4
#define IFACE_MACLIST_SIZE 512
@@ -128,7 +126,7 @@ typedef struct PortData_s {
STL_LED_INFO LedInfo; //Led Info for this port
IB_PATH_RECORD *pathp; // Path Record to send to this port
- STL_PortStatusData_t *pPortStatus;
+ STL_PORT_COUNTERS_DATA *pPortCounters;
struct ExpectedLink_s *elinkp; // if supplied in topology input
QOSData *pQOS; // optional QOS
STL_PKEY_ELEMENT *pPartitionTable; // optional Partition Table
@@ -1081,7 +1079,7 @@ extern boolean NodeHasPma(NodeData *nodep);
extern boolean PortHasPma(PortData *portp);
extern void UpdateNodePmaCapabilities(NodeData *nodep, boolean ProcessHFICounters);
extern FSTATUS STLPmGetClassPortInfo(struct omgt_port *port, PortData *portp);
-extern FSTATUS STLPmGetPortStatus(struct omgt_port *port, PortData *portp, uint8 portNum, STL_PortStatusData_t *pPortStatus);
+extern FSTATUS STLPmGetPortStatus(struct omgt_port *port, PortData *portp, uint8 portNum, STL_PORT_STATUS_RSP *pPortStatus);
extern FSTATUS STLPmClearPortCounters(struct omgt_port *port, PortData *portp, uint8 lastPortIndex, uint32 counterselect);
#if !defined(VXWORKS) || defined(BUILD_DMC)
extern FSTATUS DmGetIouInfo(struct omgt_port *port, IB_PATH_RECORD *pathp, IOUnitInfo *pIouInfo);
diff --git a/opa-fm.spec.in b/opa-fm.spec.in
index 8a66f22..4c9402f 100644
--- a/opa-fm.spec.in
+++ b/opa-fm.spec.in
@@ -29,14 +29,14 @@
#[ICS VERSION STRING: unknown]
Name: opa-fm
-Version: 10.9.2.2
+Version: 10.9.3.1
Release: 1%{?dist}
%if 0%{?rhel}
Epoch: 1
%endif
Summary: Intel Omni-Path Fabric Management Software
-License: GPLv2 or BSD
+License: BSD
Url: https://github.com/intel/opa-fm
# tarball created by:
# git clone https://github.com/01org/opa-fm.git
@@ -60,7 +60,7 @@ __RPM_DEBUG
The %{name} contains Intel Omni-Path fabric management applications. This
includes: the Subnet Manager, Baseboard Manager, Performance Manager,
Fabric Executive, and some fabric management tools.
-IFSComponent: FM 10.9.2.2.1%{?dist}
+IFSComponent: FM 10.9.3.1.1%{?dist}
%prep
%setup -q -c
diff --git a/opamgt/src/opamgt_pa.c b/opamgt/src/opamgt_pa.c
index 2b788d0..29841bd 100644
--- a/opamgt/src/opamgt_pa.c
+++ b/opamgt/src/opamgt_pa.c
@@ -953,10 +953,8 @@ iba_pa_single_mad_move_freeze_response_query(
if (port == NULL) return response;
p = (STL_MOVE_FREEZE_DATA *)(((SA_MAD *)request_data)->Data);
- p->oldFreezeImage.imageNumber = hton64(move_info->oldFreezeImage.imageNumber);
- p->oldFreezeImage.imageOffset = hton32(move_info->oldFreezeImage.imageOffset);
- p->newFreezeImage.imageNumber = hton64(move_info->newFreezeImage.imageNumber);
- p->newFreezeImage.imageOffset = hton32(move_info->newFreezeImage.imageOffset);
+ *p = *move_info;
+ BSWAP_STL_PA_MOVE_FREEZE(p);
// submit request
fstatus = pa_query_common(port, STL_PA_CMD_SET, STL_PA_ATTRID_MOVE_FREEZE_FRAME, 0,
| 0 |
5128b80853c550f708ba0e0bc321954ae37ed580
|
01org/opa-fm
|
Merge branch 'master' of https://github.com/01org/opa-fm
|
commit 5128b80853c550f708ba0e0bc321954ae37ed580 (from 1e057203a1f234b35024f2325dbc442a4ee1fcfd)
Merge: 1e05720 82600d3
Author: Scott Breyer <[email protected]>
Date: Thu May 5 06:18:40 2016 -0400
Merge branch 'master' of https://github.com/01org/opa-fm
diff --git a/Esm/ib/src/linux/startup/opafm_src.xml b/Esm/ib/src/linux/startup/opafm_src.xml
index 1a9582b..c816d9b 100644
--- a/Esm/ib/src/linux/startup/opafm_src.xml
+++ b/Esm/ib/src/linux/startup/opafm_src.xml
@@ -1720,7 +1720,7 @@
<!-- Enables fabric activation optimization to reduce packet counts -->
<!-- during fabric bring up. 0-Disable, 1-Switches only, 2-All devices -->
- <SwitchCascadeActivateEnable>2</SwitchCascadeActivateEnable>
+ <SwitchCascadeActivateEnable>0</SwitchCascadeActivateEnable>
<!-- Number of times to retry activation upon detecting an armed port -->
<!-- with a non-armed/active neighbor. -->
diff --git a/Esm/ib/src/smi/sm/sm_topology.c b/Esm/ib/src/smi/sm/sm_topology.c
index c70e6fa..556a891 100755
--- a/Esm/ib/src/smi/sm/sm_topology.c
+++ b/Esm/ib/src/smi/sm/sm_topology.c
@@ -3351,6 +3351,7 @@ topology_activate(void)
if(portStateInfo != NULL) {
vs_pool_free(&sm_pool, portStateInfo);
+ portStateInfo = NULL;
}
psiFailed = 1;
@@ -3381,7 +3382,10 @@ topology_activate(void)
}
}
- vs_pool_free(&sm_pool, portStateInfo);
+ if(portStateInfo != NULL) {
+ vs_pool_free(&sm_pool, portStateInfo);
+ portStateInfo = NULL;
+ }
}
}
diff --git a/opafm.spec b/opafm.spec
index 306979c..b8e37bd 100644
--- a/opafm.spec
+++ b/opafm.spec
@@ -119,7 +119,6 @@ install -D stage.rpm/opaxmlfilter $RPM_BUILD_ROOT/opt/opafm/etc/opaxmlfilter
#install -D stage.rpm/opa_ca_openssl.cnf-sample $RPM_BUILD_ROOT/opt/opafm/samples/opa_ca_openssl.cnf-sample
#install -D stage.rpm/opa_comp_openssl.cnf-sample $RPM_BUILD_ROOT/opt/opafm/samples/opa_comp_openssl.cnf-sample
-
mkdir -p $RPM_BUILD_ROOT%{_sbindir}
ln -s /opt/opafm/bin/fm_cmd $RPM_BUILD_ROOT%{_sbindir}/opafmcmd
ln -s /opt/opafm/bin/fm_cmdall $RPM_BUILD_ROOT%{_sbindir}/opafmcmdall
@@ -158,7 +157,10 @@ fi
/opt/opafm/bin/*
/opt/opafm/etc/*
/opt/opafm/runtime/*
+<<<<<<< HEAD
#/opt/opafm/samples/*
+=======
+>>>>>>> 82600d3632ee0c401c218fc0d9a462347e7ae2fb
%{_sbindir}/opafmcmd
%{_sbindir}/opafmcmdall
commit 5128b80853c550f708ba0e0bc321954ae37ed580 (from 82600d3632ee0c401c218fc0d9a462347e7ae2fb)
Merge: 1e05720 82600d3
Author: Scott Breyer <[email protected]>
Date: Thu May 5 06:18:40 2016 -0400
Merge branch 'master' of https://github.com/01org/opa-fm
diff --git a/Esm/ib/include/cs_hashtable.h b/Esm/ib/include/cs_hashtable.h
index 4bce7a2..610ae90 100644
--- a/Esm/ib/include/cs_hashtable.h
+++ b/Esm/ib/include/cs_hashtable.h
@@ -91,10 +91,6 @@
*
*/
-#ifndef INLINE
-# define INLINE extern inline
-#endif
-
typedef enum {
CS_HASH_KEY_NOT_ALLOCATED,
CS_HASH_KEY_ALLOCATED
@@ -245,7 +241,7 @@ valuetype * fncname (CS_HashTablep h, keytype *k) \
* @param h the hashtable
* @return the number of items stored in the hashtable
*/
-INLINE uint32_t
+static __inline uint32_t
cs_hashtable_count(CS_HashTablep h)
{
return h->entrycount;
@@ -281,7 +277,7 @@ int32_t cs_hashtable_change(CS_HashTablep h, void *k, void *v);
* cs_hashtable_iterator
*/
-INLINE void
+static __inline void
cs_hashtable_iterator(CS_HashTablep h, CS_HashTableItr_t *itr) {
itr->h = h;
itr->e = h->listHead;
@@ -292,7 +288,7 @@ cs_hashtable_iterator(CS_HashTablep h, CS_HashTableItr_t *itr) {
* - return the value of the (key,value) pair at the current position
*/
-INLINE void *
+static __inline void *
cs_hashtable_iterator_key(CS_HashTableItrp i)
{
return i->e->k;
@@ -302,7 +298,7 @@ cs_hashtable_iterator_key(CS_HashTableItrp i)
* value - return the value of the (key,value) pair at the current position
*/
-INLINE void *
+static __inline void *
cs_hashtable_iterator_value(CS_HashTableItrp i)
{
return i->e->v;
@@ -313,7 +309,7 @@ cs_hashtable_iterator_value(CS_HashTableItrp i)
* returns zero if advanced to end of table
*/
-INLINE int32_t
+static __inline int32_t
cs_hashtable_iterator_advance(CS_HashTableItrp itr) {
if (itr->e != NULL)
return (itr->e = itr->e->listNext) == NULL ? 0 : -1;
diff --git a/opafm.spec b/opafm.spec
index 744ce9f..b8e37bd 100644
--- a/opafm.spec
+++ b/opafm.spec
@@ -38,20 +38,21 @@ License: BSD
Url: http://www.intel.com/
Source0: %{name}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExclusiveArch: x86_64
Requires: rdma
#BuildRequires: libibverbs-devel >= 1.1-1, libibumad-devel, libibmad-devel
AutoReq: no
-%if 0%{?rhel}
-BuildRequires: expat-devel
-Requires: expat, libibmad, libibumad, libibverbs
+%if 0%{?rhel} || 0%{?fedora}
+BuildRequires: expat-devel, libibumad-devel, libibverbs-devel, libibmad-devel, openssl-devel
+Requires: expat, libibmad, libibumad, libibverbs, openssl
%else
-Requires: libexpat1, libibmad5, libibumad, libibverbs1
-BuildRequires: libexpat-devel
+Requires: libexpat1, libibmad5, libibumad, libibverbs1, openssl
+BuildRequires: libexpat-devel, libibumad-devel, libibverbs-devel, libibmad5-devel, libopenssl-devel
%endif
-%if 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7
+%if 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 || 0%{?fedora}
BuildRequires: systemd %{?systemd_requires} %{?BuildRequires}
Requires: systemd %{?systemd_requires}
%else
@@ -116,6 +117,8 @@ install -D stage.rpm/opafm.xml $RPM_BUILD_ROOT/opt/opafm/etc/opafm.xml
install -D stage.rpm/opaxmlextract $RPM_BUILD_ROOT/opt/opafm/etc/opaxmlextract
install -D stage.rpm/opaxmlfilter $RPM_BUILD_ROOT/opt/opafm/etc/opaxmlfilter
+#install -D stage.rpm/opa_ca_openssl.cnf-sample $RPM_BUILD_ROOT/opt/opafm/samples/opa_ca_openssl.cnf-sample
+#install -D stage.rpm/opa_comp_openssl.cnf-sample $RPM_BUILD_ROOT/opt/opafm/samples/opa_comp_openssl.cnf-sample
mkdir -p $RPM_BUILD_ROOT%{_sbindir}
ln -s /opt/opafm/bin/fm_cmd $RPM_BUILD_ROOT%{_sbindir}/opafmcmd
ln -s /opt/opafm/bin/fm_cmdall $RPM_BUILD_ROOT%{_sbindir}/opafmcmdall
@@ -154,6 +157,10 @@ fi
/opt/opafm/bin/*
/opt/opafm/etc/*
/opt/opafm/runtime/*
+<<<<<<< HEAD
+#/opt/opafm/samples/*
+=======
+>>>>>>> 82600d3632ee0c401c218fc0d9a462347e7ae2fb
%{_sbindir}/opafmcmd
%{_sbindir}/opafmcmdall
| 0 |
1d0b88a9876f266e0dc41c40509dd46e4e5676cd
|
01org/opa-fm
|
Removal of unused files
| "commit 1d0b88a9876f266e0dc41c40509dd46e4e5676cd\nAuthor: Scott Breyer <[email protected]>\nD(...TRUNCATED) | 0 |
736bd9dc3e094576d67e286d2e3a534e1dd05588
|
01org/opa-fm
|
Update to latest from build 10.4.0.0.196 (IFS 10.4.0.0.214)
| "commit 736bd9dc3e094576d67e286d2e3a534e1dd05588\nAuthor: Scott Breyer <[email protected]>\nD(...TRUNCATED) | 0 |
1e057203a1f234b35024f2325dbc442a4ee1fcfd
|
01org/opa-fm
|
Improve dependencies in spec file; fix compile with new gcc
| "commit 1e057203a1f234b35024f2325dbc442a4ee1fcfd\nAuthor: Scott Breyer <[email protected]>\nD(...TRUNCATED) | 0 |
dcce22ef26d11e788666e578704c57ff6476e9ff
|
01org/opa-fm
|
Update to latest from build 10.9.2.0.7 (IFS 10.9.2.0.9)
| "commit dcce22ef26d11e788666e578704c57ff6476e9ff\nAuthor: Scott Breyer <[email protected]>\nD(...TRUNCATED) | 0 |
6f1eb4579fc975a1e9e7f669a8afbf6569d09dd3
|
01org/opa-fm
|
Update to latest from build 10.12.1.0.6 (IFS 10.12.1.0.7)
| "commit 6f1eb4579fc975a1e9e7f669a8afbf6569d09dd3\nAuthor: Greg Kresge <greg.kresge@cornelisnetworks.(...TRUNCATED) | 0 |
9977f03d6226c189bf018766c76d8184d011d211
|
01org/opa-fm
|
Update to latest from build 10.9.0.3.1
| "commit 9977f03d6226c189bf018766c76d8184d011d211\nAuthor: Scott Breyer <[email protected]>\nD(...TRUNCATED) | 0 |
7dfd60a2f4771f20cc4e326a6fab9ecdd15fbd0f
|
01org/opa-fm
|
Updated to latest from build 10.0.0.0.686
| "commit 7dfd60a2f4771f20cc4e326a6fab9ecdd15fbd0f\nAuthor: Scott Breyer <[email protected]>\nD(...TRUNCATED) | 0 |
38c90b085eab2ccfc90c3b05e2f38993d2cde5a3
|
01org/opa-fm
|
Fix improper downcasting of MFT portmask.
| "commit 38c90b085eab2ccfc90c3b05e2f38993d2cde5a3\nAuthor: Scott Breyer <[email protected]>\nD(...TRUNCATED) | 0 |
End of preview. Expand
in Data Studio
README.md exists but content is empty.
- Downloads last month
- 333