* [Qemu-devel] [PATCH v2] libvhost-user-glib: fix VugDev main fd cleanup
@ 2019-08-27 12:13 Johannes Berg
2019-08-27 12:41 ` no-reply
0 siblings, 1 reply; 2+ messages in thread
From: Johannes Berg @ 2019-08-27 12:13 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau, Johannes Berg
From: Johannes Berg <johannes.berg@intel.com>
If you try to make a device implementation that can handle multiple
connections and allow disconnections (which requires overriding the
VHOST_USER_NONE handling), then glib will warn that we remove a src
while it's still on the mainloop, and will poll() an FD that doesn't
exist anymore.
Fix this by making vug_source_new() require pairing with the new
vug_source_destroy() so we can keep the GSource referenced in the
meantime.
Note that this requires calling the new API in vhost-user-input.
vhost-user-gpu also uses vug_source_new(), but never seems to free
the result at all, so I haven't changed anything there.
Fixes: 8bb7ddb78a1c ("libvhost-user: add glib source helper")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
contrib/libvhost-user/libvhost-user-glib.c | 14 +++++++++++---
contrib/libvhost-user/libvhost-user-glib.h | 1 +
contrib/vhost-user-input/main.c | 6 ++----
3 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/contrib/libvhost-user/libvhost-user-glib.c b/contrib/libvhost-user/libvhost-user-glib.c
index 99edd2f3de45..3e902ccd2efb 100644
--- a/contrib/libvhost-user/libvhost-user-glib.c
+++ b/contrib/libvhost-user/libvhost-user-glib.c
@@ -91,7 +91,6 @@ vug_source_new(VugDev *gdev, int fd, GIOCondition cond,
g_source_add_poll(gsrc, &src->gfd);
id = g_source_attach(gsrc, NULL);
g_assert(id);
- g_source_unref(gsrc);
return gsrc;
}
@@ -131,6 +130,15 @@ static void vug_watch(VuDev *dev, int condition, void *data)
}
}
+void vug_source_destroy(GSource *src)
+{
+ if (!src)
+ return;
+
+ g_source_unref(src);
+ g_source_destroy(src);
+}
+
bool
vug_init(VugDev *dev, uint16_t max_queues, int socket,
vu_panic_cb panic, const VuDevIface *iface)
@@ -144,7 +152,7 @@ vug_init(VugDev *dev, uint16_t max_queues, int socket,
}
dev->fdmap = g_hash_table_new_full(NULL, NULL, NULL,
- (GDestroyNotify) g_source_destroy);
+ (GDestroyNotify) vug_source_destroy);
dev->src = vug_source_new(dev, socket, G_IO_IN, vug_watch, NULL);
@@ -157,5 +165,5 @@ vug_deinit(VugDev *dev)
g_assert(dev);
g_hash_table_unref(dev->fdmap);
- g_source_unref(dev->src);
+ vug_source_destroy(dev->src);
}
diff --git a/contrib/libvhost-user/libvhost-user-glib.h b/contrib/libvhost-user/libvhost-user-glib.h
index 64d539d93aba..1a79a4916ef2 100644
--- a/contrib/libvhost-user/libvhost-user-glib.h
+++ b/contrib/libvhost-user/libvhost-user-glib.h
@@ -31,5 +31,6 @@ void vug_deinit(VugDev *dev);
GSource *vug_source_new(VugDev *dev, int fd, GIOCondition cond,
vu_watch_cb vu_cb, gpointer data);
+void vug_source_destroy(GSource *src);
#endif /* LIBVHOST_USER_GLIB_H */
diff --git a/contrib/vhost-user-input/main.c b/contrib/vhost-user-input/main.c
index 449fd2171a5a..7d6b0f9d80cc 100644
--- a/contrib/vhost-user-input/main.c
+++ b/contrib/vhost-user-input/main.c
@@ -187,7 +187,7 @@ vi_queue_set_started(VuDev *dev, int qidx, bool started)
}
if (!started && vi->evsrc) {
- g_source_destroy(vi->evsrc);
+ vug_source_destroy(vi->evsrc);
vi->evsrc = NULL;
}
}
@@ -401,9 +401,7 @@ main(int argc, char *argv[])
vug_deinit(&vi.dev);
- if (vi.evsrc) {
- g_source_unref(vi.evsrc);
- }
+ vugg_source_destroy(vi.evsrc);
g_array_free(vi.config, TRUE);
g_free(vi.queue);
return 0;
--
2.23.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Qemu-devel] [PATCH v2] libvhost-user-glib: fix VugDev main fd cleanup
2019-08-27 12:13 [Qemu-devel] [PATCH v2] libvhost-user-glib: fix VugDev main fd cleanup Johannes Berg
@ 2019-08-27 12:41 ` no-reply
0 siblings, 0 replies; 2+ messages in thread
From: no-reply @ 2019-08-27 12:41 UTC (permalink / raw)
To: johannes; +Cc: marcandre.lureau, qemu-devel, johannes.berg
Patchew URL: https://patchew.org/QEMU/20190827121339.15815-1-johannes@sipsolutions.net/
Hi,
This series seems to have some coding style problems. See output below for
more information:
Message-id: 20190827121339.15815-1-johannes@sipsolutions.net
Subject: [Qemu-devel] [PATCH v2] libvhost-user-glib: fix VugDev main fd cleanup
Type: series
=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram
./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
Switched to a new branch 'test'
3f97c56 libvhost-user-glib: fix VugDev main fd cleanup
=== OUTPUT BEGIN ===
ERROR: braces {} are necessary for all arms of this statement
#43: FILE: contrib/libvhost-user/libvhost-user-glib.c:135:
+ if (!src)
[...]
total: 1 errors, 0 warnings, 60 lines checked
Commit 3f97c566d10f (libvhost-user-glib: fix VugDev main fd cleanup) has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
=== OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/20190827121339.15815-1-johannes@sipsolutions.net/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-08-27 12:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-27 12:13 [Qemu-devel] [PATCH v2] libvhost-user-glib: fix VugDev main fd cleanup Johannes Berg
2019-08-27 12:41 ` no-reply
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).