[PULL 0/1] Block patches
[PULL for-9.0 0/1] Block patches
1
The following changes since commit 887cba855bb6ff4775256f7968409281350b568c:
1
The following changes since commit 786fd793b81410fb2a28914315e2f05d2ff6733b:
2
2
3
configure: Fix cross-building for RISCV host (v5) (2023-07-11 17:56:09 +0100)
3
Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging (2024-04-03 12:52:03 +0100)
4
4
5
are available in the Git repository at:
5
are available in the Git repository at:
6
6
7
https://gitlab.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 75dcb4d790bbe5327169fd72b185960ca58e2fa6:
9
for you to fetch changes up to bbdf9023665f409113cb07b463732861af63fb47:
10
10
11
virtio-blk: fix host notifier issues during dataplane start/stop (2023-07-12 15:20:32 -0400)
11
block/virtio-blk: Fix memory leak from virtio_blk_zone_report (2024-04-04 09:29:42 -0400)
12
12
13
----------------------------------------------------------------
13
----------------------------------------------------------------
14
Pull request
14
Pull request
15
15
16
Fix a memory leak in virtio-blk zone report emulation code when the request is
17
invalid.
18
16
----------------------------------------------------------------
19
----------------------------------------------------------------
17
20
18
Stefan Hajnoczi (1):
21
Zheyu Ma (1):
19
virtio-blk: fix host notifier issues during dataplane start/stop
22
block/virtio-blk: Fix memory leak from virtio_blk_zone_report
20
23
21
hw/block/dataplane/virtio-blk.c | 67 +++++++++++++++++++--------------
24
hw/block/virtio-blk.c | 3 ++-
22
1 file changed, 38 insertions(+), 29 deletions(-)
25
1 file changed, 2 insertions(+), 1 deletion(-)
23
26
24
--
27
--
25
2.40.1
28
2.44.0
diff view generated by jsdifflib
[PULL 1/1] virtio-blk: fix host notifier issues during dataplane start/stop
[PULL for-9.0 1/1] block/virtio-blk: Fix memory leak from virtio_blk_zone_report
1
The main loop thread can consume 100% CPU when using --device
1
From: Zheyu Ma <zheyuma97@gmail.com>
2
virtio-blk-pci,iothread=<iothread>. ppoll() constantly returns but
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.
6
2
7
The problem is that the dataplane start/stop code involves drain
3
This modification ensures that in scenarios where the buffer size is
8
operations, which call virtio_blk_drained_begin() and
4
insufficient for a zone report, the function will now properly set an
9
virtio_blk_drained_end() at points where the host notifier is not
5
error status and proceed to a cleanup label, instead of merely
10
operational:
6
returning.
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.
17
7
18
I would like to simplify ->ioeventfd_start/stop() to avoid interactions
8
The following ASAN log reveals it:
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.
27
9
28
This patch fixes the 100% CPU consumption in the main loop thread and
10
==1767400==ERROR: LeakSanitizer: detected memory leaks
29
correctly moves host notifier processing to the IOThread.
11
Direct leak of 312 byte(s) in 1 object(s) allocated from:
12
#0 0x64ac7b3280cd in malloc llvm/compiler-rt/lib/asan/asan_malloc_linux.cpp:129:3
13
#1 0x735b02fb9738 in g_malloc (/lib/x86_64-linux-gnu/libglib-2.0.so.0+0x5e738)
14
#2 0x64ac7d23be96 in virtqueue_split_pop hw/virtio/virtio.c:1612:12
15
#3 0x64ac7d23728a in virtqueue_pop hw/virtio/virtio.c:1783:16
16
#4 0x64ac7cfcaacd in virtio_blk_get_request hw/block/virtio-blk.c:228:27
17
#5 0x64ac7cfca7c7 in virtio_blk_handle_vq hw/block/virtio-blk.c:1123:23
18
#6 0x64ac7cfecb95 in virtio_blk_handle_output hw/block/virtio-blk.c:1157:5
30
19
31
Fixes: 1665d9326fd2 ("virtio-blk: implement BlockDevOps->drained_begin()")
20
Signed-off-by: Zheyu Ma <zheyuma97@gmail.com>
32
Reported-by: Lukáš Doktor <ldoktor@redhat.com>
21
Message-id: 20240404120040.1951466-1-zheyuma97@gmail.com
33
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
34
Tested-by: Lukas Doktor <ldoktor@redhat.com>
35
Message-id: 20230704151527.193586-1-stefanha@redhat.com
36
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
22
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
37
---
23
---
38
hw/block/dataplane/virtio-blk.c | 67 +++++++++++++++++++--------------
24
hw/block/virtio-blk.c | 3 ++-
39
1 file changed, 38 insertions(+), 29 deletions(-)
25
1 file changed, 2 insertions(+), 1 deletion(-)
40
26
41
diff --git a/hw/block/dataplane/virtio-blk.c b/hw/block/dataplane/virtio-blk.c
27
diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
42
index XXXXXXX..XXXXXXX 100644
28
index XXXXXXX..XXXXXXX 100644
43
--- a/hw/block/dataplane/virtio-blk.c
29
--- a/hw/block/virtio-blk.c
44
+++ b/hw/block/dataplane/virtio-blk.c
30
+++ b/hw/block/virtio-blk.c
45
@@ -XXX,XX +XXX,XX @@ int virtio_blk_data_plane_start(VirtIODevice *vdev)
31
@@ -XXX,XX +XXX,XX @@ static void virtio_blk_handle_zone_report(VirtIOBlockReq *req,
46
32
sizeof(struct virtio_blk_zone_report) +
47
memory_region_transaction_commit();
33
sizeof(struct virtio_blk_zone_descriptor)) {
48
34
virtio_error(vdev, "in buffer too small for zone report");
49
- /*
35
- return;
50
- * These fields are visible to the IOThread so we rely on implicit barriers
36
+ err_status = VIRTIO_BLK_S_ZONE_INVALID_CMD;
51
- * in aio_context_acquire() on the write side and aio_notify_accept() on
37
+ goto out;
52
- * the read side.
53
- */
54
- s->starting = false;
55
- vblk->dataplane_started = true;
56
trace_virtio_blk_data_plane_start(s);
57
58
old_context = blk_get_aio_context(s->conf->conf.blk);
59
@@ -XXX,XX +XXX,XX @@ int virtio_blk_data_plane_start(VirtIODevice *vdev)
60
event_notifier_set(virtio_queue_get_host_notifier(vq));
61
}
38
}
62
39
63
+ /*
40
/* start byte offset of the zone report */
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);
98
+ }
99
+
100
+ /*
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;
151
}
152
--
41
--
153
2.40.1
42
2.44.0
154
155
diff view generated by jsdifflib

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.