diff --git a/0003-fix-check-for-pool-capacity.patch b/0003-fix-check-for-pool-capacity.patch new file mode 100644 index 0000000000000000000000000000000000000000..fd68b62b13636b7b6cfbfad3745860582581da03 --- /dev/null +++ b/0003-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 bd9bed075058ee5d72de2abd6550bf752e3dc377..1bdbba96bc3313a15a0d27024c8a9b52de6dbe2d 100644 --- a/spdk.spec +++ b/spdk.spec @@ -4,13 +4,14 @@ Name: spdk Version: 24.01 -Release: 6 +Release: 7 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-backport-Add-ctrlr_lock-for-cuse-register-and-unregister.patch +Patch3: 0003-fix-check-for-pool-capacity.patch %define package_version %{version}-%{release} @@ -177,6 +178,9 @@ mv doc/output/html/ %{install_docdir} %changelog +* Thu Jun 27 2024 yanshuai - 24.01-7 +- nvmf/rdma: Fix check for pool capacity + * Thu Jun 6 2024 baiguo - 24.01-6 - Add ctrlr_lock for cuse register and unregister