[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v3 12/16] virtio-blk: Request BLK_PERM_AIO_CONTEXT_C
From: |
Fam Zheng |
Subject: |
[Qemu-block] [PATCH v3 12/16] virtio-blk: Request BLK_PERM_AIO_CONTEXT_CHANGE for dataplane |
Date: |
Wed, 24 May 2017 10:52:31 +0800 |
blk_set_aio_context is audited by perm API, so follow the protocol and
request for permission first.
Previously the return code in error path was hardcoded as -EPERM, but
returning 'r' is more meaningful here both for the new error and
existing ones.
Signed-off-by: Fam Zheng <address@hidden>
---
hw/block/dataplane/virtio-blk.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/hw/block/dataplane/virtio-blk.c b/hw/block/dataplane/virtio-blk.c
index 5556f0e..8f2ff2df 100644
--- a/hw/block/dataplane/virtio-blk.c
+++ b/hw/block/dataplane/virtio-blk.c
@@ -168,6 +168,7 @@ int virtio_blk_data_plane_start(VirtIODevice *vdev)
unsigned i;
unsigned nvqs = s->conf->num_queues;
int r;
+ Error *local_err = NULL;
if (vblk->dataplane_started || s->starting) {
return 0;
@@ -175,12 +176,18 @@ int virtio_blk_data_plane_start(VirtIODevice *vdev)
s->starting = true;
+ r = blk_request_perm(s->conf->conf.blk, BLK_PERM_AIO_CONTEXT_CHANGE,
+ &local_err);
+ if (r) {
+ error_report_err(local_err);
+ goto fail;
+ }
/* Set up guest notifier (irq) */
r = k->set_guest_notifiers(qbus->parent, nvqs, true);
if (r != 0) {
fprintf(stderr, "virtio-blk failed to set guest notifier (%d), "
"ensure -enable-kvm is set\n", r);
- goto fail_guest_notifiers;
+ goto fail;
}
/* Set up virtqueue notify */
@@ -191,7 +198,7 @@ int virtio_blk_data_plane_start(VirtIODevice *vdev)
while (i--) {
virtio_bus_set_host_notifier(VIRTIO_BUS(qbus), i, false);
}
- goto fail_guest_notifiers;
+ goto fail;
}
}
@@ -219,11 +226,11 @@ int virtio_blk_data_plane_start(VirtIODevice *vdev)
aio_context_release(s->ctx);
return 0;
- fail_guest_notifiers:
+fail:
vblk->dataplane_disabled = true;
s->starting = false;
vblk->dataplane_started = true;
- return -ENOSYS;
+ return r;
}
/* Context: QEMU global mutex held */
--
2.9.4
- [Qemu-block] [PATCH v3 03/16] blockjob: Add BLK_PERM_AIO_CONTEXT_CHANGE shared perm on bs, (continued)
- [Qemu-block] [PATCH v3 03/16] blockjob: Add BLK_PERM_AIO_CONTEXT_CHANGE shared perm on bs, Fam Zheng, 2017/05/23
- [Qemu-block] [PATCH v3 04/16] blockjob: Allow aio context change on intermediate nodes, Fam Zheng, 2017/05/23
- [Qemu-block] [PATCH v3 05/16] block: Propagate BLK_PERM_AIO_CONTEXT_CHANGE down the graph, Fam Zheng, 2017/05/23
- [Qemu-block] [PATCH v3 06/16] backup: Request BLK_PERM_AIO_CONTEXT_CHANGE on target, Fam Zheng, 2017/05/23
- [Qemu-block] [PATCH v3 07/16] backup: Do initial aio context move of target via BB interface, Fam Zheng, 2017/05/23
- [Qemu-block] [PATCH v3 08/16] mirror: Request aio context change permission on target, Fam Zheng, 2017/05/23
- [Qemu-block] [PATCH v3 09/16] commit: Allow aio context change on s->base, Fam Zheng, 2017/05/23
- [Qemu-block] [PATCH v3 10/16] mirror: Do initial aio context move of target via BB interface, Fam Zheng, 2017/05/23
- [Qemu-block] [PATCH v3 11/16] virtio-scsi: Request BLK_PERM_AIO_CONTEXT_CHANGE for dataplane, Fam Zheng, 2017/05/23
- [Qemu-block] [PATCH v3 12/16] virtio-blk: Request BLK_PERM_AIO_CONTEXT_CHANGE for dataplane,
Fam Zheng <=
- [Qemu-block] [PATCH v3 13/16] blk: fix aio context loss on media change, Fam Zheng, 2017/05/23
- [Qemu-block] [PATCH v3 14/16] nbd: Allow BLK_PERM_AIO_CONTEXT_CHANGE on BB, Fam Zheng, 2017/05/23
- [Qemu-block] [PATCH v3 15/16] block: Add perm assertion on blk_set_aio_context, Fam Zheng, 2017/05/23
- [Qemu-block] [PATCH v3 16/16] tests: Add test case for BLK_PERM_AIO_CONTEXT_CHANGE, Fam Zheng, 2017/05/23
- Re: [Qemu-block] [PATCH v3 00/16] block: Protect AIO context change with perm API, Stefan Hajnoczi, 2017/05/31