From d4d5e20d296b3c81183f36d3a473698edf1d0d3d Mon Sep 17 00:00:00 2001 From: Changpeng Liu Date: Wed, 21 Apr 2021 19:50:42 +0800 Subject: [PATCH] bdev: rename bdev_io_split to bdev_rw_split This will help us to add unmap split function, also remove bdev_io_type_can_split() because we changed to use swith(io_type) ... case now. Change-Id: I449d6a9f5bf2d0b43dd124bbfc9e1ca2afddc15a Signed-off-by: Changpeng Liu Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/7516 Community-CI: Broadcom CI Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Shuhei Matsumoto Reviewed-by: Ben Walker Reviewed-by: Jim Harris Reviewed-by: --- lib/bdev/bdev.c | 71 ++++++++++++++--------------- test/unit/lib/bdev/bdev.c/bdev_ut.c | 1 + 2 files changed, 34 insertions(+), 38 deletions(-) diff --git a/lib/bdev/bdev.c b/lib/bdev/bdev.c index 9ede230c08..5ca53e4e3e 100644 --- a/lib/bdev/bdev.c +++ b/lib/bdev/bdev.c @@ -1953,26 +1953,7 @@ bdev_queue_io_wait_with_cb(struct spdk_bdev_io *bdev_io, spdk_bdev_io_wait_cb cb } static bool -bdev_io_type_can_split(uint8_t type) -{ - assert(type != SPDK_BDEV_IO_TYPE_INVALID); - assert(type < SPDK_BDEV_NUM_IO_TYPES); - - /* Only split READ and WRITE I/O. Theoretically other types of I/O like - * UNMAP could be split, but these types of I/O are typically much larger - * in size (sometimes the size of the entire block device), and the bdev - * module can more efficiently split these types of I/O. Plus those types - * of I/O do not have a payload, which makes the splitting process simpler. - */ - if (type == SPDK_BDEV_IO_TYPE_READ || type == SPDK_BDEV_IO_TYPE_WRITE) { - return true; - } else { - return false; - } -} - -static bool -bdev_io_should_split(struct spdk_bdev_io *bdev_io) +bdev_rw_should_split(struct spdk_bdev_io *bdev_io) { uint32_t io_boundary = bdev_io->bdev->optimal_io_boundary; uint32_t max_size = bdev_io->bdev->max_segment_size; @@ -1984,10 +1965,6 @@ bdev_io_should_split(struct spdk_bdev_io *bdev_io) return false; } - if (!bdev_io_type_can_split(bdev_io->type)) { - return false; - } - if (io_boundary) { uint64_t start_stripe, end_stripe; @@ -2024,6 +2001,18 @@ bdev_io_should_split(struct spdk_bdev_io *bdev_io) return false; } +static bool +bdev_io_should_split(struct spdk_bdev_io *bdev_io) +{ + switch (bdev_io->type) { + case SPDK_BDEV_IO_TYPE_READ: + case SPDK_BDEV_IO_TYPE_WRITE: + return bdev_rw_should_split(bdev_io); + default: + return false; + } +} + static uint32_t _to_next_boundary(uint64_t offset, uint32_t boundary) { @@ -2034,7 +2023,7 @@ static void bdev_io_split_done(struct spdk_bdev_io *bdev_io, bool success, void *cb_arg); static void -_bdev_io_split(void *_bdev_io) +_bdev_rw_split(void *_bdev_io) { struct iovec *parent_iov, *iov; struct spdk_bdev_io *bdev_io = _bdev_io; @@ -2188,7 +2177,7 @@ _bdev_io_split(void *_bdev_io) if (rc == -ENOMEM) { if (bdev_io->u.bdev.split_outstanding == 0) { /* No I/O is outstanding. Hence we should wait here. */ - bdev_queue_io_wait_with_cb(bdev_io, _bdev_io_split); + bdev_queue_io_wait_with_cb(bdev_io, _bdev_rw_split); } } else { bdev_io->internal.status = SPDK_BDEV_IO_STATUS_FAILED; @@ -2240,40 +2229,46 @@ bdev_io_split_done(struct spdk_bdev_io *bdev_io, bool success, void *cb_arg) * Continue with the splitting process. This function will complete the parent I/O if the * splitting is done. */ - _bdev_io_split(parent_io); + _bdev_rw_split(parent_io); } static void -bdev_io_split_get_buf_cb(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io, bool success); +bdev_rw_split_get_buf_cb(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io, bool success); static void bdev_io_split(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io) { - assert(bdev_io_type_can_split(bdev_io->type)); - bdev_io->u.bdev.split_current_offset_blocks = bdev_io->u.bdev.offset_blocks; bdev_io->u.bdev.split_remaining_num_blocks = bdev_io->u.bdev.num_blocks; bdev_io->u.bdev.split_outstanding = 0; bdev_io->internal.status = SPDK_BDEV_IO_STATUS_SUCCESS; - if (_is_buf_allocated(bdev_io->u.bdev.iovs)) { - _bdev_io_split(bdev_io); - } else { - assert(bdev_io->type == SPDK_BDEV_IO_TYPE_READ); - spdk_bdev_io_get_buf(bdev_io, bdev_io_split_get_buf_cb, - bdev_io->u.bdev.num_blocks * bdev_io->bdev->blocklen); + switch (bdev_io->type) { + case SPDK_BDEV_IO_TYPE_READ: + case SPDK_BDEV_IO_TYPE_WRITE: + if (_is_buf_allocated(bdev_io->u.bdev.iovs)) { + _bdev_rw_split(bdev_io); + } else { + assert(bdev_io->type == SPDK_BDEV_IO_TYPE_READ); + spdk_bdev_io_get_buf(bdev_io, bdev_rw_split_get_buf_cb, + bdev_io->u.bdev.num_blocks * bdev_io->bdev->blocklen); + } + break; + default: + assert(false); + break; } } static void -bdev_io_split_get_buf_cb(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io, bool success) +bdev_rw_split_get_buf_cb(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io, bool success) { if (!success) { spdk_bdev_io_complete(bdev_io, SPDK_BDEV_IO_STATUS_FAILED); return; } - _bdev_io_split(bdev_io); + _bdev_rw_split(bdev_io); } /* Explicitly mark this inline, since it's used as a function pointer and otherwise won't diff --git a/test/unit/lib/bdev/bdev.c/bdev_ut.c b/test/unit/lib/bdev/bdev.c/bdev_ut.c index b5db551f05..da207559c4 100644 --- a/test/unit/lib/bdev/bdev.c/bdev_ut.c +++ b/test/unit/lib/bdev/bdev.c/bdev_ut.c @@ -1021,6 +1021,7 @@ bdev_io_spans_split_test(void) memset(&bdev, 0, sizeof(bdev)); bdev_io.u.bdev.iovs = iov; + bdev_io.type = SPDK_BDEV_IO_TYPE_READ; bdev.optimal_io_boundary = 0; bdev.max_segment_size = 0; bdev.max_num_segments = 0;