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 X-Spam-Level: X-Spam-Status: No, score=-15.2 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D17DEC07E9B for ; Wed, 21 Jul 2021 11:24:03 +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 56C9060FF3 for ; Wed, 21 Jul 2021 11:24:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 56C9060FF3 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+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:33858 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m6AKY-0004lI-EG for qemu-devel@archiver.kernel.org; Wed, 21 Jul 2021 07:24:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35002) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m6AJW-0003y5-J3 for qemu-devel@nongnu.org; Wed, 21 Jul 2021 07:22:59 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:30486) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m6AJT-0000Ya-Fs for qemu-devel@nongnu.org; Wed, 21 Jul 2021 07:22:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626866573; 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=6hffvfxEYWz3wKOVYgL4rwZWglk3WFTHX9WrkPBQXAs=; b=djlI72LZ+c4Q5fIhBJ7PY59w3FBzPLQlGsqhFEAAlh43QH5VV6MnhxBbKNqTi2KGp966qa N1/93Z9uF92IktJ1Lnj7sOuAAc/JHFDBbA9flzEh6WA3kvh77i3doHYgaY+p5/2BJLGBo1 m2g/7P5KENI23jJgsLqMKDJ/QpSILU0= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-487-IcbEAxM-NhqZ0hkaOtPa-g-1; Wed, 21 Jul 2021 07:22:52 -0400 X-MC-Unique: IcbEAxM-NhqZ0hkaOtPa-g-1 Received: by mail-wr1-f70.google.com with SMTP id 5-20020a0560001565b029013fe432d176so862407wrz.23 for ; Wed, 21 Jul 2021 04:22:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=6hffvfxEYWz3wKOVYgL4rwZWglk3WFTHX9WrkPBQXAs=; b=CTLLY6aVLTpbFt6Zji5AB+ck3+QOG/VkzSBZveSur0gX0u8rpMkTJ2+FAy0tXybRqV OCG3VW/+0r7gepVE+mf028zE47baJcP5NETDyAoCxAGYnlSi2AdmIZOlzoUMVti9Tu7v 8QWIAdz4+MiVAWcPB8PkB0/iMgLytRIneIH5Y/ZzYa0LxSBNAjGMlFopGnagYPB5rPES PTtliR4mHlv1LU6x20IOg1WyEvBWw2txU/YxP1rulA3/+0RQgz2JTToJfE7e0FV0sPwn PEymkyxYA7eDmYBSRTpzARd4A1+Zog61PU+EiLqbOxkmzeJYl3fAs7nSozmE4F5wAiFp mz/Q== X-Gm-Message-State: AOAM531On+xghBK4wkczpBj+dOxsjgQTYm+gJZMe+mIwF13T3elqswd1 N2+dgrkyFYlk5e1ppRUciVIPon/NjVtsYQpGEn6e3YWEnBl1O9ay2greAU+PTD6zM1uoKz6jJI7 iBW9HVbtHq/Ah0b4= X-Received: by 2002:a05:6000:1841:: with SMTP id c1mr40715247wri.423.1626866571355; Wed, 21 Jul 2021 04:22:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz+EEphdvJ2G3jDliEaJvqKaqdWY6iVrUvB3BJz58gOxzBpGnoRby07g+6XHngv+LJgJHGH/A== X-Received: by 2002:a05:6000:1841:: with SMTP id c1mr40715221wri.423.1626866571125; Wed, 21 Jul 2021 04:22:51 -0700 (PDT) Received: from [192.168.100.42] ([82.142.17.146]) by smtp.gmail.com with ESMTPSA id p5sm29127786wrd.25.2021.07.21.04.22.49 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 21 Jul 2021 04:22:50 -0700 (PDT) Subject: Re: [PATCH v3] failover: unregister ROM on unplug To: "Dr. David Alan Gilbert" References: <20210721093955.225759-1-lvivier@redhat.com> From: Laurent Vivier Message-ID: Date: Wed, 21 Jul 2021 13:22:48 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=lvivier@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=216.205.24.124; envelope-from=lvivier@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.459, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.117, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Juan Quintela , Jason Wang , "Michael S. Tsirkin" , qemu-devel@nongnu.org, Igor Mammedov , Jens Freimann Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 21/07/2021 13:10, Dr. David Alan Gilbert wrote: > * Laurent Vivier (lvivier@redhat.com) wrote: >> The intend of failover is to allow to migrate a VM with a VFIO >> networking card without disrupting the network operation by switching >> to a virtio-net device during the migration. >> >> This simple change allows to test failover with a simulated device >> like e1000e rather than a vfio device, even if it's useless in real >> life it can help to debug failover. >> >> This is interesting to developers that want to test failover on >> a system with no vfio device. Moreover it simplifies host networking >> configuration as we can use the same bridge for virtio-net and >> the other failover networking device. >> >> Without this change the migration of a system configured with failover >> fails with: >> >> ... >> -device virtio-net-pci,id=virtionet0,failover=on,... \ >> -device e1000,failover_pair_id=virtionet0,... \ >> ... >> >> (qemu) migrate ... >> >> Unknown ramblock "0000:00:01.1:00.0/e1000e.rom", cannot accept migration >> error while loading state for instance 0x0 of device 'ram' >> load of migration failed: Invalid argument >> >> This happens because QEMU correctly unregisters the interface vmstate but >> not the ROM one. This patch fixes that. >> >> Signed-off-by: Laurent Vivier >> --- >> >> Notes: >> v3: >> remove useless space before comma >> >> v2: >> reset has_rom to false >> update commit log message >> >> hw/net/virtio-net.c | 4 ++++ >> 1 file changed, 4 insertions(+) >> >> diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c >> index 16d20cdee52a..c0c2ec1ebb98 100644 >> --- a/hw/net/virtio-net.c >> +++ b/hw/net/virtio-net.c >> @@ -3256,6 +3256,10 @@ static void virtio_net_handle_migration_primary(VirtIONet *n, MigrationState *s) >> if (migration_in_setup(s) && !should_be_hidden) { >> if (failover_unplug_primary(n, dev)) { >> vmstate_unregister(VMSTATE_IF(dev), qdev_get_vmsd(dev), dev); >> + if (PCI_DEVICE(dev)->has_rom) { >> + PCI_DEVICE(dev)->has_rom = false; >> + vmstate_unregister_ram(&PCI_DEVICE(dev)->rom, dev); >> + } > > Not actually originated by your fix, but.... > > Why doesn't failover_replug_primary re-add the vmstates? Good point. I'm going to check but I think the vmstates are re-added by the hotplug operations that are used in failover_replug_primary(). Thanks, Laurent