[Qemu-devel] [PULL for-2.11 0/1] Block patches
[PULL 0/1] Block patches
1
The following changes since commit 8048082f7a11040a366942a2de8abb4c3d0020c9:
1
The following changes since commit 887cba855bb6ff4775256f7968409281350b568c:
2
2
3
Merge remote-tracking branch 'remotes/stefanberger/tags/pull-tpm-2017-11-15-1' into staging (2017-11-16 11:34:24 +0000)
3
configure: Fix cross-building for RISCV host (v5) (2023-07-11 17:56:09 +0100)
4
4
5
are available in the git repository at:
5
are available in the Git repository at:
6
6
7
git://github.com/stefanha/qemu.git tags/block-pull-request
7
https://gitlab.com/stefanha/qemu.git tags/block-pull-request
8
8
9
for you to fetch changes up to 341e0b5658681f46680024cdbfc998717d85cc35:
9
for you to fetch changes up to 75dcb4d790bbe5327169fd72b185960ca58e2fa6:
10
10
11
throttle-groups: forget timer and schedule next TGM on detach (2017-11-16 14:12:57 +0000)
11
virtio-blk: fix host notifier issues during dataplane start/stop (2023-07-12 15:20:32 -0400)
12
12
13
----------------------------------------------------------------
13
----------------------------------------------------------------
14
Pull request
14
15
15
----------------------------------------------------------------
16
----------------------------------------------------------------
16
17
17
Stefan Hajnoczi (1):
18
Stefan Hajnoczi (1):
18
throttle-groups: forget timer and schedule next TGM on detach
19
virtio-blk: fix host notifier issues during dataplane start/stop
19
20
20
block/throttle-groups.c | 12 ++++++++++++
21
hw/block/dataplane/virtio-blk.c | 67 +++++++++++++++++++--------------
21
1 file changed, 12 insertions(+)
22
1 file changed, 38 insertions(+), 29 deletions(-)
22
23
23
--
24
--
24
2.13.6
25
2.40.1
25
26
diff view generated by jsdifflib
[Qemu-devel] [PULL for-2.11 1/1] throttle-groups: forget timer and schedule next TGM on detach
[PULL 1/1] virtio-blk: fix host notifier issues during dataplane start/stop
1
tg->any_timer_armed[] must be cleared when detaching pending timers from
1
The main loop thread can consume 100% CPU when using --device
2
the AioContext. Failure to do so leads to hung I/O because it looks
2
virtio-blk-pci,iothread=<iothread>. ppoll() constantly returns but
3
like there are still timers pending when in fact they have been removed.
3
reading virtqueue host notifiers fails with EAGAIN. The file descriptors
4
are stale and remain registered with the AioContext because of bugs in
5
the virtio-blk dataplane start/stop code.
4
6
5
Other ThrottleGroupMembers might have requests pending too so it's
7
The problem is that the dataplane start/stop code involves drain
6
necessary to schedule the next TGM so it can set a timer.
8
operations, which call virtio_blk_drained_begin() and
9
virtio_blk_drained_end() at points where the host notifier is not
10
operational:
11
- In virtio_blk_data_plane_start(), blk_set_aio_context() drains after
12
vblk->dataplane_started has been set to true but the host notifier has
13
not been attached yet.
14
- In virtio_blk_data_plane_stop(), blk_drain() and blk_set_aio_context()
15
drain after the host notifier has already been detached but with
16
vblk->dataplane_started still set to true.
7
17
8
This patch fixes hung I/O when QEMU is launched with drives that are in
18
I would like to simplify ->ioeventfd_start/stop() to avoid interactions
9
the same throttling group:
19
with drain entirely, but couldn't find a way to do that. Instead, this
20
patch accepts the fragile nature of the code and reorders it so that
21
vblk->dataplane_started is false during drain operations. This way the
22
virtio_blk_drained_begin() and virtio_blk_drained_end() calls don't
23
touch the host notifier. The result is that
24
virtio_blk_data_plane_start() and virtio_blk_data_plane_stop() have
25
complete control over the host notifier and stale file descriptors are
26
no longer left in the AioContext.
10
27
11
(guest)$ dd if=/dev/zero of=/dev/vdb oflag=direct bs=512 &
28
This patch fixes the 100% CPU consumption in the main loop thread and
12
(guest)$ dd if=/dev/zero of=/dev/vdc oflag=direct bs=512 &
29
correctly moves host notifier processing to the IOThread.
13
(qemu) stop
14
(qemu) cont
15
...I/O is stuck...
16
30
31
Fixes: 1665d9326fd2 ("virtio-blk: implement BlockDevOps->drained_begin()")
32
Reported-by: Lukáš Doktor <ldoktor@redhat.com>
17
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
33
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
18
Message-id: 20171116112150.27607-1-stefanha@redhat.com
34
Tested-by: Lukas Doktor <ldoktor@redhat.com>
35
Message-id: 20230704151527.193586-1-stefanha@redhat.com
19
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
36
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
20
---
37
---
21
block/throttle-groups.c | 12 ++++++++++++
38
hw/block/dataplane/virtio-blk.c | 67 +++++++++++++++++++--------------
22
1 file changed, 12 insertions(+)
39
1 file changed, 38 insertions(+), 29 deletions(-)
23
40
24
diff --git a/block/throttle-groups.c b/block/throttle-groups.c
41
diff --git a/hw/block/dataplane/virtio-blk.c b/hw/block/dataplane/virtio-blk.c
25
index XXXXXXX..XXXXXXX 100644
42
index XXXXXXX..XXXXXXX 100644
26
--- a/block/throttle-groups.c
43
--- a/hw/block/dataplane/virtio-blk.c
27
+++ b/block/throttle-groups.c
44
+++ b/hw/block/dataplane/virtio-blk.c
28
@@ -XXX,XX +XXX,XX @@ void throttle_group_attach_aio_context(ThrottleGroupMember *tgm,
45
@@ -XXX,XX +XXX,XX @@ int virtio_blk_data_plane_start(VirtIODevice *vdev)
29
46
30
void throttle_group_detach_aio_context(ThrottleGroupMember *tgm)
47
memory_region_transaction_commit();
31
{
48
32
+ ThrottleGroup *tg = container_of(tgm->throttle_state, ThrottleGroup, ts);
49
- /*
33
ThrottleTimers *tt = &tgm->throttle_timers;
50
- * These fields are visible to the IOThread so we rely on implicit barriers
34
+ int i;
51
- * in aio_context_acquire() on the write side and aio_notify_accept() on
35
52
- * the read side.
36
/* Requests must have been drained */
53
- */
37
assert(tgm->pending_reqs[0] == 0 && tgm->pending_reqs[1] == 0);
54
- s->starting = false;
38
assert(qemu_co_queue_empty(&tgm->throttled_reqs[0]));
55
- vblk->dataplane_started = true;
39
assert(qemu_co_queue_empty(&tgm->throttled_reqs[1]));
56
trace_virtio_blk_data_plane_start(s);
40
57
41
+ /* Kick off next ThrottleGroupMember, if necessary */
58
old_context = blk_get_aio_context(s->conf->conf.blk);
42
+ qemu_mutex_lock(&tg->lock);
59
@@ -XXX,XX +XXX,XX @@ int virtio_blk_data_plane_start(VirtIODevice *vdev)
43
+ for (i = 0; i < 2; i++) {
60
event_notifier_set(virtio_queue_get_host_notifier(vq));
44
+ if (timer_pending(tt->timers[i])) {
61
}
45
+ tg->any_timer_armed[i] = false;
62
46
+ schedule_next_request(tgm, i);
63
+ /*
47
+ }
64
+ * These fields must be visible to the IOThread when it processes the
65
+ * virtqueue, otherwise it will think dataplane has not started yet.
66
+ *
67
+ * Make sure ->dataplane_started is false when blk_set_aio_context() is
68
+ * called above so that draining does not cause the host notifier to be
69
+ * detached/attached prematurely.
70
+ */
71
+ s->starting = false;
72
+ vblk->dataplane_started = true;
73
+ smp_wmb(); /* paired with aio_notify_accept() on the read side */
74
+
75
/* Get this show started by hooking up our callbacks */
76
if (!blk_in_drain(s->conf->conf.blk)) {
77
aio_context_acquire(s->ctx);
78
@@ -XXX,XX +XXX,XX @@ int virtio_blk_data_plane_start(VirtIODevice *vdev)
79
fail_guest_notifiers:
80
vblk->dataplane_disabled = true;
81
s->starting = false;
82
- vblk->dataplane_started = true;
83
return -ENOSYS;
84
}
85
86
@@ -XXX,XX +XXX,XX @@ void virtio_blk_data_plane_stop(VirtIODevice *vdev)
87
aio_wait_bh_oneshot(s->ctx, virtio_blk_data_plane_stop_bh, s);
88
}
89
90
+ /*
91
+ * Batch all the host notifiers in a single transaction to avoid
92
+ * quadratic time complexity in address_space_update_ioeventfds().
93
+ */
94
+ memory_region_transaction_begin();
95
+
96
+ for (i = 0; i < nvqs; i++) {
97
+ virtio_bus_set_host_notifier(VIRTIO_BUS(qbus), i, false);
48
+ }
98
+ }
49
+ qemu_mutex_unlock(&tg->lock);
50
+
99
+
51
throttle_timers_detach_aio_context(tt);
100
+ /*
52
tgm->aio_context = NULL;
101
+ * The transaction expects the ioeventfds to be open when it
102
+ * commits. Do it now, before the cleanup loop.
103
+ */
104
+ memory_region_transaction_commit();
105
+
106
+ for (i = 0; i < nvqs; i++) {
107
+ virtio_bus_cleanup_host_notifier(VIRTIO_BUS(qbus), i);
108
+ }
109
+
110
+ /*
111
+ * Set ->dataplane_started to false before draining so that host notifiers
112
+ * are not detached/attached anymore.
113
+ */
114
+ vblk->dataplane_started = false;
115
+
116
aio_context_acquire(s->ctx);
117
118
/* Wait for virtio_blk_dma_restart_bh() and in flight I/O to complete */
119
@@ -XXX,XX +XXX,XX @@ void virtio_blk_data_plane_stop(VirtIODevice *vdev)
120
121
aio_context_release(s->ctx);
122
123
- /*
124
- * Batch all the host notifiers in a single transaction to avoid
125
- * quadratic time complexity in address_space_update_ioeventfds().
126
- */
127
- memory_region_transaction_begin();
128
-
129
- for (i = 0; i < nvqs; i++) {
130
- virtio_bus_set_host_notifier(VIRTIO_BUS(qbus), i, false);
131
- }
132
-
133
- /*
134
- * The transaction expects the ioeventfds to be open when it
135
- * commits. Do it now, before the cleanup loop.
136
- */
137
- memory_region_transaction_commit();
138
-
139
- for (i = 0; i < nvqs; i++) {
140
- virtio_bus_cleanup_host_notifier(VIRTIO_BUS(qbus), i);
141
- }
142
-
143
qemu_bh_cancel(s->bh);
144
notify_guest_bh(s); /* final chance to notify guest */
145
146
/* Clean up guest notifier (irq) */
147
k->set_guest_notifiers(qbus->parent, nvqs, false);
148
149
- vblk->dataplane_started = false;
150
s->stopping = false;
53
}
151
}
54
--
152
--
55
2.13.6
153
2.40.1
56
154
57
155
diff view generated by jsdifflib

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.