From df6cacad83296f570c842663e29383a44f792540 Mon Sep 17 00:00:00 2001 From: Dmitry Savitskiy Date: Wed, 17 Jul 2024 22:09:14 +0400 Subject: [PATCH] bdev: propagate child I/O error for split I/O Signed-off-by: Dmitry Savitskiy --- lib/bdev/bdev.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/lib/bdev/bdev.c b/lib/bdev/bdev.c index ec1f4fc67b4..979337ca8fa 100644 --- a/lib/bdev/bdev.c +++ b/lib/bdev/bdev.c @@ -3334,6 +3334,17 @@ bdev_io_complete_parent_sequence_cb(void *ctx, int status) parent_bdev_io_complete(bdev_io, status); } +/* + * Determines if bdev_io has no space error status. + */ +static bool +_is_no_space_error(struct spdk_bdev_io *bdev_io) +{ + return bdev_io->internal.status == SPDK_BDEV_IO_STATUS_NVME_ERROR && + bdev_io->internal.error.nvme.sct == SPDK_NVME_SCT_VENDOR_SPECIFIC && + bdev_io->internal.error.nvme.sc == ENOSPC; +} + static void bdev_io_split_done(struct spdk_bdev_io *bdev_io, bool success, void *cb_arg) { @@ -3342,7 +3353,17 @@ bdev_io_split_done(struct spdk_bdev_io *bdev_io, bool success, void *cb_arg) spdk_bdev_free_io(bdev_io); if (!success) { - parent_io->internal.status = SPDK_BDEV_IO_STATUS_FAILED; + /* + * Propagate the last child error, unless it is ENOSPC. + * ENOSPC takes lower precedence because it may hide + * a more important failure. + */ + if (parent_io->internal.status == SPDK_BDEV_IO_STATUS_SUCCESS || + !_is_no_space_error(bdev_io)) { + parent_io->internal.status = bdev_io->internal.status; + parent_io->internal.error = bdev_io->internal.error; + } + /* If any child I/O failed, stop further splitting process. */ parent_io->u.bdev.split_current_offset_blocks += parent_io->u.bdev.split_remaining_num_blocks; parent_io->u.bdev.split_remaining_num_blocks = 0;