From 38dd77bbd5313740bde614cbf1f026e150325bac Mon Sep 17 00:00:00 2001 From: Kou Wenqi Date: Fri, 5 Jul 2024 09:38:03 +0800 Subject: [PATCH] Add ctrlr_lock for cuse register and unregister --- ...ock-for-cuse-register-and-unregister.patch | 80 +++++++++++++++++++ spdk.spec | 6 +- 2 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 0031-backport-Add-ctrlr_lock-for-cuse-register-and-unregister.patch diff --git a/0031-backport-Add-ctrlr_lock-for-cuse-register-and-unregister.patch b/0031-backport-Add-ctrlr_lock-for-cuse-register-and-unregister.patch new file mode 100644 index 0000000..e98cf9a --- /dev/null +++ b/0031-backport-Add-ctrlr_lock-for-cuse-register-and-unregister.patch @@ -0,0 +1,80 @@ +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 +Community-CI: Mellanox Build Bot +Reviewed-by: Jim Harris +Reviewed-by: Konrad Sztyber + +--- + lib/nvme/nvme_io_msg.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/lib/nvme/nvme_io_msg.c b/lib/nvme/nvme_io_msg.c +index fb5aec3..d74736c 100644 +--- a/lib/nvme/nvme_io_msg.c ++++ b/lib/nvme/nvme_io_msg.c +@@ -130,7 +130,9 @@ 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; + } + +@@ -148,6 +150,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; + } + +@@ -156,10 +159,12 @@ nvme_io_msg_ctrlr_register(struct spdk_nvme_ctrlr *ctrlr, + SPDK_ERRLOG("spdk_nvme_ctrlr_alloc_io_qpair() failed\n"); + spdk_ring_free(ctrlr->external_io_msgs); + ctrlr->external_io_msgs = NULL; ++ nvme_robust_mutex_unlock(&ctrlr->ctrlr_lock); + return -ENOMEM; + } + + STAILQ_INSERT_TAIL(&ctrlr->io_producers, io_msg_producer, link); ++ nvme_robust_mutex_unlock(&ctrlr->ctrlr_lock); + + return 0; + } +@@ -205,7 +210,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; + } + +@@ -213,4 +220,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 + diff --git a/spdk.spec b/spdk.spec index 93e2f7d..5649a54 100644 --- a/spdk.spec +++ b/spdk.spec @@ -4,7 +4,7 @@ Name: spdk Version: 21.01 -Release: 8 +Release: 9 Summary: Set of libraries and utilities for high performance user-mode storage License: BSD and MIT URL: http://spdk.io @@ -39,6 +39,7 @@ Patch27: 0027-spdk_top-check-return-value-of-strdup-in-store_last_.patch Patch28: 0028-uring-set-fd-to-1-after-close-fd-in-uring_sock_creat.patch Patch29: 0029-Fix-build-warning.patch Patch30: 0030-ut-rdma-Fix-GCC-10.2.0-warning.patch +Patch31: 0031-backport-Add-ctrlr_lock-for-cuse-register-and-unregister.patch %define package_version %{version}-%{release} @@ -212,6 +213,9 @@ mv doc/output/html/ %{install_docdir} %changelog +* Thu Jul 4 2024 kouwenqi - 21.01-9 +- Add ctrlr_lock for cuse register and unregister + * Fri Mar 15 2024 wangxiaomeng - 21.01-8 - Fix build warning