From nobody Tue Feb 10 01:18:05 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1723160908; cv=none; d=zohomail.com; s=zohoarc; b=JGJCvkm8S31gWLxRdlbkA+N99gVX022HsXE7FxGr6Mskh/3QbfbPbULj1/tFLp9uW2iKyvcf8r4mOMu0u+szM36stuOPkhxKtuD2p+bxAL3lu1NfYRdPO0GHvaxA91Cv+bSbS9S+L3ILzomXd0wbpPq/XCAdR07TDtjbalyctFw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1723160908; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id; bh=ve28TD90MLs4XnmBOSyWxRJ+a2pzUhnAGf4AUE+mLpM=; b=Av/m37z0fOaABcqJachtEOFeUKlnQIPFVkVRU85W1oWz6iYAAplMJSqtk9z0N+rrvhxDnNUQp25+6MFxAdcjcjkC2bVzs64RPahQp4pvSJ8AXoHMg+fRItCsy+vXOgviHhaGBR5PrujVE5txQC5aalnCn1w5DjjhPHivkrGWFV8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1723160908709286.4495535592721; Thu, 8 Aug 2024 16:48:28 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 8612414F0; Thu, 8 Aug 2024 19:48:27 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 87CEA12EB; Thu, 8 Aug 2024 19:39:28 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 063B4146D; Thu, 8 Aug 2024 19:39:24 -0400 (EDT) Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id E9C7F1464 for ; Thu, 8 Aug 2024 19:38:55 -0400 (EDT) Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-368313809a4so1510702f8f.0 for ; Thu, 08 Aug 2024 16:38:55 -0700 (PDT) Received: from localhost ([69.51.98.127]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4c8d69c4a86sm3702720173.76.2024.08.08.16.38.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Aug 2024 16:38:54 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1723160335; x=1723765135; darn=lists.libvirt.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7cKjANcb5c3TpSitae52WIPQcsI6UBqjfMy9Z4mdk6k=; b=TMep4jjZs41EvS+RhSdlB5yKDChvvvUHRhy0AirOvG66sQ9oOEhR0qtR9we1S1jlAp 3t/zfozx29pb0zwtdyfj0YnskQX43BN6tptE5JjIdZNmqnw8dJqs+yN7Gui0W7EHCyF4 bvXaUHfw+SVJGDFdOYyDgr/Dg3pJcclJL2ZBwBHndGfVeYDsrMf9AvgLvVsepFq8HKfi PoKQcLpyyKMLywUAidPqdfYhlAopCIa8+TcZ2emtDi1eg4hRWEgoGgUrYqcptdg7GMrG gZkuTtmH7C8lXIsIoaMgq69emnTTBK9y/wy4Lxr0Hvt5qj26opSABPmGhnUgEm/a500A jfsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723160335; x=1723765135; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7cKjANcb5c3TpSitae52WIPQcsI6UBqjfMy9Z4mdk6k=; b=LqKDSkXA2qrQoRvn4jwc8a4oQFI4GdJyXGdxgh3D7gw3K2h3VICy+aaqyqUbhdTO8m VU00LDQKATvHHlZctuFgc0JvuW2pV70yX+eaSyhd/wdTDlxRF5uoexb3MjkawRwxUgEz ecDaKvun9sAcATM4JV7vaV8CxFikw9ibhYRz+F7HUmJH450dkTnUwUsu0buii4OUJ21p jjJTK3g772ZvuzP+KncCJ5NbL2J64i7kzfakbB4J19OYf7TYjkimFTSngL1gYD18XGUD g9MH34GqvbjFGmZOILaum7rnVFurQ4/7bZXkuGYFqIL9muVcBkL+wTIoetVdB2Ccf8eQ /kkA== X-Gm-Message-State: AOJu0Yzcw/Md8WIdiU8Ufkx9QLghXd8dWKDaCgdfRHgCZV9dJHaQvUra TBwnw8iQrfwBaMSL/0ApIeEFPYj7yimI7eRTUeuORgjhTKSBOY8Xjq0xXat4QBgVDWnByvqE5V3 x X-Google-Smtp-Source: AGHT+IHPys8D/bGzjTHQpQBevN3AhsCtGWEeyDN2QexTDIWXR0nTBk5X4DfqIWPQYpjv7w/T+bmbRw== X-Received: by 2002:adf:cd8a:0:b0:36b:a5ac:7a with SMTP id ffacd0b85a97d-36d280ef138mr2673149f8f.7.1723160334843; Thu, 08 Aug 2024 16:38:54 -0700 (PDT) To: devel@lists.libvirt.org Subject: [PATCH 18/20] qemu: Add support for parallel save and restore Date: Thu, 8 Aug 2024 17:38:11 -0600 Message-Id: <20240808233813.22905-19-jfehlig@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20240808233813.22905-1-jfehlig@suse.com> References: <20240808233813.22905-1-jfehlig@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: Z7TW2EKQY2HXTUNV2OHEEGLN75XHLIZW X-Message-ID-Hash: Z7TW2EKQY2HXTUNV2OHEEGLN75XHLIZW X-MailFrom: jfehlig@suse.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: farosas@suse.de X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: From: Jim Fehlig via Devel Reply-To: Jim Fehlig X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1723160910606116600 Content-Type: text/plain; charset="utf-8" Add support for parallel save and restore by mapping libvirt's "parallel-connections" parameter to QEMU's "multifd-channels" migration parameter. Signed-off-by: Jim Fehlig --- src/qemu/qemu_driver.c | 31 ++++++++++++++++++++----------- src/qemu/qemu_migration_params.c | 25 +++++++++++++++++++++++-- src/qemu/qemu_migration_params.h | 5 ++++- 3 files changed, 47 insertions(+), 14 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0025bad6e7..fce599b321 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2608,6 +2608,8 @@ qemuDomainSaveInternal(virQEMUDriver *driver, int compressed, virCommand *compressor, const char *xmlin, + virTypedParameterPtr params, + int nparams, unsigned int flags) { g_autofree char *xml =3D NULL; @@ -2691,7 +2693,7 @@ qemuDomainSaveInternal(virQEMUDriver *driver, xml =3D NULL; =20 mappedRam =3D data->header.features & QEMU_SAVE_FEATURE_MAPPED_RAM; - if (!(saveParams =3D qemuMigrationParamsForSave(mappedRam, flags))) + if (!(saveParams =3D qemuMigrationParamsForSave(params, nparams, mappe= dRam, flags))) goto endjob; =20 ret =3D qemuSaveImageCreate(driver, vm, path, data, compressor, @@ -2777,7 +2779,7 @@ qemuDomainManagedSaveHelper(virQEMUDriver *driver, VIR_INFO("Saving state of domain '%s' to '%s'", vm->def->name, path); =20 if (qemuDomainSaveInternal(driver, vm, path, compressed, - compressor, dxml, flags) < 0) + compressor, dxml, NULL, 0, flags) < 0) return -1; =20 vm->hasManagedSave =3D true; @@ -2816,7 +2818,7 @@ qemuDomainSaveFlags(virDomainPtr dom, const char *pat= h, const char *dxml, goto cleanup; =20 ret =3D qemuDomainSaveInternal(driver, vm, path, compressed, - compressor, dxml, flags); + compressor, dxml, NULL, 0, flags); =20 cleanup: virDomainObjEndAPI(&vm); @@ -2846,13 +2848,16 @@ qemuDomainSaveParams(virDomainPtr dom, =20 virCheckFlags(VIR_DOMAIN_SAVE_BYPASS_CACHE | VIR_DOMAIN_SAVE_RUNNING | - VIR_DOMAIN_SAVE_PAUSED, -1); + VIR_DOMAIN_SAVE_PAUSED | + VIR_DOMAIN_SAVE_PARALLEL, -1); =20 if (virTypedParamsValidate(params, nparams, VIR_DOMAIN_SAVE_PARAM_FILE, VIR_TYPED_PARAM_STRING, VIR_DOMAIN_SAVE_PARAM_DXML, VIR_TYPED_PARAM_STRING, + VIR_DOMAIN_SAVE_PARAM_PARALLEL_CONNECTIONS, + VIR_TYPED_PARAM_INT, NULL) < 0) return -1; =20 @@ -2884,7 +2889,7 @@ qemuDomainSaveParams(virDomainPtr dom, goto cleanup; =20 ret =3D qemuDomainSaveInternal(driver, vm, to, compressed, - compressor, dxml, flags); + compressor, dxml, params, nparams, flags); =20 cleanup: virDomainObjEndAPI(&vm); @@ -5759,6 +5764,8 @@ static int qemuDomainRestoreInternal(virConnectPtr conn, const char *path, const char *dxml, + virTypedParameterPtr params, + int nparams, unsigned int flags, int (*ensureACL)(virConnectPtr, virDomainDef *)) { @@ -5780,7 +5787,8 @@ qemuDomainRestoreInternal(virConnectPtr conn, virCheckFlags(VIR_DOMAIN_SAVE_BYPASS_CACHE | VIR_DOMAIN_SAVE_RUNNING | VIR_DOMAIN_SAVE_PAUSED | - VIR_DOMAIN_SAVE_RESET_NVRAM, -1); + VIR_DOMAIN_SAVE_RESET_NVRAM | + VIR_DOMAIN_SAVE_PARALLEL, -1); =20 if (flags & VIR_DOMAIN_SAVE_RESET_NVRAM) reset_nvram =3D true; @@ -5789,7 +5797,7 @@ qemuDomainRestoreInternal(virConnectPtr conn, goto cleanup; =20 mapped_ram =3D data->header.features & QEMU_SAVE_FEATURE_MAPPED_RAM; - if (!(restoreParams =3D qemuMigrationParamsForSave(mapped_ram, flags))) + if (!(restoreParams =3D qemuMigrationParamsForSave(params, nparams, ma= pped_ram, flags))) return -1; =20 fd =3D qemuSaveImageOpen(driver, path, @@ -5871,7 +5879,7 @@ qemuDomainRestoreFlags(virConnectPtr conn, const char *dxml, unsigned int flags) { - return qemuDomainRestoreInternal(conn, path, dxml, flags, + return qemuDomainRestoreInternal(conn, path, dxml, NULL, 0, flags, virDomainRestoreFlagsEnsureACL); } =20 @@ -5879,7 +5887,7 @@ static int qemuDomainRestore(virConnectPtr conn, const char *path) { - return qemuDomainRestoreInternal(conn, path, NULL, 0, + return qemuDomainRestoreInternal(conn, path, NULL, NULL, 0, 0, virDomainRestoreEnsureACL); } =20 @@ -5895,6 +5903,7 @@ qemuDomainRestoreParams(virConnectPtr conn, if (virTypedParamsValidate(params, nparams, VIR_DOMAIN_SAVE_PARAM_FILE, VIR_TYPED_PARAM= _STRING, VIR_DOMAIN_SAVE_PARAM_DXML, VIR_TYPED_PARAM= _STRING, + VIR_DOMAIN_SAVE_PARAM_PARALLEL_CONNECTIONS,= VIR_TYPED_PARAM_INT, NULL) < 0) return -1; =20 @@ -5911,7 +5920,7 @@ qemuDomainRestoreParams(virConnectPtr conn, return -1; } =20 - ret =3D qemuDomainRestoreInternal(conn, path, dxml, flags, + ret =3D qemuDomainRestoreInternal(conn, path, dxml, params, nparams, f= lags, virDomainRestoreParamsEnsureACL); return ret; } @@ -6115,7 +6124,7 @@ qemuDomainObjRestore(virConnectPtr conn, } =20 mapped_ram =3D data->header.features & QEMU_SAVE_FEATURE_MAPPED_RAM; - if (!(restoreParams =3D qemuMigrationParamsForSave(mapped_ram, + if (!(restoreParams =3D qemuMigrationParamsForSave(NULL, 0, mapped_ram, bypass_cache ? VIR_DO= MAIN_SAVE_BYPASS_CACHE : 0))) return -1; =20 diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_par= ams.c index 8f6003005c..8c656af163 100644 --- a/src/qemu/qemu_migration_params.c +++ b/src/qemu/qemu_migration_params.c @@ -788,7 +788,10 @@ qemuMigrationParamsFromFlags(virTypedParameterPtr para= ms, =20 =20 qemuMigrationParams * -qemuMigrationParamsForSave(bool mappedRam, unsigned int flags) +qemuMigrationParamsForSave(virTypedParameterPtr params, + int nparams, + bool mappedRam, + unsigned int flags) { g_autoptr(qemuMigrationParams) saveParams =3D NULL; =20 @@ -800,7 +803,25 @@ qemuMigrationParamsForSave(bool mappedRam, unsigned in= t flags) return NULL; if (virBitmapSetBit(saveParams->caps, QEMU_MIGRATION_CAP_MULTIFD) = < 0) return NULL; - saveParams->params[QEMU_MIGRATION_PARAM_MULTIFD_CHANNELS].value.i = =3D 1; + + if (flags & VIR_DOMAIN_SAVE_PARALLEL) { + int nchannels; + + if (params && virTypedParamsGetInt(params, nparams, + VIR_DOMAIN_SAVE_PARAM_PARAL= LEL_CONNECTIONS, + &nchannels) < 0) + return NULL; + + if (nchannels < 1) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("number of parallel save channels cannot = be less than 1")); + return NULL; + } + + saveParams->params[QEMU_MIGRATION_PARAM_MULTIFD_CHANNELS].valu= e.i =3D nchannels; + } else { + saveParams->params[QEMU_MIGRATION_PARAM_MULTIFD_CHANNELS].valu= e.i =3D 1; + } saveParams->params[QEMU_MIGRATION_PARAM_MULTIFD_CHANNELS].set =3D = true; =20 if (flags & VIR_DOMAIN_SAVE_BYPASS_CACHE) { diff --git a/src/qemu/qemu_migration_params.h b/src/qemu/qemu_migration_par= ams.h index 9700469b5e..a672b3d875 100644 --- a/src/qemu/qemu_migration_params.h +++ b/src/qemu/qemu_migration_params.h @@ -88,7 +88,10 @@ qemuMigrationParamsFromFlags(virTypedParameterPtr params, qemuMigrationParty party); =20 qemuMigrationParams * -qemuMigrationParamsForSave(bool mappedRam, unsigned int flags); +qemuMigrationParamsForSave(virTypedParameterPtr params, + int nparams, + bool mappedRam, + unsigned int flags); =20 int qemuMigrationParamsDump(qemuMigrationParams *migParams, --=20 2.35.3