From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 91DBEC5475B for ; Mon, 11 Mar 2024 18:12:30 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rjk8N-0002Dh-To; Mon, 11 Mar 2024 14:12:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rjk8M-0002DK-Dq for qemu-devel@nongnu.org; Mon, 11 Mar 2024 14:12:22 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rjk8K-0005Hp-2a for qemu-devel@nongnu.org; Mon, 11 Mar 2024 14:12:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1710180738; 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=wGcE3QFdqy73nkafCGtJ2aT4/+FvITZrbH0F+dr2Jbo=; b=hhk0uae5frZoOspJFXOvyZbzAPRSGNejFhKG1SbwLtWrLBdvNMhqawm0DMF15OhB7A+VpP 3BQLAAgNKv8TVjWi700tqIaE9v6y0YX5vNUkpcKD8sd2k6aSBZfz/zZaPSgkQAhLC7Fa2T 6Ed/J2r5WcwzosPLmBr8EvXRfvzN6fo= Received: from mail-io1-f70.google.com (mail-io1-f70.google.com [209.85.166.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-186-Abz4YF3CPLGo0c4t_nt0EQ-1; Mon, 11 Mar 2024 14:12:16 -0400 X-MC-Unique: Abz4YF3CPLGo0c4t_nt0EQ-1 Received: by mail-io1-f70.google.com with SMTP id ca18e2360f4ac-7c8ad16544fso109579239f.2 for ; Mon, 11 Mar 2024 11:12:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710180735; x=1710785535; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=wGcE3QFdqy73nkafCGtJ2aT4/+FvITZrbH0F+dr2Jbo=; b=RXblp/SLajrs/RSyIqSSnUL3D6KKVeIrv2i4Vccq14DX+n0t01+o+aftgk414GtzWz D+/z0Oi76wyq8tYLJY8qdOdLdxGla1YEnmQBjTbdXbPD9wN11GdsjQqDTOZ+eWbmxBR8 +2P5e0JE96fSj9WrTkD+Eo+JBBqYzb1cyeWOKehcS/zbEmA75Ka6rqzPTicnXlcqWDtt w7GRpji23VQSLQm4hKKYwHqCM4w5je2L3idh7orSUG+qE+qzBajzgCTTFvTYsBD2d5ng haI1y7gHO/vVDb0wWsPlPu1WTXft9/kdMivHc7MWOTkgLp+Hc7EQl+V1968dWDcB+AwN ntQg== X-Forwarded-Encrypted: i=1; AJvYcCXla02IA5Z1HXZ5US9ICpruBuO96vdpQ6Bkjyf5DnG31Y9LILDYUUlFJOZqoHWNirpyN8zFK167ZxQKTr7cU2WUfBsEBTc= X-Gm-Message-State: AOJu0YxoeJg1RzkJp5rUn9P/qPEkGy75BKiYqUu9GiYFpnGtybeg/3tU K01HN4jShSkEsu0RKS2J7Ku4oGd+mZq2yaijgTHWNx/VeAGvaI/uOqH+FvJZYT51m6pEaAX7iBE HSqv+DAQkbdNK72hj9U5DXhD9cBz69byOhW0pHf6gMdwn/it/MRo9 X-Received: by 2002:a5d:9398:0:b0:7c8:c5ab:f97d with SMTP id c24-20020a5d9398000000b007c8c5abf97dmr1576674iol.20.1710180735351; Mon, 11 Mar 2024 11:12:15 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFdrqhJrIv7fnTGuR6FY/yc8LuA2CHtEv6PS4ImNaDNvzeLMk2NVGhw70KXxS+IgLg9x6Zluw== X-Received: by 2002:a5d:9398:0:b0:7c8:c5ab:f97d with SMTP id c24-20020a5d9398000000b007c8c5abf97dmr1576651iol.20.1710180734952; Mon, 11 Mar 2024 11:12:14 -0700 (PDT) Received: from ?IPV6:2a01:e0a:280:24f0:9db0:474c:ff43:9f5c? ([2a01:e0a:280:24f0:9db0:474c:ff43:9f5c]) by smtp.gmail.com with ESMTPSA id r26-20020a6bd91a000000b007c8b3171883sm1109241ioc.51.2024.03.11.11.12.13 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 11 Mar 2024 11:12:14 -0700 (PDT) Message-ID: <74d722a9-ad04-4501-ba79-7d1a7029963d@redhat.com> Date: Mon, 11 Mar 2024 19:12:11 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v4 10/25] migration: Add Error** argument to qemu_savevm_state_setup() Content-Language: en-US, fr To: Peter Xu Cc: Laurent Vivier , qemu-devel@nongnu.org, Fabiano Rosas , Alex Williamson , Avihai Horon , =?UTF-8?Q?Philippe_Mathieu-Daud=C3=A9?= , Markus Armbruster , Prasad Pandit References: <20240306133441.2351700-1-clg@redhat.com> <20240306133441.2351700-11-clg@redhat.com> <9772e612-6ecc-4a8f-aae8-86884397f39d@redhat.com> From: =?UTF-8?Q?C=C3=A9dric_Le_Goater?= In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=170.10.133.124; envelope-from=clg@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.029, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On 3/8/24 15:17, Peter Xu wrote: > On Fri, Mar 08, 2024 at 02:55:30PM +0100, Cédric Le Goater wrote: >> On 3/8/24 14:39, Cédric Le Goater wrote: >>> On 3/8/24 14:14, Cédric Le Goater wrote: >>>> On 3/8/24 13:56, Peter Xu wrote: >>>>> On Wed, Mar 06, 2024 at 02:34:25PM +0100, Cédric Le Goater wrote: >>>>>> This prepares ground for the changes coming next which add an Error** >>>>>> argument to the .save_setup() handler. Callers of qemu_savevm_state_setup() >>>>>> now handle the error and fail earlier setting the migration state from >>>>>> MIGRATION_STATUS_SETUP to MIGRATION_STATUS_FAILED. >>>>>> >>>>>> In qemu_savevm_state(), move the cleanup to preserve the error >>>>>> reported by .save_setup() handlers. >>>>>> >>>>>> Since the previous behavior was to ignore errors at this step of >>>>>> migration, this change should be examined closely to check that >>>>>> cleanups are still correctly done. >>>>>> >>>>>> Signed-off-by: Cédric Le Goater >>>>>> --- >>>>>> >>>>>>   Changes in v4: >>>>>>   - Merged cleanup change in qemu_savevm_state() >>>>>>   Changes in v3: >>>>>>   - Set migration state to MIGRATION_STATUS_FAILED >>>>>>   - Fixed error handling to be done under lock in bg_migration_thread() >>>>>>   - Made sure an error is always set in case of failure in >>>>>>     qemu_savevm_state_setup() >>>>>>   migration/savevm.h    |  2 +- >>>>>>   migration/migration.c | 27 ++++++++++++++++++++++++--- >>>>>>   migration/savevm.c    | 26 +++++++++++++++----------- >>>>>>   3 files changed, 40 insertions(+), 15 deletions(-) >>>>>> >>>>>> diff --git a/migration/savevm.h b/migration/savevm.h >>>>>> index 74669733dd63a080b765866c703234a5c4939223..9ec96a995c93a42aad621595f0ed58596c532328 100644 >>>>>> --- a/migration/savevm.h >>>>>> +++ b/migration/savevm.h >>>>>> @@ -32,7 +32,7 @@ >>>>>>   bool qemu_savevm_state_blocked(Error **errp); >>>>>>   void qemu_savevm_non_migratable_list(strList **reasons); >>>>>>   int qemu_savevm_state_prepare(Error **errp); >>>>>> -void qemu_savevm_state_setup(QEMUFile *f); >>>>>> +int qemu_savevm_state_setup(QEMUFile *f, Error **errp); >>>>>>   bool qemu_savevm_state_guest_unplug_pending(void); >>>>>>   int qemu_savevm_state_resume_prepare(MigrationState *s); >>>>>>   void qemu_savevm_state_header(QEMUFile *f); >>>>>> diff --git a/migration/migration.c b/migration/migration.c >>>>>> index a49fcd53ee19df1ce0182bc99d7e064968f0317b..6d1544224e96f5edfe56939a9c8395d88ef29581 100644 >>>>>> --- a/migration/migration.c >>>>>> +++ b/migration/migration.c >>>>>> @@ -3408,6 +3408,8 @@ static void *migration_thread(void *opaque) >>>>>>       int64_t setup_start = qemu_clock_get_ms(QEMU_CLOCK_HOST); >>>>>>       MigThrError thr_error; >>>>>>       bool urgent = false; >>>>>> +    Error *local_err = NULL; >>>>>> +    int ret; >>>>>>       thread = migration_threads_add("live_migration", qemu_get_thread_id()); >>>>>> @@ -3451,9 +3453,17 @@ static void *migration_thread(void *opaque) >>>>>>       } >>>>>>       bql_lock(); >>>>>> -    qemu_savevm_state_setup(s->to_dst_file); >>>>>> +    ret = qemu_savevm_state_setup(s->to_dst_file, &local_err); >>>>>>       bql_unlock(); >>>>>> +    if (ret) { >>>>>> +        migrate_set_error(s, local_err); >>>>>> +        error_free(local_err); >>>>>> +        migrate_set_state(&s->state, MIGRATION_STATUS_SETUP, >>>>>> +                          MIGRATION_STATUS_FAILED); >>>>>> +        goto out; >>>>>> +     } >>>>> >>>>> There's a small indent issue, I can fix it. >>>> >>>> checkpatch did report anything. >>>> >>>>> >>>>> The bigger problem is I _think_ this will trigger a ci failure in the >>>>> virtio-net-failover test: >>>>> >>>>> ▶ 121/464 ERROR:../tests/qtest/virtio-net-failover.c:1203:test_migrate_abort_wait_unplug: assertion failed (status == "cancelling"): ("cancelled" == "cancelling") ERROR >>>>> 121/464 qemu:qtest+qtest-x86_64 / qtest-x86_64/virtio-net-failover    ERROR            4.77s   killed by signal 6 SIGABRT >>>>>>>> PYTHON=/builds/peterx/qemu/build/pyvenv/bin/python3.8 G_TEST_DBUS_DAEMON=/builds/peterx/qemu/tests/dbus-vmstate-daemon.sh MALLOC_PERTURB_=161 QTEST_QEMU_IMG=./qemu-img QTEST_QEMU_STORAGE_DAEMON_BINARY=./storage-daemon/qemu-storage-daemon QTEST_QEMU_BINARY=./qemu-system-x86_64 /builds/peterx/qemu/build/tests/qtest/virtio-net-failover --tap -k >>>>> ――――――――――――――――――――――――――――――――――――― ✀  ――――――――――――――――――――――――――――――――――――― >>>>> stderr: >>>>> qemu-system-x86_64: ram_save_setup failed: Input/output error >>>>> ** >>>>> ERROR:../tests/qtest/virtio-net-failover.c:1203:test_migrate_abort_wait_unplug: assertion failed (status == "cancelling"): ("cancelled" == "cancelling") >>>>> (test program exited with status code -6) >>>>> ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― >>>>> >>>>> I am not familiar enough with the failover code, and may not have time >>>>> today to follow this up, copy Laurent.  Cedric, if you have time, please >>>>> have a look. >>>> >>>> >>>> Sure. Weird because I usually run make check on x86_64, s390x, ppc64 and >>>> aarch64. Let me check again. >>> >>> I see one timeout error on s390x but not always. See below. It occurs with >>> or without this patchset. the other x86_64, ppc64 arches run fine (a part >>> from one io  test failing from time to time) >> >> Ah ! I got this once on aarch64 : >> >> 161/486 ERROR:../tests/qtest/virtio-net-failover.c:1222:test_migrate_abort_wait_unplug: 'device' should not be NULL ERROR >> 161/486 qemu:qtest+qtest-x86_64 / qtest-x86_64/virtio-net-failover ERROR 5.98s killed by signal 6 SIGABRT >>>>> G_TEST_DBUS_DAEMON=/home/legoater/work/qemu/qemu.git/tests/dbus-vmstate-daemon.sh MALLOC_PERTURB_=119 QTEST_QEMU_BINARY=./qemu-system-x86_64 QTEST_QEMU_IMG=./qemu-img PYTHON=/home/legoater/work/qemu/qemu.git/build/pyvenv/bin/python3 QTEST_QEMU_STORAGE_DAEMON_BINARY=./storage-daemon/qemu-storage-daemon /home/legoater/work/qemu/qemu.git/build/tests/qtest/virtio-net-failover --tap -k >> ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― ✀ ――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― >> stderr: >> qemu-system-x86_64: ram_save_setup failed: Input/output error >> ** >> ERROR:../tests/qtest/virtio-net-failover.c:1222:test_migrate_abort_wait_unplug: 'device' should not be NULL >> >> (test program exited with status code -6) >> ――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― > > Hmm, this one seems different.. > >> >> I couldn't reproduce yet :/ > > I never reproduced it locally on x86, and my failure is always at checking > "cancelling" v.s. "cancelled" rather than the NULL check. It's much easier > to trigger on CI in check-system-centos (I don't know why centos..): > > https://gitlab.com/peterx/qemu/-/jobs/6351020546 > > I think at least for the error I hit, the problem is the failover test will > cancel the migration, but if it cancels too fast and during setup now it > can already fail it (while it won't fail before when we ignore > qemu_savevm_state_setup() errors), and I think it'll skip: > > qemu_savevm_wait_unplug(s, MIGRATION_STATUS_SETUP, > MIGRATION_STATUS_ACTIVE); > > It seems the test wants the "cancelling" to hold until later: > > /* while the card is not ejected, we must be in "cancelling" state */ > ret = migrate_status(qts); > > status = qdict_get_str(ret, "status"); > g_assert_cmpstr(status, ==, "cancelling"); > qobject_unref(ret); > > /* OS unplugs the cards, QEMU can move from wait-unplug state */ > qtest_outl(qts, ACPI_PCIHP_ADDR_ICH9 + PCI_EJ_BASE, 1); > > Again, since I'll need to read the failover code, not much I can tell. > Laurent might have a clue. I guess we need to fix the test to handle failures and this looks like a complex task. C.