From c4b21bbcc478ddfcddd8af6dd06b30781aec3474 Mon Sep 17 00:00:00 2001 From: Zht-Try Date: Thu, 7 Mar 2024 17:54:13 +0800 Subject: [PATCH] Fix probe core dump while admin cmd timeout (cherry picked from commit c04c671ce38d44c97cf8522fcce8d8f132724e0d) --- ...be-core-dump-while-admin-cmd-timeout.patch | 34 +++++++++++++++++++ spdk.spec | 6 +++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 0023-Fix-probe-core-dump-while-admin-cmd-timeout.patch diff --git a/0023-Fix-probe-core-dump-while-admin-cmd-timeout.patch b/0023-Fix-probe-core-dump-while-admin-cmd-timeout.patch new file mode 100644 index 0000000..ed146da --- /dev/null +++ b/0023-Fix-probe-core-dump-while-admin-cmd-timeout.patch @@ -0,0 +1,34 @@ +From c89931a6c3e7041dd7b6378438a48046cc5d5d57 Mon Sep 17 00:00:00 2001 +From: Zht-Try +Date: Tue, 5 Mar 2024 19:59:10 +0800 +Subject: [PATCH] Fix probe core dump while admin cmd timeout + +Signed-off-by: zhanghongtao +--- + module/bdev/nvme/bdev_nvme.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/module/bdev/nvme/bdev_nvme.c b/module/bdev/nvme/bdev_nvme.c +index e9d730d..425436f 100644 +--- a/module/bdev/nvme/bdev_nvme.c ++++ b/module/bdev/nvme/bdev_nvme.c +@@ -1592,6 +1592,8 @@ nvme_bdev_ctrlr_create(struct spdk_nvme_ctrlr *ctrlr, + spdk_nvme_ctrlr_register_aer_callback(ctrlr, aer_cb, nvme_bdev_ctrlr); + spdk_nvme_ctrlr_set_remove_cb(ctrlr, remove_cb, nvme_bdev_ctrlr); + ++ TAILQ_INSERT_HEAD(&nvme_bdev_ctrlr->trids, trid_entry, link); ++ + if (spdk_nvme_ctrlr_get_flags(nvme_bdev_ctrlr->ctrlr) & + SPDK_NVME_CTRLR_SECURITY_SEND_RECV_SUPPORTED) { + nvme_bdev_ctrlr->opal_dev = spdk_opal_dev_construct(nvme_bdev_ctrlr->ctrlr); +@@ -1600,7 +1602,6 @@ nvme_bdev_ctrlr_create(struct spdk_nvme_ctrlr *ctrlr, + } + } + +- TAILQ_INSERT_HEAD(&nvme_bdev_ctrlr->trids, trid_entry, link); + return 0; + + err_init_ocssd: +-- +2.33.0 + diff --git a/spdk.spec b/spdk.spec index 6567fd6..01a0063 100644 --- a/spdk.spec +++ b/spdk.spec @@ -3,7 +3,7 @@ Name: spdk Version: 21.01.1 -Release: 10 +Release: 11 Summary: Set of libraries and utilities for high performance user-mode storage License: BSD and MIT URL: http://spdk.io @@ -30,6 +30,7 @@ Patch19: 0019-build-Specify-the-target-build-architecture-for-LOON.patch Patch20: 0020-configure-add-CONFIG_HAVE_ARC4RANDOM.patch Patch21: 0021-lib-bdev-return-error-when-failing-to-get-resource.patch Patch22: 0022-Fix-the-build-error-ppc64le-gnu-gcc-does-not-support.patch +Patch23: 0023-Fix-probe-core-dump-while-admin-cmd-timeout.patch %define package_version %{version}-%{release} @@ -200,6 +201,9 @@ mv doc/output/html/ %{install_docdir} %changelog +* Wed Mar 6 2024 Hongtao Zhang - 21.01.1-11 +- Fix probe core dump while admin cmd timeout + * Mon Mar 4 2024 Ren Zhijie - 21.01.1-10 - Add support for ppc64le -- Gitee