From nobody Wed Feb 11 06:48:36 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=fail(p=quarantine dis=quarantine) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1681808485; cv=none; d=zohomail.com; s=zohoarc; b=IAxCEP44C6ASZMq63OqBd7Uh3yHNUXI7MxVcLUa2wqrGUluaYvmucBmmZwaZQZUCFOZ9QUYFHOEcjrF/n55IP+u2JqeRqVZYVvSXJTkFjsXxHg6Lm4teKhyw65AaddiS4V/3TFfjmm71xKbj6i4+EZUm2O0dHXLSoKswIARpsD0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1681808485; h=Content-Type:Content-Transfer-Encoding:Cc: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=hMj+Sy4xziF9vJS1FZI88JzG8rTs8fKFT3il5siF2WE=; b=FStuDzoYjgyj+8HJP1FwedEYg8nT6DUNw0BLaxZWaqp2uRC1/uo6YJhskk1geZQP0w+tIto7XXqcZtKfYI0XIEKQcM7vKpmOG33U/8SefYpWJ+jcLlI7dSd1f/JX46e3iL4vuB6zOMqbXsW3Esv1o78qs8Nn16WPN7lEiHf3s1M= 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=fail header.from= (p=quarantine dis=quarantine) 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 1681808485491916.7354839955009; Tue, 18 Apr 2023 02:01:25 -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-81-u80rVNtIMM65hjk7xIAJEA-1; Tue, 18 Apr 2023 05:01:21 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0BE4F886068; Tue, 18 Apr 2023 09:01:19 +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 B60C72166B29; Tue, 18 Apr 2023 09:01:18 +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 8A12F1946594; Tue, 18 Apr 2023 09:01:18 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 2F271194658F for ; Tue, 18 Apr 2023 09:01:17 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 1196CC15BA0; Tue, 18 Apr 2023 09:01:17 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast07.extmail.prod.ext.rdu2.redhat.com [10.11.55.23]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 09C2BC15BB8 for ; Tue, 18 Apr 2023 09:01:10 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CCDFB3C10686 for ; Tue, 18 Apr 2023 09:01:10 +0000 (UTC) Received: from relay.virtuozzo.com (relay.virtuozzo.com [130.117.225.111]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-582-EGaTwJFkOjaD-7l3qECF0w-1; Tue, 18 Apr 2023 05:01:07 -0400 Received: from [192.168.16.124] (helo=dv.vzint.dev) by relay.virtuozzo.com with esmtp (Exim 4.96) (envelope-from ) id 1pogx4-005ltk-2B; Tue, 18 Apr 2023 10:44:51 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1681808484; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=hMj+Sy4xziF9vJS1FZI88JzG8rTs8fKFT3il5siF2WE=; b=hHqyYY9Fl5cTIYO3XTBwoSMZr6W94q1XsfgSfqLY/pHpPndFZCPFJUVpz+ce3yvwHxF+Kp gXVSbmy7My+wms0gqu2iU70eCYRgNZJDzdIU9+yAiY3iCfJdMpUEwyc7rZqmMwgfEt67dW KnAFmQ4M/EgKiyTD7uJImSD8DwvYtho= X-MC-Unique: u80rVNtIMM65hjk7xIAJEA-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: EGaTwJFkOjaD-7l3qECF0w-1 From: Oleg Vasilev To: libvir-list@redhat.com Subject: [PATCH 2/3] qemu: migration: implement zstd compression Date: Tue, 18 Apr 2023 14:44:49 +0600 Message-Id: <20230418084450.486595-3-oleg.vasilev@virtuozzo.com> In-Reply-To: <20230418084450.486595-1-oleg.vasilev@virtuozzo.com> References: <20230418084450.486595-1-oleg.vasilev@virtuozzo.com> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 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: , Cc: Oleg Vasilev , Den Lunev Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: virtuozzo.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1681808487406100001 Content-Type: text/plain; charset="utf-8"; x-default="true" QEMU now supports multifd-compression=3Dzstd for migration with enabled mul= tifd. Bring the support to libvirt as well. Signed-off-by: Oleg Vasilev --- include/libvirt/libvirt-domain.h | 10 ++++++++++ src/qemu/qemu_migration.h | 1 + src/qemu/qemu_migration_params.c | 32 ++++++++++++++++++++++++++++++++ src/qemu/qemu_migration_params.h | 2 ++ tools/virsh-completer-domain.c | 2 +- tools/virsh-domain.c | 14 ++++++++++++++ 6 files changed, 60 insertions(+), 1 deletion(-) diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-dom= ain.h index 3ebb2c6642..f267ca357b 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -1319,6 +1319,16 @@ typedef enum { */ # define VIR_MIGRATE_PARAM_COMPRESSION_XBZRLE_CACHE "compression.xbzrle.ca= che" =20 +/** + * VIR_MIGRATE_PARAM_COMPRESSION_ZSTD_LEVEL: + * + * virDomainMigrate* params field: the level of compression for zstd + * compression as VIR_TYPED_PARAM_INT. Accepted values are in range 1-22. + * + * Since: 9.0.0 + */ +# define VIR_MIGRATE_PARAM_COMPRESSION_ZSTD_LEVEL "compression.zstd.level" + /** * VIR_MIGRATE_PARAM_AUTO_CONVERGE_INITIAL: * diff --git a/src/qemu/qemu_migration.h b/src/qemu/qemu_migration.h index d21b6f67e8..09d21fd878 100644 --- a/src/qemu/qemu_migration.h +++ b/src/qemu/qemu_migration.h @@ -88,6 +88,7 @@ VIR_MIGRATE_PARAM_PARALLEL_CONNECTIONS, VIR_TYPED_PARAM_INT, \ VIR_MIGRATE_PARAM_TLS_DESTINATION, VIR_TYPED_PARAM_STRING, \ VIR_MIGRATE_PARAM_DISKS_URI, VIR_TYPED_PARAM_STRING, \ + VIR_MIGRATE_PARAM_COMPRESSION_ZSTD_LEVEL, VIR_TYPED_PARAM_INT, \ NULL =20 =20 diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_par= ams.c index a40f791be6..2533353ccf 100644 --- a/src/qemu/qemu_migration_params.c +++ b/src/qemu/qemu_migration_params.c @@ -71,6 +71,7 @@ struct _qemuMigrationParams { typedef enum { QEMU_MIGRATION_COMPRESS_XBZRLE =3D 0, QEMU_MIGRATION_COMPRESS_MT, + QEMU_MIGRATION_COMPRESS_ZSTD, =20 QEMU_MIGRATION_COMPRESS_LAST } qemuMigrationCompressMethod; @@ -79,6 +80,7 @@ VIR_ENUM_IMPL(qemuMigrationCompressMethod, QEMU_MIGRATION_COMPRESS_LAST, "xbzrle", "mt", + "zstd", ); =20 VIR_ENUM_IMPL(qemuMigrationCapability, @@ -114,6 +116,8 @@ VIR_ENUM_IMPL(qemuMigrationParam, "xbzrle-cache-size", "max-postcopy-bandwidth", "multifd-channels", + "multifd-compression", + "multifd-zstd-level", ); =20 typedef struct _qemuMigrationParamsAlwaysOnItem qemuMigrationParamsAlwaysO= nItem; @@ -216,6 +220,10 @@ static const qemuMigrationParamsTPMapItem qemuMigratio= nParamsTPMap[] =3D { .param =3D QEMU_MIGRATION_PARAM_XBZRLE_CACHE_SIZE, .party =3D QEMU_MIGRATION_SOURCE | QEMU_MIGRATION_DESTINATION}, =20 + {.typedParam =3D VIR_MIGRATE_PARAM_COMPRESSION_ZSTD_LEVEL, + .param =3D QEMU_MIGRATION_PARAM_MULTIFD_ZSTD_LEVEL, + .party =3D QEMU_MIGRATION_SOURCE | QEMU_MIGRATION_DESTINATION}, + {.typedParam =3D VIR_MIGRATE_PARAM_BANDWIDTH_POSTCOPY, .unit =3D 1024 * 1024, /* MiB/s */ .param =3D QEMU_MIGRATION_PARAM_MAX_POSTCOPY_BANDWIDTH, @@ -271,6 +279,12 @@ static const qemuMigrationParamInfoItem qemuMigrationP= aramInfo[] =3D { [QEMU_MIGRATION_PARAM_MULTIFD_CHANNELS] =3D { .type =3D QEMU_MIGRATION_PARAM_TYPE_INT, }, + [QEMU_MIGRATION_PARAM_MULTIFD_COMPRESSION] =3D { + .type =3D QEMU_MIGRATION_PARAM_TYPE_STRING, + }, + [QEMU_MIGRATION_PARAM_MULTIFD_ZSTD_LEVEL] =3D { + .type =3D QEMU_MIGRATION_PARAM_TYPE_INT, + }, }; G_STATIC_ASSERT(G_N_ELEMENTS(qemuMigrationParamInfo) =3D=3D QEMU_MIGRATION= _PARAM_LAST); =20 @@ -546,6 +560,10 @@ qemuMigrationParamsSetCompression(virTypedParameterPtr= params, cap =3D QEMU_MIGRATION_CAP_COMPRESS; break; =20 + case QEMU_MIGRATION_COMPRESS_ZSTD: + qemuMigrationParamsSetString(migParams, + QEMU_MIGRATION_PARAM_MULTIFD_COMP= RESSION, + "zstd"); case QEMU_MIGRATION_COMPRESS_LAST: default: continue; @@ -569,6 +587,13 @@ qemuMigrationParamsSetCompression(virTypedParameterPtr= params, return -1; } =20 + if (migParams->params[QEMU_MIGRATION_PARAM_MULTIFD_ZSTD_LEVEL].set && + !(migParams->compMethods & (1ULL << QEMU_MIGRATION_COMPRESS_ZSTD))= ) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("Turn zstd compression on to tune it")); + return -1; + } + if (!migParams->compMethods && (flags & VIR_MIGRATE_COMPRESSED)) { migParams->compMethods =3D 1ULL << QEMU_MIGRATION_COMPRESS_XBZRLE; ignore_value(virBitmapSetBit(migParams->caps, @@ -669,6 +694,13 @@ qemuMigrationParamsFromFlags(virTypedParameterPtr para= ms, return NULL; } =20 + if (migParams->params[QEMU_MIGRATION_PARAM_MULTIFD_ZSTD_LEVEL].set && + !(flags & VIR_MIGRATE_PARALLEL)) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("Turn parallel migration on to tune zstd level")= ); + return NULL; + } + if (qemuMigrationParamsSetCompression(params, nparams, flags, migParam= s) < 0) return NULL; =20 diff --git a/src/qemu/qemu_migration_params.h b/src/qemu/qemu_migration_par= ams.h index 458a7a4dfa..383b25ce63 100644 --- a/src/qemu/qemu_migration_params.h +++ b/src/qemu/qemu_migration_params.h @@ -59,6 +59,8 @@ typedef enum { QEMU_MIGRATION_PARAM_XBZRLE_CACHE_SIZE, QEMU_MIGRATION_PARAM_MAX_POSTCOPY_BANDWIDTH, QEMU_MIGRATION_PARAM_MULTIFD_CHANNELS, + QEMU_MIGRATION_PARAM_MULTIFD_COMPRESSION, + QEMU_MIGRATION_PARAM_MULTIFD_ZSTD_LEVEL, =20 QEMU_MIGRATION_PARAM_LAST } qemuMigrationParam; diff --git a/tools/virsh-completer-domain.c b/tools/virsh-completer-domain.c index b54baf3577..66748b7b65 100644 --- a/tools/virsh-completer-domain.c +++ b/tools/virsh-completer-domain.c @@ -1012,7 +1012,7 @@ virshDomainMigrateCompMethodsCompleter(vshControl *ct= l, const vshCmd *cmd, unsigned int flags) { - const char *methods[] =3D {"xbzrle", "mt", NULL}; + const char *methods[] =3D {"xbzrle", "mt", "zstd", NULL}; const char *method =3D NULL; =20 virCheckFlags(0, NULL); diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 6850843a25..0813bd5de0 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -11056,6 +11056,10 @@ static const vshCmdOptDef opts_migrate[] =3D { .type =3D VSH_OT_INT, .help =3D N_("page cache size for xbzrle compression") }, + {.name =3D "comp-zstd-level", + .type =3D VSH_OT_INT, + .help =3D N_("zstd level for zstd compression") + }, {.name =3D "auto-converge-initial", .type =3D VSH_OT_INT, .help =3D N_("initial CPU throttling rate for auto-convergence") @@ -11238,6 +11242,16 @@ doMigrate(void *opaque) goto save_error; } =20 + if ((rv =3D vshCommandOptInt(ctl, cmd, "comp-zstd-level", &intOpt)) < = 0) { + goto out; + } else if (rv > 0) { + if (virTypedParamsAddInt(¶ms, &nparams, &maxparams, + VIR_MIGRATE_PARAM_COMPRESSION_ZSTD_LEVEL, + intOpt) < 0) + goto save_error; + } + + if (vshCommandOptStringReq(ctl, cmd, "xml", &opt) < 0) goto out; if (opt) { --=20 2.40.0