From nobody Sun May 5 10:52:07 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1578394456; cv=none; d=zohomail.com; s=zohoarc; b=dqLphBPLqrCBdeDt9l2WknC121ELcX3TFIq1/m/vP0CJWWINDLxm7NYorwObpFbByQKtey44gxtlXBUCjgNIEk4kn2/cSTy8c1rCTAh42GCoyBjzHHcZIgwQrwKdVjXBFTOp6v4wFj24zcs85GKym0Env7/seWyWfjvJX40lNG8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578394456; 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=u9cLPIzThFBog77ftH06FIMmofa4BTkdvNkOMvWgwgw=; b=IzEb2czFAw/tbQGkNMumrlM4ubvOv0QtckmOAGadCuKvQ6vxU3J2AElrzcBlJbWgE4riAE/qFZ5vJR84Vl4PFwyQz80oQDur6F8pTPAgBFV6VdhgR5oWiKagmvWoHI+v2tHKESQ35D+hW2e5adNNFS4qU7CAT89KnnaXsGb+f/k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578394456202771.6867987018345; Tue, 7 Jan 2020 02:54:16 -0800 (PST) Received: from localhost ([::1]:46374 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iomV3-00088H-NO for importer@patchew.org; Tue, 07 Jan 2020 05:54:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59167) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iomQO-0004Rp-U9 for qemu-devel@nongnu.org; Tue, 07 Jan 2020 05:49:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iomQM-0004mI-Cg for qemu-devel@nongnu.org; Tue, 07 Jan 2020 05:49:23 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:58872 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iomQM-0004lz-9V for qemu-devel@nongnu.org; Tue, 07 Jan 2020 05:49:22 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-381-Q-zpLXcNMhehrOLZ8F1OGg-1; Tue, 07 Jan 2020 05:49:20 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7C67D1052A1F; Tue, 7 Jan 2020 10:49:19 +0000 (UTC) Received: from secure.mitica (ovpn-116-240.ams2.redhat.com [10.36.116.240]) by smtp.corp.redhat.com (Postfix) with ESMTP id BFACC1A8D6; Tue, 7 Jan 2020 10:49:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578394161; h=from:from: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; bh=u9cLPIzThFBog77ftH06FIMmofa4BTkdvNkOMvWgwgw=; b=Lpy/R+OfAWK22CsIxw9Yyw4m3aEGe/UWU80SFFxG+tLQasTcs5s8o1hqkJteDKJvyQ9XC3 U+uYLWTfbzznHFc2mF8fREzDgsXzmCv9ScVDuA07YAmpGJOnrj8EJOEd28ggBfcRJTbnh3 T/yUFnOYs3c4mHpUop4OG/TlN9OAQZ4= From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v2 1/3] migration-test: Add migration multifd test Date: Tue, 7 Jan 2020 11:49:12 +0100 Message-Id: <20200107104914.1814-2-quintela@redhat.com> In-Reply-To: <20200107104914.1814-1-quintela@redhat.com> References: <20200107104914.1814-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: Q-zpLXcNMhehrOLZ8F1OGg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Thomas Huth , Juan Quintela , "Dr. David Alan Gilbert" , Wei Yang , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" We set multifd-channels. Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Thomas Huth Tested-by: Wei Yang Signed-off-by: Juan Quintela --- tests/migration-test.c | 56 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/tests/migration-test.c b/tests/migration-test.c index 53afec4395..1a8d06718e 100644 --- a/tests/migration-test.c +++ b/tests/migration-test.c @@ -1202,6 +1202,61 @@ static void test_migrate_auto_converge(void) test_migrate_end(from, to, true); } =20 +static void test_multifd_tcp(void) +{ + MigrateStart *args =3D migrate_start_new(); + QTestState *from, *to; + QDict *rsp; + char *uri; + + if (test_migrate_start(&from, &to, "defer", args)) { + return; + } + + /* + * We want to pick a speed slow enough that the test completes + * quickly, but that it doesn't complete precopy even on a slow + * machine, so also set the downtime. + */ + /* 1 ms should make it not converge*/ + migrate_set_parameter_int(from, "downtime-limit", 1); + /* 1GB/s */ + migrate_set_parameter_int(from, "max-bandwidth", 1000000000); + + migrate_set_parameter_int(from, "multifd-channels", 16); + migrate_set_parameter_int(to, "multifd-channels", 16); + + migrate_set_capability(from, "multifd", "true"); + migrate_set_capability(to, "multifd", "true"); + + /* Start incoming migration from the 1st socket */ + rsp =3D wait_command(to, "{ 'execute': 'migrate-incoming'," + " 'arguments': { 'uri': 'tcp:127.0.0.1:0' }}"); + qobject_unref(rsp); + + /* Wait for the first serial output from the source */ + wait_for_serial("src_serial"); + + uri =3D migrate_get_socket_address(to, "socket-address"); + + migrate_qmp(from, uri, "{}"); + + wait_for_migration_pass(from); + + /* 300ms it should converge */ + migrate_set_parameter_int(from, "downtime-limit", 600); + + if (!got_stop) { + qtest_qmp_eventwait(from, "STOP"); + } + qtest_qmp_eventwait(to, "RESUME"); + + wait_for_serial("dest_serial"); + wait_for_migration_complete(from); + test_migrate_end(from, to, true); + free(uri); +} + int main(int argc, char **argv) { char template[] =3D "/tmp/migration-test-XXXXXX"; @@ -1266,6 +1321,7 @@ int main(int argc, char **argv) test_validate_uuid_dst_not_set); =20 qtest_add_func("/migration/auto_converge", test_migrate_auto_converge); + qtest_add_func("/migration/multifd/tcp", test_multifd_tcp); =20 ret =3D g_test_run(); =20 --=20 2.24.1 From nobody Sun May 5 10:52:07 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1578396637; cv=none; d=zohomail.com; s=zohoarc; b=NkVZmb6Ej7Nor9TrrsxhTYv5pqPMgjimQc4y90NLE+iB/6oo/xzc4momaOkKR6k5IIJ0qrOcEu6g6l37MfYQpdFcNWUaDrR+77FuTvGbPIk6R3FBqUzydavVC2Au4ibv5GdAUNDkQuL3926q56lhn/90aFPo72RKA5xiN/MWpho= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578396637; 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=IoyM5N3oMYNqzFUjFx3yfuZB9d4KCOyOQGaheYlrGX0=; b=NFUWfMWXFjKzbCAXEp9SfzKcSyH3ysNUTao5PMEZ/KS+qCYrc7Y56mtRVYtOZkAavujmXaEUBfRkzBR/4aSv8XoAM6si1qRossrBM5/f5xo28S6EBxZVR9kB7g3J5Z207VFRs4KzwhErVLOR8NewhZRgFhtyRi6OUojKfac4nsk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578396637408191.7705250029078; Tue, 7 Jan 2020 03:30:37 -0800 (PST) Received: from localhost ([::1]:46892 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ion3z-0003uT-7Y for importer@patchew.org; Tue, 07 Jan 2020 06:30:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59201) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iomQR-0004dh-AH for qemu-devel@nongnu.org; Tue, 07 Jan 2020 05:49:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iomQP-0004nv-W9 for qemu-devel@nongnu.org; Tue, 07 Jan 2020 05:49:27 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:43157 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iomQP-0004n4-SU for qemu-devel@nongnu.org; Tue, 07 Jan 2020 05:49:25 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-366-dETClZ0sMGu2-NjZbHvPJQ-1; Tue, 07 Jan 2020 05:49:22 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6021985B6FA for ; Tue, 7 Jan 2020 10:49:21 +0000 (UTC) Received: from secure.mitica (ovpn-116-240.ams2.redhat.com [10.36.116.240]) by smtp.corp.redhat.com (Postfix) with ESMTP id CF3C71A8D6; Tue, 7 Jan 2020 10:49:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578394163; h=from:from: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; bh=IoyM5N3oMYNqzFUjFx3yfuZB9d4KCOyOQGaheYlrGX0=; b=ib71isITp+6EXrau4bgkES8RKLDyAQXcY86oq+6SzC73VbQibofKoH7ArxKzsh+WT/cO2D xVfLJYGXrswkUIGStAEymag+ZvXjQn6IQ/l/imDS9GP8juF8WrLu+rbiqeiQLWZh0aHPtf ZQhlPhP4XREAHHAc8Uf5ybgKfHfIUEk= From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v2 2/3] migration: Make sure that we don't call write() in case of error Date: Tue, 7 Jan 2020 11:49:13 +0100 Message-Id: <20200107104914.1814-3-quintela@redhat.com> In-Reply-To: <20200107104914.1814-1-quintela@redhat.com> References: <20200107104914.1814-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: dETClZ0sMGu2-NjZbHvPJQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Paolo Bonzini , Thomas Huth , "Dr. David Alan Gilbert" , Juan Quintela Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" If we are exiting due to an error/finish/.... Just don't try to even touch the channel with one IO operation. Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert Signed-off-by: Juan Quintela --- migration/ram.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/migration/ram.c b/migration/ram.c index 96feb4062c..6e678dbd2e 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -900,6 +900,12 @@ struct { uint64_t packet_num; /* send channels ready */ QemuSemaphore channels_ready; + /* + * Have we already run terminate threads. There is a race when it + * happens that we got one error while we are exiting. + * We will use atomic operations. Only valid values are 0 and 1. + */ + int exiting; } *multifd_send_state; =20 /* @@ -928,6 +934,10 @@ static int multifd_send_pages(RAMState *rs) MultiFDPages_t *pages =3D multifd_send_state->pages; uint64_t transferred; =20 + if (atomic_read(&multifd_send_state->exiting)) { + return -1; + } + qemu_sem_wait(&multifd_send_state->channels_ready); for (i =3D next_channel;; i =3D (i + 1) % migrate_multifd_channels()) { p =3D &multifd_send_state->params[i]; @@ -1009,6 +1019,16 @@ static void multifd_send_terminate_threads(Error *er= r) } } =20 + /* + * We don't want to exit each threads twice. Depending on where + * we get the error, or if there are two independent errors in two + * threads at the same time, we can end calling this function + * twice. + */ + if (atomic_xchg(&multifd_send_state->exiting, 1)) { + return; + } + for (i =3D 0; i < migrate_multifd_channels(); i++) { MultiFDSendParams *p =3D &multifd_send_state->params[i]; =20 @@ -1118,6 +1138,10 @@ static void *multifd_send_thread(void *opaque) =20 while (true) { qemu_sem_wait(&p->sem); + + if (atomic_read(&multifd_send_state->exiting)) { + break; + } qemu_mutex_lock(&p->mutex); =20 if (p->pending_job) { @@ -1224,6 +1248,7 @@ int multifd_save_setup(void) multifd_send_state->params =3D g_new0(MultiFDSendParams, thread_count); multifd_send_state->pages =3D multifd_pages_init(page_count); qemu_sem_init(&multifd_send_state->channels_ready, 0); + atomic_set(&multifd_send_state->exiting, 0); =20 for (i =3D 0; i < thread_count; i++) { MultiFDSendParams *p =3D &multifd_send_state->params[i]; --=20 2.24.1 From nobody Sun May 5 10:52:07 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1578396230; cv=none; d=zohomail.com; s=zohoarc; b=RhHAJFthoLQtfpMKW9Oa/8y25imnkuIEVa+xM4YycYprWwPw7cnJ+2OYL/N8gbYa6dbg+LwmUrdluE+rjzq4QmM68wbVuDxU+YFqE7Gi/GNB40P5YTICXpzei37bCjNy6hEFaa9slFCoFPsZyzGQLzescCg6l9dx44WTcNZqHDc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578396230; 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=tfun3ceBT6mbxjPryPJ7sF/KZSXd65wbTG4RfEVBNTQ=; b=e9219R6PMKBB6C0n5g+vhCvUVxu61bJY5ugmoY762Y/tsQtPPBzv8GR7n3c9Pxd51ZbpCGTnxB6q09/ojw+nsmUR2Q9orqpOE5Iro5BvbgcF6exPUQ3N65NdNkmIQWMgrbe4avX5xJHu2qzvlJUBzSqHH5Uu6nTpbaX5o6wJN78= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578396230645814.0091908922498; Tue, 7 Jan 2020 03:23:50 -0800 (PST) Received: from localhost ([::1]:46808 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iomxg-0003tF-EF for importer@patchew.org; Tue, 07 Jan 2020 06:23:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59202) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iomQR-0004dl-Ac for qemu-devel@nongnu.org; Tue, 07 Jan 2020 05:49:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iomQP-0004no-R2 for qemu-devel@nongnu.org; Tue, 07 Jan 2020 05:49:27 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:30556 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iomQP-0004na-NL for qemu-devel@nongnu.org; Tue, 07 Jan 2020 05:49:25 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-47-cNNLY2vdNqOoRpWom3f80Q-1; Tue, 07 Jan 2020 05:49:24 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3E09718C43CB for ; Tue, 7 Jan 2020 10:49:23 +0000 (UTC) Received: from secure.mitica (ovpn-116-240.ams2.redhat.com [10.36.116.240]) by smtp.corp.redhat.com (Postfix) with ESMTP id B53701A8D6; Tue, 7 Jan 2020 10:49:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578394165; h=from:from: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; bh=tfun3ceBT6mbxjPryPJ7sF/KZSXd65wbTG4RfEVBNTQ=; b=KN/TidVTY7G2W2DdwlVma/e0O7BnFHhS/TdUpus3SOsoQqgN1HMjpCc66RZXImL5xAsVMT Bv3eQeXZGA4y+ETqL+P7TK8BZQxLbnsEXrjrm6l3L82RNWzwrArlJ8ka6uD7aVf9JZ4E3y 1rLdqHGYHRiKb1gLPhoa3d7GVxJZcQ8= From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v2 3/3] migration-test: Make sure that multifd and cancel works Date: Tue, 7 Jan 2020 11:49:14 +0100 Message-Id: <20200107104914.1814-4-quintela@redhat.com> In-Reply-To: <20200107104914.1814-1-quintela@redhat.com> References: <20200107104914.1814-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: cNNLY2vdNqOoRpWom3f80Q-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Paolo Bonzini , Thomas Huth , "Dr. David Alan Gilbert" , Juan Quintela Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Test that this sequerce works: - launch source - launch target - start migration - cancel migration - relaunch target - do migration again Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert Signed-off-by: Juan Quintela --- - Wait for 1st trhead to move to cancelled before launching second migration - Add 'to2' parameter to diferentiate 1st and second target. --- tests/migration-test.c | 110 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 109 insertions(+), 1 deletion(-) diff --git a/tests/migration-test.c b/tests/migration-test.c index 1a8d06718e..7a833d65ce 100644 --- a/tests/migration-test.c +++ b/tests/migration-test.c @@ -387,6 +387,14 @@ static void migrate_recover(QTestState *who, const cha= r *uri) qobject_unref(rsp); } =20 +static void migrate_cancel(QTestState *who) +{ + QDict *rsp; + + rsp =3D wait_command(who, "{ 'execute': 'migrate_cancel' }"); + qobject_unref(rsp); +} + static void migrate_set_capability(QTestState *who, const char *capability, bool value) { @@ -419,6 +427,8 @@ static void migrate_postcopy_start(QTestState *from, QT= estState *to) typedef struct { bool hide_stderr; bool use_shmem; + /* only launch the target process */ + bool only_target; char *opts_source; char *opts_target; } MigrateStart; @@ -534,7 +544,9 @@ static int test_migrate_start(QTestState **from, QTestS= tate **to, arch_source, shmem_opts, args->opts_sourc= e, ignore_stderr); g_free(arch_source); - *from =3D qtest_init(cmd_source); + if (!args->only_target) { + *from =3D qtest_init(cmd_source); + } g_free(cmd_source); =20 cmd_target =3D g_strdup_printf("-accel kvm -accel tcg%s%s " @@ -1257,6 +1269,101 @@ static void test_multifd_tcp(void) free(uri); } =20 +/* + * This test does: + * source target + * migrate_incoming + * migrate + * migrate_cancel + * launch another target + * migrate + * + * And see that it works + */ + +static void test_multifd_tcp_cancel(void) +{ + MigrateStart *args =3D migrate_start_new(); + QTestState *from, *to, *to2; + QDict *rsp; + char *uri; + + args->hide_stderr =3D true; + + if (test_migrate_start(&from, &to, "defer", args)) { + return; + } + + /* + * We want to pick a speed slow enough that the test completes + * quickly, but that it doesn't complete precopy even on a slow + * machine, so also set the downtime. + */ + /* 1 ms should make it not converge*/ + migrate_set_parameter_int(from, "downtime-limit", 1); + /* 1GB/s */ + migrate_set_parameter_int(from, "max-bandwidth", 1000000000); + + migrate_set_parameter_int(from, "multifd-channels", 16); + migrate_set_parameter_int(to, "multifd-channels", 16); + + migrate_set_capability(from, "multifd", "true"); + migrate_set_capability(to, "multifd", "true"); + + /* Start incoming migration from the 1st socket */ + rsp =3D wait_command(to, "{ 'execute': 'migrate-incoming'," + " 'arguments': { 'uri': 'tcp:127.0.0.1:0' }}"); + qobject_unref(rsp); + + /* Wait for the first serial output from the source */ + wait_for_serial("src_serial"); + + uri =3D migrate_get_socket_address(to, "socket-address"); + + migrate_qmp(from, uri, "{}"); + + wait_for_migration_pass(from); + + migrate_cancel(from); + + args =3D migrate_start_new(); + args->only_target =3D true; + + if (test_migrate_start(&from, &to2, "defer", args)) { + return; + } + + migrate_set_parameter_int(to2, "multifd-channels", 16); + + migrate_set_capability(to2, "multifd", "true"); + + /* Start incoming migration from the 1st socket */ + rsp =3D wait_command(to2, "{ 'execute': 'migrate-incoming'," + " 'arguments': { 'uri': 'tcp:127.0.0.1:0' }}"= ); + qobject_unref(rsp); + + /* 300ms it should converge */ + migrate_set_parameter_int(from, "downtime-limit", 300); + + uri =3D migrate_get_socket_address(to2, "socket-address"); + + wait_for_migration_status(from, "cancelled", NULL); + + migrate_qmp(from, uri, "{}"); + + wait_for_migration_pass(from); + + if (!got_stop) { + qtest_qmp_eventwait(from, "STOP"); + } + qtest_qmp_eventwait(to2, "RESUME"); + + wait_for_serial("dest_serial"); + wait_for_migration_complete(from); + test_migrate_end(from, to2, true); + free(uri); +} + int main(int argc, char **argv) { char template[] =3D "/tmp/migration-test-XXXXXX"; @@ -1322,6 +1429,7 @@ int main(int argc, char **argv) =20 qtest_add_func("/migration/auto_converge", test_migrate_auto_converge); qtest_add_func("/migration/multifd/tcp", test_multifd_tcp); + qtest_add_func("/migration/multifd/tcp/cancel", test_multifd_tcp_cance= l); =20 ret =3D g_test_run(); =20 --=20 2.24.1