Skip to content

Commit

Permalink
blockdev: acquire AioContext in block_set_io_throttle
Browse files Browse the repository at this point in the history
The block_set_io_throttle QMP and HMP commands modify I/O throttling
limits for block devices.

Acquire the BlockDriverState's AioContext to protect against race
conditions with an IOThread that is running I/O for this device.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Benoit Canet <benoit@irqsave.net>
  • Loading branch information
stefanhaRH committed Jun 4, 2014
1 parent 22524f7 commit b15446f
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions blockdev.c
Expand Up @@ -1703,6 +1703,7 @@ void qmp_block_set_io_throttle(const char *device, int64_t bps, int64_t bps_rd,
{
ThrottleConfig cfg;
BlockDriverState *bs;
AioContext *aio_context;

bs = bdrv_find(device);
if (!bs) {
Expand Down Expand Up @@ -1746,6 +1747,9 @@ void qmp_block_set_io_throttle(const char *device, int64_t bps, int64_t bps_rd,
return;
}

aio_context = bdrv_get_aio_context(bs);
aio_context_acquire(aio_context);

if (!bs->io_limits_enabled && throttle_enabled(&cfg)) {
bdrv_io_limits_enable(bs);
} else if (bs->io_limits_enabled && !throttle_enabled(&cfg)) {
Expand All @@ -1755,6 +1759,8 @@ void qmp_block_set_io_throttle(const char *device, int64_t bps, int64_t bps_rd,
if (bs->io_limits_enabled) {
bdrv_set_io_limits(bs, &cfg);
}

aio_context_release(aio_context);
}

int do_drive_del(Monitor *mon, const QDict *qdict, QObject **ret_data)
Expand Down

0 comments on commit b15446f

Please sign in to comment.