0002-backport-Add-ctrlr_lock-for-cuse-register-and-unregister.patch

@@ -1,94 +0,0 @@
-From 253cca4fc3a89c38e79d2e940c5a0b7bb082afcc Mon Sep 17 00:00:00 2001
-From: Zhanghongtao2417 <651380626@qq.com>
-Date: Fri, 26 Apr 2024 22:01:25 +0800
-Subject: [PATCH] nvme/cuse: Add ctrlr_lock for cuse register and unregister
-
-conflicts:
-lib/nvme/nvme_io_msg.c  nvme_io_msg_ctrlr_update
-
-spdk_nvme_cuse_unregister and spdk_nvme_ctrlr_process_admin_completions
- running at the same time, concurrently operate external_io_msgs.
-So we add locks to protect.
-
-Fixes #3353
-
-Change-Id: Id5176975676c29a475e8e2a0d7c93e44646c00dc
-Signed-off-by: Zhanghongtao2417 <651380626@qq.com>
-Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/22927
-Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
-Community-CI: Mellanox Build Bot
-Reviewed-by: Jim Harris <jim.harris@samsung.com>
-Reviewed-by: Konrad Sztyber <konrad.sztyber@intel.com>
-
----
- lib/nvme/nvme_io_msg.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/lib/nvme/nvme_io_msg.c b/lib/nvme/nvme_io_msg.c
-index 94c4d07..9f5ee6d 100644
---- a/lib/nvme/nvme_io_msg.c
-+++ b/lib/nvme/nvme_io_msg.c
-@@ -111,13 +111,16 @@ nvme_io_msg_ctrlr_register(struct spdk_nvme_ctrlr *ctrlr,
- 		return -EINVAL;
- 	}
- 
-+	nvme_robust_mutex_lock(&ctrlr->ctrlr_lock);
- 	if (nvme_io_msg_is_producer_registered(ctrlr, io_msg_producer)) {
-+		nvme_robust_mutex_unlock(&ctrlr->ctrlr_lock);
- 		return -EEXIST;
- 	}
- 
- 	if (!STAILQ_EMPTY(&ctrlr->io_producers) || ctrlr->is_resetting) {
- 		/* There are registered producers - IO messaging already started */
- 		STAILQ_INSERT_TAIL(&ctrlr->io_producers, io_msg_producer, link);
-+		nvme_robust_mutex_unlock(&ctrlr->ctrlr_lock);
- 		return 0;
- 	}
- 
-@@ -129,6 +132,7 @@ nvme_io_msg_ctrlr_register(struct spdk_nvme_ctrlr *ctrlr,
- 	ctrlr->external_io_msgs = spdk_ring_create(SPDK_RING_TYPE_MP_SC, 65536, SPDK_ENV_SOCKET_ID_ANY);
- 	if (!ctrlr->external_io_msgs) {
- 		SPDK_ERRLOG("Unable to allocate memory for message ring\n");
-+		nvme_robust_mutex_unlock(&ctrlr->ctrlr_lock);
- 		return -ENOMEM;
- 	}
- 
-@@ -141,6 +145,7 @@ nvme_io_msg_ctrlr_register(struct spdk_nvme_ctrlr *ctrlr,
- 	}
- 
- 	STAILQ_INSERT_TAIL(&ctrlr->io_producers, io_msg_producer, link);
-+	nvme_robust_mutex_unlock(&ctrlr->ctrlr_lock);
- 
- 	return 0;
- }
-@@ -156,9 +161,11 @@ nvme_io_msg_ctrlr_update(struct spdk_nvme_ctrlr *ctrlr)
- 	}
- 
- 	/* Update all producers */
-+	nvme_robust_mutex_lock(&ctrlr->ctrlr_lock);
- 	STAILQ_FOREACH(io_msg_producer, &ctrlr->io_producers, link) {
- 		io_msg_producer->update(ctrlr);
- 	}
-+	nvme_robust_mutex_unlock(&ctrlr->ctrlr_lock);
- }
- 
- void
-@@ -195,7 +202,9 @@ nvme_io_msg_ctrlr_unregister(struct spdk_nvme_ctrlr *ctrlr,
- {
- 	assert(io_msg_producer != NULL);
- 
-+	nvme_robust_mutex_lock(&ctrlr->ctrlr_lock);
- 	if (!nvme_io_msg_is_producer_registered(ctrlr, io_msg_producer)) {
-+		nvme_robust_mutex_unlock(&ctrlr->ctrlr_lock);
- 		return;
- 	}
- 
-@@ -203,4 +212,5 @@ nvme_io_msg_ctrlr_unregister(struct spdk_nvme_ctrlr *ctrlr,
- 	if (STAILQ_EMPTY(&ctrlr->io_producers)) {
- 		nvme_io_msg_ctrlr_detach(ctrlr);
- 	}
-+	nvme_robust_mutex_unlock(&ctrlr->ctrlr_lock);	
- }
--- 
-2.27.0
-

0100-spdk-uos-add-sw64-support.patch

@@ -1,46 +0,0 @@
-diff -Naur a/include/spdk/barrier.h b/include/spdk/barrier.h
---- a/include/spdk/barrier.h	2024-01-26 23:17:18.000000000 +0800
-+++ b/include/spdk/barrier.h	2024-12-12 21:12:33.045436865 +0800
-@@ -95,6 +95,16 @@
- #define _spdk_smp_mb()	__asm volatile("dbar 0" ::: "memory")
- #define _spdk_ivdt_dcache(pdata)
- 
-+#elif defined(__sw_64)
-+
-+#define _spdk_rmb()	__asm volatile("memb" ::: "memory")
-+#define _spdk_wmb()	__asm volatile("memb" ::: "memory")
-+#define _spdk_mb()	__asm volatile("memb" ::: "memory")
-+#define _spdk_smp_rmb()	__asm volatile("memb" ::: "memory")
-+#define _spdk_smp_wmb()	__asm volatile("memb" ::: "memory")
-+#define _spdk_smp_mb()	__asm volatile("memb" ::: "memory")
-+#define _spdk_ivdt_dcache(pdata)
-+
- #else
- 
- #define _spdk_rmb()
-diff -Naur a/lib/nvme/nvme_pcie_common.c b/lib/nvme/nvme_pcie_common.c
---- a/lib/nvme/nvme_pcie_common.c	2024-01-26 23:17:18.000000000 +0800
-+++ b/lib/nvme/nvme_pcie_common.c	2024-12-12 21:15:59.272412493 +0800
-@@ -898,7 +898,7 @@
- 			__builtin_prefetch(&pqpair->tr[next_cpl->cid]);
- 		}
- 
--#if defined(__PPC64__) || defined(__riscv) || defined(__loongarch__)
-+#if defined(__PPC64__) || defined(__riscv) || defined(__loongarch__) || defined(__sw_64)
- 		/*
- 		 * This memory barrier prevents reordering of:
- 		 * - load after store from/to tr
-diff -Naur a/mk/spdk.common.mk b/mk/spdk.common.mk
---- a/mk/spdk.common.mk	2024-01-26 23:17:18.000000000 +0800
-+++ b/mk/spdk.common.mk	2024-12-12 21:47:43.964114007 +0800
-@@ -71,6 +71,10 @@
- else ifneq ($(filter loongarch%,$(TARGET_MACHINE)),)
- COMMON_CFLAGS += -march=$(TARGET_ARCHITECTURE)
- COMMON_CFLAGS += -DPAGE_SIZE=$(shell getconf PAGESIZE)
-+else ifneq ($(filter sw_64%,$(TARGET_MACHINE)),)
-+# -march=native is not yet supported by GCC on RISC-V. Falling back to default.
-+#COMMON_CFLAGS += -march=$(TARGET_ARCHITECTURE)
-+#COMMON_CFLAGS += -DPAGE_SIZE=$(shell getconf PAGESIZE)
- else
- COMMON_CFLAGS += -march=$(TARGET_ARCHITECTURE)
- endif

spdk.spec

@@ -4,14 +4,12 @@
 
 Name: spdk
 Version: 24.01
-Release: 8
+Release: 3
 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: 0100-spdk-uos-add-sw64-support.patch
 
 %define package_version %{version}-%{release}
 
@@ -26,17 +24,15 @@ Patch3: 0100-spdk-uos-add-sw64-support.patch
 %define use_python2 0
 %endif
 
-ExclusiveArch: x86_64 aarch64 loongarch64 ppc64le riscv64 sw_64
+ExclusiveArch: x86_64 aarch64 loongarch64 ppc64le riscv64
 
 BuildRequires: gcc gcc-c++ make
-BuildRequires: dpdk-devel >= 23.11, numactl-devel, ncurses-devel
+BuildRequires: dpdk-devel, numactl-devel, ncurses-devel
 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
-BuildRequires: CUnit, CUnit-devel, chrpath
-BuildRequires: python3-pip, python3-setuptools, python3-wheel
 %if %{with doc}
 BuildRequires: doxygen mscgen graphviz
 %endif
@@ -179,21 +175,6 @@ mv doc/output/html/ %{install_docdir}
 
 
 %changelog
-* Fri Feb 28 2025 zhangshaoning <zhangshaoning@uniontech.com> - 24.01-8
-- Add sw_64 support
-
-* Sat Nov 30 2024 Weifeng Su <suweifeng1@huawei.com> - 24.01-7
-- Fix build isue for spdk-tools
-
-* Thu Jun 6 2024 baiguo <baiguo@kylinos.cn> - 24.01-6
-- Add ctrlr_lock for cuse register and unregister 
-
-* Mon Apr 29 2024 huangwenhua <huangwenhua@kylinos.cn> - 24.01-5
-- Add BuildRequires: patchelf
-
-* Wed Mar 13 2024 wangxiaomeng <wangxiaomeng@kylinos.cn> - 24.01-4
-- Add version constraints to the dpdk-devel package to resolve building error
-
 * Tue Mar 5 2024 shafeipaozi <sunbo.oerv@isrc.iscas.ac.cn> - 24.01-3
 - Add support for riscv64