From 4bbdcbebfae62f977bae877282545f980f033be6 Mon Sep 17 00:00:00 2001 From: anolis-bot Date: Thu, 10 Nov 2022 14:48:16 +0800 Subject: [PATCH] update to rdma-core-41.0-1.el8 Signed-off-by: anolis-bot --- ...mparing-qp_state-for-iWARP-providers.patch | 63 ------------------- dist | 1 + download | 2 +- rdma-core.spec | 25 +++----- 4 files changed, 10 insertions(+), 81 deletions(-) delete mode 100644 0001-tests-Fix-comparing-qp_state-for-iWARP-providers.patch create mode 100644 dist diff --git a/0001-tests-Fix-comparing-qp_state-for-iWARP-providers.patch b/0001-tests-Fix-comparing-qp_state-for-iWARP-providers.patch deleted file mode 100644 index 686531e..0000000 --- a/0001-tests-Fix-comparing-qp_state-for-iWARP-providers.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 698f2ae804767635342694d31d9590fe6ad2217e Mon Sep 17 00:00:00 2001 -From: Kamal Heib -Date: Wed, 8 Dec 2021 16:12:11 +0200 -Subject: [PATCH] tests: Fix comparing qp_state for iWARP providers. - -The initial QP state for iWARP providers is IBV_QPS_INIT (not -IBV_QPS_RESET), Change the test to handle this case. - -Signed-off-by: Kamal Heib ---- - tests/test_qp.py | 16 ++++++++++++++-- - 1 file changed, 14 insertions(+), 2 deletions(-) - -diff --git a/tests/test_qp.py b/tests/test_qp.py -index b952c95e..a66f724f 100644 ---- a/tests/test_qp.py -+++ b/tests/test_qp.py -@@ -14,6 +14,7 @@ from pyverbs.pyverbs_error import PyverbsRDMAError - from pyverbs.qp import QPInitAttr, QPAttr, QP - from tests.base import PyverbsAPITestCase - import pyverbs.utils as pu -+import pyverbs.device as d - import pyverbs.enums as e - from pyverbs.pd import PD - from pyverbs.cq import CQ -@@ -177,6 +178,11 @@ class QPTest(PyverbsAPITestCase): - self.assertLessEqual(orig_cap.max_recv_sge, init_attr.cap.max_recv_sge) - self.assertLessEqual(orig_cap.max_inline_data, init_attr.cap.max_inline_data) - -+ def get_node_type(self): -+ for dev in d.get_device_list(): -+ if dev.name.decode() == self.ctx.name: -+ return dev.node_type -+ - def query_qp_common_test(self, qp_type): - with PD(self.ctx) as pd: - with CQ(self.ctx, 100, None, None, 0) as cq: -@@ -190,14 +196,20 @@ class QPTest(PyverbsAPITestCase): - caps = qia.cap - qp = self.create_qp(pd, qia, False, False, self.ib_port) - qp_attr, qp_init_attr = qp.query(e.IBV_QP_STATE | e.IBV_QP_CAP) -- self.verify_qp_attrs(caps, e.IBV_QPS_RESET, qp_init_attr, qp_attr) -+ if self.get_node_type() == e.IBV_NODE_RNIC: -+ self.verify_qp_attrs(caps, e.IBV_QPS_INIT, qp_init_attr, qp_attr) -+ else: -+ self.verify_qp_attrs(caps, e.IBV_QPS_RESET, qp_init_attr, qp_attr) - - # Extended QP - qia = get_qp_init_attr_ex(cq, pd, self.attr, self.attr_ex, qp_type) - caps = qia.cap # Save them to verify values later - qp = self.create_qp(self.ctx, qia, True, False, self.ib_port) - qp_attr, qp_init_attr = qp.query(e.IBV_QP_STATE | e.IBV_QP_CAP) -- self.verify_qp_attrs(caps, e.IBV_QPS_RESET, qp_init_attr, qp_attr) -+ if self.get_node_type() == e.IBV_NODE_RNIC: -+ self.verify_qp_attrs(caps, e.IBV_QPS_INIT, qp_init_attr, qp_attr) -+ else: -+ self.verify_qp_attrs(caps, e.IBV_QPS_RESET, qp_init_attr, qp_attr) - - def test_query_rc_qp(self): - """ --- -2.33.1 - diff --git a/dist b/dist new file mode 100644 index 0000000..9c0e36e --- /dev/null +++ b/dist @@ -0,0 +1 @@ +an8 diff --git a/download b/download index 91ee9dc..42de858 100644 --- a/download +++ b/download @@ -1 +1 @@ -efc96cfed2ee6898c7a6f234c185f87a rdma-core-37.2.tar.gz +2250389cb61a7130133e6411fdeef2f9 rdma-core-41.0.tar.gz diff --git a/rdma-core.spec b/rdma-core.spec index 2a124d4..5602402 100644 --- a/rdma-core.spec +++ b/rdma-core.spec @@ -1,7 +1,6 @@ -%define anolis_release .0.1 Name: rdma-core -Version: 37.2 -Release: 1%{anolis_release}%{?dist} +Version: 41.0 +Release: 1%{?dist} Summary: RDMA core userspace libraries and daemons # Almost everything is licensed under the OFA dual GPLv2, 2 Clause BSD license @@ -20,8 +19,6 @@ Source3: rxe_cfg.8.gz Patch3: udev-keep-NAME_KERNEL-as-default-interface-naming-co.patch # RHEL specific patch for OPA ibacm plugin Patch300: 0001-ibacm-acm.c-load-plugin-while-it-is-soft-link.patch - -Patch301: 0001-tests-Fix-comparing-qp_state-for-iWARP-providers.patch # Do not build static libs by default. %define with_static %{?_with_static: 1} %{?!_with_static: 0} @@ -85,9 +82,7 @@ BuildRequires: make %define cmake_install DESTDIR=%{buildroot} make install %endif -%ifnarch loongarch64 BuildRequires: pandoc -%endif %description RDMA core userspace infrastructure and documentation, including kernel @@ -258,7 +253,6 @@ easy, object-oriented access to IB verbs. %setup -q %patch3 -p1 %patch300 -p1 -%patch301 -p1 %build @@ -410,7 +404,7 @@ fi %config(noreplace) %{_sysconfdir}/rdma/modules/roce.conf %config(noreplace) %{_sysconfdir}/udev/rules.d/* %dir %{_sysconfdir}/modprobe.d -%ifnarch s390 loongarch64 +%ifnarch s390 %config(noreplace) %{_sysconfdir}/modprobe.d/mlx4.conf %endif %config(noreplace) %{_sysconfdir}/modprobe.d/truescale.conf @@ -450,15 +444,13 @@ fi %endif %{_libdir}/lib*.so %{_libdir}/pkgconfig/*.pc -%ifnarch loongarch64 %{_mandir}/man3/efadv* -%endif %{_mandir}/man3/ibv_* %{_mandir}/man3/rdma* %{_mandir}/man3/umad* %{_mandir}/man3/*_to_ibv_rate.* %{_mandir}/man7/rdma_cm.* -%ifnarch s390 loongarch64 +%ifnarch s390 %{_mandir}/man3/mlx5dv* %{_mandir}/man3/mlx4dv* %{_mandir}/man7/efadv* @@ -538,12 +530,10 @@ fi %files -n libibverbs %dir %{_sysconfdir}/libibverbs.d %dir %{_libdir}/libibverbs -%ifnarch loongarch64 %{_libdir}/libefa.so.* -%endif %{_libdir}/libibverbs*.so.* %{_libdir}/libibverbs/*.so -%ifnarch s390 loongarch64 +%ifnarch s390 %{_libdir}/libmlx5.so.* %{_libdir}/libmlx4.so.* %endif @@ -648,8 +638,9 @@ fi %endif %changelog -* Fri Apr 22 2022 Jacob Wang - 37.2-1.0.1 -- Support loongarch64 (Hang Zhao) +* Fri Aug 05 2022 Michal Schmidt - 41.0-1 +- Update to upstream release v41.0 +- Resolves: rhbz#2049518 * Thu Jan 06 2022 Honggang Li - 37.2-1 - Update to upstream v37.2 release for fixes -- Gitee