qemu: stop polling non-system fds on vmstop
PATCH 1/1 qemu: stop polling non-system fds on vmstop
We should not run any devices while the VM is stopped:
DMA into memory while VM is stopped makes it hard to debug migration (consequitive saves result in different files); Sending while vm is stopped has an even worse effect as it confuses the bridges so that they do not know where to send packets.
The following patch addresses this by splitting device and system io handlers into separate lists. Device handlers are stopped on vmstop, system handlers keep running.
Signed-off-by Michael S. Tsirkin <[email protected]>
--- aio.c | 32 +++++++++++-- cmd.c | 8 ++-- cpus.c | 2 +- migration-exec.c | 4 +- migration-fd.c | 4 +- migration-tcp.c | 8 ++-- migration-unix.c | 8 ++-- migration.c | 8 ++-- qemu-aio.h | 7 +++ qemu-char.h | 5 ++ qemu-kvm.c | 2 +- qemu-tool.c | 9 ++++ vl.c | 136 +++++++++++++++++++++++++++++++++++------------------- 13 files changed, 160 insertions(+), 73 deletions(-)
aio.c +28 -4
@@ -52,14 +52,15 @@ static AioHandler *find_aio_handler(int fd)return NULL ; } -int qemu_aio_set_fd_handler (int fd, +static int qemu_aio_assign_fd_handler (int fd,IOHandler *io_read,IOHandler *io_write,AioFlushHandler *io_flush,AioProcessQueue *io_process_queue, -void *opaque) +void *opaque,bool system) {AioHandler *node; +int r; node =find_aio_handler (fd);
@@ -93,11 +94,34 @@ int qemu_aio_set_fd_handler(int fd, node->opaque = opaque; } -qemu_set_fd_handler2 (fd,NULL , io_read, io_write, opaque); - + r = system ?qemu_set_fd_handler2 (fd,NULL , io_read, io_write, opaque) : +qemu_set_system_fd_handler (fd,NULL , io_read, io_write, opaque); +assert (!r);return 0 ; } +int qemu_aio_set_fd_handler (int fd, +IOHandler *io_read, +IOHandler *io_write, +AioFlushHandler *io_flush, +AioProcessQueue *io_process_queue, +void *opaque) +{ +return qemu_aio_assign_fd_handler (fd, io_read, io_write, io_flush, + io_process_queue, opaque, false); +} + +int qemu_aio_set_system_fd_handler (int fd, +IOHandler *io_read, +IOHandler *io_write, +AioFlushHandler *io_flush, +AioProcessQueue *io_process_queue, +void *opaque) +{ +return qemu_aio_assign_fd_handler (fd, io_read, io_write, io_flush, + io_process_queue, opaque, true); +} +void qemu_aio_flush (void ) {AioHandler *node;
cmd.c +4 -4
@@ -154,7 +154,7 @@ static void prep_fetchline(void *opaque) {int *fetchable = opaque; -qemu_aio_set_fd_handler (STDIN_FILENO ,NULL ,NULL ,NULL ,NULL ,NULL ); +qemu_aio_set_system_fd_handler (STDIN_FILENO ,NULL ,NULL ,NULL ,NULL ,NULL ); *fetchable=1 ; }
@@ -202,8 +202,8 @@ command_loop(void)if (!prompted) {printf ("%s" ,get_prompt ());fflush (stdout); -qemu_aio_set_fd_handler (STDIN_FILENO , prep_fetchline,NULL ,NULL , -NULL , &fetchable); +qemu_aio_set_system_fd_handler (STDIN_FILENO , prep_fetchline, +NULL ,NULL ,NULL , &fetchable); prompted =1 ; }
@@ -228,7 +228,7 @@ command_loop(void) prompted =0 ; fetchable =0 ; } -qemu_aio_set_fd_handler (STDIN_FILENO ,NULL ,NULL ,NULL ,NULL ,NULL ); +qemu_aio_set_system_fd_handler (STDIN_FILENO ,NULL ,NULL ,NULL ,NULL ,NULL ); }/* from libxcmd/input.c */
cpus.c +1 -1
@@ -209,7 +209,7 @@ static int qemu_event_init(void)if (err <0 ) goto fail; -qemu_set_fd_handler2 (fds[0 ],NULL , qemu_event_read,NULL , +qemu_set_system_fd_handler (fds[0 ],NULL , qemu_event_read,NULL , (void *)(unsigned long )fds[0 ]); io_thread_fd = fds[1 ];
migration-exec.c +2 -2
@@ -123,7 +123,7 @@ static void exec_accept_incoming_migration(void *opaque)QEMUFile *f = opaque;process_incoming_migration (f); -qemu_set_fd_handler2 (qemu_stdio_fd (f),NULL ,NULL ,NULL ,NULL ); +qemu_set_system_fd_handler (qemu_stdio_fd (f),NULL ,NULL ,NULL ,NULL );qemu_fclose (f); }
@@ -138,7 +138,7 @@ int exec_start_incoming_migration(const char *command)return -errno; } -qemu_set_fd_handler2 (qemu_stdio_fd (f),NULL , +qemu_set_system_fd_handler (qemu_stdio_fd (f),NULL , exec_accept_incoming_migration,NULL , f);return 0 ;
migration-fd.c +2 -2
@@ -106,7 +106,7 @@ static void fd_accept_incoming_migration(void *opaque)QEMUFile *f = opaque;process_incoming_migration (f); -qemu_set_fd_handler2 (qemu_stdio_fd (f),NULL ,NULL ,NULL ,NULL ); +qemu_set_system_fd_handler (qemu_stdio_fd (f),NULL ,NULL ,NULL ,NULL );qemu_fclose (f); }
@@ -124,7 +124,7 @@ int fd_start_incoming_migration(const char *infd)return -errno; } -qemu_set_fd_handler2 (fd,NULL , fd_accept_incoming_migration,NULL , f); +qemu_set_system_fd_handler (fd,NULL , fd_accept_incoming_migration,NULL , f);return 0 ; }
migration-tcp.c +4 -4
@@ -66,7 +66,7 @@ static void tcp_wait_for_connect(void *opaque)return ; } -qemu_set_fd_handler2 (s->fd,NULL ,NULL ,NULL ,NULL ); +qemu_set_system_fd_handler (s->fd,NULL ,NULL ,NULL ,NULL );if (val ==0 )migrate_fd_connect (s);
@@ -123,7 +123,7 @@ MigrationState *tcp_start_outgoing_migration(Monitor *mon, ret = -(s->get_error (s));if (ret == -EINPROGRESS || ret == -EWOULDBLOCK ) -qemu_set_fd_handler2 (s->fd,NULL ,NULL , tcp_wait_for_connect, s); +qemu_set_system_fd_handler (s->fd,NULL ,NULL , tcp_wait_for_connect, s); }while (ret == -EINTR );if (ret <0 && ret != -EINPROGRESS && ret != -EWOULDBLOCK ) {
@@ -165,7 +165,7 @@ static void tcp_accept_incoming_migration(void *opaque) out:close (c); out2: -qemu_set_fd_handler2 (s,NULL ,NULL ,NULL ,NULL ); +qemu_set_system_fd_handler (s,NULL ,NULL ,NULL ,NULL );close (s); }
@@ -193,7 +193,7 @@ int tcp_start_incoming_migration(const char *host_port)if (listen (s,1 ) ==-1 ) goto err; -qemu_set_fd_handler2 (s,NULL , tcp_accept_incoming_migration,NULL , +qemu_set_system_fd_handler (s,NULL , tcp_accept_incoming_migration,NULL , (void *)(unsigned long )s);return 0 ;
migration-unix.c +4 -4
@@ -65,7 +65,7 @@ static void unix_wait_for_connect(void *opaque)return ; } -qemu_set_fd_handler2 (s->fd,NULL ,NULL ,NULL ,NULL ); +qemu_set_system_fd_handler (s->fd,NULL ,NULL ,NULL ,NULL );if (val ==0 )migrate_fd_connect (s);
@@ -118,7 +118,7 @@ MigrationState *unix_start_outgoing_migration(Monitor *mon, ret = -(s->get_error (s));if (ret == -EINPROGRESS || ret == -EWOULDBLOCK ) -qemu_set_fd_handler2 (s->fd,NULL ,NULL , unix_wait_for_connect, s); +qemu_set_system_fd_handler (s->fd,NULL ,NULL , unix_wait_for_connect, s); }while (ret == -EINTR );if (ret <0 && ret != -EINPROGRESS && ret != -EWOULDBLOCK ) {
@@ -171,7 +171,7 @@ static void unix_accept_incoming_migration(void *opaque)process_incoming_migration (f);qemu_fclose (f); out: -qemu_set_fd_handler2 (s,NULL ,NULL ,NULL ,NULL ); +qemu_set_system_fd_handler (s,NULL ,NULL ,NULL ,NULL );close (s);close (c); }
@@ -203,7 +203,7 @@ int unix_start_incoming_migration(const char *path) goto err; } -qemu_set_fd_handler2 (sock,NULL , unix_accept_incoming_migration,NULL , +qemu_set_system_fd_handler (sock,NULL , unix_accept_incoming_migration,NULL , (void *)(unsigned long )sock);return 0 ;
migration.c +4 -4
@@ -273,7 +273,7 @@ int migrate_fd_cleanup(FdMigrationState *s) {int ret =0 ; -qemu_set_fd_handler2 (s->fd,NULL ,NULL ,NULL ,NULL ); +qemu_set_system_fd_handler (s->fd,NULL ,NULL ,NULL ,NULL );if (s->file) {DPRINTF ("closing file\n" );
@@ -300,7 +300,7 @@ void migrate_fd_put_notify(void *opaque) {FdMigrationState *s = opaque; -qemu_set_fd_handler2 (s->fd,NULL ,NULL ,NULL ,NULL ); +qemu_set_system_fd_handler (s->fd,NULL ,NULL ,NULL ,NULL );qemu_file_put_notify (s->file); }
@@ -317,7 +317,7 @@ ssize_t migrate_fd_put_buffer(void *opaque, const void *data, size_t size) ret = -(s->get_error (s));if (ret == -EAGAIN ) { -qemu_set_fd_handler2 (s->fd,NULL ,NULL , migrate_fd_put_notify, s); +qemu_set_system_fd_handler (s->fd,NULL ,NULL , migrate_fd_put_notify, s); }else if (ret <0 ) {if (s->mon) {monitor_resume (s->mon);
@@ -445,6 +445,6 @@ int migrate_fd_close(void *opaque) {FdMigrationState *s = opaque; -qemu_set_fd_handler2 (s->fd,NULL ,NULL ,NULL ,NULL ); +qemu_set_system_fd_handler (s->fd,NULL ,NULL ,NULL ,NULL );return s->close (s); }
qemu-aio.h +7 -0
@@ -56,4 +56,11 @@ int qemu_aio_set_fd_handler(int fd, AioProcessQueue *io_process_queue, void *opaque); +/* Same but for system handlers, which run when VM is stopped. */ +int qemu_aio_set_system_fd_handler (int fd, +IOHandler *io_read, +IOHandler *io_write, +AioFlushHandler *io_flush, +AioProcessQueue *io_process_queue, +void *opaque);#endif
qemu-char.h +5 -0
@@ -111,4 +111,9 @@ int qemu_set_fd_handler(int fd, IOHandler *fd_read, IOHandler *fd_write, void *opaque); +int qemu_set_system_fd_handler (int fd, +IOCanReadHandler *fd_read_poll, +IOHandler *fd_read, +IOHandler *fd_write, +void *opaque);#endif
qemu-kvm.c +1 -1
@@ -1621,7 +1621,7 @@ int kvm_main_loop(void)fcntl (sigfd,F_SETFL ,O_NONBLOCK ); -qemu_set_fd_handler2 (sigfd,NULL , sigfd_handler,NULL , +qemu_set_system_fd_handler (sigfd,NULL , sigfd_handler,NULL , (void *)(unsigned long ) sigfd);pthread_cond_broadcast (&qemu_system_cond);
qemu-tool.c +9 -0
@@ -111,6 +111,15 @@ int qemu_set_fd_handler2(int fd,return 0 ; } +int qemu_set_system_fd_handler (int fd, +IOCanReadHandler *fd_read_poll, +IOHandler *fd_read, +IOHandler *fd_write, +void *opaque) +{ +return 0 ; +} +int64_t qemu_get_clock (QEMUClock *clock) {qemu_timeval tv;
vl.c +87 -45
190 lines not on this page · raw message
Signature · 1 line
1.7.3.2.91.g446ac