ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bdev: add bdev_io_get_buf_complete helper function

Browse Source 
This will be helpful in future patches where auxiliary
buffer support is added, and we have a different
type of callback to invoke.

Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: I81d2cf3057e706a0e68de87a20b24c194205bbd5

Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/482021
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Community-CI: SPDK CI Jenkins <sys_sgci@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Jim Harris 2020-01-17 08:36:18 -07:00 committed by Tomasz Zawadzki
parent 7167f8d334
commit 03171deee8
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/bdev/bdev.c
View File

@ -594,6 +594,13 @@ _bdev_io_set_bounce_md_buf(struct spdk_bdev_io *bdev_io, void *md_buf, size_t le
} }
} }
static void
bdev_io_get_buf_complete(struct spdk_bdev_io *bdev_io, bool status)
{
bdev_io->internal.get_buf_cb(spdk_bdev_io_get_io_channel(bdev_io), bdev_io, status);
bdev_io->internal.get_buf_cb = NULL;
}
static void static void
_bdev_io_set_buf(struct spdk_bdev_io *bdev_io, void *buf, uint64_t len) _bdev_io_set_buf(struct spdk_bdev_io *bdev_io, void *buf, uint64_t len)
{ {
@ -626,7 +633,7 @@ _bdev_io_set_buf(struct spdk_bdev_io *bdev_io, void *buf, uint64_t len)
} }
bdev_io->internal.buf = buf; bdev_io->internal.buf = buf;
bdev_io->internal.get_buf_cb(spdk_bdev_io_get_io_channel(bdev_io), bdev_io, true); bdev_io_get_buf_complete(bdev_io, true);
} }
static void static void
@ -720,6 +727,7 @@ spdk_bdev_io_get_buf(struct spdk_bdev_io *bdev_io, spdk_bdev_io_get_buf_cb cb, u
void *buf; void *buf;
assert(cb != NULL); assert(cb != NULL);
bdev_io->internal.get_buf_cb = cb;
alignment = spdk_bdev_get_buf_align(bdev); alignment = spdk_bdev_get_buf_align(bdev);
md_len = spdk_bdev_is_md_separate(bdev) ? bdev_io->u.bdev.num_blocks * bdev->md_len : 0; md_len = spdk_bdev_is_md_separate(bdev) ? bdev_io->u.bdev.num_blocks * bdev->md_len : 0;
@ -727,7 +735,7 @@ spdk_bdev_io_get_buf(struct spdk_bdev_io *bdev_io, spdk_bdev_io_get_buf_cb cb, u
if (_is_buf_allocated(bdev_io->u.bdev.iovs) && if (_is_buf_allocated(bdev_io->u.bdev.iovs) &&
_are_iovs_aligned(bdev_io->u.bdev.iovs, bdev_io->u.bdev.iovcnt, alignment)) { _are_iovs_aligned(bdev_io->u.bdev.iovs, bdev_io->u.bdev.iovcnt, alignment)) {
/* Buffer already present and aligned */ /* Buffer already present and aligned */
cb(spdk_bdev_io_get_io_channel(bdev_io), bdev_io, true); bdev_io_get_buf_complete(bdev_io, true);
return; return;
} }
@ -735,14 +743,13 @@ spdk_bdev_io_get_buf(struct spdk_bdev_io *bdev_io, spdk_bdev_io_get_buf_cb cb, u
SPDK_BDEV_POOL_ALIGNMENT) { SPDK_BDEV_POOL_ALIGNMENT) {
SPDK_ERRLOG("Length + alignment %" PRIu64 " is larger than allowed\n", SPDK_ERRLOG("Length + alignment %" PRIu64 " is larger than allowed\n",
len + alignment); len + alignment);
cb(spdk_bdev_io_get_io_channel(bdev_io), bdev_io, false); bdev_io_get_buf_complete(bdev_io, false);
return; return;
} }
mgmt_ch = bdev_io->internal.ch->shared_resource->mgmt_ch; mgmt_ch = bdev_io->internal.ch->shared_resource->mgmt_ch;
bdev_io->internal.buf_len = len; bdev_io->internal.buf_len = len;
bdev_io->internal.get_buf_cb = cb;
if (len + alignment + md_len <= SPDK_BDEV_BUF_SIZE_WITH_MD(SPDK_BDEV_SMALL_BUF_MAX_SIZE) + if (len + alignment + md_len <= SPDK_BDEV_BUF_SIZE_WITH_MD(SPDK_BDEV_SMALL_BUF_MAX_SIZE) +
SPDK_BDEV_POOL_ALIGNMENT) { SPDK_BDEV_POOL_ALIGNMENT) {