From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: [PATCH for 4.6 v3 2/3] xl/libxl: disallow saving a guest with vNUMA configured Date: Thu, 10 Sep 2015 15:50:50 +0100 Message-ID: <1441896651-24735-3-git-send-email-wei.liu2@citrix.com> References: <1441896651-24735-1-git-send-email-wei.liu2@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Za3Bh-0001Vr-4z for xen-devel@lists.xenproject.org; Thu, 10 Sep 2015 14:50:57 +0000 In-Reply-To: <1441896651-24735-1-git-send-email-wei.liu2@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Xen-devel Cc: Wei Liu , Ian Jackson , Ian Campbell , andrew.cooper3@citrix.com List-Id: xen-devel@lists.xenproject.org This is because the migration stream does not preserve node information. Note this is not a regression for migration v2 vs legacy migration because neither of them preserve node information. Signed-off-by: Wei Liu --- Cc: andrew.cooper3@citrix.com v3: 1. Update manpage, code comment and commit message. 2. *Don't* check if nomigrate is set. --- docs/man/xl.cfg.pod.5 | 2 ++ tools/libxl/libxl_dom.c | 14 ++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index 80e51bb..555f8ba 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -263,6 +263,8 @@ virtual node. Note that virtual NUMA for PV guest is not yet supported, because there is an issue with cpuid handling that affects PV virtual NUMA. +Further more, guest with virtual NUMA cannot be saved or migrated +because migration stream does not preserve node information. Each B is a list, which has a form of "[VNODE_CONFIG_OPTION,VNODE_CONFIG_OPTION, ... ]" (without quotes). diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index c2518a3..a4d37dc 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -24,6 +24,7 @@ #include #include #include +#include libxl_domain_type libxl__domain_type(libxl__gc *gc, uint32_t domid) { @@ -1612,6 +1613,7 @@ void libxl__domain_save(libxl__egc *egc, libxl__domain_suspend_state *dss) const libxl_domain_remus_info *const r_info = dss->remus; libxl__srm_save_autogen_callbacks *const callbacks = &dss->sws.shs.callbacks.save.a; + unsigned int nr_vnodes = 0, nr_vmemranges = 0, nr_vcpus = 0; dss->rc = 0; logdirty_init(&dss->logdirty); @@ -1636,6 +1638,18 @@ void libxl__domain_save(libxl__egc *egc, libxl__domain_suspend_state *dss) | (debug ? XCFLAGS_DEBUG : 0) | (dss->hvm ? XCFLAGS_HVM : 0); + /* Disallow saving a guest with vNUMA configured because migration + * stream does not preserve node information. + */ + rc = xc_domain_getvnuma(CTX->xch, domid, &nr_vnodes, &nr_vmemranges, + &nr_vcpus, NULL, NULL, NULL); + assert(rc == -1 && (errno == XEN_ENOBUFS || errno == XEN_EOPNOTSUPP)); + if (errno == XEN_ENOBUFS && nr_vnodes) { + LOG(ERROR, "Cannot save a guest with vNUMA configured"); + rc = ERROR_FAIL; + goto out; + } + dss->guest_evtchn.port = -1; dss->guest_evtchn_lockfd = -1; dss->guest_responded = 0; -- 2.1.4