DAOS-17207 daos: upgrade to SPDK 24.09 #16013

wangdi1 · 2025-03-04T04:03:37Z

Upgrade to SPDK24.09

Steps for the author:

Commit message follows the guidelines.
Appropriate Features or Test-tag pragmas were used.
At least two positive code reviews including at least one code owner from each category referenced in the PR.
Testing is complete. If necessary, forced-landing label added and a reason added in a comment.

After all prior steps are complete:

Gatekeeper requested (daos-gatekeeper added as a reviewer).

Upgrade to SPDK24.09 Signed-off-by: Di Wang <[email protected]> Signed-off-by: Jeff Olivier <[email protected]>

github-actions · 2025-03-04T04:03:55Z

Ticket title is 'Update SPDK to 24'
Status is 'In Progress'
Errors are Unknown component
https://daosio.atlassian.net/browse/DAOS-17207

daosbuild1 · 2025-03-04T04:08:22Z

Test stage Build RPM on EL 9 completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-16013/1/execution/node/332/log

fix style Signed-off-by: Di Wang <[email protected]>

daosbuild1 · 2025-03-04T04:10:05Z

Test stage Build RPM on EL 8 completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-16013/1/execution/node/307/log

daosbuild1 · 2025-03-04T04:15:39Z

Test stage Build RPM on EL 9 completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-16013/2/execution/node/333/log

daosbuild1 · 2025-03-04T04:17:42Z

Test stage Build RPM on EL 8 completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-16013/2/execution/node/334/log

daosbuild1 · 2025-03-04T04:18:41Z

Test stage Build RPM on Leap 15.5 completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-16013/2/execution/node/328/log

daosbuild1 · 2025-03-04T04:21:59Z

Test stage Build DEB on Ubuntu 20.04 completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-16013/2/execution/node/337/log

fix style and add those binary in app Signed-off-by: Di Wang <[email protected]>

fix style issue. Signed-off-by: Di Wang <[email protected]>

daosbuild1 · 2025-03-04T06:45:14Z

Test stage Build RPM on EL 9 completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-16013/4/execution/node/337/log

daosbuild1 · 2025-03-04T06:47:24Z

Test stage Build RPM on EL 8 completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-16013/4/execution/node/284/log

daosbuild1 · 2025-03-04T06:48:19Z

Test stage Build RPM on Leap 15.5 completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-16013/4/execution/node/281/log

daosbuild1 · 2025-03-04T06:50:35Z

Test stage Build DEB on Ubuntu 20.04 completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-16013/4/execution/node/306/log

tanabarr

I think there are some missing specfile and Debian packaging changes that will be needed for this update.

tanabarr · 2025-03-04T17:13:00Z

site_scons/components/__init__.py

-                          ['cp', 'build/examples/nvme_manage', '$SPDK_PREFIX/bin/spdk_nvme_manage'],
-                          ['cp', 'build/examples/identify', '$SPDK_PREFIX/bin/spdk_nvme_identify'],
-                          ['cp', 'build/examples/perf', '$SPDK_PREFIX/bin/spdk_nvme_perf']],
+                          ['cp', 'build/examples/nvme_manage', '$SPDK_PREFIX/bin/spdk_nvme_manage']


why remove perf and identify apps?

perf and identify has been moved under app, since I remove --disable-apps, they should be included.

tanabarr · 2025-03-04T17:22:45Z

utils/build.config

@@ -26,7 +26,6 @@ protobufc=https://github.com/protobuf-c/protobuf-c.git
 ucx=https://github.com/openucx/ucx.git

 [patch_versions]
-spdk=https://github.com/spdk/spdk/commit/b0aba3fcd5aceceea530a702922153bc75664978.diff,https://github.com/spdk/spdk/commit/445a4c808badbad3942696ecf16fa60e8129a747.diff


are we sure both of these commits are in v24.09?

yes, I checked.

tanabarr · 2025-03-04T17:38:41Z

src/bio/bio_xstream.c

@@ -1617,13 +1702,14 @@ bio_xsctxt_alloc(struct bio_xs_context **pctxt, int tgt_id, bool self_polling)

 		/* Initialize all registered subsystems: bdev, vmd, copy. */
 		common_prep_arg(&cp_arg);
