From 2b5fb80ff7f475ab9cd0fed0ffbe15a8acce4494 Mon Sep 17 00:00:00 2001 From: David Vrabel Date: Fri, 31 Aug 2012 10:42:04 +0100 Subject: xenconsoled: clean-up after all dead domains xenconsoled expected domains that are being shutdown to end up in the the DYING state and would only clean-up such domains. HVM domains either didn't enter the DYING state or weren't in long enough for xenconsoled to notice. For every shutdown HVM domain, xenconsoled would leak memory, grow its list of domains and (if guest console logging was enabled) leak the log file descriptor. If the file descriptors were leaked and enough HVM domains were shutdown, no more console connections would work as the evtchn device could not be opened. Guests would then block waiting to send console output. Fix this by tagging domains that exist in enum_domains(). Afterwards, all untagged domains are assumed to be dead and are shutdown and cleaned up. Signed-off-by: David Vrabel Acked-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Campbell --- tools/console/daemon/io.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'tools/console') diff --git a/tools/console/daemon/io.c b/tools/console/daemon/io.c index f09d63a304..48fe1519d5 100644 --- a/tools/console/daemon/io.c +++ b/tools/console/daemon/io.c @@ -84,6 +84,7 @@ struct domain { int slave_fd; int log_fd; bool is_dead; + unsigned last_seen; struct buffer buffer; struct domain *next; char *conspath; @@ -727,12 +728,16 @@ static void shutdown_domain(struct domain *d) d->xce_handle = NULL; } +static unsigned enum_pass = 0; + void enum_domains(void) { int domid = 1; xc_dominfo_t dominfo; struct domain *dom; + enum_pass++; + while (xc_domain_getinfo(xc, domid, 1, &dominfo) == 1) { dom = lookup_domain(dominfo.domid); if (dominfo.dying) { @@ -740,8 +745,10 @@ void enum_domains(void) shutdown_domain(dom); } else { if (dom == NULL) - create_domain(dominfo.domid); + dom = create_domain(dominfo.domid); } + if (dom) + dom->last_seen = enum_pass; domid = dominfo.domid + 1; } } @@ -1069,6 +1076,9 @@ void handle_io(void) &writefds)) handle_tty_write(d); + if (d->last_seen != enum_pass) + shutdown_domain(d); + if (d->is_dead) cleanup_domain(d); } -- cgit v1.2.3