From patchwork Wed Dec 18 05:04:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 11299533 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8FC2E138C for ; Wed, 18 Dec 2019 05:07:47 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6566820733 for ; Wed, 18 Dec 2019 05:07:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="BDbN3Glo" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6566820733 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:49742 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihRYo-0002Av-Fe for patchwork-qemu-devel@patchwork.kernel.org; Wed, 18 Dec 2019 00:07:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47932) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihRW1-0006vW-Rt for qemu-devel@nongnu.org; Wed, 18 Dec 2019 00:04:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihRVv-0003Z4-FZ for qemu-devel@nongnu.org; Wed, 18 Dec 2019 00:04:51 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:34513 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 1ihRVv-0003XK-2v for qemu-devel@nongnu.org; Wed, 18 Dec 2019 00:04:47 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576645486; 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=f8pG+ePynhpBGfAMaIg4eXtSkCZio1rbAzzHRQGEB9s=; b=BDbN3Glo1+2y9k0W8gd57FPVfTyO61e80YCaWqqgbB2Qcg+IArLP13NnNEREH4BnsXegQz Ws9wapY8R3DsQf4ZOopv5XQ09L18XiTZnmVD7ZEzEZ52FYIQ+355n6ERAXbSecmPGzilLc sO5nQ2u8ba9zdI9Ru2IcnezZ4UUFRw8= 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-24-BneBhDcoOXeCM9MFALv5wg-1; Wed, 18 Dec 2019 00:04:45 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 57D6910CE7A9 for ; Wed, 18 Dec 2019 05:04:44 +0000 (UTC) Received: from secure.mitica (ovpn-116-32.ams2.redhat.com [10.36.116.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id D53575D9E1; Wed, 18 Dec 2019 05:04:42 +0000 (UTC) From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH 1/4] qemu-file: Don't do IO after shutdown Date: Wed, 18 Dec 2019 06:04:36 +0100 Message-Id: <20191218050439.5989-2-quintela@redhat.com> In-Reply-To: <20191218050439.5989-1-quintela@redhat.com> References: <20191218050439.5989-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: BneBhDcoOXeCM9MFALv5wg-1 X-Mimecast-Spam-Score: 0 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Be sure that we are not doing neither read/write after shutdown of the QEMUFile. Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert --- migration/qemu-file.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/migration/qemu-file.c b/migration/qemu-file.c index 26fb25ddc1..1e5543a279 100644 --- a/migration/qemu-file.c +++ b/migration/qemu-file.c @@ -53,6 +53,8 @@ struct QEMUFile { int last_error; Error *last_error_obj; + /* has the file has been shutdown */ + bool shutdown; }; /* @@ -61,6 +63,7 @@ struct QEMUFile { */ int qemu_file_shutdown(QEMUFile *f) { + f->shutdown = true; if (!f->ops->shut_down) { return -ENOSYS; } @@ -214,6 +217,9 @@ void qemu_fflush(QEMUFile *f) return; } + if (f->shutdown) { + return; + } if (f->iovcnt > 0) { expect = iov_size(f->iov, f->iovcnt); ret = f->ops->writev_buffer(f->opaque, f->iov, f->iovcnt, f->pos, @@ -328,6 +334,10 @@ static ssize_t qemu_fill_buffer(QEMUFile *f) f->buf_index = 0; f->buf_size = pending; + if (f->shutdown) { + return 0; + } + len = f->ops->get_buffer(f->opaque, f->buf + pending, f->pos, IO_BUF_SIZE - pending, &local_error); if (len > 0) { @@ -642,6 +652,9 @@ int64_t qemu_ftell(QEMUFile *f) int qemu_file_rate_limit(QEMUFile *f) { + if (f->shutdown) { + return 1; + } if (qemu_file_get_error(f)) { return 1; } From patchwork Wed Dec 18 05:04:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 11299527 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 31708138C for ; Wed, 18 Dec 2019 05:06:07 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 083A821582 for ; Wed, 18 Dec 2019 05:06:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="CZ+CU7xb" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 083A821582 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:49724 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihRXB-0008Fc-Qk for patchwork-qemu-devel@patchwork.kernel.org; Wed, 18 Dec 2019 00:06:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48270) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihRW1-0006vZ-Qi for qemu-devel@nongnu.org; Wed, 18 Dec 2019 00:04:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihRW0-0003l6-L1 for qemu-devel@nongnu.org; Wed, 18 Dec 2019 00:04:53 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:56471 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 1ihRW0-0003ap-Gx for qemu-devel@nongnu.org; Wed, 18 Dec 2019 00:04:52 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576645488; 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=VrGzzfv5NC3Zj64RUvUmQx8W98nbwIJZg4x0dPWCbpQ=; b=CZ+CU7xb2F01Ixa+igQG5PDKMzvwiPJEpzH9+DEeQ2ragY10fnK97mY119Jb9CRaD7Fwf4 QADlbdxmb9BVZgfB+wgXDbm+UolJ2oQ7u+5MYhJqrCdLVzOpXbCQLOQchuGjDwVIFWm8dP 99y9pwCCptMIG7P/7Y7zCuuP8WuWBFw= 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-234-re28d7dYOy-keMArZ5BGTw-1; Wed, 18 Dec 2019 00:04:47 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 33DE518543CC for ; Wed, 18 Dec 2019 05:04:46 +0000 (UTC) Received: from secure.mitica (ovpn-116-32.ams2.redhat.com [10.36.116.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id ACB625D9E1; Wed, 18 Dec 2019 05:04:44 +0000 (UTC) From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH 2/4] multifd: Make sure that we don't do any IO after an error Date: Wed, 18 Dec 2019 06:04:37 +0100 Message-Id: <20191218050439.5989-3-quintela@redhat.com> In-Reply-To: <20191218050439.5989-1-quintela@redhat.com> References: <20191218050439.5989-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: re28d7dYOy-keMArZ5BGTw-1 X-Mimecast-Spam-Score: 0 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert --- migration/ram.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index db90237977..4b44578e57 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -4132,7 +4132,7 @@ static int ram_save_iterate(QEMUFile *f, void *opaque) { RAMState **temp = opaque; RAMState *rs = *temp; - int ret; + int ret = 0; int i; int64_t t0; int done = 0; @@ -4203,12 +4203,14 @@ static int ram_save_iterate(QEMUFile *f, void *opaque) ram_control_after_iterate(f, RAM_CONTROL_ROUND); out: - multifd_send_sync_main(rs); - qemu_put_be64(f, RAM_SAVE_FLAG_EOS); - qemu_fflush(f); - ram_counters.transferred += 8; + if (ret >= 0) { + multifd_send_sync_main(rs); + qemu_put_be64(f, RAM_SAVE_FLAG_EOS); + qemu_fflush(f); + ram_counters.transferred += 8; - ret = qemu_file_get_error(f); + ret = qemu_file_get_error(f); + } if (ret < 0) { return ret; } @@ -4260,9 +4262,11 @@ static int ram_save_complete(QEMUFile *f, void *opaque) ram_control_after_iterate(f, RAM_CONTROL_FINISH); } - multifd_send_sync_main(rs); - qemu_put_be64(f, RAM_SAVE_FLAG_EOS); - qemu_fflush(f); + if (ret >= 0) { + multifd_send_sync_main(rs); + qemu_put_be64(f, RAM_SAVE_FLAG_EOS); + qemu_fflush(f); + } return ret; } From patchwork Wed Dec 18 05:04:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 11299531 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 10EDE13B6 for ; Wed, 18 Dec 2019 05:07:45 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DB44420733 for ; Wed, 18 Dec 2019 05:07:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Ek9Iyssx" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DB44420733 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:49740 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihRYm-00028c-1p for patchwork-qemu-devel@patchwork.kernel.org; Wed, 18 Dec 2019 00:07:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48105) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihRW1-0006vY-Q7 for qemu-devel@nongnu.org; Wed, 18 Dec 2019 00:04:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihRVz-0003g6-7n for qemu-devel@nongnu.org; Wed, 18 Dec 2019 00:04:52 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:37660 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 1ihRVz-0003e3-3s for qemu-devel@nongnu.org; Wed, 18 Dec 2019 00:04:51 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576645490; 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=s1nkmlv34bXpJjjAp06LNzSqEhMoyMdeErSNU1L6v7M=; b=Ek9IyssxRw4vKFHol6lAv5XEdUhqb+PulQ0Ci3CcZCrTKmoZlULEX3WRTfMpC6c7Zo058g cZzJ1Nc4qp4KZitaikCVIhZZg2ZORFYr8DrGPhg1Z1Yvqpu/IFzyB6+GAxC2lxtlNYi7LJ zdDlpo15lsS5+niFi63CVguJY+xXSaA= 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-370-KB_CbUnZNqeMISLBcKvR9w-1; Wed, 18 Dec 2019 00:04:48 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0FCE18024E0 for ; Wed, 18 Dec 2019 05:04:48 +0000 (UTC) Received: from secure.mitica (ovpn-116-32.ams2.redhat.com [10.36.116.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id 89F045D9E1; Wed, 18 Dec 2019 05:04:46 +0000 (UTC) From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH 3/4] migration-test: Make sure that multifd and cancel works Date: Wed, 18 Dec 2019 06:04:38 +0100 Message-Id: <20191218050439.5989-4-quintela@redhat.com> In-Reply-To: <20191218050439.5989-1-quintela@redhat.com> References: <20191218050439.5989-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: KB_CbUnZNqeMISLBcKvR9w-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" 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 --- tests/migration-test.c | 108 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 107 insertions(+), 1 deletion(-) diff --git a/tests/migration-test.c b/tests/migration-test.c index 7588f50b9b..1c93b3e5bc 100644 --- a/tests/migration-test.c +++ b/tests/migration-test.c @@ -527,6 +527,14 @@ static void migrate_recover(QTestState *who, const char *uri) qobject_unref(rsp); } +static void migrate_cancel(QTestState *who) +{ + QDict *rsp; + + rsp = wait_command(who, "{ 'execute': 'migrate_cancel' }"); + qobject_unref(rsp); +} + static void migrate_set_capability(QTestState *who, const char *capability, bool value) { @@ -583,6 +591,8 @@ static void migrate_postcopy_start(QTestState *from, QTestState *to) typedef struct { bool hide_stderr; bool use_shmem; + /* only launch the target process */ + bool only_target; char *opts_source; char *opts_target; } MigrateStart; @@ -704,7 +714,9 @@ static int test_migrate_start(QTestState **from, QTestState **to, arch_source, shmem_opts, args->opts_source, ignore_stderr); g_free(arch_source); - *from = qtest_init(cmd_source); + if (!args->only_target) { + *from = qtest_init(cmd_source); + } g_free(cmd_source); cmd_target = g_strdup_printf("-machine %saccel=kvm:tcg%s " @@ -1470,6 +1482,99 @@ static void test_multifd_tcp_zstd(void) test_multifd_tcp("zstd"); } +/* + * 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 = 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 = 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 = migrate_get_socket_address(to, "socket-address"); + + migrate(from, uri, "{}"); + + wait_for_migration_pass(from); + + printf("before cancel\n"); + migrate_cancel(from); + printf("after cancel\n"); + + args = migrate_start_new(); + args->only_target = true; + + if (test_migrate_start(&from, &to, "defer", args)) { + return; + } + + migrate_set_parameter_int(to, "multifd-channels", 16); + + migrate_set_capability(to, "multifd", "true"); + + /* Start incoming migration from the 1st socket */ + rsp = wait_command(to, "{ '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", 600); + + uri = migrate_get_socket_address(to, "socket-address"); + + migrate(from, uri, "{}"); + + wait_for_migration_pass(from); + + 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[] = "/tmp/migration-test-XXXXXX"; @@ -1537,6 +1642,7 @@ int main(int argc, char **argv) qtest_add_func("/migration/multifd/tcp/none", test_multifd_tcp_none); qtest_add_func("/migration/multifd/tcp/zlib", test_multifd_tcp_zlib); qtest_add_func("/migration/multifd/tcp/zstd", test_multifd_tcp_zstd); + qtest_add_func("/migration/multifd/tcp/cancel", test_multifd_tcp_cancel); ret = g_test_run(); From patchwork Wed Dec 18 05:04:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 11299525 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EFE1A138C for ; Wed, 18 Dec 2019 05:06:05 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BD6FA21582 for ; Wed, 18 Dec 2019 05:06:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="H8Tzm32E" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BD6FA21582 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:49722 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihRXA-0008DK-Cn for patchwork-qemu-devel@patchwork.kernel.org; Wed, 18 Dec 2019 00:06:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48273) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihRW1-0006va-U1 for qemu-devel@nongnu.org; Wed, 18 Dec 2019 00:04:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihRW0-0003kf-J1 for qemu-devel@nongnu.org; Wed, 18 Dec 2019 00:04:53 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:40637 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 1ihRW0-0003iX-Dc for qemu-devel@nongnu.org; Wed, 18 Dec 2019 00:04:52 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576645492; 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=Z85wuO3YWoeRNkarji+P9H3WlDB4HRutxh9nmFLYEyg=; b=H8Tzm32EjQAhMm8DmUmN2WY53oTJWO2pNUYLfcN2ozOb4Lt21+4Xs2SCVK64+rLcJRxymv MXMhMkBJxottsmsQG+wYduDujh9qOpUk7o82ml/yfpjVD+yCj/zGeFF1ByVofUA3mDZegk s+mgKATHDstE+TnhtWwacgnzUgNXSZ8= 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-106-wfe4FHTcMhGO5yL3xBBwyQ-1; Wed, 18 Dec 2019 00:04:50 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DE15791252 for ; Wed, 18 Dec 2019 05:04:49 +0000 (UTC) Received: from secure.mitica (ovpn-116-32.ams2.redhat.com [10.36.116.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id 64DE75D9E1; Wed, 18 Dec 2019 05:04:48 +0000 (UTC) From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH 4/4] migration: Make sure that we don't call write() in case of error Date: Wed, 18 Dec 2019 06:04:39 +0100 Message-Id: <20191218050439.5989-5-quintela@redhat.com> In-Reply-To: <20191218050439.5989-1-quintela@redhat.com> References: <20191218050439.5989-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: wfe4FHTcMhGO5yL3xBBwyQ-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" 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 --- migration/ram.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/migration/ram.c b/migration/ram.c index 4b44578e57..909ef6d237 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -1601,6 +1601,12 @@ struct { QemuSemaphore channels_ready; /* multifd ops */ MultiFDMethods *ops; + /* + * 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; /* @@ -1629,6 +1635,10 @@ static int multifd_send_pages(RAMState *rs) MultiFDPages_t *pages = multifd_send_state->pages; uint64_t transferred; + if (atomic_read(&multifd_send_state->exiting)) { + return -1; + } + qemu_sem_wait(&multifd_send_state->channels_ready); for (i = next_channel;; i = (i + 1) % migrate_multifd_channels()) { p = &multifd_send_state->params[i]; @@ -1710,6 +1720,10 @@ static void multifd_send_terminate_threads(Error *err) } } + if (atomic_xchg(&multifd_send_state->exiting, 1)) { + return; + } + for (i = 0; i < migrate_multifd_channels(); i++) { MultiFDSendParams *p = &multifd_send_state->params[i]; @@ -1824,6 +1838,10 @@ static void *multifd_send_thread(void *opaque) while (true) { qemu_sem_wait(&p->sem); + + if (atomic_read(&multifd_send_state->exiting)) { + break; + } qemu_mutex_lock(&p->mutex); if (p->pending_job) { @@ -1938,6 +1956,7 @@ int multifd_save_setup(Error **errp) multifd_send_state->pages = multifd_pages_init(page_count); qemu_sem_init(&multifd_send_state->channels_ready, 0); multifd_send_state->ops = multifd_ops[migrate_multifd_method()]; + atomic_set(&multifd_send_state->exiting, 0); for (i = 0; i < thread_count; i++) { MultiFDSendParams *p = &multifd_send_state->params[i];