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=-8.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,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 B5C10C32751 for ; Wed, 7 Aug 2019 17:13:13 +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 86F4A21EF2 for ; Wed, 7 Aug 2019 17:13:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 86F4A21EF2 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]:43698 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hvPUu-0002Oj-ND for qemu-devel@archiver.kernel.org; Wed, 07 Aug 2019 13:13:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52459) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hvPUW-0001ys-LP for qemu-devel@nongnu.org; Wed, 07 Aug 2019 13:12:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hvPUV-0003EV-Fa for qemu-devel@nongnu.org; Wed, 07 Aug 2019 13:12:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60698) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hvPUV-0003D2-7c for qemu-devel@nongnu.org; Wed, 07 Aug 2019 13:12:47 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5ED3E3C92D; Wed, 7 Aug 2019 17:12:46 +0000 (UTC) Received: from work-vm (ovpn-117-204.ams2.redhat.com [10.36.117.204]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2B69860BE0; Wed, 7 Aug 2019 17:12:45 +0000 (UTC) Date: Wed, 7 Aug 2019 18:12:42 +0100 From: "Dr. David Alan Gilbert" To: Marcel Apfelbaum Message-ID: <20190807171242.GB27871@work-vm> References: <20190705010711.23277-1-marcel.apfelbaum@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190705010711.23277-1-marcel.apfelbaum@gmail.com> User-Agent: Mutt/1.12.1 (2019-06-15) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Wed, 07 Aug 2019 17:12:46 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: Re: [Qemu-devel] [PATCH] hw/net: fix vmxnet3 live migration 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: skrtbhtngr@gmail.com, dmitry.fleytman@gmail.com, qemu-devel@nongnu.org, yuval.shaia@oracle.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" * Marcel Apfelbaum (marcel.apfelbaum@gmail.com) wrote: > At some point vmxnet3 live migration stopped working and git-bisect > didn't help finding a working version. > The issue is the PCI configuration space is not being migrated > successfully and MSIX remains masked at destination. > > Remove the migration differentiation between PCI and PCIe since > the logic resides now inside VMSTATE_PCI_DEVICE. > Remove also the VMXNET3_COMPAT_FLAG_DISABLE_PCIE based differentiation > since at 'realize' time is decided if the device is PCI or PCIe, > then the above macro is enough. > > Use the opportunity to move to the standard VMSTATE_MSIX > instead of the deprecated SaveVMHandlers. > > Signed-off-by: Marcel Apfelbaum Queued > --- > hw/net/vmxnet3.c | 52 ++---------------------------------------------- > 1 file changed, 2 insertions(+), 50 deletions(-) > > diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c > index 10d01d0058..8b17548b02 100644 > --- a/hw/net/vmxnet3.c > +++ b/hw/net/vmxnet3.c > @@ -2141,21 +2141,6 @@ vmxnet3_cleanup_msi(VMXNET3State *s) > msi_uninit(d); > } > > -static void > -vmxnet3_msix_save(QEMUFile *f, void *opaque) > -{ > - PCIDevice *d = PCI_DEVICE(opaque); > - msix_save(d, f); > -} > - > -static int > -vmxnet3_msix_load(QEMUFile *f, void *opaque, int version_id) > -{ > - PCIDevice *d = PCI_DEVICE(opaque); > - msix_load(d, f); > - return 0; > -} > - > static const MemoryRegionOps b0_ops = { > .read = vmxnet3_io_bar0_read, > .write = vmxnet3_io_bar0_write, > @@ -2176,11 +2161,6 @@ static const MemoryRegionOps b1_ops = { > }, > }; > > -static SaveVMHandlers savevm_vmxnet3_msix = { > - .save_state = vmxnet3_msix_save, > - .load_state = vmxnet3_msix_load, > -}; > - > static uint64_t vmxnet3_device_serial_num(VMXNET3State *s) > { > uint64_t dsn_payload; > @@ -2203,7 +2183,6 @@ static uint64_t vmxnet3_device_serial_num(VMXNET3State *s) > > static void vmxnet3_pci_realize(PCIDevice *pci_dev, Error **errp) > { > - DeviceState *dev = DEVICE(pci_dev); > VMXNET3State *s = VMXNET3(pci_dev); > int ret; > > @@ -2249,8 +2228,6 @@ static void vmxnet3_pci_realize(PCIDevice *pci_dev, Error **errp) > pcie_dev_ser_num_init(pci_dev, VMXNET3_DSN_OFFSET, > vmxnet3_device_serial_num(s)); > } > - > - register_savevm_live(dev, "vmxnet3-msix", -1, 1, &savevm_vmxnet3_msix, s); > } > > static void vmxnet3_instance_init(Object *obj) > @@ -2440,29 +2417,6 @@ static const VMStateDescription vmstate_vmxnet3_int_state = { > } > }; > > -static bool vmxnet3_vmstate_need_pcie_device(void *opaque) > -{ > - VMXNET3State *s = VMXNET3(opaque); > - > - return !(s->compat_flags & VMXNET3_COMPAT_FLAG_DISABLE_PCIE); > -} > - > -static bool vmxnet3_vmstate_test_pci_device(void *opaque, int version_id) > -{ > - return !vmxnet3_vmstate_need_pcie_device(opaque); > -} > - > -static const VMStateDescription vmstate_vmxnet3_pcie_device = { > - .name = "vmxnet3/pcie", > - .version_id = 1, > - .minimum_version_id = 1, > - .needed = vmxnet3_vmstate_need_pcie_device, > - .fields = (VMStateField[]) { > - VMSTATE_PCI_DEVICE(parent_obj, VMXNET3State), > - VMSTATE_END_OF_LIST() > - } > -}; > - > static const VMStateDescription vmstate_vmxnet3 = { > .name = "vmxnet3", > .version_id = 1, > @@ -2470,9 +2424,8 @@ static const VMStateDescription vmstate_vmxnet3 = { > .pre_save = vmxnet3_pre_save, > .post_load = vmxnet3_post_load, > .fields = (VMStateField[]) { > - VMSTATE_STRUCT_TEST(parent_obj, VMXNET3State, > - vmxnet3_vmstate_test_pci_device, 0, > - vmstate_pci_device, PCIDevice), > + VMSTATE_PCI_DEVICE(parent_obj, VMXNET3State), > + VMSTATE_MSIX(parent_obj, VMXNET3State), > VMSTATE_BOOL(rx_packets_compound, VMXNET3State), > VMSTATE_BOOL(rx_vlan_stripping, VMXNET3State), > VMSTATE_BOOL(lro_supported, VMXNET3State), > @@ -2508,7 +2461,6 @@ static const VMStateDescription vmstate_vmxnet3 = { > }, > .subsections = (const VMStateDescription*[]) { > &vmxstate_vmxnet3_mcast_list, > - &vmstate_vmxnet3_pcie_device, > NULL > } > }; > -- > 2.17.1 > > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK