From 01e7c02e152c80573015f900b8b17df99bad6283 Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Thu, 6 Sep 2018 12:05:29 -0700 Subject: [PATCH] bdev: call spdk_bdev_io_get_buf before splitting We cannot split an iov if a buffer hasn't been allocated yet. So always call spdk_bdev_io_get_buf on reads before trying to split. Signed-off-by: Jim Harris Change-Id: I2c26efb9dc6cb2c7c3e3b7ae5bab2c37844b9113 Reviewed-on: https://review.gerrithub.io/424879 Tested-by: SPDK CI Jenkins Reviewed-by: Ben Walker Reviewed-by: Paul Luse Reviewed-by: Shuhei Matsumoto Reviewed-by: Changpeng Liu Chandler-Test-Pool: SPDK Automated Test System --- lib/bdev/bdev.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/bdev/bdev.c b/lib/bdev/bdev.c index b933764b5..9411b0503 100644 --- a/lib/bdev/bdev.c +++ b/lib/bdev/bdev.c @@ -1229,7 +1229,7 @@ _spdk_bdev_io_split_done(struct spdk_bdev_io *bdev_io, bool success, void *cb_ar } static void -_spdk_bdev_io_split(struct spdk_bdev_io *bdev_io) +_spdk_bdev_io_split(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io) { assert(_spdk_bdev_io_type_can_split(bdev_io->type)); @@ -1287,7 +1287,12 @@ spdk_bdev_io_submit(struct spdk_bdev_io *bdev_io) assert(bdev_io->internal.status == SPDK_BDEV_IO_STATUS_PENDING); if (bdev->split_on_optimal_io_boundary && _spdk_bdev_io_should_split(bdev_io)) { - _spdk_bdev_io_split(bdev_io); + if (bdev_io->type == SPDK_BDEV_IO_TYPE_READ) { + spdk_bdev_io_get_buf(bdev_io, _spdk_bdev_io_split, + bdev_io->u.bdev.num_blocks * bdev_io->bdev->blocklen); + } else { + _spdk_bdev_io_split(NULL, bdev_io); + } return; }