-		spdk_subsystem_init_from_json_config(nvme_glb.bd_nvme_conf,
-						     SPDK_DEFAULT_RPC_ADDR,


Will the same default RPC address be used with these changes?

yes, https://github.com/spdk/spdk/blob/d0bb354293fb373e21001c4fee100545d2d89744/lib/init/json_config.c#L622

tanabarr · 2025-03-04T17:42:17Z

the normal procedure is to update the daos/spdk packaging branch first IIRC

NiuYawei · 2025-03-06T13:48:02Z

src/bio/bio_xstream.c

+subsystem_init_done(int rc, void *arg)
+{
+	subsystem_init_arg_fini(arg, rc);
+}


Why do we need this callback?

To free json_data basically.

NiuYawei · 2025-03-06T13:48:45Z

src/bio/bio_xstream.c

+};
+
+static void
+subsystem_init_arg_fini(void *arg, int rc)


hmm, why do we need this callback? Can't we just modify existing subsys_init_cb()?

yeah, indeed, we can use that cb. Thanks.

NiuYawei · 2025-03-06T13:58:39Z

src/bio/bio_xstream.c

+	init_arg.json_data      = json_data;
+	init_arg.json_data_size = json_data_size;
+	spdk_subsystem_load_config(json_data, (ssize_t)json_data_size, load_config_cb, &init_arg,
+				   true);


I'm not sure if I follow this, can't we call spdk_subsystem_init() directly?

Oh, the RPC state has to be set to RUN_TIME, then you can run those aio_create cmd in the config jason file. So the first load_config() is to running those methods bdev_aio_create(), then set the RPC state as RUN_TIME explicitly, then do second load_config(). In the previous version(22.01), you can do that in a single API, but they remove that in the current version, which make the process a bit strange indeed.

"subsystems": [
{
"subsystem": "bdev",
"config": [
{
"params": {
"bdev_io_pool_size": 65536,
"bdev_io_cache_size": 256
},
"method": "bdev_set_options"
},
{
"params": {
"retry_count": 4,
"timeout_us": 0,
"nvme_adminq_poll_period_us": 100000,
"action_on_timeout": "none",
"nvme_ioq_poll_period_us": 0
},
"method": "bdev_nvme_set_options"
},
{
"params": {
"enable": false,
"period_us": 0
},
"method": "bdev_nvme_set_hotplug"
},
{
"params": {
"block_size": 4096,
"name": "AIO_1",
"filename": "/tmp/aio_file"
},
"method": "bdev_aio_create"
}
]
}
]
}

Use subsys_init_cb directly. Signed-off-by: Di Wang <[email protected]>

daosbuild1 · 2025-03-06T18:13:53Z

Test stage Build RPM on EL 9 completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-16013/5/execution/node/345/log

daosbuild1 · 2025-03-06T18:16:55Z

Test stage Build RPM on EL 8 completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-16013/5/execution/node/310/log

daosbuild1 · 2025-03-06T18:18:14Z

Test stage Build RPM on Leap 15.5 completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-16013/5/execution/node/323/log

daosbuild1 · 2025-03-06T18:24:48Z

Test stage Build DEB on Ubuntu 20.04 completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-16013/5/execution/node/307/log

Update the function and fix more jason file. Signed-off-by: Di Wang <[email protected]>

daosbuild1 · 2025-03-07T03:44:18Z

Test stage Build RPM on EL 9 completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-16013/6/execution/node/337/log

daosbuild1 · 2025-03-07T03:45:18Z

Test stage Build RPM on EL 8 completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-16013/6/execution/node/342/log

daosbuild1 · 2025-03-07T03:49:02Z

Test stage Build RPM on Leap 15.5 completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-16013/6/execution/node/345/log

daosbuild1 · 2025-03-07T03:54:22Z

Test stage Build DEB on Ubuntu 20.04 completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-16013/6/execution/node/338/log

DAOS-17207 daos: upgrade to SPDK 24.09

08c9a40

Upgrade to SPDK24.09 Signed-off-by: Di Wang <[email protected]> Signed-off-by: Jeff Olivier <[email protected]>

