From nobody Sun Feb 8 21:11:34 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1656589557; cv=none; d=zohomail.com; s=zohoarc; b=UyvIooGF9DGQXJpnUUmim6I4PhLURP1pj+hVA3D9Y3hNQjt3DGT/An8X3ad8JV2udyrBr1CZcc+IhQBI30mvRwRcRUPYzYtAuBjTY96i+t4cHaUUI+H8rP3Kf60F+cv04+9GDWMclsJSQ2ADyuMYQa2+Vwvw5BtPPpkLoNFzkIk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1656589557; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=S3RQ8BAzeYG7/aW33hUTsa0kpl7jKOLhbRLR15wqpYE=; b=kR3zcFv91fxM71JGNT6HOFKgtdrPIwPIsVSxF/0dLUp4LWKvjEZLBJ1h2F1XwOysMVmKTEkACWzRMCDs1Q3FizpRtxPdnV8WnZkfn34YkmBRIWeudpekeV9l152vOlGR+Rpgl9ehP+rJw7E4zINKdmLdASg7l7yRLRxdQiHvsgc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1656589557622622.8349029893117; Thu, 30 Jun 2022 04:45:57 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-563-lIE_3O3zPAOQwpGTpYDgUA-1; Thu, 30 Jun 2022 07:45:52 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 248D98061F1; Thu, 30 Jun 2022 11:45:49 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id CC46FC2810D; Thu, 30 Jun 2022 11:45:47 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id D5A0B19451EF; Thu, 30 Jun 2022 11:45:45 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id F3B3E194704E for ; Thu, 30 Jun 2022 11:45:44 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id E35872026D64; Thu, 30 Jun 2022 11:45:44 +0000 (UTC) Received: from virval.usersys.redhat.com (unknown [10.43.2.227]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A921D2026D07 for ; Thu, 30 Jun 2022 11:45:44 +0000 (UTC) Received: by virval.usersys.redhat.com (Postfix, from userid 500) id A58672408F1; Thu, 30 Jun 2022 13:45:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1656589556; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=S3RQ8BAzeYG7/aW33hUTsa0kpl7jKOLhbRLR15wqpYE=; b=buT0p7CcQl422UJFiknfd3ZWR7kQBbE8w71c6UY2GB6NR0xn8YJ83l5c/00Uy6Vu7IhWZS yjBlWkn5x7ezQhYbdyD2RXAfSQtpKx1CYy0YD093lZoH61zlEzDzhWLYSDQ60ZnhNzLtUr e69p4DP7k4POR7rs9hzbGQyaFg/lO60= X-MC-Unique: lIE_3O3zPAOQwpGTpYDgUA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Jiri Denemark To: libvir-list@redhat.com Subject: [libvirt PATCH 4/4] qemu_migration: Apply max-postcopy-bandwidth on post-copy resume Date: Thu, 30 Jun 2022 13:45:40 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1656589559043100007 Content-Type: text/plain; charset="utf-8" When resuming post-copy migration users may want to limit the bandwidth used by the migration and use a value that is different from the one specified when the migration was originally started. Resolves: https://gitlab.com/libvirt/libvirt/-/issues/333 Signed-off-by: Jiri Denemark --- src/qemu/qemu_migration.c | 12 ++++++-- src/qemu/qemu_migration_params.c | 45 ++++++++++++++++++---------- src/qemu/qemu_migration_paramspriv.h | 3 +- tests/qemumigparamstest.c | 2 +- tests/qemumigrationcookiexmltest.c | 2 +- 5 files changed, 42 insertions(+), 22 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 0c41af86e7..368995085f 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -5051,12 +5051,13 @@ qemuMigrationSrcRun(virQEMUDriver *driver, =20 static int qemuMigrationSrcResume(virDomainObj *vm, - qemuMigrationParams *migParams G_GNUC_UNUSED, + qemuMigrationParams *migParams, const char *cookiein, int cookieinlen, char **cookieout, int *cookieoutlen, - qemuMigrationSpec *spec) + qemuMigrationSpec *spec, + unsigned long flags) { qemuDomainObjPrivate *priv =3D vm->privateData; virQEMUDriver *driver =3D priv->driver; @@ -5073,6 +5074,10 @@ qemuMigrationSrcResume(virDomainObj *vm, if (!mig) return -1; =20 + if (qemuMigrationParamsApply(driver, vm, VIR_ASYNC_JOB_MIGRATION_OUT, + migParams, flags) < 0) + return -1; + if (qemuDomainObjEnterMonitorAsync(driver, vm, VIR_ASYNC_JOB_MIGRATION_OUT) < 0) return -1; @@ -5154,6 +5159,7 @@ qemuMigrationSrcPerformNative(virQEMUDriver *driver, =20 if (STREQ(uribits->scheme, "unix")) { if ((flags & VIR_MIGRATE_TLS) && + !(flags & VIR_MIGRATE_POSTCOPY_RESUME) && !qemuMigrationParamsTLSHostnameIsSet(migParams)) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("Explicit destination hostname is required " @@ -5185,7 +5191,7 @@ qemuMigrationSrcPerformNative(virQEMUDriver *driver, =20 if (flags & VIR_MIGRATE_POSTCOPY_RESUME) { ret =3D qemuMigrationSrcResume(vm, migParams, cookiein, cookieinle= n, - cookieout, cookieoutlen, &spec); + cookieout, cookieoutlen, &spec, flags= ); } else { ret =3D qemuMigrationSrcRun(driver, vm, persist_xml, cookiein, coo= kieinlen, cookieout, cookieoutlen, flags, resource, diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_par= ams.c index a68aed9aa4..6ea0bde13a 100644 --- a/src/qemu/qemu_migration_params.c +++ b/src/qemu/qemu_migration_params.c @@ -141,6 +141,7 @@ struct _qemuMigrationParamsTPMapItem { typedef struct _qemuMigrationParamInfoItem qemuMigrationParamInfoItem; struct _qemuMigrationParamInfoItem { qemuMigrationParamType type; + bool applyOnPostcopyResume; }; =20 /* Migration capabilities which should always be enabled as long as they @@ -265,6 +266,7 @@ static const qemuMigrationParamInfoItem qemuMigrationPa= ramInfo[] =3D { }, [QEMU_MIGRATION_PARAM_MAX_POSTCOPY_BANDWIDTH] =3D { .type =3D QEMU_MIGRATION_PARAM_TYPE_ULL, + .applyOnPostcopyResume =3D true, }, [QEMU_MIGRATION_PARAM_MULTIFD_CHANNELS] =3D { .type =3D QEMU_MIGRATION_PARAM_TYPE_INT, @@ -782,7 +784,8 @@ qemuMigrationParamsFromJSON(virJSONValue *params) =20 =20 virJSONValue * -qemuMigrationParamsToJSON(qemuMigrationParams *migParams) +qemuMigrationParamsToJSON(qemuMigrationParams *migParams, + bool postcopyResume) { g_autoptr(virJSONValue) params =3D virJSONValueNewObject(); size_t i; @@ -795,6 +798,9 @@ qemuMigrationParamsToJSON(qemuMigrationParams *migParam= s) if (!pv->set) continue; =20 + if (postcopyResume && !qemuMigrationParamInfo[i].applyOnPostcopyRe= sume) + continue; + switch (qemuMigrationParamInfo[i].type) { case QEMU_MIGRATION_PARAM_TYPE_INT: rc =3D virJSONValueObjectAppendNumberInt(params, name, pv->val= ue.i); @@ -868,6 +874,7 @@ qemuMigrationCapsToJSON(virBitmap *caps, * * Send parameters stored in @migParams to QEMU. If @apiFlags is non-zero,= some * parameters that do not make sense for the enabled flags will be ignored. + * VIR_MIGRATE_POSTCOPY_RESUME is the only flag checked currently. * * Returns 0 on success, -1 on failure. */ @@ -876,32 +883,38 @@ qemuMigrationParamsApply(virQEMUDriver *driver, virDomainObj *vm, int asyncJob, qemuMigrationParams *migParams, - unsigned long apiFlags G_GNUC_UNUSED) + unsigned long apiFlags) { qemuDomainObjPrivate *priv =3D vm->privateData; bool xbzrleCacheSize_old =3D false; g_autoptr(virJSONValue) params =3D NULL; g_autoptr(virJSONValue) caps =3D NULL; qemuMigrationParam xbzrle =3D QEMU_MIGRATION_PARAM_XBZRLE_CACHE_SIZE; + bool postcopyResume =3D !!(apiFlags & VIR_MIGRATE_POSTCOPY_RESUME); int ret =3D -1; =20 if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) return -1; =20 - if (asyncJob =3D=3D VIR_ASYNC_JOB_NONE) { - if (!virBitmapIsAllClear(migParams->caps)) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Migration capabilities can only be set by " - "a migration job")); - goto cleanup; - } - } else { - if (!(caps =3D qemuMigrationCapsToJSON(priv->migrationCaps, migPar= ams->caps))) - goto cleanup; + /* Changing capabilities is only allowed before migration starts, we n= eed + * to skip them when resuming post-copy migration. + */ + if (!postcopyResume) { + if (asyncJob =3D=3D VIR_ASYNC_JOB_NONE) { + if (!virBitmapIsAllClear(migParams->caps)) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Migration capabilities can only be set b= y " + "a migration job")); + goto cleanup; + } + } else { + if (!(caps =3D qemuMigrationCapsToJSON(priv->migrationCaps, mi= gParams->caps))) + goto cleanup; =20 - if (virJSONValueArraySize(caps) > 0 && - qemuMonitorSetMigrationCapabilities(priv->mon, &caps) < 0) - goto cleanup; + if (virJSONValueArraySize(caps) > 0 && + qemuMonitorSetMigrationCapabilities(priv->mon, &caps) < 0) + goto cleanup; + } } =20 /* If QEMU is too old to support xbzrle-cache-size migration parameter, @@ -917,7 +930,7 @@ qemuMigrationParamsApply(virQEMUDriver *driver, migParams->params[xbzrle].set =3D false; } =20 - if (!(params =3D qemuMigrationParamsToJSON(migParams))) + if (!(params =3D qemuMigrationParamsToJSON(migParams, postcopyResume))) goto cleanup; =20 if (virJSONValueObjectKeysNumber(params) > 0 && diff --git a/src/qemu/qemu_migration_paramspriv.h b/src/qemu/qemu_migration= _paramspriv.h index f7e0f51fbd..34d51231ff 100644 --- a/src/qemu/qemu_migration_paramspriv.h +++ b/src/qemu/qemu_migration_paramspriv.h @@ -26,7 +26,8 @@ #pragma once =20 virJSONValue * -qemuMigrationParamsToJSON(qemuMigrationParams *migParams); +qemuMigrationParamsToJSON(qemuMigrationParams *migParams, + bool postcopyResume); =20 qemuMigrationParams * qemuMigrationParamsFromJSON(virJSONValue *params); diff --git a/tests/qemumigparamstest.c b/tests/qemumigparamstest.c index bcdee5f32b..5d45a9dd58 100644 --- a/tests/qemumigparamstest.c +++ b/tests/qemumigparamstest.c @@ -155,7 +155,7 @@ qemuMigParamsTestJSON(const void *opaque) if (!(migParams =3D qemuMigrationParamsFromJSON(paramsIn))) return -1; =20 - if (!(paramsOut =3D qemuMigrationParamsToJSON(migParams)) || + if (!(paramsOut =3D qemuMigrationParamsToJSON(migParams, false)) || !(actualJSON =3D virJSONValueToString(paramsOut, true))) return -1; =20 diff --git a/tests/qemumigrationcookiexmltest.c b/tests/qemumigrationcookie= xmltest.c index 316bfedd15..9731348b53 100644 --- a/tests/qemumigrationcookiexmltest.c +++ b/tests/qemumigrationcookiexmltest.c @@ -333,7 +333,7 @@ testQemuMigrationCookieBlockDirtyBitmaps(const void *op= aque) =20 qemuMigrationParamsSetBlockDirtyBitmapMapping(migParams, &migParamsBit= maps); =20 - if (!(paramsOut =3D qemuMigrationParamsToJSON(migParams)) || + if (!(paramsOut =3D qemuMigrationParamsToJSON(migParams, false)) || !(actualJSON =3D virJSONValueToString(paramsOut, true))) return -1; =20 --=20 2.35.1