From 6fdc0a534697a2ccccae9b5494d567322fdbb9a7 Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Sun, 13 Dec 2020 23:22:14 +0900 Subject: [PATCH] bdev/ocssd: Call read() directly when buffer is already allocated Call bdev_ocssd_read() directly when buffer is already allocated to improve performance and support retry in the bdev module as done for the standard NVMe bdev. Signed-off-by: Shuhei Matsumoto Change-Id: Icf18148e09b61df7effc84535bea60f49d1c15b3 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5559 Community-CI: Broadcom CI Tested-by: SPDK CI Jenkins Reviewed-by: Changpeng Liu Reviewed-by: Aleksey Marchuk --- module/bdev/nvme/bdev_ocssd.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/module/bdev/nvme/bdev_ocssd.c b/module/bdev/nvme/bdev_ocssd.c index aa2f78c32..82f9ec01b 100644 --- a/module/bdev/nvme/bdev_ocssd.c +++ b/module/bdev/nvme/bdev_ocssd.c @@ -810,9 +810,20 @@ _bdev_ocssd_submit_request(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev switch (bdev_io->type) { case SPDK_BDEV_IO_TYPE_READ: - spdk_bdev_io_get_buf(bdev_io, bdev_ocssd_io_get_buf_cb, - bdev_io->u.bdev.num_blocks * bdev_io->bdev->blocklen); - return 0; + if (bdev_io->u.bdev.iovs && bdev_io->u.bdev.iovs[0].iov_base) { + return bdev_ocssd_read(ocssd_bdev, + nvme_ch, + ocdev_io, + bdev_io->u.bdev.iovs, + bdev_io->u.bdev.iovcnt, + bdev_io->u.bdev.md_buf, + bdev_io->u.bdev.num_blocks, + bdev_io->u.bdev.offset_blocks); + } else { + spdk_bdev_io_get_buf(bdev_io, bdev_ocssd_io_get_buf_cb, + bdev_io->u.bdev.num_blocks * bdev_io->bdev->blocklen); + return 0; + } case SPDK_BDEV_IO_TYPE_WRITE: return bdev_ocssd_write(ocssd_bdev,