From nobody Sat Apr 20 06:45:04 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1556876685; cv=none; d=zoho.com; s=zohoarc; b=bZmcbPZ7xd1XP1waYU4qHv+FJNEx5A20UqAzgBXdS5iJa7AUYg0k22aNNuwYH7EXOKOgPIeZ+0Fs8JaLk0r/2mBCtERMozuCUrOeYLZCKAi+tDxQDc3PurshrP309MAwNltTpoOjxbV2g5S4ppzsZIGJmrCT1VbJAJi/JH/Xjfo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556876685; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=Wg6PYN7dN+VZIqH8CWbkY37nXnbj2bqyPZKg3WRIywU=; b=BypdkD+8K4n6Q24ZP4meWxeH1nFgHrugIYpRltK6C7Xo6bueAcvRwo2l6LupSXiEeZCWGx3THm6roptz7JJUkbUX8NWdBszEPNXdv5mptq/EVP3aHDliM1+G5k5fB8wmqQ7eJ8zE05lSF56i+4NMrrnuiP7jyapevkP06/KiWNw= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1556876684044281.72916346402667; Fri, 3 May 2019 02:44:44 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hMUic-0005D9-RZ; Fri, 03 May 2019 09:43:02 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hMUib-0005D4-GY for xen-devel@lists.xenproject.org; Fri, 03 May 2019 09:43:02 +0000 Received: from mo6-p00-ob.smtp.rzone.de (unknown [2a01:238:20a:202:5300::1]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id d5b89135-6d87-11e9-843c-bc764e045a96; Fri, 03 May 2019 09:42:59 +0000 (UTC) Received: from sender by smtp.strato.de (RZmta 44.18 DYNA|AUTH) with ESMTPSA id 60a847v439grKEU (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA)) (Client did not present a certificate); Fri, 3 May 2019 11:42:53 +0200 (CEST) X-Inumbo-ID: d5b89135-6d87-11e9-843c-bc764e045a96 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1556876578; s=strato-dkim-0002; d=aepfle.de; h=Message-Id:Date:Subject:Cc:To:From:X-RZG-CLASS-ID:X-RZG-AUTH:From: Subject:Sender; bh=1M8QQwYlbAS98NHPSa/rcSf9CBZR4+BO2CLavvWsx9I=; b=JmBDhLcpl02cjJXo151NkeWBEyOLytpg0dAF0t8VNXX+ReJHbT6XWNAVBcehqF+Hnm FYXGpy0dCMTDbgOnxnhj/mydhzaKY3UsDyfcypR9HT4gJyqlXAsXXk3jT5vqF8oDW3Ex KovgpFRR2zjEGqgm7GPK6sTl2UKsY0+IwzkIaZ7saJ+oX06fQiFNnYw6CgxZrMH2W9vX GPzbi7Ra643O6ICkvPD3h6XFGmPPPXKJMt0IueORvhqpCT9UbWRM1d8/8Qp3O2AMGHnt Ycgsq8OpO9EP+5XDV7Hj3MSSQO4dZOWIVIL9EyFNZbvn5dbL0G8AOKDj6BtDQArxYSKM xX7A== X-RZG-AUTH: ":P2EQZWCpfu+qG7CngxMFH1J+3q8wa/QXkBR9MXjAuzBd/ORjA5Q4DFnYbn87Gg==" X-RZG-CLASS-ID: mo00 From: Olaf Hering To: xen-devel@lists.xenproject.org Date: Fri, 3 May 2019 11:42:51 +0200 Message-Id: <20190503094251.16148-1-olaf@aepfle.de> X-Mailer: git-send-email 2.16.4 MIME-Version: 1.0 Subject: [Xen-devel] [PATCH v2] libxl: fix migration of PV and PVH domUs with and without qemu X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Anthony PERARD , Wei Liu , Olaf Hering , Ian Jackson , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) If a domU has a qemu-xen instance attached, it is required to call qemus "xen-save-devices-state" method. Without it, the receiving side of a PV or PVH migration may be unable to lock the image: xen be: qdisk-51712: xen be: qdisk-51712: error: Failed to get "write" lock error: Failed to get "write" lock xen be: qdisk-51712: xen be: qdisk-51712: initialise() failed initialise() failed To fix this bug, libxl__domain_suspend_device_model() and libxl__domain_resume_device_model() have to be called not only for HVM, but also if the active device_model is QEMU_XEN. Unfortunately, libxl__domain_build_info_setdefault() hardcodes b_info->device_model_version to QEMU_XEN if it does not know it any better. This breaks domUs without a device_model. libxl__qmp_stop() would wait 10 seconds in qmp_open() for a qemu that will never appear. During this long timeframe the domU remains in state paused on the sending side. As a result network connections may be dropped. Once this bug is fixed as well, by just removing that assumption, there is no code to actually initialise b_info->device_model_version. There is a helper function libxl__need_xenpv_qemu(), which is used in various places to decide if any device_model has to be spawned. This function can not be used as is, just to fill b_info->device_model_version, because store_libxl_entry() was already called earlier. Update this function to receive a domid to work with, instead of reading xenstore. Rearrange the code and initialize b_info->device_model_version in libxl__domain_build_info_setdefault() per DOMAIN_TYPE. Update initiate_domain_create() to set b_info->device_model_version if it was not set earlier, using the updated libxl__need_xenpv_qemu(). Introduce LIBXL_DEVICE_MODEL_VERSION_NONE_REQUIRED for PV and PVH that have no need for a device_model. Update existing users of libxl__need_xenpv_qemu() to use b_info->device_model_version for their check if a device_model is needed. v02: - update wording in a comment - remove stale goto in domcreate_launch_dm - initialize ret in libxl__need_xenpv_qemu Signed-off-by: Olaf Hering Cc: Roger Pau Monn=C3=A9 Cc: Anthony PERARD --- tools/libxl/libxl_create.c | 39 +++++++++++++++++++++++++++++++------= -- tools/libxl/libxl_dm.c | 40 +++++++++++++++++++++++--------------= --- tools/libxl/libxl_dom_suspend.c | 8 ++++++-- tools/libxl/libxl_internal.h | 3 ++- tools/libxl/libxl_types.idl | 1 + 5 files changed, 63 insertions(+), 28 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 89fe80fc9c..150ab02354 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -87,16 +87,20 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, b_info->device_model_ssidref =3D SECINITSID_DOMDM; =20 if (!b_info->device_model_version) { - if (b_info->type =3D=3D LIBXL_DOMAIN_TYPE_HVM) { + switch (b_info->type) { + case LIBXL_DOMAIN_TYPE_HVM: if (libxl_defbool_val(b_info->device_model_stubdomain)) { b_info->device_model_version =3D LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL; } else { b_info->device_model_version =3D libxl__default_device_mod= el(gc); } - } else { - b_info->device_model_version =3D - LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN; + break; + case LIBXL_DOMAIN_TYPE_PV: + case LIBXL_DOMAIN_TYPE_PVH: + default: + /* may be set later */ + break; } if (b_info->device_model_version =3D=3D LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN) { @@ -978,6 +982,17 @@ static void initiate_domain_create(libxl__egc *egc, goto error_out; } =20 + if (d_config->b_info.device_model_version + =3D=3D LIBXL_DEVICE_MODEL_VERSION_UNKNOWN) { + ret =3D libxl__need_xenpv_qemu(gc, d_config, domid); + if (ret) + d_config->b_info.device_model_version =3D + LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN; + else + d_config->b_info.device_model_version =3D + LIBXL_DEVICE_MODEL_VERSION_NONE_REQUIRED; + } + dcs->guest_domid =3D domid; dcs->sdss.dm.guest_domid =3D 0; /* means we haven't spawned */ =20 @@ -1312,6 +1327,7 @@ static void domcreate_launch_dm(libxl__egc *egc, libx= l__multidev *multidev, libxl__domain_create_state *dcs =3D CONTAINER_OF(multidev, *dcs, multi= dev); STATE_AO_GC(dcs->ao); int i; + bool need_qemu; =20 /* convenience aliases */ const uint32_t domid =3D dcs->guest_domid; @@ -1464,10 +1480,17 @@ static void domcreate_launch_dm(libxl__egc *egc, li= bxl__multidev *multidev, libxl__device_console_add(gc, domid, &console, state, &device); libxl__device_console_dispose(&console); =20 - ret =3D libxl__need_xenpv_qemu(gc, d_config); - if (ret < 0) - goto error_out; - if (ret) { + switch (d_config->b_info.device_model_version) { + case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: + case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: + need_qemu =3D true; + break; + default: + need_qemu =3D false; + break; + } + + if (need_qemu) { dcs->sdss.dm.guest_domid =3D domid; libxl__spawn_local_dm(egc, &dcs->sdss.dm); return; diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 2f19786bdd..bab04ab196 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -2268,7 +2268,7 @@ static void spawn_stub_launch_dm(libxl__egc *egc, libxl__domain_build_state *const d_state =3D sdss->dm.build_state; libxl__domain_build_state *const stubdom_state =3D &sdss->dm_state; uint32_t dm_domid =3D sdss->pvqemu.guest_domid; - int need_qemu; + bool need_qemu; =20 if (ret) { LOGD(ERROR, guest_domid, "error connecting disk devices"); @@ -2337,7 +2337,15 @@ static void spawn_stub_launch_dm(libxl__egc *egc, } } =20 - need_qemu =3D libxl__need_xenpv_qemu(gc, dm_config); + switch (dm_config->b_info.device_model_version) { + case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: + case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: + need_qemu =3D true; + break; + default: + need_qemu =3D false; + break; + } =20 for (i =3D 0; i < num_console; i++) { libxl__device device; @@ -3175,18 +3183,11 @@ static void kill_device_model_uid_cb(libxl__egc *eg= c, } =20 /* Return 0 if no dm needed, 1 if needed and <0 if error. */ -int libxl__need_xenpv_qemu(libxl__gc *gc, libxl_domain_config *d_config) +int libxl__need_xenpv_qemu(libxl__gc *gc, libxl_domain_config *d_config, u= int32_t domid) { - int idx, i, ret, num; - uint32_t domid; + int idx, i, ret =3D 0, num; const struct libxl_device_type *dt; =20 - ret =3D libxl__get_domid(gc, &domid); - if (ret) { - LOG(ERROR, "unable to get domain id"); - goto out; - } - if (d_config->num_vfbs > 0 || d_config->num_p9s > 0) { ret =3D 1; goto out; @@ -3238,21 +3239,26 @@ int libxl__dm_check_start(libxl__gc *gc, libxl_doma= in_config *d_config, uint32_t domid) { int rc; + bool need_qemu; =20 if (libxl__dm_active(gc, domid)) return 0; =20 - rc =3D libxl__need_xenpv_qemu(gc, d_config); - if (rc < 0) - goto out; - - if (!rc) + switch (d_config->b_info.device_model_version) { + case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: + case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: + need_qemu =3D true; + break; + default: + need_qemu =3D false; + break; + } + if (need_qemu =3D=3D false) return 0; =20 LOGD(ERROR, domid, "device model required but not running"); rc =3D ERROR_FAIL; =20 -out: return rc; } =20 diff --git a/tools/libxl/libxl_dom_suspend.c b/tools/libxl/libxl_dom_suspen= d.c index d1af3a6573..c492fe5dd1 100644 --- a/tools/libxl/libxl_dom_suspend.c +++ b/tools/libxl/libxl_dom_suspend.c @@ -379,7 +379,9 @@ static void domain_suspend_common_guest_suspended(libxl= __egc *egc, libxl__ev_xswatch_deregister(gc, &dsps->guest_watch); libxl__ev_time_deregister(gc, &dsps->guest_timeout); =20 - if (dsps->type =3D=3D LIBXL_DOMAIN_TYPE_HVM) { + if (dsps->type =3D=3D LIBXL_DOMAIN_TYPE_HVM || + libxl__device_model_version_running(gc, dsps->domid) =3D=3D + LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN) { dsps->callback_device_model_done =3D domain_suspend_common_done; libxl__domain_suspend_device_model(egc, dsps); /* must be last */ return; @@ -459,7 +461,9 @@ int libxl__domain_resume(libxl__gc *gc, uint32_t domid,= int suspend_cancel) goto out; } =20 - if (type =3D=3D LIBXL_DOMAIN_TYPE_HVM) { + if (type =3D=3D LIBXL_DOMAIN_TYPE_HVM || + libxl__device_model_version_running(gc, domid) =3D=3D + LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN) { rc =3D libxl__domain_resume_device_model(gc, domid); if (rc) { LOGD(ERROR, domid, "failed to resume device model:%d", rc); diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 44e0221284..9eb4211d85 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -1817,7 +1817,8 @@ _hidden int libxl__domain_build(libxl__gc *gc, _hidden const char *libxl__domain_device_model(libxl__gc *gc, const libxl_domain_build_info *inf= o); _hidden int libxl__need_xenpv_qemu(libxl__gc *gc, - libxl_domain_config *d_config); + libxl_domain_config *d_config, + uint32_t domid); _hidden bool libxl__query_qemu_backend(libxl__gc *gc, uint32_t domid, uint32_t backend_id, diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index cb4702fd7a..7d75bd3850 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -106,6 +106,7 @@ libxl_device_model_version =3D Enumeration("device_mode= l_version", [ (0, "UNKNOWN"), (1, "QEMU_XEN_TRADITIONAL"), # Historical qemu-xen device model (qemu-= dm) (2, "QEMU_XEN"), # Upstream based qemu-xen device model + (3, "NONE_REQUIRED"), ]) =20 libxl_console_type =3D Enumeration("console_type", [ _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel