xemu-project/xemu
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu.git synced 2024-11-24 20:19:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

throttle-groups: drain before detaching ThrottleState

Browse Source 
I/O requests hang after stop/cont commands at least since QEMU 2.10.0
with -drive iops=100:

  (guest)$ dd if=/dev/zero of=/dev/vdb oflag=direct count=1000
  (qemu) stop
  (qemu) cont
  ...I/O is stuck...

This happens because blk_set_aio_context() detaches the ThrottleState
while requests may still be in flight:

  if (tgm->throttle_state) {
      throttle_group_detach_aio_context(tgm);
      throttle_group_attach_aio_context(tgm, new_context);
  }

This patch encloses the detach/attach calls in a drained region so no
I/O request is left hanging.  Also add assertions so we don't make the
same mistake again in the future.

Reported-by: Yongxue Hong <yhong@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Message-id: 20171110151934.16883-1-stefanha@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Stefan Hajnoczi 2017-11-10 15:19:34 +00:00
parent 632a773543
commit dc868fb03b
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
block/block-backend.c
View File

@ -1752,8 +1752,10 @@ void blk_set_aio_context(BlockBackend *blk, AioContext *new_context)
if (bs) { if (bs) {
if (tgm->throttle_state) { if (tgm->throttle_state) {
bdrv_drained_begin(bs);
throttle_group_detach_aio_context(tgm); throttle_group_detach_aio_context(tgm);
throttle_group_attach_aio_context(tgm, new_context); throttle_group_attach_aio_context(tgm, new_context);
bdrv_drained_end(bs);
} }
bdrv_set_aio_context(bs, new_context); bdrv_set_aio_context(bs, new_context);
} }

6
block/throttle-groups.c
View File

@ -594,6 +594,12 @@ void throttle_group_attach_aio_context(ThrottleGroupMember *tgm,
void throttle_group_detach_aio_context(ThrottleGroupMember *tgm) void throttle_group_detach_aio_context(ThrottleGroupMember *tgm)
{ {
ThrottleTimers *tt = &tgm->throttle_timers; ThrottleTimers *tt = &tgm->throttle_timers;
/* Requests must have been drained */
assert(tgm->pending_reqs[0] == 0 && tgm->pending_reqs[1] == 0);
assert(qemu_co_queue_empty(&tgm->throttled_reqs[0]));
assert(qemu_co_queue_empty(&tgm->throttled_reqs[1]));
throttle_timers_detach_aio_context(tt); throttle_timers_detach_aio_context(tt);
tgm->aio_context = NULL; tgm->aio_context = NULL;
} }