[Qemu-devel] [PULL 0/1] Block patches
[Qemu-devel] [PULL 0/2] Block patches
1
The following changes since commit d47a851caeda96d5979bf48d4bae6a87784ad91d:
1
The following changes since commit 75e50c80e051423a6f55a34ee4a1eec842444a5b:
2
2
3
Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20170601' into staging (2017-06-02 14:07:53 +0100)
3
Merge remote-tracking branch 'remotes/armbru/tags/pull-misc-2018-10-10' into staging (2018-10-11 10:43:37 +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/codyprime/qemu-kvm-jtc.git tags/block-pull-request
7
git://github.com/famz/qemu.git tags/block-pull-request
8
8
9
for you to fetch changes up to df3a429ae82c0f45becdfab105617701d75e0f05:
9
for you to fetch changes up to 6388147296cd4c841a7d4409ba622c200332a8c7:
10
10
11
gluster: add support for PREALLOC_MODE_FALLOC (2017-06-02 10:51:47 -0400)
11
nvme: correct locking around completion (2018-10-12 09:46:14 +0800)
12
12
13
----------------------------------------------------------------
13
----------------------------------------------------------------
14
Gluster patch(es)
14
Block patches
15
16
One fix from Marc-André for iothread.
17
One fix from Paolo on nvme:// driver.
18
15
----------------------------------------------------------------
19
----------------------------------------------------------------
16
20
17
Niels de Vos (1):
21
Marc-André Lureau (1):
18
gluster: add support for PREALLOC_MODE_FALLOC
22
iothread: fix crash with invalid properties
19
23
20
block/gluster.c | 78 ++++++++++++++++++++++++++++++---------------------------
24
Paolo Bonzini (1):
21
configure | 6 +++++
25
nvme: correct locking around completion
22
2 files changed, 47 insertions(+), 37 deletions(-)
26
27
block/nvme.c | 2 --
28
iothread.c | 9 ++++++---
29
2 files changed, 6 insertions(+), 5 deletions(-)
23
30
24
--
31
--
25
2.9.3
32
2.17.1
26
33
27
34
diff view generated by jsdifflib
New patch
[Qemu-devel] [PULL 1/2] iothread: fix crash with invalid properties
1
From: Marc-André Lureau <marcandre.lureau@redhat.com>
1
2
3
-object iothread,id=foo,? will crash qemu:
4
5
qemu-system-x86_64:qemu-thread-posix.c:128: qemu_cond_destroy: Assertion `cond->initialized' failed.
6
7
Use thread_id != -1 to check if iothread_complete() finished
8
successfully and the mutex/cond have been initialized.
9
10
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
11
Message-Id: <20180821100716.13803-1-marcandre.lureau@redhat.com>
12
Signed-off-by: Fam Zheng <famz@redhat.com>
13
---
14
iothread.c | 9 ++++++---
15
1 file changed, 6 insertions(+), 3 deletions(-)
16
17
diff --git a/iothread.c b/iothread.c
18
index XXXXXXX..XXXXXXX 100644
19
--- a/iothread.c
20
+++ b/iothread.c
21
@@ -XXX,XX +XXX,XX @@ static void iothread_instance_init(Object *obj)
22
IOThread *iothread = IOTHREAD(obj);
23
24
iothread->poll_max_ns = IOTHREAD_POLL_MAX_NS_DEFAULT;
25
+ iothread->thread_id = -1;
26
}
27
28
static void iothread_instance_finalize(Object *obj)
29
@@ -XXX,XX +XXX,XX @@ static void iothread_instance_finalize(Object *obj)
30
IOThread *iothread = IOTHREAD(obj);
31
32
iothread_stop(iothread);
33
+
34
+ if (iothread->thread_id != -1) {
35
+ qemu_cond_destroy(&iothread->init_done_cond);
36
+ qemu_mutex_destroy(&iothread->init_done_lock);
37
+ }
38
/*
39
* Before glib2 2.33.10, there is a glib2 bug that GSource context
40
* pointer may not be cleared even if the context has already been
41
@@ -XXX,XX +XXX,XX @@ static void iothread_instance_finalize(Object *obj)
42
g_main_context_unref(iothread->worker_context);
43
iothread->worker_context = NULL;
44
}
45
- qemu_cond_destroy(&iothread->init_done_cond);
46
- qemu_mutex_destroy(&iothread->init_done_lock);
47
}
48
49
static void iothread_complete(UserCreatable *obj, Error **errp)
50
@@ -XXX,XX +XXX,XX @@ static void iothread_complete(UserCreatable *obj, Error **errp)
51
52
iothread->stopping = false;
53
iothread->running = true;
54
- iothread->thread_id = -1;
55
iothread->ctx = aio_context_new(&local_error);
56
if (!iothread->ctx) {
57
error_propagate(errp, local_error);
58
--
59
2.17.1
60
61
diff view generated by jsdifflib
[Qemu-devel] [PULL 1/1] gluster: add support for PREALLOC_MODE_FALLOC
[Qemu-devel] [PULL 2/2] nvme: correct locking around completion
1
From: Niels de Vos <ndevos@redhat.com>
1
From: Paolo Bonzini <pbonzini@redhat.com>
2
2
3
Add missing support for "preallocation=falloc" to the Gluster block
3
nvme_poll_queues is already protected by q->lock, and
4
driver. This change bases its logic on that of block/file-posix.c and
4
AIO callbacks are invoked outside the AioContext lock.
5
removed the gluster_supports_zerofill() and qemu_gluster_zerofill()
5
So remove the acquire/release pair in nvme_handle_event.
6
functions in favour of #ifdef checks in an easy to read
7
switch-statement.
8
6
9
Both glfs_zerofill() and glfs_fallocate() have been introduced with
7
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
10
GlusterFS 3.5.0 (pkg-config glusterfs-api = 6). A #define for the
8
Message-Id: <20180814062739.19640-1-pbonzini@redhat.com>
11
availability of glfs_fallocate() has been added to ./configure.
9
Signed-off-by: Fam Zheng <famz@redhat.com>
10
---
11
block/nvme.c | 2 --
12
1 file changed, 2 deletions(-)
12
13
13
Reported-by: Satheesaran Sundaramoorthi <sasundar@redhat.com>
14
diff --git a/block/nvme.c b/block/nvme.c
14
Signed-off-by: Niels de Vos <ndevos@redhat.com>
15
Message-id: 20170528063114.28691-1-ndevos@redhat.com
16
URL: https://bugzilla.redhat.com/1450759
17
Signed-off-by: Niels de Vos <ndevos@redhat.com>
18
Signed-off-by: Jeff Cody <jcody@redhat.com>
19
---
20
block/gluster.c | 78 ++++++++++++++++++++++++++++++---------------------------
21
configure | 6 +++++
22
2 files changed, 47 insertions(+), 37 deletions(-)
23
24
diff --git a/block/gluster.c b/block/gluster.c
25
index XXXXXXX..XXXXXXX 100644
15
index XXXXXXX..XXXXXXX 100644
26
--- a/block/gluster.c
16
--- a/block/nvme.c
27
+++ b/block/gluster.c
17
+++ b/block/nvme.c
28
@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qemu_gluster_co_pwrite_zeroes(BlockDriverState *bs,
18
@@ -XXX,XX +XXX,XX @@ static void nvme_handle_event(EventNotifier *n)
29
qemu_coroutine_yield();
19
BDRVNVMeState *s = container_of(n, BDRVNVMeState, irq_notifier);
30
return acb.ret;
20
21
trace_nvme_handle_event(s);
22
- aio_context_acquire(s->aio_context);
23
event_notifier_test_and_clear(n);
24
nvme_poll_queues(s);
25
- aio_context_release(s->aio_context);
31
}
26
}
32
-
27
33
-static inline bool gluster_supports_zerofill(void)
28
static bool nvme_add_io_queue(BlockDriverState *bs, Error **errp)
34
-{
35
- return 1;
36
-}
37
-
38
-static inline int qemu_gluster_zerofill(struct glfs_fd *fd, int64_t offset,
39
- int64_t size)
40
-{
41
- return glfs_zerofill(fd, offset, size);
42
-}
43
-
44
-#else
45
-static inline bool gluster_supports_zerofill(void)
46
-{
47
- return 0;
48
-}
49
-
50
-static inline int qemu_gluster_zerofill(struct glfs_fd *fd, int64_t offset,
51
- int64_t size)
52
-{
53
- return 0;
54
-}
55
#endif
56
57
static int qemu_gluster_create(const char *filename,
58
@@ -XXX,XX +XXX,XX @@ static int qemu_gluster_create(const char *filename,
59
struct glfs *glfs;
60
struct glfs_fd *fd;
61
int ret = 0;
62
- int prealloc = 0;
63
+ PreallocMode prealloc;
64
int64_t total_size = 0;
65
char *tmp = NULL;
66
+ Error *local_err = NULL;
67
68
gconf = g_new0(BlockdevOptionsGluster, 1);
69
gconf->debug = qemu_opt_get_number_del(opts, GLUSTER_OPT_DEBUG,
70
@@ -XXX,XX +XXX,XX @@ static int qemu_gluster_create(const char *filename,
71
BDRV_SECTOR_SIZE);
72
73
tmp = qemu_opt_get_del(opts, BLOCK_OPT_PREALLOC);
74
- if (!tmp || !strcmp(tmp, "off")) {
75
- prealloc = 0;
76
- } else if (!strcmp(tmp, "full") && gluster_supports_zerofill()) {
77
- prealloc = 1;
78
- } else {
79
- error_setg(errp, "Invalid preallocation mode: '%s'"
80
- " or GlusterFS doesn't support zerofill API", tmp);
81
+ prealloc = qapi_enum_parse(PreallocMode_lookup, tmp,
82
+ PREALLOC_MODE__MAX, PREALLOC_MODE_OFF,
83
+ &local_err);
84
+ g_free(tmp);
85
+ if (local_err) {
86
+ error_propagate(errp, local_err);
87
ret = -EINVAL;
88
goto out;
89
}
90
@@ -XXX,XX +XXX,XX @@ static int qemu_gluster_create(const char *filename,
91
O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, S_IRUSR | S_IWUSR);
92
if (!fd) {
93
ret = -errno;
94
- } else {
95
+ goto out;
96
+ }
97
+
98
+ switch (prealloc) {
99
+#ifdef CONFIG_GLUSTERFS_FALLOCATE
100
+ case PREALLOC_MODE_FALLOC:
101
+ if (glfs_fallocate(fd, 0, 0, total_size)) {
102
+ error_setg(errp, "Could not preallocate data for the new file");
103
+ ret = -errno;
104
+ }
105
+ break;
106
+#endif /* CONFIG_GLUSTERFS_FALLOCATE */
107
+#ifdef CONFIG_GLUSTERFS_ZEROFILL
108
+ case PREALLOC_MODE_FULL:
109
if (!glfs_ftruncate(fd, total_size)) {
110
- if (prealloc && qemu_gluster_zerofill(fd, 0, total_size)) {
111
+ if (glfs_zerofill(fd, 0, total_size)) {
112
+ error_setg(errp, "Could not zerofill the new file");
113
ret = -errno;
114
}
115
} else {
116
+ error_setg(errp, "Could not resize file");
117
ret = -errno;
118
}
119
+ break;
120
+#endif /* CONFIG_GLUSTERFS_ZEROFILL */
121
+ case PREALLOC_MODE_OFF:
122
+ if (glfs_ftruncate(fd, total_size) != 0) {
123
+ ret = -errno;
124
+ error_setg(errp, "Could not resize file");
125
+ }
126
+ break;
127
+ default:
128
+ ret = -EINVAL;
129
+ error_setg(errp, "Unsupported preallocation mode: %s",
130
+ PreallocMode_lookup[prealloc]);
131
+ break;
132
+ }
133
134
- if (glfs_close(fd) != 0) {
135
- ret = -errno;
136
- }
137
+ if (glfs_close(fd) != 0) {
138
+ ret = -errno;
139
}
140
out:
141
- g_free(tmp);
142
qapi_free_BlockdevOptionsGluster(gconf);
143
glfs_clear_preopened(glfs);
144
return ret;
145
diff --git a/configure b/configure
146
index XXXXXXX..XXXXXXX 100755
147
--- a/configure
148
+++ b/configure
149
@@ -XXX,XX +XXX,XX @@ seccomp=""
150
glusterfs=""
151
glusterfs_xlator_opt="no"
152
glusterfs_discard="no"
153
+glusterfs_fallocate="no"
154
glusterfs_zerofill="no"
155
gtk=""
156
gtkabi=""
157
@@ -XXX,XX +XXX,XX @@ if test "$glusterfs" != "no" ; then
158
glusterfs_discard="yes"
159
fi
160
if $pkg_config --atleast-version=6 glusterfs-api; then
161
+ glusterfs_fallocate="yes"
162
glusterfs_zerofill="yes"
163
fi
164
else
165
@@ -XXX,XX +XXX,XX @@ if test "$glusterfs_discard" = "yes" ; then
166
echo "CONFIG_GLUSTERFS_DISCARD=y" >> $config_host_mak
167
fi
168
169
+if test "$glusterfs_fallocate" = "yes" ; then
170
+ echo "CONFIG_GLUSTERFS_FALLOCATE=y" >> $config_host_mak
171
+fi
172
+
173
if test "$glusterfs_zerofill" = "yes" ; then
174
echo "CONFIG_GLUSTERFS_ZEROFILL=y" >> $config_host_mak
175
fi
176
--
29
--
177
2.9.3
30
2.17.1
178
31
179
32
diff view generated by jsdifflib

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.