From bd3dc1f5fcece7408036bd2cb7a7edd2f4f42026 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 7 May 2019 03:33:43 -0400 Subject: [PATCH] import infiniband-diags-2.1.0-1.el8 --- .gitignore | 1 + .infiniband-diags.metadata | 1 + ...-new-device-ID-to-device-white-lists.patch | 52 ++ SPECS/infiniband-diags.spec | 472 ++++++++++++++++++ 4 files changed, 526 insertions(+) create mode 100644 .gitignore create mode 100644 .infiniband-diags.metadata create mode 100644 SOURCES/0001-Add-latest-new-device-ID-to-device-white-lists.patch create mode 100644 SPECS/infiniband-diags.spec diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..350c249 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/infiniband-diags-2.1.0.tar.gz diff --git a/.infiniband-diags.metadata b/.infiniband-diags.metadata new file mode 100644 index 0000000..d7175e1 --- /dev/null +++ b/.infiniband-diags.metadata @@ -0,0 +1 @@ +4f8ad11d3ba793ff8e201c0d182c0a6c97931afa SOURCES/infiniband-diags-2.1.0.tar.gz diff --git a/SOURCES/0001-Add-latest-new-device-ID-to-device-white-lists.patch b/SOURCES/0001-Add-latest-new-device-ID-to-device-white-lists.patch new file mode 100644 index 0000000..8c7c165 --- /dev/null +++ b/SOURCES/0001-Add-latest-new-device-ID-to-device-white-lists.patch @@ -0,0 +1,52 @@ +From 48baa814d84215de2afbae696b6ed6cc95714f13 Mon Sep 17 00:00:00 2001 +From: Hal Rosenstock +Date: Fri, 14 Sep 2018 16:05:12 +0300 +Subject: [PATCH] Add latest new device ID to device white lists + +Signed-off-by: Hal Rosenstock +--- + libibnetdisc/src/ibnetdisc.c | 2 +- + src/ibdiag_common.c | 1 + + src/vendstat.c | 1 + + 3 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/libibnetdisc/src/ibnetdisc.c b/libibnetdisc/src/ibnetdisc.c +index 05f1dc9..04bc5c5 100644 +--- a/libibnetdisc/src/ibnetdisc.c ++++ b/libibnetdisc/src/ibnetdisc.c +@@ -208,7 +208,7 @@ static int is_mlnx_ext_port_info_supported(ibnd_port_t * port) + devid == 0x1ba0 || + (devid >= 0x1bd0 && devid <= 0x1bd5)))) + return 1; +- if ((devid >= 0x1003 && devid <= 0x101b) || ++ if ((devid >= 0x1003 && devid <= 0x101b) || (devid == 0xa2d2) || + ((vendorid == 0x119f) && + /* Bull ConnectX3 */ + (devid == 0x1b33 || devid == 0x1b73 || +diff --git a/src/ibdiag_common.c b/src/ibdiag_common.c +index 41b749c..a3aaada 100644 +--- a/src/ibdiag_common.c ++++ b/src/ibdiag_common.c +@@ -553,6 +553,7 @@ int is_mlnx_ext_port_info_supported(uint32_t vendorid, + (devid >= 0x1bd0 && devid <= 0x1bd5)))) + return 1; + if ((devid >= 0x1003 && devid <= 0x101b) || ++ (devid == 0xa2d2) || + ((vendorid == 0x119f) && + /* Bull ConnectX3 */ + (devid == 0x1b33 || devid == 0x1b73 || +diff --git a/src/vendstat.c b/src/vendstat.c +index 5a3af21..71d7b98 100644 +--- a/src/vendstat.c ++++ b/src/vendstat.c +@@ -150,6 +150,7 @@ static uint16_t ext_fw_info_device[][2] = { + {0xd2f0, 0xd2f0}, /* Quantum */ + {0x01b3, 0x01b3}, /* IS-4 */ + {0x1003, 0x101b}, /* Connect-X */ ++ {0xa2d2, 0xa2d2}, /* BlueField */ + {0x1b02, 0x1b02}, /* Bull SwitchX */ + {0x1b50, 0x1b50}, /* Bull SwitchX */ + {0x1ba0, 0x1ba0}, /* Bull SwitchIB */ +-- +2.14.4 + diff --git a/SPECS/infiniband-diags.spec b/SPECS/infiniband-diags.spec new file mode 100644 index 0000000..23bd2eb --- /dev/null +++ b/SPECS/infiniband-diags.spec @@ -0,0 +1,472 @@ +Name: infiniband-diags +Summary: OpenFabrics Alliance InfiniBand Diagnostic Tools +Version: 2.1.0 +Release: 1%{?dist} +# Upstream allows either license to be used +License: GPLv2 or BSD +Url: https://github.com/linux-rdma/infiniband-diags +Source0: https://github.com/linux-rdma/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz +Patch1: 0001-Add-latest-new-device-ID-to-device-white-lists.patch + +BuildRequires: gcc +BuildRequires: glib2-devel +BuildRequires: libibumad-devel +BuildRequires: opensm-devel +Provides: perl(IBswcountlimits) +Provides: libibmad = %{version}-%{release} +Obsoletes: libibmad < %{version}-%{release} +Obsoletes: openib-diags < 1.3 +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig +ExcludeArch: s390 %{arm} +%if 0%{?rhel} > 7 +ExcludeArch: s390x +%endif + +# Find the correct directory to install the perl module into. +%global _perldir %(perl -e 'use Config; print $Config{installvendorarch};') + +%description +This package provides IB diagnostic programs and scripts needed to diagnose an +IB subnet. infiniband-diags now also provides libibmad. libibmad provides low +layer IB functions for use by the IB diagnostic and management programs. These +include MAD, SA, SMP, and other basic IB functions. + +%package compat +Summary: OpenFabrics Alliance InfiniBand Diagnostic Tools + +%description compat +Deprecated scripts and utilities which provide duplicated functionality, most +often at a reduced performance. These are maintained for the time being for +compatibility reasons. + +%package devel +Summary: Development files for the infiniband-diags library +Requires: %{name}%{?_isa} = %{version}-%{release} +Provides: libibmad-devel = %{version}-%{release} +Obsoletes: libibmad-devel < %{version}-%{release} + +%description devel +Headers and shared devel libraries for the infiniband-diags package. + +%package devel-static +Summary: Static development files for the infiniband-diags library +Requires: %{name}-devel%{?_isa} = %{version}-%{release} +Provides: libibmad-static = %{version}-%{release} +Obsoletes: libibmad-static < %{version}-%{release} + +%description devel-static +Static libraries for the infiniband-diags and libibmad libraries. + +%prep +%setup +%patch1 -p1 + +%build +%configure --enable-compat-utils +make V=1 + +%install +make DESTDIR=$RPM_BUILD_ROOT install +chmod 644 ${RPM_BUILD_ROOT}%{_sysconfdir}/infiniband-diags/ibdiag.conf +# remove unpackaged files from the buildroot +find ${RPM_BUILD_ROOT} -type f -name '*.la' -print -delete + +%files compat +%{_sbindir}/ibcheckerrs +%{_mandir}/man8/ibcheckerrs.8.gz +%{_sbindir}/ibchecknet +%{_mandir}/man8/ibchecknet.8.gz +%{_sbindir}/ibchecknode +%{_mandir}/man8/ibchecknode.8.gz +%{_sbindir}/ibcheckport +%{_mandir}/man8/ibcheckport.8.gz +%{_sbindir}/ibcheckportwidth +%{_mandir}/man8/ibcheckportwidth.8.gz +%{_sbindir}/ibcheckportstate +%{_mandir}/man8/ibcheckportstate.8.gz +%{_sbindir}/ibcheckwidth +%{_mandir}/man8/ibcheckwidth.8.gz +%{_sbindir}/ibcheckstate +%{_mandir}/man8/ibcheckstate.8.gz +%{_sbindir}/ibcheckerrors +%{_mandir}/man8/ibcheckerrors.8.gz +%{_sbindir}/ibdatacounts +%{_mandir}/man8/ibdatacounts.8.gz +%{_sbindir}/ibdatacounters +%{_mandir}/man8/ibdatacounters.8.gz +%{_sbindir}/ibdiscover.pl +%{_mandir}/man8/ibdiscover.8.gz +%{_sbindir}/ibswportwatch.pl +%{_mandir}/man8/ibswportwatch.8.gz +%{_sbindir}/ibqueryerrors.pl +%{_sbindir}/iblinkinfo.pl +%{_sbindir}/ibprintca.pl +%{_mandir}/man8/ibprintca.8.gz +%{_sbindir}/ibprintswitch.pl +%{_mandir}/man8/ibprintswitch.8.gz +%{_sbindir}/ibprintrt.pl +%{_mandir}/man8/ibprintrt.8.gz +%{_sbindir}/set_nodedesc.sh + + +%files +# C programs here +%{_sbindir}/ibaddr +%{_mandir}/man8/ibaddr.8.gz +%{_sbindir}/ibnetdiscover +%{_mandir}/man8/ibnetdiscover.8.gz +%{_sbindir}/ibping +%{_mandir}/man8/ibping.8.gz +%{_sbindir}/ibportstate +%{_mandir}/man8/ibportstate.8.gz +%{_sbindir}/ibroute +%{_mandir}/man8/ibroute.8.gz +%{_sbindir}/ibstat +%{_mandir}/man8/ibstat.8.gz +%{_sbindir}/ibsysstat +%{_mandir}/man8/ibsysstat.8.gz +%{_sbindir}/ibtracert +%{_mandir}/man8/ibtracert.8.gz +%{_sbindir}/perfquery +%{_mandir}/man8/perfquery.8.gz +%{_sbindir}/sminfo +%{_mandir}/man8/sminfo.8.gz +%{_sbindir}/smpdump +%{_mandir}/man8/smpdump.8.gz +%{_sbindir}/smpquery +%{_mandir}/man8/smpquery.8.gz +%{_sbindir}/saquery +%{_mandir}/man8/saquery.8.gz +%{_sbindir}/vendstat +%{_mandir}/man8/vendstat.8.gz +%{_sbindir}/iblinkinfo +%{_mandir}/man8/iblinkinfo.8.gz +%{_sbindir}/ibqueryerrors +%{_mandir}/man8/ibqueryerrors.8.gz +%{_sbindir}/ibcacheedit +%{_mandir}/man8/ibcacheedit.8.gz +%{_sbindir}/ibccquery +%{_mandir}/man8/ibccquery.8.gz +%{_sbindir}/ibccconfig +%{_mandir}/man8/ibccconfig.8.gz +%{_sbindir}/dump_fts +%{_mandir}/man8/dump_fts.8.gz + +# scripts here +%{_sbindir}/ibhosts +%{_mandir}/man8/ibhosts.8.gz +%{_sbindir}/ibswitches +%{_mandir}/man8/ibswitches.8.gz +%{_sbindir}/ibnodes +%{_mandir}/man8/ibnodes.8.gz +%{_sbindir}/ibrouters +%{_mandir}/man8/ibrouters.8.gz +%{_sbindir}/ibfindnodesusing.pl +%{_mandir}/man8/ibfindnodesusing.8.gz +%{_sbindir}/ibidsverify.pl +%{_mandir}/man8/ibidsverify.8.gz +%{_sbindir}/check_lft_balance.pl +%{_mandir}/man8/check_lft_balance.8.gz +%{_sbindir}/dump_lfts.sh +%{_mandir}/man8/dump_lfts.8.gz +%{_sbindir}/dump_mfts.sh +%{_mandir}/man8/dump_mfts.8.gz +%{_sbindir}/ibclearerrors +%{_mandir}/man8/ibclearerrors.8.gz +%{_sbindir}/ibclearcounters +%{_mandir}/man8/ibclearcounters.8.gz +%{_sbindir}/ibstatus +%{_mandir}/man8/ibstatus.8.gz + +# and the rest +%{_mandir}/man8/infiniband-diags.8.gz +%{_libdir}/*.so.* +%{_mandir}/man3/* +%global _perldir %(perl -e 'use Config; $T=$Config{installvendorlib}; print $T;') +%{_perldir}/* +%config(noreplace) %{_sysconfdir}/infiniband-diags/error_thresholds +%config(noreplace) %{_sysconfdir}/infiniband-diags/ibdiag.conf +%doc README ChangeLog +%license COPYING + +%files devel +%{_libdir}/*.so +%{_includedir}/infiniband/*.h + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + +%files devel-static +%{_libdir}/*.a + +%changelog +* Tue Sep 25 2018 Honggang Li - 2.1.0-1 +- Rebase to latest upstream release v2.1.0 +- Resolves: bz1630652 + +* Wed Feb 07 2018 Fedora Release Engineering - 2.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Tue Aug 29 2017 Honggang Li 2.0.0-1 +- Rebase to latest upstream release v2.0.0 +- Resolves: bz1486092 + +* Sat Aug 26 2017 Honggang Li - 1.6.7-5 +- Update source URL +- Disable support for ARM32 +- Disable support for s390 as rdma-core is unavailable for s390 +- Remove rdma-ndd as it had been merged into rdma-core +- Resolves: bz1484155 + +* Wed Aug 02 2017 Fedora Release Engineering - 1.6.7-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 1.6.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 1.6.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Aug 24 2016 Honggang Li - 1.6.7-1 +- Update to latest upstream version 1.6.7 + +* Mon Mar 21 2016 Honggang Li - 1.6.6-1 +- Update to latest upstream version 1.6.6 +- Add systemd file for rdma-ndd + +* Thu Feb 04 2016 Fedora Release Engineering - 1.6.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 1.6.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat Aug 16 2014 Fedora Release Engineering - 1.6.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 1.6.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Mon Mar 17 2014 Peter Robinson 1.6.4-1 +- Update to 1.6.4 +- Sync Exclude/Exclusive with other OpenFabric packages + +* Sat Aug 03 2013 Fedora Release Engineering - 1.6.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Jul 17 2013 Petr Pisar - 1.6.1-5 +- Perl 5.18 rebuild + +* Sun Mar 10 2013 Doug Ledford - 1.6.1-4 +- Fix hostname usage in set_nodedesc.sh + +* Sat Mar 2 2013 Peter Robinson 1.6.1-3 +- Build on ARM +- Cleanup and modernise spec + +* Thu Feb 14 2013 Fedora Release Engineering - 1.6.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Fri Nov 30 2012 Jon Stanley +- Update to 1.6.1 + +* Thu Jul 19 2012 Fedora Release Engineering - 1.5.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Jan 06 2012 Doug Ledford - 1.5.12-1 +- Update to latest upstream release +- Initial Fedora import +- Add devel and devel static packages (review item) +- Make etc file config(noreplace) (review item) +- Remove no longer support scripts (review item) + +* Wed Jul 27 2011 Doug Ledford - 1.5.8-1.el6 +- Update to latest upstream version +- Make build work on i686 arch +- Modify perfquery to be able to loop through all HCAs in a single host +- Resolves: bz593767 +- Related: bz725016 + +* Fri Mar 12 2010 Doug Ledford - 1.5.5-1.el6 +- Update and rebuild against latest opensm (which was needed for latest + ibutils, which was needed for licensing issues resolved in new upstream + tarball, which was needed for pkgwrangler review) +- Related: bz555835 + +* Fri Feb 26 2010 Doug Ledford - 1.5.3-4.el6 +- Tidy ups for pkgwrangler review +- Related: bz555835 + +* Tue Feb 9 2010 Jay Fenlason 1.5.3-3.el6 +- Correct the perldir macro for rhel-6's perl. +- Remove the unrecognized --with-node-name-map configure option. +- reorganize the files section to use fewer globs, so that it's less likely + to pick up files inappropriately. + +* Mon Jan 25 2010 Doug Ledford - 1.5.3-2.el6 +- Update license tag for pkgwrangler import +- Related: bz543948 + +* Tue Dec 22 2009 Doug Ledford - 1.5.3-1.el5 +- Update to latest upstream version +- Don't include the newly added devel stuff as it's likely only needed + internally (and certainly not needed by anything we've supported before + since we've never shipped it) +- Related: bz518218 + +* Fri Apr 17 2009 Doug Ledford - 1.4.4-1.el5 +- Update to ofed 1.4.1-rc3 version +- Remove dead patch +- Related: bz459652 + +* Fri Oct 17 2008 Doug Ledford - 1.4.1-2 +- Fix up a few trivial issues +- Resolves: bz216014 + +* Wed Sep 17 2008 Doug Ledford - 1.4.1-1 +- Update to latest upstream version (required to work with latest opensm libs) +- Resolves: bz451465 + +* Tue Apr 01 2008 Doug Ledford - 1.3.6-1 +- Update to latest upstream version to match OFED 1.3 +- Related: bz428197 + +* Sun Jan 27 2008 Doug Ledford - 1.3.5-2 +- Obsolete the openib-diags that this package replaces + +* Fri Jan 25 2008 Doug Ledford - 1.3.5-1 +- Import into Red Hat CVS +- Related: bz428197 + +* Wed Oct 31 2007 Ira Weiny - 1.3.2 +- Change switch-map option to node-name-map + +* Thu Aug 9 2007 Ira Weiny - 1.3.1 +- Change set_mthca_nodedesc.sh to set_nodedesc.sh + +* Tue Jul 10 2007 Hal Rosenstock - 1.3.1 +- Add link width and speed to topology file output in ibnetdiscover +- Add support for -R(outer_list) in ibnetdiscover +- Add script and man page for ibidsverify +- Moved diags from bin to sbin +- Add scripts and man pages for display on IB routers +- Add GUID to output line for ports in ibqueryerrors.pl +- Add ibdatacounts and ibdatacounters scripts and man pages +- Add peer port link width and speed validation in iblinkinfo.pl +- Display remote LID with peer port info in IBswcountlimits.pm +- Handle peer ports at 1x that should be wider and 2.5 Gbps + links that should be faster in ibportstate +- Add LinkSpeed/Width components to output of ibportstate +- Add support for IB routers +- Add grouping support for ISR2012 and ISR2004 in ibnetdiscover +- Remove all uses of "/tmp" from perl scripts +- Add switch map support for saquery -O and -U options +- Add support for saquery -s (isSMdisabled) +- Add name input checks to saquery (-O and -U) + +* Thu Mar 29 2007 Hal Rosenstock - 1.3.0 +- Add some extra debug information to IBswcountlimits.pm +- Send normal output to stdout in ibtracert +- Don't truncate NodeDescriptions containing ctl characters in ibdiag_common +- Fix ibnetdiscover grouping for Cisco SFS7000 +- Add support to query the GUIDInfo table in smpquery +- Allow user to specify a default switch map file + +* Fri Mar 9 2007 Hal Rosenstock - 1.2.5 +- Find perl modules in perl sitearch directory +- Fix non standard prefix install for diag scripts +- Clean gcc-4.1 warnings in saquery and ibdiag_common + +* Fri Mar 2 2007 Hal Rosenstock - 1.2.4 +- OpenFabrics 1.2.4 release +- Fix diag rpmbuild from make dist +- Include set_mthca_nodedesc.sh and dump_lfts.sh in the rpm + +* Thu Mar 1 2007 Hal Rosenstock - 1.2.3 +- OpenFabrics 1.2.3 release +- Fixed saquery timeout handling + +* Tue Feb 27 2007 Hal Rosenstock - 1.2.2 +- OpenFabrics 1.2.2 release +- Minor changes to ibswitches and ibhosts output + +* Wed Feb 14 2007 Hal Rosenstock - 1.2.1 +- OpenFabrics 1.2.1 release +- Initial release of vendstat tool + +* Fri Feb 2 2007 Hal Rosenstock - 1.2.0 +- OpenFabrics 1.2.0 release +- Added brief option to ibcheckerrors and ibcheckerrs +- Updated man pages +- Added build version to saquery and updated build version tags of other tools +- Added -N | nocolor to usage display of scripts +- Fixed -nocolor and -G options on scripts +- Fixed error return status in ibchecknet +- Added exit code to ibcheckerrors +- Added nodename to output of ibcheckerrs +- ibqueryerrors.pl fixes and improvements +- Removed use of tmpfile for ibroute data in ibfindnodeusing.pl +- Fixed undefined subroutine error in iblinkinfo.pl +- Added switch-map option to ibtracert and ibnetdiscover +- Cleaned up node descriptions before printing in saquery +- Clarified --src-to-dst option in saquery +- Added peer NodeDescription and LID to output of inbetdiscover +- For grouping, ordered Spine and Line Nodes (for Voltaire chassis) in ibnetdiscover +- Cleaned up node descriptions before printing in ibtracert and ibroute +- Added additional sematics to -m option of saquery +- Added dump_mfts.sh similar to dump_lfts.sh +- ibnetdiscover improvements (memory leaks, ports moving, etc.) +- Converted iblinkspeed.pl into iblinkinfo.pl and added additional capabilities +- Added 0x in front of GUID printing of ibtracert +- Fixed loopback handling in ibnetdiscover +- Added support for querying Service Records to saquery +- Added support for PerfMgt IsExtendedWidthSupported IBA 1.2 erratum in perfquery +- For query operations, added peer port checking of linkwidth and speed + active in ibportstate +- Added support for DrSLID in smpquery +- Added IB router support to ibnetdiscover and ibtracert +- Added additional options to saquery +- Added support to change LinkSpeedEnabled in ibportstate + +* Fri Sep 22 2006 Hal Rosenstock - 1.1.0 +- OpenFabrics 1.1 release + +* Wed Sep 13 2006 Hal Rosenstock - 1.1.0-rc5 +- OpenFabrics 1.1-rc5 release + +* Wed Sep 6 2006 Hal Rosenstock - 1.1.0-rc4 +- OpenFabrics 1.1-rc4 release + +* Wed Aug 23 2006 Hal Rosenstock - 1.1.0-rc3 +- OpenFabrics 1.1-rc3 release + +* Mon Aug 14 2006 Hal Rosenstock - 1.1.0-rc2 +- OpenFabrics 1.1-rc2 release +- Added ibsysstat man page + +* Wed Jul 26 2006 Hal Rosenstock - 1.1.0-rc1 +- OpenFabrics 1.1-rc1 release +- Added man pages +- Made diag command/script options more consistent +- saquery tool added +- dump_lft.sh script added +- Renamed discover.pl to ibdiscover.pl + +* Sat Jun 10 2006 Hal Rosenstock - 1.0-1 +- OpenFabrics 1.0 release + +* Tue May 30 2006 Hal Rosenstock - 1.0.0-rc6 +- Maintenance release + +* Fri May 12 2006 Hal Rosenstock - 1.0.0-rc5 +- Maintenance release + +* Thu Apr 27 2006 Hal Rosenstock - 1.0.0-rc4 +- Maintenance release +- Note rc3 skipped to sync with OFED + +* Mon Apr 10 2006 Hal Rosenstock - 1.0.0-rc2 +- Maintenance release + +* Mon Feb 27 2006 Hal Rosenstock - 1.0.0-rc1 +- Initial spec file and release