Re: [Xen-devel] [PATCH v7 07/10] libxc: introduce soft reset for HVM domains
On Wed, 2015-05-27 at 17:25 +0200, Vitaly Kuznetsov wrote:
> Add new xc_soft_reset() function which performs so-called 'soft reset'
> for an HVM domain. It is being performed in the following way:
> - Save HVM context and all HVM params of the source domain;
> - Transfer all the source domain's memory to the destinatio domain with
"destination"
> XEN_DOMCTL_soft_reset;
> - Restore HVM context, HVM params, seed grant table for the new domain.
> When the operation succeeds the source domain is being destroyed and the
This is sounding a lot like a migration, with the refactoring done for
migration v2 is there any possibility we might be able to reuse any of
that?
(e.g. the list of hvmparams to be dealt with seems like something which
needs to be the same everywhere)
> +if ( xc_domain_get_pod_target(xch, source_dom, &pod_info[0],
> &pod_info[1],
> + &pod_info[2]) )
I don't like all the open coded [0], [1] and [2] in the following code
which this implies. You could define symbolic names TOT_PAGES=1, etc but
TBH I think you would be better off just having 3 appropriately named
variables instead of the array.
> +{
> +PERROR("Could not get old domain's PoD info");
> +return 1;
> +}
> +
> +if ( xc_domain_getinfo(xch, dest_dom, 1, &new_info) != 1 ||
> + new_info.domid != dest_dom )
> +{
> +PERROR("Could not get new domain's info");
> +return 1;
> +}
> +
> +if ( !old_info.hvm || !new_info.hvm )
> +{
> +PERROR("Soft reset is supported for HVM only");
> +return 1;
> +}
Should do these sorts of checks before real work, like getting the PoD
info.
> +
> +sharedinfo_pfn = old_info.shared_info_frame;
> +if ( xc_get_pfn_type_batch(xch, source_dom, 1, &sharedinfo_pfn) )
> +{
> +PERROR("xc_get_pfn_type_batch failed");
> +goto out;
> +}
> +
> +hvm_buf_size = xc_domain_hvm_getcontext(xch, source_dom, 0, 0);
> +if ( hvm_buf_size == -1 )
> +{
> +PERROR("Couldn't get HVM context size from Xen");
> +goto out;
> +}
> +
> +hvm_buf = malloc(hvm_buf_size);
> +if ( !hvm_buf )
> +{
> +ERROR("Couldn't allocate memory");
> +goto out;
> +}
> +
> +if ( xc_domain_hvm_getcontext(xch, source_dom, hvm_buf,
> + hvm_buf_size) == -1 )
> +{
> +PERROR("HVM:Could not get hvm buffer");
> +goto out;
> +}
> +
> +xc_hvm_param_get(xch, source_dom, HVM_PARAM_STORE_PFN,
> + &hvm_params[HVM_PARAM_STORE_PFN]);
> +store_pfn = hvm_params[HVM_PARAM_STORE_PFN];
> +*store_mfn = store_pfn;
> +
> +xc_hvm_param_get(xch, source_dom,
> + HVM_PARAM_CONSOLE_PFN,
> + &hvm_params[HVM_PARAM_CONSOLE_PFN]);
> +console_pfn = hvm_params[HVM_PARAM_CONSOLE_PFN];
> +*console_mfn = console_pfn;
> +
> +xc_hvm_param_get(xch, source_dom, HVM_PARAM_BUFIOREQ_PFN,
> + &hvm_params[HVM_PARAM_BUFIOREQ_PFN]);
> +buffio_pfn = hvm_params[HVM_PARAM_BUFIOREQ_PFN];
> +
> +xc_hvm_param_get(xch, source_dom, HVM_PARAM_IOREQ_PFN,
> + &hvm_params[HVM_PARAM_IOREQ_PFN]);
> +io_pfn = hvm_params[HVM_PARAM_IOREQ_PFN];
> +
> +xc_hvm_param_get(xch, source_dom, HVM_PARAM_IDENT_PT,
> + &hvm_params[HVM_PARAM_IDENT_PT]);
> +
> +xc_hvm_param_get(xch, source_dom, HVM_PARAM_PAGING_RING_PFN,
> + &hvm_params[HVM_PARAM_PAGING_RING_PFN]);
> +
> +xc_hvm_param_get(xch, source_dom, HVM_PARAM_VM86_TSS,
> + &hvm_params[HVM_PARAM_VM86_TSS]);
> +
> +xc_hvm_param_get(xch, source_dom, HVM_PARAM_ACPI_IOPORTS_LOCATION,
> + &hvm_params[HVM_PARAM_ACPI_IOPORTS_LOCATION]);
> +
> +xc_hvm_param_get(xch, source_dom, HVM_PARAM_VIRIDIAN,
> + &hvm_params[HVM_PARAM_VIRIDIAN]);
> +
> +xc_hvm_param_get(xch, source_dom, HVM_PARAM_PAE_ENABLED,
> + &hvm_params[HVM_PARAM_PAE_ENABLED]);
> +
> +xc_hvm_param_get(xch, source_dom, HVM_PARAM_STORE_EVTCHN,
> + &hvm_params[HVM_PARAM_STORE_EVTCHN]);
> +
> +xc_hvm_param_get(xch, source_dom, HVM_PARAM_IOREQ_SERVER_PFN,
> + &hvm_params[HVM_PARAM_IOREQ_SERVER_PFN]);
> +
> +xc_hvm_param_get(xch, source_dom, HVM_PARAM_NR_IOREQ_SERVER_PAGES,
> + &hvm_params[HVM_PARAM_NR_IOREQ_SERVER_PAGES]);
> +
> +xc_hvm_param_get(xch, source_dom, HVM_PARAM_VM_GENERATION_ID_ADDR,
> + &hvm_params[HVM_PARAM_VM_GENERATION_ID_ADDR]);
Even if this can't be shared with the migration please at least make it
table driven (i.e. an array of HVM_PARAM_* to wander over) so that
get/set can use the same table and not get out of sync.
Does the set have to follow the xc_domain_soft_reset and/or the get
precede the xc_domain_soft_reset? Or could a simple helper implement get
+set in
[Xen-devel] [PATCH v7 07/10] libxc: introduce soft reset for HVM domains
Add new xc_soft_reset() function which performs so-called 'soft reset'
for an HVM domain. It is being performed in the following way:
- Save HVM context and all HVM params of the source domain;
- Transfer all the source domain's memory to the destinatio domain with
XEN_DOMCTL_soft_reset;
- Restore HVM context, HVM params, seed grant table for the new domain.
When the operation succeeds the source domain is being destroyed and the
destination domain is ready to proceed from where the source was stopped.
Signed-off-by: Vitaly Kuznetsov
---
Changes in v7:
- check that xc_domain_getinfo() return the domain we asked for [Julien Grall]
- xc_domain_soft_reset -> xc_soft_reset
- xc_soft_reset destroys the source domain, no need to do it manually
- nr_transfered was removed from hypercall interface, use
xc_domain_get_pod_target for the source domain instead.
---
tools/libxc/Makefile | 1 +
tools/libxc/include/xenguest.h | 21
tools/libxc/xc_soft_reset.c| 280 +
3 files changed, 302 insertions(+)
create mode 100644 tools/libxc/xc_soft_reset.c
diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile
index 63878ec..62bc21b 100644
--- a/tools/libxc/Makefile
+++ b/tools/libxc/Makefile
@@ -69,6 +69,7 @@ $(patsubst %.c,%.opic,$(GUEST_SRCS-y)): CFLAGS +=
-DXG_LIBXL_HVM_COMPAT
else
GUEST_SRCS-y += xc_nomigrate.c
endif
+GUEST_SRCS-y += xc_soft_reset.c
vpath %.c ../../xen/common/libelf
CFLAGS += -I../../xen/common/libelf
diff --git a/tools/libxc/include/xenguest.h b/tools/libxc/include/xenguest.h
index 7581263..c71b423 100644
--- a/tools/libxc/include/xenguest.h
+++ b/tools/libxc/include/xenguest.h
@@ -147,6 +147,27 @@ int xc_domain_restore2(xc_interface *xch, int io_fd,
uint32_t dom,
* of the new domain is automatically appended to the filename,
* separated by a ".".
*/
+
+/**
+ * This function does soft reset for a domain. During soft reset all
+ * source domain's memory is being reassigned to the destination domain,
+ * HVM context and HVM params are being copied, source domain is being
+ * destroyed.
+ *
+ * @parm xch a handle to an open hypervisor interface
+ * @parm source_dom the id of the source domain
+ * @parm dest_dom the id of the destination domain
+ * @parm console_domid the id of the domain handling console
+ * @parm console_mfn returned with the mfn of the console page
+ * @parm store_domid the id of the domain handling store
+ * @parm store_mfn returned with the mfn of the store page
+ * @return 0 on success, -1 on failure
+ */
+int xc_soft_reset(xc_interface *xch, uint32_t source_dom,
+ uint32_t dest_dom, domid_t console_domid,
+ unsigned long *console_mfn, domid_t store_domid,
+ unsigned long *store_mfn);
+
#define XC_DEVICE_MODEL_RESTORE_FILE "/var/lib/xen/qemu-resume"
/**
diff --git a/tools/libxc/xc_soft_reset.c b/tools/libxc/xc_soft_reset.c
new file mode 100644
index 000..ea07470
--- /dev/null
+++ b/tools/libxc/xc_soft_reset.c
@@ -0,0 +1,280 @@
+/**
+ * xc_soft_reset.c
+ *
+ * Do soft reset.
+ *
+ * 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;
+ * version 2.1 of the License.
+ *
+ * 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
+#include
+#include
+#include
+#include
+
+#include "xc_private.h"
+#include "xc_core.h"
+#include "xc_bitops.h"
+#include "xc_dom.h"
+#include "xg_private.h"
+#include "xg_save_restore.h"
+
+#include
+
+int xc_soft_reset(xc_interface *xch, uint32_t source_dom,
+ uint32_t dest_dom, domid_t console_domid,
+ unsigned long *console_mfn, domid_t store_domid,
+ unsigned long *store_mfn)
+{
+xc_dominfo_t old_info, new_info;
+int rc = 1;
+
+uint32_t hvm_buf_size = 0;
+uint8_t *hvm_buf = NULL;
+unsigned long console_pfn, store_pfn, io_pfn, buffio_pfn;
+uint64_t hvm_params[HVM_NR_PARAMS];
+uint64_t pod_info[3];
+xen_pfn_t sharedinfo_pfn;
+
+DPRINTF("%s: soft reset domid %u -> %u", __func__, source_dom, dest_dom);
+
+if ( xc_domain_getinfo(xch, source_dom, 1, &old_info) != 1 ||
+ old_info.domid != source_dom )
+{
+PERROR("Could not get old domain's info");
+return 1;
+}
+
+if ( xc_domain_get_pod_target(xch, source_dom, &pod_info[0], &pod_info[1],
+
