packages/rdma-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!24 update to 35.1

Browse Source 
Merge pull request !24 from eaglegai/master
This commit is contained in:
openeuler-ci-bot 2021-12-21 02:17:02 +00:00 committed by Gitee
commit 88f89608f6
6 changed files with 39 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
backport-fixbug-increase-maximum-number-of-cpus-rdma.patch Normal file
View File

@ -0,0 +1,27 @@
From c381cfa26ba6163b9cc51212702e64bf1d83f838 Mon Sep 17 00:00:00 2001
From: swimlessbird <52704385+swimlessbird@users.noreply.github.com>
Date: Fri, 17 Sep 2021 14:35:05 +0800
Subject: [PATCH] ibdiags: Increase maximum number of CPUs
In modern systems, the old limit (8) is small enough, so increase
to something larger (256).
Signed-off-by: Suwan Sun <swimlessbird@gmail.com>
Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
---
infiniband-diags/ibsysstat.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/infiniband-diags/ibsysstat.c b/infiniband-diags/ibsysstat.c
index 6ff7ca0c4..73972d039 100644
--- a/infiniband-diags/ibsysstat.c
+++ b/infiniband-diags/ibsysstat.c
@@ -41,7 +41,7 @@
#include "ibdiag_common.h"
-#define MAX_CPUS 8
+#define MAX_CPUS 256
static struct ibmad_port *srcport;

12
fixbug-increase-maximum-number-of-cpus-rdma.patch
View File

@ -1,12 +0,0 @@
diff -ur rdma-core-35.0.old/infiniband-diags/ibsysstat.c rdma-core-35.0/infiniband-diags/ibsysstat.c
--- rdma-core-35.0.old/infiniband-diags/ibsysstat.c 2021-05-10 15:58:48.000000000 +0800
+++ rdma-core-35.0/infiniband-diags/ibsysstat.c 2021-09-24 10:59:28.653893593 +0800
@@ -41,7 +41,7 @@
#include "ibdiag_common.h"
-#define MAX_CPUS 8
+#define MAX_CPUS 256
static struct ibmad_port *srcport;

BIN
rdma-core-35.0.tar.gz
View File

Binary file not shown.

BIN
rdma-core-35.1.tar.gz Normal file
View File

Binary file not shown.

18
rdma-core.spec
View File

@ -1,17 +1,18 @@
Name: rdma-core
Version: 35.0
Release: 3
Version: 35.1
Release: 1
Summary: RDMA core userspace libraries and daemons
License: GPLv2 or BSD
Url: https://github.com/linux-rdma/rdma-core
Source: https://github.com/linux-rdma/rdma-core/releases/download/v%{version}/%{name}-%{version}.tar.gz
Patch0: backport-fixbug-increase-maximum-number-of-cpus-rdma.patch
BuildRequires: binutils cmake >= 2.8.11 gcc libudev-devel pkgconfig pkgconfig(libnl-3.0)
BuildRequires: pkgconfig(libnl-route-3.0) valgrind-devel systemd systemd-devel
BuildRequires: python3-devel python3-Cython python3 python3-docutils perl-generators
BuildRequires: ninja-build
Requires: dracut kmod systemd pciutils
Requires: systemd pciutils
Provides: ibacm infiniband-diags-compat infiniband-diags libibverbs libibverbs-utils iwpmd libibumad librdmacm librdmacm-utils srp_daemon
Obsoletes: ibacm infiniband-diags-compat infiniband-diags libibverbs libibverbs-utils iwpmd libibumad librdmacm librdmacm-utils srp_daemon
@ -48,9 +49,6 @@ Obsoletes: openib-srptools <= 0.0.6
Conflicts: infiniband-diags <= 1.6.7
Patch001: fixbug-increase-maximum-number-of-cpus-rdma.patch
Patch002: use-e-para-to-make-transferred-meaning-take-effect.patch
%{?systemd_requires}
%define CMAKE_FLAGS -GNinja
@ -170,9 +168,11 @@ rm -f %{buildroot}/%{_sbindir}/srp_daemon.sh
%ldconfig_scriptlets
%post
if [ -x /sbin/udevadm ];then
/sbin/udevadm trigger --subsystem-match=infiniband --action=change || true
/sbin/udevadm trigger --subsystem-match=net --action=change || true
/sbin/udevadm trigger --subsystem-match=infiniband_mad --action=change || true
fi
%systemd_post ibacm.service
%systemd_post srp_daemon.service
%systemd_post iwpmd.service
@ -250,6 +250,12 @@ rm -f %{buildroot}/%{_sbindir}/srp_daemon.sh
%{_mandir}/*
%changelog
* Thu Dec 09 2021 gaihuiying <gaihuiying1@huawei.com> - 35.1-1
- Type: requirement
- ID: NA
- SUG: NA
- DESC: update to 35.1
* Thu Sep 26 2021 seuzw <930zhaowei@163.com> - 35.0-3
- Type: bugfix
- ID: NA

95
use-e-para-to-make-transferred-meaning-take-effect.patch
View File

@ -1,95 +0,0 @@
From cfac7d4cadbc93f20c0b4e6badfcabb9f55f0ad5 Mon Sep 17 00:00:00 2001
From: seuzw <930zhaowei@163.com>
Date: Sun, 26 Sep 2021 15:38:49 +0800
Subject: [PATCH] use -e para to make transferred meaning take effect
---
infiniband-diags/scripts/ibcheckerrs.in | 2 +-
infiniband-diags/scripts/ibchecknode.in | 2 +-
infiniband-diags/scripts/ibcheckport.in | 2 +-
infiniband-diags/scripts/ibcheckportstate.in | 2 +-
infiniband-diags/scripts/ibcheckportwidth.in | 2 +-
infiniband-diags/scripts/ibdatacounts.in | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/infiniband-diags/scripts/ibcheckerrs.in b/infiniband-diags/scripts/ibcheckerrs.in
index 1edd1eb..4902f55 100644
--- a/infiniband-diags/scripts/ibcheckerrs.in
+++ b/infiniband-diags/scripts/ibcheckerrs.in
@@ -140,7 +140,7 @@ else
fi
if [ "$suppress_deprecated" = "no" ]; then
-echo "*** WARNING ***: this command is deprecated; Please use \"ibqueryerrors\"\n\n" 1>&2
+echo -e "*** WARNING ***: this command is deprecated; Please use \"ibqueryerrors\"\n\n" 1>&2
fi
if [ "$guid_addr" ]; then
diff --git a/infiniband-diags/scripts/ibchecknode.in b/infiniband-diags/scripts/ibchecknode.in
index d70d5c8..9555513 100644
--- a/infiniband-diags/scripts/ibchecknode.in
+++ b/infiniband-diags/scripts/ibchecknode.in
@@ -75,7 +75,7 @@ if [ -z "$1" ]; then
fi
if [ "$suppress_deprecated" = "no" ]; then
-echo "*** WARNING ***: this command is deprecated; Please use \"smpquery nodeinfo\"\n\n" 1>&2
+echo -e "*** WARNING ***: this command is deprecated; Please use \"smpquery nodeinfo\"\n\n" 1>&2
fi
if [ "$guid_addr" ]; then
diff --git a/infiniband-diags/scripts/ibcheckport.in b/infiniband-diags/scripts/ibcheckport.in
index 16a8c24..a504c97 100644
--- a/infiniband-diags/scripts/ibcheckport.in
+++ b/infiniband-diags/scripts/ibcheckport.in
@@ -77,7 +77,7 @@ fi
portnum=$2
if [ "$suppress_deprecated" = "no" ]; then
-echo "*** WARNING ***: this command is deprecated\n\n" 1>&2
+echo -e "*** WARNING ***: this command is deprecated\n\n" 1>&2
fi
if [ "$guid_addr" ]; then
diff --git a/infiniband-diags/scripts/ibcheckportstate.in b/infiniband-diags/scripts/ibcheckportstate.in
index c5fb948..5482075 100644
--- a/infiniband-diags/scripts/ibcheckportstate.in
+++ b/infiniband-diags/scripts/ibcheckportstate.in
@@ -77,7 +77,7 @@ fi
portnum=$2
if [ "$suppress_deprecated" = "no" ]; then
-echo "*** WARNING ***: this command is deprecated\n\n" 1>&2
+echo -e "*** WARNING ***: this command is deprecated\n\n" 1>&2
fi
if [ "$guid_addr" ]; then
diff --git a/infiniband-diags/scripts/ibcheckportwidth.in b/infiniband-diags/scripts/ibcheckportwidth.in
index 9cfca11..eb79944 100644
--- a/infiniband-diags/scripts/ibcheckportwidth.in
+++ b/infiniband-diags/scripts/ibcheckportwidth.in
@@ -77,7 +77,7 @@ fi
portnum=$2
if [ "$suppress_deprecated" = "no" ]; then
-echo "*** WARNING ***: this command is deprecated\n\n" 1>&2
+echo -e "*** WARNING ***: this command is deprecated\n\n" 1>&2
fi
if [ "$guid_addr" ]; then
diff --git a/infiniband-diags/scripts/ibdatacounts.in b/infiniband-diags/scripts/ibdatacounts.in
index ac5f8c4..772b47f 100644
--- a/infiniband-diags/scripts/ibdatacounts.in
+++ b/infiniband-diags/scripts/ibdatacounts.in
@@ -113,7 +113,7 @@ fi
nodename=`$IBPATH/smpquery $ca_info nodedesc $lid | sed -e "s/^Node Description:\.*\(.*\)/\1/"`
if [ "$suppress_deprecated" = "no" ]; then
-echo "*** WARNING ***: this command is deprecated; Please use \"ibqueryerrors --counters\"\n\n" 1>&2
+echo -e "*** WARNING ***: this command is deprecated; Please use \"ibqueryerrors --counters\"\n\n" 1>&2
fi
text="`eval $IBPATH/perfquery $ca_info $lid $portnum`"
--
2.27.0