From 936e05e1a53e68966860f6cf98db02e24249c8b5 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Sun, 9 Jan 2022 20:21:13 +0000 Subject: [PATCH] import rdma-core-37.2-1.el8 --- .gitignore | 2 +- .rdma-core.metadata | 2 +- ...mparing-qp_state-for-iWARP-providers.patch | 63 +++++++++++++++++++ SPECS/rdma-core.spec | 9 ++- 4 files changed, 73 insertions(+), 3 deletions(-) create mode 100644 SOURCES/0001-tests-Fix-comparing-qp_state-for-iWARP-providers.patch diff --git a/.gitignore b/.gitignore index 6086463..dfbd510 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/rdma-core-37.1.tar.gz +SOURCES/rdma-core-37.2.tar.gz SOURCES/rxe_cfg.8.gz diff --git a/.rdma-core.metadata b/.rdma-core.metadata index 1b5f1ca..cb16315 100644 --- a/.rdma-core.metadata +++ b/.rdma-core.metadata @@ -1,2 +1,2 @@ -cdd206d938d6e3add2ed18c106e58a1db8b78912 SOURCES/rdma-core-37.1.tar.gz +ec4596f069873bc3119f0cf2ed076a0aef61c2cf SOURCES/rdma-core-37.2.tar.gz 9187638355d9bee854989bbfc6c2956301fd52aa SOURCES/rxe_cfg.8.gz diff --git a/SOURCES/0001-tests-Fix-comparing-qp_state-for-iWARP-providers.patch b/SOURCES/0001-tests-Fix-comparing-qp_state-for-iWARP-providers.patch new file mode 100644 index 0000000..686531e --- /dev/null +++ b/SOURCES/0001-tests-Fix-comparing-qp_state-for-iWARP-providers.patch @@ -0,0 +1,63 @@ +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/SPECS/rdma-core.spec b/SPECS/rdma-core.spec index b4a4f31..aec4239 100644 --- a/SPECS/rdma-core.spec +++ b/SPECS/rdma-core.spec @@ -1,5 +1,5 @@ Name: rdma-core -Version: 37.1 +Version: 37.2 Release: 1%{?dist} Summary: RDMA core userspace libraries and daemons @@ -19,6 +19,8 @@ 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} @@ -253,6 +255,7 @@ easy, object-oriented access to IB verbs. %setup -q %patch3 -p1 %patch300 -p1 +%patch301 -p1 %build @@ -638,6 +641,10 @@ fi %endif %changelog +* Thu Jan 06 2022 Honggang Li - 37.2-1 +- Update to upstream v37.2 release for fixes +- Resolves: bz2008509, bz2024865, bz1915555 + * Tue Nov 09 2021 Honggang Li - 37.1-1 - Update to upstream v37.1 release for features and fixes - Resolves: bz1982200, bz1990120, bz1982131