|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH v3 1/3] tools/libxc: refactored mempaging code from xenpaging to libxc.
This patch moves the code to initialize and teardown mempaging from xenpaging
to libxc. The code refactored from xenpaging is the code which sets up paging,
initializes a shared ring and event channel to communicate with xen. This
communication is done between the hypervisor and the dom0 tool which performs
the activity of pager. Another routine is also added by this patch which will
teardown the ring and mem paging setup. The xenpaging code is changed to use
the newly created routines and is tested to properly build and work with this
code.
The refactored code is to be placed in libxc with LGPL license while the old
xenpaging code was under GPL2+ license, hence proper permission has been taken
from previous copyright holders to relicense the code.
The refactoring is done so that the tools lazy restore pager and xenpaging which
rely on memory paging can use the same routines to initialize mempaging. This
refactoring
will also allow any future (in-tree) tools to use mempaging. The refactored
code in
xc_mem_paging_ring_setup is to be compiled into libxenguest.
Note:- The name of a macro in the file tools/ocaml/libs/xc/xenctrl_stubs.c is
changed
from RING_SIZE to BUF_RING_SIZE because the earlier name collides with xen
shared ring
definitions in io/ring.h
Signed-off-by: Dushyant Behl <myselfdushyantbehl@xxxxxxxxx>
Reviewed-by: Andres Lagar-Cavilla <andres@xxxxxxxxxxxxxxxx>
Reviewed-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
Acked-by: David Scott <dave.scott@xxxxxxxxxx>
---
tools/libxc/Makefile | 2 +
tools/libxc/xc_mem_paging_setup.c | 184 ++++++++++++++++++++++++++++++++++++
tools/libxc/xenguest.h | 42 ++++++++
tools/ocaml/libs/xc/xenctrl_stubs.c | 7 +-
tools/xenpaging/Makefile | 4 +-
tools/xenpaging/xenpaging.c | 110 +++++----------------
6 files changed, 255 insertions(+), 94 deletions(-)
create mode 100644 tools/libxc/xc_mem_paging_setup.c
diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile
index 22eef8e..68c5f08 100644
--- a/tools/libxc/Makefile
+++ b/tools/libxc/Makefile
@@ -70,6 +70,8 @@ GUEST_SRCS-$(CONFIG_ARM) += xc_dom_armzimageloader.c
GUEST_SRCS-y += xc_dom_binloader.c
GUEST_SRCS-y += xc_dom_compat_linux.c
+GUEST_SRCS-y += xc_mem_paging_setup.c
+
GUEST_SRCS-$(CONFIG_X86) += xc_dom_x86.c
GUEST_SRCS-$(CONFIG_X86) += xc_cpuid_x86.c
GUEST_SRCS-$(CONFIG_X86) += xc_hvm_build_x86.c
diff --git a/tools/libxc/xc_mem_paging_setup.c
b/tools/libxc/xc_mem_paging_setup.c
new file mode 100644
index 0000000..bfb9a9b
--- /dev/null
+++ b/tools/libxc/xc_mem_paging_setup.c
@@ -0,0 +1,184 @@
+/*
+ * tools/libxc/xc_mem_paging_setup.c
+ *
+ * Routines to initialize and teardown memory paging.
+ * Create shared ring and event channels to communicate
+ * with the hypervisor.
+ *
+ * Copyright (c) 2014 Dushyant Behl <myselfdushyantbehl@xxxxxxxxx>
+ * Copyright (c) 2009 by Citrix Systems, Inc. (Patrick Colp)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
+ */
+
+#include "xg_private.h"
+#include <xen/event_channel.h>
+#include <xen/mem_event.h>
+
+/*
+ * Mem paging ring and event channel setup routine.
+ * Setup a shared ring and an event channel to communicate between
+ * hypervisor and the tool performing mem paging operations.
+ * The function will return zero on successful completion and will
+ * return -1 on failure at any intermediate step setting up errno
+ * properly.
+ */
+int xc_mem_paging_ring_setup(xc_interface *xch,
+ xc_evtchn *xce_handle,
+ domid_t domain_id,
+ void *ring_page,
+ int *port,
+ uint32_t *evtchn_port,
+ mem_event_back_ring_t *back_ring)
+{
+ int rc;
+ uint64_t pfn;
+ xen_pfn_t ring_pfn, mmap_pfn;
+
+ /* Map the ring page */
+ xc_hvm_param_get(xch, domain_id, HVM_PARAM_PAGING_RING_PFN, &pfn);
+
+ ring_pfn = pfn;
+ mmap_pfn = ring_pfn;
+ ring_page = xc_map_foreign_batch(xch, domain_id,
+ PROT_READ | PROT_WRITE, &mmap_pfn, 1);
+ if ( mmap_pfn & XEN_DOMCTL_PFINFO_XTAB )
+ {
+ /* Map failed, populate ring page */
+ rc = xc_domain_populate_physmap_exact(xch, domain_id,
+ 1, 0, 0, &ring_pfn);
+ if ( rc != 0 )
+ {
+ PERROR("Failed to populate ring gfn\n");
+ return -1;
+ }
+
+ mmap_pfn = ring_pfn;
+ ring_page = xc_map_foreign_batch(xch, domain_id,
+ PROT_READ | PROT_WRITE, &mmap_pfn, 1);
+
+ if ( mmap_pfn & XEN_DOMCTL_PFINFO_XTAB )
+ {
+ PERROR("Could not map the ring page\n");
+ return -1;
+ }
+ }
+
+ /* Initialise Xen */
+ rc = xc_mem_paging_enable(xch, domain_id, evtchn_port);
+ if ( rc != 0 )
+ {
+ switch ( errno ) {
+ case EBUSY:
+ ERROR("mempaging is (or was) active on this domain");
+ break;
+ case ENODEV:
+ ERROR("mempaging requires Hardware Assisted Paging");
+ break;
+ case EMLINK:
+ ERROR("mempaging not supported while iommu passthrough is
enabled");
+ break;
+ case EXDEV:
+ ERROR("mempaging not supported in a PoD guest");
+ break;
+ default:
+ PERROR("mempaging: error initialising shared page");
+ break;
+ }
+ return -1;
+ }
+
+ /* Bind event notification */
+ rc = xc_evtchn_bind_interdomain(xce_handle, domain_id, *evtchn_port);
+ if ( rc < 0 )
+ {
+ PERROR("Failed to bind event channel");
+ return -1;
+ }
+ *port = rc;
+
+ /* Initialise ring */
+ SHARED_RING_INIT((mem_event_sring_t *)ring_page);
+ BACK_RING_INIT(back_ring, (mem_event_sring_t *)ring_page, PAGE_SIZE);
+
+ /* Now that the ring is set, remove it from the guest's physmap */
+ if ( xc_domain_decrease_reservation_exact(xch, domain_id, 1, 0, &ring_pfn)
)
+ {
+ PERROR("Failed to remove ring_pfn from guest physmap");
+ return -1;
+ }
+
+ return 0;
+}
+
+/*
+ * Mem paging ring and event channel teardown routine.
+ * The function call invalidates the arguments ring_page and port.
+ * The function will return zero on successful completion and will
+ * return -1 on failure at any intermediate step setting up errno
+ * properly.
+ */
+int xc_mem_paging_ring_teardown(xc_interface *xch,
+ xc_evtchn *xce_handle,
+ domid_t domain_id,
+ void *ring_page,
+ int *port)
+{
+ int rc;
+
+ /* Remove the ring page. */
+ rc = munmap(ring_page, PAGE_SIZE);
+ if ( rc < 0 )
+ PERROR("Error while disabling paging in xen");
+ else
+ DPRINTF("successfully unmapped ringpage");
+
+ ring_page = NULL;
+
+ /*Disable memory paging. */
+ rc = xc_mem_paging_disable(xch, domain_id);
+ if ( rc < 0 )
+ {
+ PERROR("Error while disabling paging in xen");
+ goto out;
+ }
+ else
+ DPRINTF("successfully disabled mempaging");
+
+ /* Unbind the event channel. */
+ rc = xc_evtchn_unbind(xce_handle, *port);
+ if ( rc < 0 )
+ {
+ PERROR("Error unbinding event port");
+ goto out;
+ }
+ else
+ DPRINTF("successfully unbinded event channel");
+
+ /* Set the port to invalid. */
+ *port = -1;
+
+ out:
+ return rc;
+}
+
+/*
+ * Local variables:
+ * mode: C
+ * c-file-style: "BSD"
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
diff --git a/tools/libxc/xenguest.h b/tools/libxc/xenguest.h
index 341da66..dd66a2f 100644
--- a/tools/libxc/xenguest.h
+++ b/tools/libxc/xenguest.h
@@ -32,6 +32,8 @@
#define X86_64_B_SIZE 64
#define X86_32_B_SIZE 32
+#include <xen/mem_event.h>
+
/* callbacks provided by xc_domain_save */
struct save_callbacks {
/* Called after expiration of checkpoint interval,
@@ -322,4 +324,44 @@ xen_pfn_t *xc_map_m2p(xc_interface *xch,
unsigned long max_mfn,
int prot,
unsigned long *mfn0);
+
+/**
+ * Mem paging ring and event channel setup routine.
+ * Setup a shared ring and an event channel to communicate between
+ * hypervisor and the tool performing mem paging operations.
+ * The function will return zero on successful completion and will
+ * return -1 on failure at any intermediate step setting up errno
+ * properly.
+ * @parm xch a handle to an open hypervisor interface
+ * @parm xce_handle a handle to an open event channel
+ * @parm domain_id number identifier of the domain
+ * @parm ring_page passed NULL, returned pointer to the shared ring page
+ * @parm port pointer to the integer for storing event port
+ * @pram evtchn_port pointer to the integer for storing event channel port
+ * @pram back_ring pointer to the reader end of the memory event channel ring
+ */
+int xc_mem_paging_ring_setup(xc_interface *xch,
+ xc_evtchn *xce_handle,
+ domid_t domain_id,
+ void *ring_page,
+ int *port,
+ uint32_t *evtchn_port,
+ mem_event_back_ring_t *back_ring);
+/**
+ * Mem paging ring and event channel teardown routine.
+ * The function call invalidates the arguments ring_page and port.
+ * The function will return zero on successful completion and will
+ * return -1 on failure at any intermediate step setting up errno
+ * properly.
+ * @parm xch a handle to an open hypervisor interface
+ * @parm xce_handle a handle to an open event channel
+ * @parm domain_id number identifier of the domain
+ * @parm ring_page pointer to the shared ring page
+ * @parm port pointer to the integer storing event port
+ */
+int xc_mem_paging_ring_teardown(xc_interface *xch,
+ xc_evtchn *xce_handle,
+ domid_t domain_id,
+ void *ring_page,
+ int *port);
#endif /* XENGUEST_H */
diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c
b/tools/ocaml/libs/xc/xenctrl_stubs.c
index f0810eb..8ce957e 100644
--- a/tools/ocaml/libs/xc/xenctrl_stubs.c
+++ b/tools/ocaml/libs/xc/xenctrl_stubs.c
@@ -525,13 +525,12 @@ CAMLprim value stub_xc_evtchn_reset(value xch, value
domid)
CAMLreturn(Val_unit);
}
-
-#define RING_SIZE 32768
-static char ring[RING_SIZE];
+#define BUF_RING_SIZE 32768
+static char ring[BUF_RING_SIZE];
CAMLprim value stub_xc_readconsolering(value xch)
{
- unsigned int size = RING_SIZE - 1;
+ unsigned int size = BUF_RING_SIZE - 1;
char *ring_ptr = ring;
int retval;
diff --git a/tools/xenpaging/Makefile b/tools/xenpaging/Makefile
index 548d9dd..ea370d3 100644
--- a/tools/xenpaging/Makefile
+++ b/tools/xenpaging/Makefile
@@ -1,8 +1,8 @@
XEN_ROOT=$(CURDIR)/../..
include $(XEN_ROOT)/tools/Rules.mk
-CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenstore) $(PTHREAD_CFLAGS)
-LDLIBS += $(LDLIBS_libxenctrl) $(LDLIBS_libxenstore) $(PTHREAD_LIBS)
+CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) $(CFLAGS_libxenstore)
$(PTHREAD_CFLAGS)
+LDLIBS += $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore)
$(PTHREAD_LIBS)
LDFLAGS += $(PTHREAD_LDFLAGS)
POLICY = default
diff --git a/tools/xenpaging/xenpaging.c b/tools/xenpaging/xenpaging.c
index 82c1ee4..77ed42f 100644
--- a/tools/xenpaging/xenpaging.c
+++ b/tools/xenpaging/xenpaging.c
@@ -29,6 +29,7 @@
#include <unistd.h>
#include <poll.h>
#include <xc_private.h>
+#include <xenguest.h>
#include <xenstore.h>
#include <getopt.h>
@@ -281,7 +282,6 @@ static struct xenpaging *xenpaging_init(int argc, char
*argv[])
xentoollog_logger *dbg = NULL;
char *p;
int rc;
- unsigned long ring_pfn, mmap_pfn;
/* Allocate memory */
paging = calloc(1, sizeof(struct xenpaging));
@@ -338,61 +338,6 @@ static struct xenpaging *xenpaging_init(int argc, char
*argv[])
goto err;
}
- /* Map the ring page */
- xc_get_hvm_param(xch, paging->mem_event.domain_id,
- HVM_PARAM_PAGING_RING_PFN, &ring_pfn);
- mmap_pfn = ring_pfn;
- paging->mem_event.ring_page =
- xc_map_foreign_batch(xch, paging->mem_event.domain_id,
- PROT_READ | PROT_WRITE, &mmap_pfn, 1);
- if ( mmap_pfn & XEN_DOMCTL_PFINFO_XTAB )
- {
- /* Map failed, populate ring page */
- rc = xc_domain_populate_physmap_exact(paging->xc_handle,
- paging->mem_event.domain_id,
- 1, 0, 0, &ring_pfn);
- if ( rc != 0 )
- {
- PERROR("Failed to populate ring gfn\n");
- goto err;
- }
-
- mmap_pfn = ring_pfn;
- paging->mem_event.ring_page =
- xc_map_foreign_batch(xch, paging->mem_event.domain_id,
- PROT_READ | PROT_WRITE, &mmap_pfn, 1);
- if ( mmap_pfn & XEN_DOMCTL_PFINFO_XTAB )
- {
- PERROR("Could not map the ring page\n");
- goto err;
- }
- }
-
- /* Initialise Xen */
- rc = xc_mem_paging_enable(xch, paging->mem_event.domain_id,
- &paging->mem_event.evtchn_port);
- if ( rc != 0 )
- {
- switch ( errno ) {
- case EBUSY:
- ERROR("xenpaging is (or was) active on this domain");
- break;
- case ENODEV:
- ERROR("xenpaging requires Hardware Assisted Paging");
- break;
- case EMLINK:
- ERROR("xenpaging not supported while iommu passthrough is
enabled");
- break;
- case EXDEV:
- ERROR("xenpaging not supported in a PoD guest");
- break;
- default:
- PERROR("Error initialising shared page");
- break;
- }
- goto err;
- }
-
/* Open event channel */
paging->mem_event.xce_handle = xc_evtchn_open(NULL, 0);
if ( paging->mem_event.xce_handle == NULL )
@@ -401,28 +346,21 @@ static struct xenpaging *xenpaging_init(int argc, char
*argv[])
goto err;
}
- /* Bind event notification */
- rc = xc_evtchn_bind_interdomain(paging->mem_event.xce_handle,
- paging->mem_event.domain_id,
- paging->mem_event.evtchn_port);
- if ( rc < 0 )
+ /* Initialize paging by setting up ring and event channel. */
+ rc = xc_mem_paging_ring_setup(paging->xc_handle,
+ paging->mem_event.xce_handle,
+ paging->mem_event.domain_id,
+ paging->mem_event.ring_page,
+ &paging->mem_event.port,
+ &paging->mem_event.evtchn_port,
+ &paging->mem_event.back_ring);
+ if( rc )
{
- PERROR("Failed to bind event channel");
+ PERROR("Could not initialize mem paging\n");
goto err;
}
- paging->mem_event.port = rc;
-
- /* Initialise ring */
- SHARED_RING_INIT((mem_event_sring_t *)paging->mem_event.ring_page);
- BACK_RING_INIT(&paging->mem_event.back_ring,
- (mem_event_sring_t *)paging->mem_event.ring_page,
- PAGE_SIZE);
-
- /* Now that the ring is set, remove it from the guest's physmap */
- if ( xc_domain_decrease_reservation_exact(xch,
- paging->mem_event.domain_id, 1, 0, &ring_pfn) )
- PERROR("Failed to remove ring from guest physmap");
+ DPRINTF("ring and event channel setup successful");
/* Get max_pages from guest if not provided via cmdline */
if ( !paging->max_pages )
@@ -523,21 +461,18 @@ static void xenpaging_teardown(struct xenpaging *paging)
xs_unwatch(paging->xs_handle, "@releaseDomain", watch_token);
paging->xc_handle = NULL;
- /* Tear down domain paging in Xen */
- munmap(paging->mem_event.ring_page, PAGE_SIZE);
- rc = xc_mem_paging_disable(xch, paging->mem_event.domain_id);
- if ( rc != 0 )
- {
- PERROR("Error tearing down domain paging in xen");
- }
- /* Unbind VIRQ */
- rc = xc_evtchn_unbind(paging->mem_event.xce_handle,
paging->mem_event.port);
- if ( rc != 0 )
+ /* Tear down domain paging and ring setup in Xen */
+ rc = xc_mem_paging_ring_teardown(xch, paging->mem_event.xce_handle,
+ paging->mem_event.domain_id,
+ paging->mem_event.ring_page,
+ &paging->mem_event.port);
+ if ( rc < 0 )
{
- PERROR("Error unbinding event port");
+ PERROR("Error in mem paging teardown");
}
- paging->mem_event.port = -1;
+ else
+ DPRINTF("tear down ring and mempaging successful");
/* Close event channel */
rc = xc_evtchn_close(paging->mem_event.xce_handle);
@@ -545,8 +480,7 @@ static void xenpaging_teardown(struct xenpaging *paging)
{
PERROR("Error closing event channel");
}
- paging->mem_event.xce_handle = NULL;
-
+
/* Close connection to xenstore */
xs_close(paging->xs_handle);
--
1.9.1
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |