From nobody Wed May 14 17:00:09 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1526642999636924.4570931283839; Fri, 18 May 2018 04:29:59 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B80DD30D49C7; Fri, 18 May 2018 11:29:56 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8C5F45D762; Fri, 18 May 2018 11:29:56 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 4BE05EF01; Fri, 18 May 2018 11:29:56 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4IBTQho016115 for ; Fri, 18 May 2018 07:29:26 -0400 Received: by smtp.corp.redhat.com (Postfix) id DB9BA2026E03; Fri, 18 May 2018 11:29:25 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8038F2026DFD for ; Fri, 18 May 2018 11:29:25 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Fri, 18 May 2018 13:29:05 +0200 Message-Id: <8bb2890902cab76ccfbb9eef5e034d7584b5a4b3.1526642823.git.pkrempa@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 15/15] qemu: migration: Add support for transporting NBD over TLS X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Fri, 18 May 2018 11:29:58 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Implement the secure way to transport non-shared storage data across migrations. The new approach uses blockdev-add to create the NBD client so that the TLS secret object can be specified. https://bugzilla.redhat.com/show_bug.cgi?id=3D1300772 Signed-off-by: Peter Krempa --- src/qemu/qemu_migration.c | 122 ++++++++++++++++++++++++++++++++++++++++++= +--- 1 file changed, 115 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 6617b7aea6..68663eac47 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -39,6 +39,7 @@ #include "qemu_hotplug.h" #include "qemu_blockjob.h" #include "qemu_security.h" +#include "qemu_block.h" #include "domain_audit.h" #include "virlog.h" @@ -737,6 +738,19 @@ qemuMigrationSrcNBDCopyCancel(virQEMUDriverPtr driver, goto cleanup; } + for (i =3D 0; i < vm->def->ndisks; i++) { + virDomainDiskDefPtr disk =3D vm->def->disks[i]; + qemuDomainDiskPrivatePtr diskPriv =3D QEMU_DOMAIN_DISK_PRIVATE(dis= k); + + if (!diskPriv->migrSource) + continue; + + qemuBlockStorageSourceDetachOneBlockdev(driver, vm, asyncJob, + diskPriv->migrSource); + virStorageSourceFree(diskPriv->migrSource); + diskPriv->migrSource =3D NULL; + } + ret =3D failed ? -1 : 0; cleanup: @@ -748,6 +762,85 @@ qemuMigrationSrcNBDCopyCancel(virQEMUDriverPtr driver, } +static int +qemuMigrationSrcNBDStorageCopyBlockdev(virQEMUDriverPtr driver, + virDomainObjPtr vm, + virDomainDiskDefPtr disk, + const char *diskAlias, + const char *host, + int port, + unsigned long long mirror_speed, + unsigned int mirror_flags, + const char *tlsAlias) +{ + qemuBlockStorageSourceAttachDataPtr data =3D NULL; + qemuDomainDiskPrivatePtr diskPriv =3D QEMU_DOMAIN_DISK_PRIVATE(disk); + virStorageSourcePtr copysrc =3D NULL; + int mon_ret =3D 0; + int ret =3D -1; + + VIR_DEBUG("starting blockdev mirror for disk=3D%s to host=3D%s", diskA= lias, host); + + if (VIR_ALLOC(copysrc) < 0) + goto cleanup; + + copysrc->type =3D VIR_STORAGE_TYPE_NETWORK; + copysrc->protocol =3D VIR_STORAGE_NET_PROTOCOL_NBD; + copysrc->format =3D VIR_STORAGE_FILE_RAW; + + if (VIR_ALLOC(copysrc->backingStore) < 0) + goto cleanup; + + if (VIR_STRDUP(copysrc->path, diskAlias) < 0) + goto cleanup; + + if (VIR_ALLOC_N(copysrc->hosts, 1) < 0) + goto cleanup; + + copysrc->nhosts =3D 1; + copysrc->hosts->transport =3D VIR_STORAGE_NET_HOST_TRANS_TCP; + copysrc->hosts->port =3D port; + if (VIR_STRDUP(copysrc->hosts->name, host) < 0) + goto cleanup; + + if (VIR_STRDUP(copysrc->tlsAlias, tlsAlias) < 0) + goto cleanup; + + if (virAsprintf(©src->nodestorage, "migration-%s-storage", disk->d= st) < 0 || + virAsprintf(©src->nodeformat, "migration-%s-format", disk->dst= ) < 0) + goto cleanup; + + if (!(data =3D qemuBlockStorageSourceAttachPrepareBlockdev(copysrc))) + goto cleanup; + + if (qemuDomainObjEnterMonitorAsync(driver, vm, + QEMU_ASYNC_JOB_MIGRATION_OUT) < 0) + goto cleanup; + + mon_ret =3D qemuBlockStorageSourceAttachApply(qemuDomainGetMonitor(vm)= , data); + + if (mon_ret =3D=3D 0) + mon_ret =3D qemuMonitorBlockdevMirror(qemuDomainGetMonitor(vm), NU= LL, + diskAlias, copysrc->nodeformat, + mirror_speed, 0, 0, mirror_fla= gs); + + if (mon_ret !=3D 0) + qemuBlockStorageSourceAttachRollback(qemuDomainGetMonitor(vm), dat= a); + + if (qemuDomainObjExitMonitor(driver, vm) < 0 || mon_ret < 0) + goto cleanup; + + VIR_STEAL_PTR(diskPriv->migrSource, copysrc); + + ret =3D 0; + + cleanup: + qemuBlockStorageSourceAttachDataFree(data); + virStorageSourceFree(copysrc); + return ret; +} + + static int qemuMigrationSrcNBDStorageCopyDriveMirror(virQEMUDriverPtr driver, virDomainObjPtr vm, @@ -818,7 +911,9 @@ qemuMigrationSrcNBDStorageCopy(virQEMUDriverPtr driver, unsigned int *migrate_flags, size_t nmigrate_disks, const char **migrate_disks, - virConnectPtr dconn) + virConnectPtr dconn, + const char *tlsAlias, + unsigned int flags) { qemuDomainObjPrivatePtr priv =3D vm->privateData; int ret =3D -1; @@ -850,6 +945,7 @@ qemuMigrationSrcNBDStorageCopy(virQEMUDriverPtr driver, for (i =3D 0; i < vm->def->ndisks; i++) { virDomainDiskDefPtr disk =3D vm->def->disks[i]; qemuDomainDiskPrivatePtr diskPriv =3D QEMU_DOMAIN_DISK_PRIVATE(dis= k); + int rc; /* check whether disk should be migrated */ if (!qemuMigrationAnyCopyDisk(disk, nmigrate_disks, migrate_disks)) @@ -860,10 +956,21 @@ qemuMigrationSrcNBDStorageCopy(virQEMUDriverPtr drive= r, qemuBlockJobSyncBegin(disk); - if (qemuMigrationSrcNBDStorageCopyDriveMirror(driver, vm, diskAlia= s, - host, port, - mirror_speed, - mirror_flags) < 0) { + if (flags & VIR_MIGRATE_TLS) { + rc =3D qemuMigrationSrcNBDStorageCopyBlockdev(driver, vm, + disk, diskAlias, + host, port, + mirror_speed, + mirror_flags, + tlsAlias); + } else { + rc =3D qemuMigrationSrcNBDStorageCopyDriveMirror(driver, vm, d= iskAlias, + host, port, + mirror_speed, + mirror_flags); + } + + if (rc < 0) { qemuBlockJobSyncEnd(vm, QEMU_ASYNC_JOB_MIGRATION_OUT, disk); goto cleanup; } @@ -3367,7 +3474,8 @@ qemuMigrationSrcRun(virQEMUDriverPtr driver, * non-shared storage migration with TLS. As we need to honour= the * VIR_MIGRATE_TLS flag, we need to reject such migration until * we implement TLS for NBD. */ - if (flags & VIR_MIGRATE_TLS) { + if (flags & VIR_MIGRATE_TLS && + !virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV_DEL)) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("NBD migration with TLS is not supported"= )); goto error; @@ -3380,7 +3488,7 @@ qemuMigrationSrcRun(virQEMUDriverPtr driver, &migrate_flags, nmigrate_disks, migrate_disks, - dconn) < 0) { + dconn, tlsAlias, flags) < 0= ) { goto error; } } else { --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list