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

vhost-blk: extract per queue vdev worker

Browse Source 
Change-Id: Id852585f3eb3b61f5a074336c73e300f020c594e
Signed-off-by: Liu Xiaodong <xiaodong.liu@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4863
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
This commit is contained in:
Liu Xiaodong 2020-10-24 01:30:44 -04:00 committed by Tomasz Zawadzki
parent d2db3cdf8f
commit 36d2e93ea1
1 changed files with 48 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
lib/vhost/vhost_blk.c
View File

@ -111,6 +111,13 @@ process_blk_request(struct spdk_vhost_blk_task *task,
struct spdk_vhost_blk_session *bvsession, struct spdk_vhost_blk_session *bvsession,
struct spdk_vhost_virtqueue *vq); struct spdk_vhost_virtqueue *vq);
static struct spdk_vhost_blk_session *
to_blk_session(struct spdk_vhost_session *vsession)
{
assert(vsession->vdev->backend == &vhost_blk_device_backend);
return (struct spdk_vhost_blk_session *)vsession;
}
static void static void
blk_task_finish(struct spdk_vhost_blk_task *task) blk_task_finish(struct spdk_vhost_blk_task *task)
{ {
@ -663,27 +670,37 @@ process_packed_vq(struct spdk_vhost_blk_session *bvsession, struct spdk_vhost_vi
} }
} }
static int
_vdev_vq_worker(struct spdk_vhost_virtqueue *vq)
{
struct spdk_vhost_session *vsession = vq->vsession;
struct spdk_vhost_blk_session *bvsession = to_blk_session(vsession);
bool packed_ring;
packed_ring = vq->packed.packed_ring;
if (packed_ring) {
process_packed_vq(bvsession, vq);
} else {
process_vq(bvsession, vq);
}
vhost_session_vq_used_signal(vq);
return SPDK_POLLER_BUSY;
}
static int static int
vdev_worker(void *arg) vdev_worker(void *arg)
{ {
struct spdk_vhost_blk_session *bvsession = arg; struct spdk_vhost_blk_session *bvsession = arg;
struct spdk_vhost_session *vsession = &bvsession->vsession; struct spdk_vhost_session *vsession = &bvsession->vsession;
uint16_t q_idx; uint16_t q_idx;
bool packed_ring;
/* In a session, every vq supports the same format */
packed_ring = vsession->virtqueue[0].packed.packed_ring;
for (q_idx = 0; q_idx < vsession->max_queues; q_idx++) { for (q_idx = 0; q_idx < vsession->max_queues; q_idx++) {
if (packed_ring) { _vdev_vq_worker(&vsession->virtqueue[q_idx]);
process_packed_vq(bvsession, &vsession->virtqueue[q_idx]);
} else {
process_vq(bvsession, &vsession->virtqueue[q_idx]);
}
} }
vhost_session_used_signal(vsession);
return SPDK_POLLER_BUSY; return SPDK_POLLER_BUSY;
} }
@ -748,24 +765,20 @@ no_bdev_process_packed_vq(struct spdk_vhost_blk_session *bvsession, struct spdk_
} }
static int static int
no_bdev_vdev_worker(void *arg) _no_bdev_vdev_vq_worker(struct spdk_vhost_virtqueue *vq)
{ {
struct spdk_vhost_blk_session *bvsession = arg; struct spdk_vhost_session *vsession = vq->vsession;
struct spdk_vhost_session *vsession = &bvsession->vsession; struct spdk_vhost_blk_session *bvsession = to_blk_session(vsession);
uint16_t q_idx;
bool packed_ring; bool packed_ring;
/* In a session, every vq supports the same format */ packed_ring = vq->packed.packed_ring;
packed_ring = vsession->virtqueue[0].packed.packed_ring; if (packed_ring) {
for (q_idx = 0; q_idx < vsession->max_queues; q_idx++) { no_bdev_process_packed_vq(bvsession, vq);
if (packed_ring) { } else {
no_bdev_process_packed_vq(bvsession, &vsession->virtqueue[q_idx]); no_bdev_process_vq(bvsession, vq);
} else {
no_bdev_process_vq(bvsession, &vsession->virtqueue[q_idx]);
}
} }
vhost_session_used_signal(vsession); vhost_session_vq_used_signal(vq);
if (vsession->task_cnt == 0 && bvsession->io_channel) { if (vsession->task_cnt == 0 && bvsession->io_channel) {
spdk_put_io_channel(bvsession->io_channel); spdk_put_io_channel(bvsession->io_channel);
@ -775,11 +788,18 @@ no_bdev_vdev_worker(void *arg)
return SPDK_POLLER_BUSY; return SPDK_POLLER_BUSY;
} }
static struct spdk_vhost_blk_session * static int
to_blk_session(struct spdk_vhost_session *vsession) no_bdev_vdev_worker(void *arg)
{ {
assert(vsession->vdev->backend == &vhost_blk_device_backend); struct spdk_vhost_blk_session *bvsession = arg;
return (struct spdk_vhost_blk_session *)vsession; struct spdk_vhost_session *vsession = &bvsession->vsession;
uint16_t q_idx;
for (q_idx = 0; q_idx < vsession->max_queues; q_idx++) {
_no_bdev_vdev_vq_worker(&vsession->virtqueue[q_idx]);
}
return SPDK_POLLER_BUSY;
} }
static struct spdk_vhost_blk_dev * static struct spdk_vhost_blk_dev *