From nobody Tue Sep 9 23:57:22 2025 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=1737588711; cv=none; d=zohomail.com; s=zohoarc; b=WbTTQMtSjeXmTiMx62mNLMjRwNSJoSnYv4SDinCXdxfBI+dEc93fmgsKGFN4FPOr+JfXO08tIkW3pcNGM+eR9nZTAcLSp6SQhcgSSSuQGsHHbCr3IT4rtOt+TMaLR59JLd+zKuOiaWxNxIvGmXtCMTERHkNRHkjF4CdNDrqmD8k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1737588711; 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=Rk4COkXKxSUGt8IMfOAJUhophJJBAjRaUmSGWM/bWnA=; b=m3sG7i8VCkIiGKVWDR3H0QxbKqiO00SMzRtEeJxi6wZxG7xdSCZM0e9cEQshrWEClGHfl/azvxAVKWp2LnHsIlMbaGsMkDmLeKbv7bGIYaa7/XHqmUWApqtvG1v4AhiKuw2uwPKdWxPRqnhCEQnx4B9DYPQDXjVSzmhBI5yE99E= 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 1737588711549221.94545947040228; Wed, 22 Jan 2025 15:31:51 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id E1A6E1378; Wed, 22 Jan 2025 18:31:50 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 9D82613ED; Wed, 22 Jan 2025 18:23:36 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id A99BA12F8; Wed, 22 Jan 2025 18:23:29 -0500 (EST) Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) (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 05E4E13B2 for ; Wed, 22 Jan 2025 18:23:05 -0500 (EST) Received: by mail-ej1-f41.google.com with SMTP id a640c23a62f3a-aa67ac42819so54020266b.0 for ; Wed, 22 Jan 2025 15:23:04 -0800 (PST) Received: from localhost (75-169-8-111.slkc.qwest.net. [75.169.8.111]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-72dab9c8e37sm11556922b3a.119.2025.01.22.15.23.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jan 2025 15:23:03 -0800 (PST) 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_H3, RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,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=1737588184; x=1738192984; 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=S+3mVvrEeTcH1iKODD0E+SOcz4pdYPLjzLrV5dMKoKY=; b=ISEwmiAOciLVX3gMfjC6iM8Jg7QVei9f9tfmAk1D4Xn4Zlefa9VaeqEMknxKl4PAbA NzSqhlRC29jX2/+YKFJ+BlWQcydDUBwUGWXH5/+zKqVmWNyw/cKJOAwGTww1ciKJkxG1 90fNSSjuVPfwt+Gsuv+EpPPjwFrUHEU+FZ7xKUwonSIJ+10bW6yGXHs/EshCU1JARNKv iypROuUzPn9VzSZivBYzONEujgPZ3KwOPR7+Ya0ddGZ4JD1vFxQDM6CTItpR3HGF3DMT eJokVSftGcQMOoEiX21Ss0+VNPRcLObaIEm8MeIimvTs1U/CAJE9xSMx3O0+JMfYy33U IMUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737588184; x=1738192984; 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=S+3mVvrEeTcH1iKODD0E+SOcz4pdYPLjzLrV5dMKoKY=; b=cKV5vRTdP99QrggYsIHSHbGo48Nia1B9bKEL38T8v/TxpvF68MzAiyPRRSb4QG+In/ l7xFItIQG5I3k/p5vq1i0i4RHbO1tVCwQEWfhH0VhZrVZzP0PpIsrYlQvm17c9vxjWUH gqGemo+5eKJR/IFYUQ0VYgcvMK4hbI7CsVd1dR/MfvZADsF1Xxx1NBaa8TfnHD0LRb08 EoWHT5+cCFcAK1+CeF9wgUw6afdNY2P+FiUvoblgjdQx6UFQ/lISBzOqRXCLghy8nZpZ LeavICU7L7e0Uq+jPEGACnroNk9VWhaZwr4bhlSFQxH4RS0fhcVAC1boJ0QaXJnkqwHU h2lA== X-Gm-Message-State: AOJu0Yypjp+WGrB9UuWkVOMG4QRicA0Wew75hadY3Jex4lPbgQ1DCGw5 pnW1LSBD0H1PVPkWUg9BgbmK6vUJLGK5b2EOAZ2jSZ+ZTup2QyrKjLGjc97bi+X/rjuOFKMPOgD X X-Gm-Gg: ASbGnct4DOQLfvUUhwsZ8p6Zh/zHltLRklIHf9esmktdLPpfpLIA+f5yHsFbpw9/hwd x4c0Nw9vHrr5D4IzA/Z5u3CBM9MlInOaf3iJuYIhbooobXy22eV9jsRB3dA2lAMWfg4HUvHnK55 LP7svpNWIhu9A4jYwzwI+uYndP4VkgSnBJygxsPo7DmXLdrzTHeOwbq++l9V3sajtyaQJLWXzSR wdesBVu5opIS7iKah6u5e3dyyOHw8Fnr1y0swdf27/rV0qmAtzMGlblXDmwjVWmuXW71uj5qh8S vCQnTIMpTWzs X-Google-Smtp-Source: AGHT+IHpSwUn1SvKIggBEamUxC1c1jMH1HmoBy0lpYiLo3hDZH8UbLaods9yZ8V6wjj/WXyoQpOXNA== X-Received: by 2002:a17:907:1c26:b0:aa6:88ae:22a with SMTP id a640c23a62f3a-ab38b3aff78mr2081620466b.37.1737588183854; Wed, 22 Jan 2025 15:23:03 -0800 (PST) To: devel@lists.libvirt.org Subject: [PATCH V2 18/20] qemu: Add support for parallel save and restore Date: Wed, 22 Jan 2025 16:16:52 -0700 Message-ID: <20250122232228.19306-19-jfehlig@suse.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250122232228.19306-1-jfehlig@suse.com> References: <20250122232228.19306-1-jfehlig@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: IP5UGXT6KXE723OEEPTSIGM5FGGSHNSM X-Message-ID-Hash: IP5UGXT6KXE723OEEPTSIGM5FGGSHNSM 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: 1737588712568019000 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 | 32 +++++++++++++++++++++----------- src/qemu/qemu_migration_params.c | 31 +++++++++++++++++++++++++++++-- src/qemu/qemu_migration_params.h | 5 ++++- 3 files changed, 54 insertions(+), 14 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 803c7be3f7..4d8f5f08c3 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2611,6 +2611,8 @@ qemuDomainSaveInternal(virQEMUDriver *driver, int format, virCommand *compressor, const char *xmlin, + virTypedParameterPtr params, + int nparams, unsigned int flags) { g_autofree char *xml =3D NULL; @@ -2700,7 +2702,8 @@ qemuDomainSaveInternal(virQEMUDriver *driver, goto endjob; xml =3D NULL; =20 - if (!(saveParams =3D qemuMigrationParamsForSave(format =3D=3D QEMU_SAV= E_FORMAT_SPARSE, + if (!(saveParams =3D qemuMigrationParamsForSave(params, nparams, + format =3D=3D QEMU_SAVE_= FORMAT_SPARSE, flags))) goto endjob; =20 @@ -2787,7 +2790,7 @@ qemuDomainManagedSaveHelper(virQEMUDriver *driver, VIR_INFO("Saving state of domain '%s' to '%s'", vm->def->name, path); =20 if (qemuDomainSaveInternal(driver, vm, path, format, - compressor, dxml, flags) < 0) + compressor, dxml, NULL, 0, flags) < 0) return -1; =20 vm->hasManagedSave =3D true; @@ -2826,7 +2829,7 @@ qemuDomainSaveFlags(virDomainPtr dom, const char *pat= h, const char *dxml, goto cleanup; =20 ret =3D qemuDomainSaveInternal(driver, vm, path, format, - compressor, dxml, flags); + compressor, dxml, NULL, 0, flags); =20 cleanup: virDomainObjEndAPI(&vm); @@ -2856,13 +2859,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_CHANNELS, + VIR_TYPED_PARAM_INT, NULL) < 0) return -1; =20 @@ -2894,7 +2900,7 @@ qemuDomainSaveParams(virDomainPtr dom, goto cleanup; =20 ret =3D qemuDomainSaveInternal(driver, vm, to, format, - compressor, dxml, flags); + compressor, dxml, params, nparams, flags); =20 cleanup: virDomainObjEndAPI(&vm); @@ -5769,6 +5775,8 @@ static int qemuDomainRestoreInternal(virConnectPtr conn, const char *path, const char *dxml, + virTypedParameterPtr params, + int nparams, unsigned int flags, int (*ensureACL)(virConnectPtr, virDomainDef *)) { @@ -5790,7 +5798,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; @@ -5799,7 +5808,7 @@ qemuDomainRestoreInternal(virConnectPtr conn, goto cleanup; =20 sparse =3D data->header.format =3D=3D QEMU_SAVE_FORMAT_SPARSE; - if (!(restoreParams =3D qemuMigrationParamsForSave(sparse, flags))) + if (!(restoreParams =3D qemuMigrationParamsForSave(params, nparams, sp= arse, flags))) goto cleanup; =20 fd =3D qemuSaveImageOpen(driver, path, @@ -5881,7 +5890,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 @@ -5889,7 +5898,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 @@ -5905,6 +5914,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_CHANNELS, VI= R_TYPED_PARAM_INT, NULL) < 0) return -1; =20 @@ -5921,7 +5931,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; } @@ -6125,7 +6135,7 @@ qemuDomainObjRestore(virConnectPtr conn, } =20 sparse =3D data->header.format =3D=3D QEMU_SAVE_FORMAT_SPARSE; - if (!(restoreParams =3D qemuMigrationParamsForSave(sparse, + if (!(restoreParams =3D qemuMigrationParamsForSave(NULL, 0, sparse, 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 79b47333f9..420bf2fdbe 100644 --- a/src/qemu/qemu_migration_params.c +++ b/src/qemu/qemu_migration_params.c @@ -788,10 +788,19 @@ qemuMigrationParamsFromFlags(virTypedParameterPtr par= ams, =20 =20 qemuMigrationParams * -qemuMigrationParamsForSave(bool sparse, unsigned int flags) +qemuMigrationParamsForSave(virTypedParameterPtr params, + int nparams, + bool sparse, + unsigned int flags) { g_autoptr(qemuMigrationParams) saveParams =3D NULL; =20 + if (flags & VIR_DOMAIN_SAVE_PARALLEL && !sparse) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("Parallel save is only supported with the 'sparse= ' save image format")); + return NULL; + } + if (!(saveParams =3D qemuMigrationParamsNew())) return NULL; =20 @@ -800,7 +809,25 @@ qemuMigrationParamsForSave(bool sparse, unsigned int f= lags) 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_CHANNELS, + &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 b326aa5bc1..b6998d67a2 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 sparse, unsigned int flags); +qemuMigrationParamsForSave(virTypedParameterPtr params, + int nparams, + bool sparse, + unsigned int flags); =20 int qemuMigrationParamsDump(qemuMigrationParams *migParams, --=20 2.43.0