| 1 | The following changes since commit 64175afc695c0672876fbbfc31b299c86d562cb4: | 1 | The following changes since commit 8048082f7a11040a366942a2de8abb4c3d0020c9: |
|---|---|---|---|
| 2 | 2 | ||
| 3 | arm_gicv3: Fix ICC_BPR1 reset value when EL3 not implemented (2017-06-07 17:21:44 +0100) | 3 | Merge remote-tracking branch 'remotes/stefanberger/tags/pull-tpm-2017-11-15-1' into staging (2017-11-16 11:34:24 +0000) |
| 4 | 4 | ||
| 5 | are available in the git repository at: | 5 | are available in the git repository at: |
| 6 | 6 | ||
| 7 | git://github.com/codyprime/qemu-kvm-jtc.git tags/block-pull-request | 7 | git://github.com/stefanha/qemu.git tags/block-pull-request |
| 8 | 8 | ||
| 9 | for you to fetch changes up to 56faeb9bb6872b3f926b3b3e0452a70beea10af2: | 9 | for you to fetch changes up to 341e0b5658681f46680024cdbfc998717d85cc35: |
| 10 | 10 | ||
| 11 | block/gluster.c: Handle qdict_array_entries() failure (2017-06-09 08:41:29 -0400) | 11 | throttle-groups: forget timer and schedule next TGM on detach (2017-11-16 14:12:57 +0000) |
| 12 | 12 | ||
| 13 | ---------------------------------------------------------------- | 13 | ---------------------------------------------------------------- |
| 14 | Gluster patch | 14 | |
| 15 | ---------------------------------------------------------------- | 15 | ---------------------------------------------------------------- |
| 16 | 16 | ||
| 17 | Peter Maydell (1): | 17 | Stefan Hajnoczi (1): |
| 18 | block/gluster.c: Handle qdict_array_entries() failure | 18 | throttle-groups: forget timer and schedule next TGM on detach |
| 19 | 19 | ||
| 20 | block/gluster.c | 3 +-- | 20 | block/throttle-groups.c | 12 ++++++++++++ |
| 21 | 1 file changed, 1 insertion(+), 2 deletions(-) | 21 | 1 file changed, 12 insertions(+) |
| 22 | 22 | ||
| 23 | -- | 23 | -- |
| 24 | 2.9.3 | 24 | 2.13.6 |
| 25 | 25 | ||
| 26 | 26 | diff view generated by jsdifflib |
| 1 | From: Peter Maydell <peter.maydell@linaro.org> | 1 | tg->any_timer_armed[] must be cleared when detaching pending timers from |
|---|---|---|---|
| 2 | the AioContext. Failure to do so leads to hung I/O because it looks | ||
| 3 | like there are still timers pending when in fact they have been removed. | ||
| 2 | 4 | ||
| 3 | In qemu_gluster_parse_json(), the call to qdict_array_entries() | 5 | Other ThrottleGroupMembers might have requests pending too so it's |
| 4 | could return a negative error code, which we were ignoring | 6 | necessary to schedule the next TGM so it can set a timer. |
| 5 | because we assigned the result to an unsigned variable. | ||
| 6 | Fix this by using the 'int' type instead, which matches the | ||
| 7 | return type of qdict_array_entries() and also the type | ||
| 8 | we use for the loop enumeration variable 'i'. | ||
| 9 | 7 | ||
| 10 | (Spotted by Coverity, CID 1360960.) | 8 | This patch fixes hung I/O when QEMU is launched with drives that are in |
| 9 | the same throttling group: | ||
| 11 | 10 | ||
| 12 | Signed-off-by: Peter Maydell <peter.maydell@linaro.org> | 11 | (guest)$ dd if=/dev/zero of=/dev/vdb oflag=direct bs=512 & |
| 13 | Reviewed-by: Eric Blake <eblake@redhat.com> | 12 | (guest)$ dd if=/dev/zero of=/dev/vdc oflag=direct bs=512 & |
| 14 | Reviewed-by: Jeff Cody <jcody@redhat.com> | 13 | (qemu) stop |
| 15 | Message-id: 1496682098-1540-1-git-send-email-peter.maydell@linaro.org | 14 | (qemu) cont |
| 16 | Signed-off-by: Jeff Cody <jcody@redhat.com> | 15 | ...I/O is stuck... |
| 16 | |||
| 17 | Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> | ||
| 18 | Message-id: 20171116112150.27607-1-stefanha@redhat.com | ||
| 19 | Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> | ||
| 17 | --- | 20 | --- |
| 18 | block/gluster.c | 3 +-- | 21 | block/throttle-groups.c | 12 ++++++++++++ |
| 19 | 1 file changed, 1 insertion(+), 2 deletions(-) | 22 | 1 file changed, 12 insertions(+) |
| 20 | 23 | ||
| 21 | diff --git a/block/gluster.c b/block/gluster.c | 24 | diff --git a/block/throttle-groups.c b/block/throttle-groups.c |
| 22 | index XXXXXXX..XXXXXXX 100644 | 25 | index XXXXXXX..XXXXXXX 100644 |
| 23 | --- a/block/gluster.c | 26 | --- a/block/throttle-groups.c |
| 24 | +++ b/block/gluster.c | 27 | +++ b/block/throttle-groups.c |
| 25 | @@ -XXX,XX +XXX,XX @@ static int qemu_gluster_parse_json(BlockdevOptionsGluster *gconf, | 28 | @@ -XXX,XX +XXX,XX @@ void throttle_group_attach_aio_context(ThrottleGroupMember *tgm, |
| 26 | Error *local_err = NULL; | 29 | |
| 27 | char *str = NULL; | 30 | void throttle_group_detach_aio_context(ThrottleGroupMember *tgm) |
| 28 | const char *ptr; | 31 | { |
| 29 | - size_t num_servers; | 32 | + ThrottleGroup *tg = container_of(tgm->throttle_state, ThrottleGroup, ts); |
| 30 | - int i, type; | 33 | ThrottleTimers *tt = &tgm->throttle_timers; |
| 31 | + int i, type, num_servers; | 34 | + int i; |
| 32 | 35 | ||
| 33 | /* create opts info from runtime_json_opts list */ | 36 | /* Requests must have been drained */ |
| 34 | opts = qemu_opts_create(&runtime_json_opts, NULL, 0, &error_abort); | 37 | assert(tgm->pending_reqs[0] == 0 && tgm->pending_reqs[1] == 0); |
| 38 | assert(qemu_co_queue_empty(&tgm->throttled_reqs[0])); | ||
| 39 | assert(qemu_co_queue_empty(&tgm->throttled_reqs[1])); | ||
| 40 | |||
| 41 | + /* Kick off next ThrottleGroupMember, if necessary */ | ||
| 42 | + qemu_mutex_lock(&tg->lock); | ||
| 43 | + for (i = 0; i < 2; i++) { | ||
| 44 | + if (timer_pending(tt->timers[i])) { | ||
| 45 | + tg->any_timer_armed[i] = false; | ||
| 46 | + schedule_next_request(tgm, i); | ||
| 47 | + } | ||
| 48 | + } | ||
| 49 | + qemu_mutex_unlock(&tg->lock); | ||
| 50 | + | ||
| 51 | throttle_timers_detach_aio_context(tt); | ||
| 52 | tgm->aio_context = NULL; | ||
| 53 | } | ||
| 35 | -- | 54 | -- |
| 36 | 2.9.3 | 55 | 2.13.6 |
| 37 | 56 | ||
| 38 | 57 | diff view generated by jsdifflib |