motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-31 14:02:05 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

monitor: protect mon->fds with mon_lock

Browse source 
mon->fds were protected by BQL.  Now protect it by mon_lock so that it
can even be used in monitor iothread.

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
Message-Id: <20180608035511.7439-3-peterx@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Peter Xu 2018-06-08 11:55:06 +08:00 • committed by Markus Armbruster
parent dc7cbcd8fa
commit 9409fc05fe
1 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

22
monitor.c
View file

@ -212,7 +212,6 @@ struct Monitor {
BlockCompletionFunc *password_completion_cb; BlockCompletionFunc *password_completion_cb;
void *password_opaque; void *password_opaque;
mon_cmd_t *cmd_table; mon_cmd_t *cmd_table;
QLIST_HEAD(,mon_fd_t) fds;
QTAILQ_ENTRY(Monitor) entry; QTAILQ_ENTRY(Monitor) entry;
/* /*
@ -224,6 +223,7 @@ struct Monitor {
/* /*
* Fields that are protected by the per-monitor lock. * Fields that are protected by the per-monitor lock.
*/ */
QLIST_HEAD(, mon_fd_t) fds;
QString *outbuf; QString *outbuf;
guint out_watch; guint out_watch;
/* Read under either BQL or mon_lock, written with BQL+mon_lock. */ /* Read under either BQL or mon_lock, written with BQL+mon_lock. */
@ -2187,7 +2187,7 @@ static void hmp_acl_remove(Monitor *mon, const QDict *qdict)
void qmp_getfd(const char *fdname, Error **errp) void qmp_getfd(const char *fdname, Error **errp)
{ {
mon_fd_t *monfd; mon_fd_t *monfd;
int fd; int fd, tmp_fd;
fd = qemu_chr_fe_get_msgfd(&cur_mon->chr); fd = qemu_chr_fe_get_msgfd(&cur_mon->chr);
if (fd == -1) { if (fd == -1) {
@ -2202,13 +2202,17 @@ void qmp_getfd(const char *fdname, Error **errp)
return; return;
} }
qemu_mutex_lock(&cur_mon->mon_lock);
QLIST_FOREACH(monfd, &cur_mon->fds, next) { QLIST_FOREACH(monfd, &cur_mon->fds, next) {
if (strcmp(monfd->name, fdname) != 0) { if (strcmp(monfd->name, fdname) != 0) {
continue; continue;
} }
close(monfd->fd); tmp_fd = monfd->fd;
monfd->fd = fd; monfd->fd = fd;
qemu_mutex_unlock(&cur_mon->mon_lock);
/* Make sure close() is out of critical section */
close(tmp_fd);
return; return;
} }
@ -2217,24 +2221,31 @@ void qmp_getfd(const char *fdname, Error **errp)
monfd->fd = fd; monfd->fd = fd;
QLIST_INSERT_HEAD(&cur_mon->fds, monfd, next); QLIST_INSERT_HEAD(&cur_mon->fds, monfd, next);
qemu_mutex_unlock(&cur_mon->mon_lock);
} }
void qmp_closefd(const char *fdname, Error **errp) void qmp_closefd(const char *fdname, Error **errp)
{ {
mon_fd_t *monfd; mon_fd_t *monfd;
int tmp_fd;
qemu_mutex_lock(&cur_mon->mon_lock);
QLIST_FOREACH(monfd, &cur_mon->fds, next) { QLIST_FOREACH(monfd, &cur_mon->fds, next) {
if (strcmp(monfd->name, fdname) != 0) { if (strcmp(monfd->name, fdname) != 0) {
continue; continue;
} }
QLIST_REMOVE(monfd, next); QLIST_REMOVE(monfd, next);
close(monfd->fd); tmp_fd = monfd->fd;
g_free(monfd->name); g_free(monfd->name);
g_free(monfd); g_free(monfd);
qemu_mutex_unlock(&cur_mon->mon_lock);
/* Make sure close() is out of critical section */
close(tmp_fd);
return; return;
} }
qemu_mutex_unlock(&cur_mon->mon_lock);
error_setg(errp, QERR_FD_NOT_FOUND, fdname); error_setg(errp, QERR_FD_NOT_FOUND, fdname);
} }
@ -2242,6 +2253,7 @@ int monitor_get_fd(Monitor *mon, const char *fdname, Error **errp)
{ {
mon_fd_t *monfd; mon_fd_t *monfd;
qemu_mutex_lock(&mon->mon_lock);
QLIST_FOREACH(monfd, &mon->fds, next) { QLIST_FOREACH(monfd, &mon->fds, next) {
int fd; int fd;
@ -2255,10 +2267,12 @@ int monitor_get_fd(Monitor *mon, const char *fdname, Error **errp)
QLIST_REMOVE(monfd, next); QLIST_REMOVE(monfd, next);
g_free(monfd->name); g_free(monfd->name);
g_free(monfd); g_free(monfd);
qemu_mutex_unlock(&mon->mon_lock);
return fd; return fd;
} }
qemu_mutex_unlock(&mon->mon_lock);
error_setg(errp, "File descriptor named '%s' has not been found", fdname); error_setg(errp, "File descriptor named '%s' has not been found", fdname);
return -1; return -1;
} }