wangdi1 requested review from a team as code owners March 4, 2025 04:03

DAOS-17207 build: fix style

6cda205

fix style Signed-off-by: Di Wang <[email protected]>

wangdi1 requested review from jolivier23, NiuYawei, tanabarr and mjmac March 4, 2025 04:11

wangdi1 added 2 commits March 4, 2025 06:37

DAOS-17027 bio: fix style

d5bf1b4

fix style and add those binary in app Signed-off-by: Di Wang <[email protected]>

DAOS-17207 build: fix style issue

5a8186a

fix style issue. Signed-off-by: Di Wang <[email protected]>

tanabarr requested changes Mar 4, 2025

View reviewed changes

NiuYawei reviewed Mar 6, 2025

View reviewed changes

DAOS-17207 bio: update the patch

651a8cd

Use subsys_init_cb directly. Signed-off-by: Di Wang <[email protected]>

wangdi1 requested a review from tanabarr March 6, 2025 18:07

wangdi1 requested a review from NiuYawei March 6, 2025 18:07

DAOS-17207 bio: update patch

d878b6e

Update the function and fix more jason file. Signed-off-by: Di Wang <[email protected]>

NiuYawei approved these changes Mar 10, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

DAOS-17207 daos: upgrade to SPDK 24.09 #16013

DAOS-17207 daos: upgrade to SPDK 24.09 #16013

wangdi1 commented Mar 4, 2025

github-actions bot commented Mar 4, 2025 •

edited

Loading

daosbuild1 commented Mar 4, 2025

daosbuild1 commented Mar 4, 2025

daosbuild1 commented Mar 4, 2025

daosbuild1 commented Mar 4, 2025

daosbuild1 commented Mar 4, 2025

daosbuild1 commented Mar 4, 2025

daosbuild1 commented Mar 4, 2025

daosbuild1 commented Mar 4, 2025

daosbuild1 commented Mar 4, 2025

daosbuild1 commented Mar 4, 2025

tanabarr left a comment

tanabarr Mar 4, 2025

wangdi1 Mar 6, 2025

tanabarr Mar 4, 2025

wangdi1 Mar 6, 2025

tanabarr Mar 4, 2025

wangdi1 Mar 6, 2025

tanabarr commented Mar 4, 2025

NiuYawei Mar 6, 2025

wangdi1 Mar 6, 2025

NiuYawei Mar 6, 2025

wangdi1 Mar 6, 2025

NiuYawei Mar 6, 2025

wangdi1 Mar 6, 2025

daosbuild1 commented Mar 6, 2025

daosbuild1 commented Mar 6, 2025

daosbuild1 commented Mar 6, 2025

daosbuild1 commented Mar 6, 2025

daosbuild1 commented Mar 7, 2025

daosbuild1 commented Mar 7, 2025

daosbuild1 commented Mar 7, 2025

daosbuild1 commented Mar 7, 2025

DAOS-17207 daos: upgrade to SPDK 24.09 #16013

Are you sure you want to change the base?

DAOS-17207 daos: upgrade to SPDK 24.09 #16013

Conversation

wangdi1 commented Mar 4, 2025

Steps for the author:

After all prior steps are complete:

github-actions bot commented Mar 4, 2025 • edited Loading

daosbuild1 commented Mar 4, 2025

daosbuild1 commented Mar 4, 2025

daosbuild1 commented Mar 4, 2025

daosbuild1 commented Mar 4, 2025

daosbuild1 commented Mar 4, 2025

daosbuild1 commented Mar 4, 2025

daosbuild1 commented Mar 4, 2025

daosbuild1 commented Mar 4, 2025

daosbuild1 commented Mar 4, 2025

daosbuild1 commented Mar 4, 2025

tanabarr left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tanabarr commented Mar 4, 2025

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

daosbuild1 commented Mar 6, 2025

daosbuild1 commented Mar 6, 2025

daosbuild1 commented Mar 6, 2025

daosbuild1 commented Mar 6, 2025

daosbuild1 commented Mar 7, 2025

daosbuild1 commented Mar 7, 2025

daosbuild1 commented Mar 7, 2025

daosbuild1 commented Mar 7, 2025

github-actions bot commented Mar 4, 2025 •

edited

Loading