# HG changeset patch
# User Olaf Hering <olaf@xxxxxxxxx>
# Date 1307437222 -7200
# Node ID 168eef309cc99a5bebed230a54f337b6692c112d
# Parent 9484d35ec6e802aa3727cb6332e649b41e80a615
xenpaging: implement stopping of pager by sending SIGTERM/SIGINT
Write all paged-out pages back into the guest if the pager is
interrupted by ctrl-c or if it receives SIGTERM.
Signed-off-by: Olaf Hering <olaf@xxxxxxxxx>
diff -r 9484d35ec6e8 -r 168eef309cc9 tools/xenpaging/Makefile
--- a/tools/xenpaging/Makefile Tue Jun 07 11:00:21 2011 +0200
+++ b/tools/xenpaging/Makefile Tue Jun 07 11:00:22 2011 +0200
@@ -9,6 +9,7 @@ POLICY = default
SRC :=
SRCS += file_ops.c xc.c xenpaging.c policy_$(POLICY).c
SRCS += watch.c
+SRCS += pagein.c
CFLAGS += -Werror
CFLAGS += -Wno-unused
diff -r 9484d35ec6e8 -r 168eef309cc9 tools/xenpaging/pagein.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tools/xenpaging/pagein.c Tue Jun 07 11:00:22 2011 +0200
@@ -0,0 +1,68 @@
+/* Trigger a page-in in a separate thread-of-execution to avoid deadlock */
+#include <pthread.h>
+#include "xc.h"
+
+struct page_in_args {
+ domid_t dom;
+ xc_interface *xch;
+};
+
+static struct page_in_args page_in_args;
+static unsigned long page_in_gfn;
+static unsigned int page_in_possible;
+
+static pthread_t page_in_thread;
+static pthread_cond_t page_in_cond = PTHREAD_COND_INITIALIZER;
+static pthread_mutex_t page_in_mutex = PTHREAD_MUTEX_INITIALIZER;
+
+static void *page_in(void *arg)
+{
+ struct page_in_args *pia = arg;
+ void *page;
+ xen_pfn_t gfn;
+
+ while (1)
+ {
+ pthread_mutex_lock(&page_in_mutex);
+ while (!page_in_gfn)
+ pthread_cond_wait(&page_in_cond, &page_in_mutex);
+ gfn = page_in_gfn;
+ page_in_gfn = 0;
+ pthread_mutex_unlock(&page_in_mutex);
+
+ /* Ignore errors */
+ page = xc_map_foreign_pages(pia->xch, pia->dom, PROT_READ, &gfn, 1);
+ if (page)
+ munmap(page, PAGE_SIZE);
+ }
+ page_in_possible = 0;
+ pthread_exit(NULL);
+}
+
+void page_in_trigger(unsigned long gfn)
+{
+ if (!page_in_possible)
+ return;
+
+ pthread_mutex_lock(&page_in_mutex);
+ page_in_gfn = gfn;
+ pthread_mutex_unlock(&page_in_mutex);
+ pthread_cond_signal(&page_in_cond);
+}
+
+void create_page_in_thread(domid_t domain_id, xc_interface *xch)
+{
+ page_in_args.dom = domain_id;
+ page_in_args.xch = xch;
+ if (pthread_create(&page_in_thread, NULL, page_in, &page_in_args) == 0)
+ page_in_possible = 1;
+}
+
+/*
+ * Local variables:
+ * mode: C
+ * c-set-style: "BSD"
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
diff -r 9484d35ec6e8 -r 168eef309cc9 tools/xenpaging/xenpaging.c
--- a/tools/xenpaging/xenpaging.c Tue Jun 07 11:00:21 2011 +0200
+++ b/tools/xenpaging/xenpaging.c Tue Jun 07 11:00:22 2011 +0200
@@ -585,6 +585,9 @@ int main(int argc, char *argv[])
/* watch for shutdown of domain_id */
create_watch_thread(paging->mem_event.domain_id, set_interrupted_quit);
+ /* listen for page-in events to stop pager */
+ create_page_in_thread(paging->mem_event.domain_id, xch);
+
/* Evict pages */
for ( i = 0; i < paging->num_pages; i++ )
{
@@ -600,7 +603,7 @@ int main(int argc, char *argv[])
DPRINTF("%d pages evicted. Done.\n", i);
/* Swap pages in and out */
- while ( !interrupted )
+ while ( 1 )
{
/* Wait for Xen to signal that a page needs paged in */
rc = xc_wait_for_event_or_timeout(xch, paging->mem_event.xce_handle,
100);
@@ -663,8 +666,12 @@ int main(int argc, char *argv[])
goto out;
}
- /* Evict a new page to replace the one we just paged in */
- evict_victim(paging, &victims[i], fd, i);
+ /* Evict a new page to replace the one we just paged in,
+ * or clear this pagefile slot on exit */
+ if ( interrupted )
+ victims[i].gfn = INVALID_MFN;
+ else
+ evict_victim(paging, &victims[i], fd, i);
}
else
{
@@ -691,6 +698,28 @@ int main(int argc, char *argv[])
}
}
}
+
+ /* Write all pages back into the guest */
+ if ( interrupted == SIGTERM || interrupted == SIGINT )
+ {
+ for ( i = 0; i < paging->domain_info->max_pages; i++ )
+ {
+ if ( test_bit(i, paging->bitmap) )
+ {
+ page_in_trigger(i);
+ break;
+ }
+ }
+ /* If no more pages to process, exit loop */
+ if ( i == paging->domain_info->max_pages )
+ break;
+ }
+ else
+ {
+ /* Exit on any other signal */
+ if ( interrupted )
+ break;
+ }
}
DPRINTF("xenpaging got signal %d\n", interrupted);
diff -r 9484d35ec6e8 -r 168eef309cc9 tools/xenpaging/xenpaging.h
--- a/tools/xenpaging/xenpaging.h Tue Jun 07 11:00:21 2011 +0200
+++ b/tools/xenpaging/xenpaging.h Tue Jun 07 11:00:22 2011 +0200
@@ -57,6 +57,9 @@ typedef struct xenpaging_victim {
extern void create_watch_thread(domid_t domain_id, void (*fn)(void));
+extern void create_page_in_thread(domid_t domain_id, xc_interface *xch);
+extern void page_in_trigger(unsigned long gfn);
+
#endif // __XEN_PAGING_H__
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
Home