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.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, 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 3C258C606C7 for ; Mon, 8 Jul 2019 18:50:01 +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 0FC142086D for ; Mon, 8 Jul 2019 18:50:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="XqRcxjlO" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0FC142086D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:43940 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkYi8-00081F-8P for qemu-devel@archiver.kernel.org; Mon, 08 Jul 2019 14:50:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54481) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkYg5-00079G-6i for qemu-devel@nongnu.org; Mon, 08 Jul 2019 14:47:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hkYg0-00005q-QP for qemu-devel@nongnu.org; Mon, 08 Jul 2019 14:47:51 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:34788) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hkYfx-0008Fn-5N for qemu-devel@nongnu.org; Mon, 08 Jul 2019 14:47:46 -0400 Received: by mail-wm1-x342.google.com with SMTP id w9so646043wmd.1 for ; Mon, 08 Jul 2019 11:47:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding:content-language; bh=YCIv1whswcl9y1jZV8PWG62hVjY7KfMM30SH+nNvvso=; b=XqRcxjlO9jV/jo1mwCx6dls5f1fMp4xGRreYpzzfjLtqlvhVl0DM+PAo2ZBVWZ1ASF mxylhjbtNdU9er9IWtGdHwFD1e6GSDy7SJ61aK+NjOxrv3RLRDKFhwd+NWrrIFFDsFSs RuP2vOSE3BWEf2en1P4EoeAUHsYcKYmDeSyDAQxX+d79NG3pCQFng/3IM8ashchoqL08 biuIoNtZ9A6jzIpMwb+83W269lik5e/X1uaOUpz6+bqsmZMDTBVcmHkMbtTwdbjkFAZx 8EIQyZrdHZWQqr56MYNZhi7vLNbDMAQ6MOwd5444eHXKxMRohi3KyMkLO5qvY01D4x3z tbcQ== 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-transfer-encoding :content-language; bh=YCIv1whswcl9y1jZV8PWG62hVjY7KfMM30SH+nNvvso=; b=Pc2IEy/fhHjjyaXZ2/KYChK8w//xi3x/j3UiSVy9NgM5/pUarjuD6FpQMzu8XEI4an HEtxW07MyU4I0avtTNnyrsion8FJYtF3BDngpbPIoqcD12IWR5L9WnQRKCqkP4mxYULR KgD12cu78X7wz5LMs1ELq61DLZDmXPZ5m4ipd8jGeOuPMCsdArN3kaBr4zDYg/wdKZ7H un3vrTir2AmDPJCzCTa0GPd+8qQoaZqMPixRvdkiIFk2Xga03Cf55gq7Xx+B3nYQqsGO apqK84ETuxNC6R+fwyKOC9eYfQQDf+BIdobzRMBzACESperBRUR0rK+YMuYfgnX18yL8 QiRQ== X-Gm-Message-State: APjAAAXh3305NRkQhqtS5lzuq4jD1ud8JH1RUlj6ez6Cq2jAV7+v8eri cnxzd0DlnUzta6NCzO3ttqQ= X-Google-Smtp-Source: APXvYqwMifVeY6PCcNCLUrnVKs0vdfonLFxVpaHoleQRm9yMz6snaV2YKm7sFgujyNWgsL1cSEvWYA== X-Received: by 2002:a1c:1f06:: with SMTP id f6mr18516539wmf.60.1562611631026; Mon, 08 Jul 2019 11:47:11 -0700 (PDT) Received: from localhost.localdomain ([37.142.144.12]) by smtp.gmail.com with ESMTPSA id o6sm33474533wra.27.2019.07.08.11.47.09 (version=TLS1_3 cipher=AEAD-AES128-GCM-SHA256 bits=128/128); Mon, 08 Jul 2019 11:47:10 -0700 (PDT) To: "Dr. David Alan Gilbert" References: <20190705010711.23277-1-marcel.apfelbaum@gmail.com> <03CB6DEC-3D25-4C09-9C9C-3A5206D1D1F7@gmail.com> <49bb8456-a4b1-5a0e-e34d-cf5977e821ae@gmail.com> <20190708160320.GM2746@work-vm> From: Marcel Apfelbaum Message-ID: Date: Mon, 8 Jul 2019 21:47:24 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <20190708160320.GM2746@work-vm> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 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: Sukrit Bhatnagar , Dmitry Fleytman , qemu-devel@nongnu.org, Yuval Shaia Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 7/8/19 7:03 PM, Dr. David Alan Gilbert wrote: > * Marcel Apfelbaum (marcel.apfelbaum@gmail.com) wrote: >> >> On 7/5/19 2:14 PM, Sukrit Bhatnagar wrote: >>> On Fri, 5 Jul 2019 at 16:29, Dmitry Fleytman wrote: >>>>> On 5 Jul 2019, at 4:07, Marcel Apfelbaum 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 >>>> Reviewed-by: Dmitry Fleytman >>>> >>> Tested-by: Sukrit Bhatnagar >> Thanks for the fast testing and review! >> >> David, since the live migration was broken long before this patch, >> I don't need  to add any compatibility code, right? > Right, although we should probably bump the version_id field, that way > you'll get a nice clean error if you try and migrate from the old<->new. Will do, thanks. > (It's nice to get rid of the old msix oddity). > >> If so, can you merge it using your migration tree? > I could do; or since it's entirely in vmxnet3 Dmitry can take it. I'll ask him, thanks! Marcel > > Dave > >> Thanks, >> Marcel >> >> >>>>> --- >>>>> 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