From b11df94bc58b6782b7766148db8acba81397ebf6 Mon Sep 17 00:00:00 2001 From: wxm Date: Wed, 13 Mar 2024 06:30:25 +0000 Subject: [PATCH 1/3] Add version constraints to the dpdk-devel package to resolve building error Signed-off-by: wxm (cherry picked from commit 94901b4e41aacda95a558eee5cb0de4fb60f4f80) --- spdk.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/spdk.spec b/spdk.spec index 6e04578..77c64f5 100644 --- a/spdk.spec +++ b/spdk.spec @@ -4,7 +4,7 @@ Name: spdk Version: 24.01 -Release: 3 +Release: 4 Summary: Set of libraries and utilities for high performance user-mode storage License: BSD and MIT URL: http://spdk.io @@ -27,7 +27,7 @@ Patch1: 0001-Add-without-ISA-L-option-and-disabled-by-default.patch ExclusiveArch: x86_64 aarch64 loongarch64 ppc64le riscv64 BuildRequires: gcc gcc-c++ make -BuildRequires: dpdk-devel, numactl-devel, ncurses-devel +BuildRequires: dpdk-devel >= 23.11, numactl-devel, ncurses-devel BuildRequires: libiscsi-devel, libaio-devel, openssl-devel, libuuid-devel BuildRequires: libibverbs-devel, librdmacm-devel BuildRequires: fuse3, fuse3-devel @@ -175,6 +175,9 @@ mv doc/output/html/ %{install_docdir} %changelog +* Wed Mar 13 2024 wangxiaomeng - 24.01-4 +- Add version constraints to the dpdk-devel package to resolve building error + * Tue Mar 5 2024 shafeipaozi - 24.01-3 - Add support for riscv64 -- Gitee From a669e21f8dec2115da5484d38aa09b7225b9ec34 Mon Sep 17 00:00:00 2001 From: huangwenhua Date: Mon, 29 Apr 2024 11:19:27 +0800 Subject: [PATCH 2/3] Add BuildRequires: patchelf --- spdk.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/spdk.spec b/spdk.spec index 77c64f5..191b5cd 100644 --- a/spdk.spec +++ b/spdk.spec @@ -4,7 +4,7 @@ Name: spdk Version: 24.01 -Release: 4 +Release: 5 Summary: Set of libraries and utilities for high performance user-mode storage License: BSD and MIT URL: http://spdk.io @@ -32,6 +32,7 @@ BuildRequires: libiscsi-devel, libaio-devel, openssl-devel, libuuid-devel BuildRequires: libibverbs-devel, librdmacm-devel BuildRequires: fuse3, fuse3-devel BuildRequires: libboundscheck +BuildRequires: patchelf BuildRequires: CUnit, CUnit-devel, python3-pip, chrpath %if %{with doc} BuildRequires: doxygen mscgen graphviz @@ -175,6 +176,9 @@ mv doc/output/html/ %{install_docdir} %changelog +* Mon Apr 29 2024 huangwenhua - 24.01-5 +- Add BuildRequires: patchelf + * Wed Mar 13 2024 wangxiaomeng - 24.01-4 - Add version constraints to the dpdk-devel package to resolve building error -- Gitee From 0ba50c6ff42a964172d1871a21a85f2aa99ebdea Mon Sep 17 00:00:00 2001 From: yanshuai01 Date: Mon, 27 May 2024 15:31:49 +0800 Subject: [PATCH 3/3] fix check for pool capacity --- 0002-fix-check-for-pool-capacity.patch | 38 ++++++++++++++++++++++++++ spdk.spec | 6 +++- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 0002-fix-check-for-pool-capacity.patch diff --git a/0002-fix-check-for-pool-capacity.patch b/0002-fix-check-for-pool-capacity.patch new file mode 100644 index 0000000..fd68b62 --- /dev/null +++ b/0002-fix-check-for-pool-capacity.patch @@ -0,0 +1,38 @@ +From ab2395bb04f65945696a06642e3df74745b3521b Mon Sep 17 00:00:00 2001 +From: Alexey Marchuk +Date: Tue, 21 May 2024 18:03:19 +0200 +Subject: [PATCH] nvmf/rdma: Fix check for pool capacity + +Data WR pool can be configured and default value was changed, +but check for the pool capacity was not updated and as result +a wrong error message is printed + +Signed-off-by: Alexey Marchuk +Change-Id: Ib50664ff972a20fac6e6f718132b80707b9f6d6b +Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/23280 +Reviewed-by: Shuhei Matsumoto +Community-CI: Mellanox Build Bot +Reviewed-by: Jim Harris +Tested-by: SPDK CI Jenkins + +--- + lib/nvmf/rdma.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/lib/nvmf/rdma.c b/lib/nvmf/rdma.c +index f329446..859dcf9 100644 +--- a/lib/nvmf/rdma.c ++++ b/lib/nvmf/rdma.c +@@ -2928,8 +2928,7 @@ nvmf_rdma_destroy(struct spdk_nvmf_transport *transport, + } + + if (rtransport->data_wr_pool != NULL) { +- if (spdk_mempool_count(rtransport->data_wr_pool) != +- (transport->opts.max_queue_depth * SPDK_NVMF_MAX_SGL_ENTRIES)) { ++ if (spdk_mempool_count(rtransport->data_wr_pool) != transport->opts.data_wr_pool_size) { + SPDK_ERRLOG("transport wr pool count is %zu but should be %u\n", + spdk_mempool_count(rtransport->data_wr_pool), + transport->opts.max_queue_depth * SPDK_NVMF_MAX_SGL_ENTRIES); +-- +2.27.0 + diff --git a/spdk.spec b/spdk.spec index 191b5cd..90f65f9 100644 --- a/spdk.spec +++ b/spdk.spec @@ -4,12 +4,13 @@ Name: spdk Version: 24.01 -Release: 5 +Release: 6 Summary: Set of libraries and utilities for high performance user-mode storage License: BSD and MIT URL: http://spdk.io Source0: https://github.com/spdk/spdk/archive/refs/tags/v%{version}.tar.gz Patch1: 0001-Add-without-ISA-L-option-and-disabled-by-default.patch +Patch2: 0002-fix-check-for-pool-capacity.patch %define package_version %{version}-%{release} @@ -176,6 +177,9 @@ mv doc/output/html/ %{install_docdir} %changelog +* Mon May 27 2024 yanshuai - 24.01-6 +- nvmf/rdma: Fix check for pool capacity + * Mon Apr 29 2024 huangwenhua - 24.01-5 - Add BuildRequires: patchelf -- Gitee