From nobody Sat May 18 23:44:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1637313109354429.91353416111383; Fri, 19 Nov 2021 01:11:49 -0800 (PST) Received: from localhost ([::1]:49138 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mnzvw-0006bm-3U for importer@patchew.org; Fri, 19 Nov 2021 04:11:48 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60604) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mnzsr-0003kt-2k for qemu-devel@nongnu.org; Fri, 19 Nov 2021 04:08:37 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:28232) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mnzso-0003pW-M0 for qemu-devel@nongnu.org; Fri, 19 Nov 2021 04:08:36 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-168-05VXKAU_NXmysdI5yKm4cA-1; Fri, 19 Nov 2021 04:08:30 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D750F804141; Fri, 19 Nov 2021 09:08:29 +0000 (UTC) Received: from thinkpad.redhat.com (unknown [10.39.194.176]) by smtp.corp.redhat.com (Postfix) with ESMTP id D35E562A41; Fri, 19 Nov 2021 09:07:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637312913; 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=7lCIBCzyW1VprGHqSSOJCGP/x8FvLGwEVaBdWdWlK9M=; b=GdCSjvzxR1RANzAEoiTivIkhsdt2yRmgTpvzsj9xiIcZLjcbfJGc1b9uIG0PmzMytnCDRj g0g9iKsg9bSpXjdYKgrf4k8ATVJAcNNYQ6o2iqNEru0oSjZ0gmCF9SMBYeA8ltobWPFBoZ fwJPWRXdCjnvFhWXMaUQfJcDnMaVZTs= X-MC-Unique: 05VXKAU_NXmysdI5yKm4cA-1 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PATCH v5 1/4] qtest/libqos: add a function to initialize secondary PCI buses Date: Fri, 19 Nov 2021 10:07:15 +0100 Message-Id: <20211119090718.440793-2-lvivier@redhat.com> In-Reply-To: <20211119090718.440793-1-lvivier@redhat.com> References: <20211119090718.440793-1-lvivier@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=lvivier@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.7, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Thomas Huth , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Juan Quintela , Michael Roth , "Michael S. Tsirkin" , Gerd Hoffmann , Igor Mammedov , Ani Sinha , Paolo Bonzini , Jens Freimann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1637313110769100001 Content-Type: text/plain; charset="utf-8" Scan the PCI devices to find bridge and set PCI_SECONDARY_BUS and PCI_SUBORDINATE_BUS (algorithm from seabios) Signed-off-by: Laurent Vivier Reviewed-by: Michael S. Tsirkin --- include/hw/pci/pci_bridge.h | 8 +++ tests/qtest/libqos/pci.c | 118 ++++++++++++++++++++++++++++++++++++ tests/qtest/libqos/pci.h | 1 + 3 files changed, 127 insertions(+) diff --git a/include/hw/pci/pci_bridge.h b/include/hw/pci/pci_bridge.h index a94d350034bf..30691a6e5728 100644 --- a/include/hw/pci/pci_bridge.h +++ b/include/hw/pci/pci_bridge.h @@ -138,6 +138,7 @@ typedef struct PCIBridgeQemuCap { uint64_t mem_pref_64; /* Prefetchable memory to reserve (64-bit MMIO) = */ } PCIBridgeQemuCap; =20 +#define REDHAT_PCI_CAP_TYPE_OFFSET 3 #define REDHAT_PCI_CAP_RESOURCE_RESERVE 1 =20 /* @@ -152,6 +153,13 @@ typedef struct PCIResReserve { uint64_t mem_pref_64; } PCIResReserve; =20 +#define REDHAT_PCI_CAP_RES_RESERVE_BUS_RES 4 +#define REDHAT_PCI_CAP_RES_RESERVE_IO 8 +#define REDHAT_PCI_CAP_RES_RESERVE_MEM 16 +#define REDHAT_PCI_CAP_RES_RESERVE_PREF_MEM_32 20 +#define REDHAT_PCI_CAP_RES_RESERVE_PREF_MEM_64 24 +#define REDHAT_PCI_CAP_RES_RESERVE_CAP_SIZE 32 + int pci_bridge_qemu_reserve_cap_init(PCIDevice *dev, int cap_offset, PCIResReserve res_reserve, Error **errp); =20 diff --git a/tests/qtest/libqos/pci.c b/tests/qtest/libqos/pci.c index e1e96189c821..3f0b18f4750b 100644 --- a/tests/qtest/libqos/pci.c +++ b/tests/qtest/libqos/pci.c @@ -13,6 +13,8 @@ #include "qemu/osdep.h" #include "pci.h" =20 +#include "hw/pci/pci.h" +#include "hw/pci/pci_bridge.h" #include "hw/pci/pci_regs.h" #include "qemu/host-utils.h" #include "qgraph.h" @@ -99,6 +101,122 @@ void qpci_device_init(QPCIDevice *dev, QPCIBus *bus, Q= PCIAddress *addr) g_assert(!addr->device_id || device_id =3D=3D addr->device_id); } =20 +static uint8_t qpci_find_resource_reserve_capability(QPCIDevice *dev) +{ + uint16_t device_id; + uint8_t cap =3D 0; + + if (qpci_config_readw(dev, PCI_VENDOR_ID) !=3D PCI_VENDOR_ID_REDHAT) { + return 0; + } + + device_id =3D qpci_config_readw(dev, PCI_DEVICE_ID); + + if (device_id !=3D PCI_DEVICE_ID_REDHAT_PCIE_RP && + device_id !=3D PCI_DEVICE_ID_REDHAT_BRIDGE) { + return 0; + } + + do { + cap =3D qpci_find_capability(dev, PCI_CAP_ID_VNDR, cap); + } while (cap && + qpci_config_readb(dev, cap + REDHAT_PCI_CAP_TYPE_OFFSET) !=3D + REDHAT_PCI_CAP_RESOURCE_RESERVE); + if (cap) { + uint8_t cap_len =3D qpci_config_readb(dev, cap + PCI_CAP_FLAGS); + if (cap_len < REDHAT_PCI_CAP_RES_RESERVE_CAP_SIZE) { + return 0; + } + } + return cap; +} + +static void qpci_secondary_buses_rec(QPCIBus *qbus, int bus, int *pci_bus) +{ + QPCIDevice *dev; + uint16_t class; + uint8_t pribus, secbus, subbus; + int i; + + for (i =3D 0; i < 32; i++) { + dev =3D qpci_device_find(qbus, QPCI_DEVFN(bus + i, 0)); + if (dev =3D=3D NULL) { + continue; + } + class =3D qpci_config_readw(dev, PCI_CLASS_DEVICE); + if (class =3D=3D PCI_CLASS_BRIDGE_PCI) { + qpci_config_writeb(dev, PCI_SECONDARY_BUS, 255); + qpci_config_writeb(dev, PCI_SUBORDINATE_BUS, 0); + } + g_free(dev); + } + + for (i =3D 0; i < 32; i++) { + dev =3D qpci_device_find(qbus, QPCI_DEVFN(bus + i, 0)); + if (dev =3D=3D NULL) { + continue; + } + class =3D qpci_config_readw(dev, PCI_CLASS_DEVICE); + if (class !=3D PCI_CLASS_BRIDGE_PCI) { + continue; + } + + pribus =3D qpci_config_readb(dev, PCI_PRIMARY_BUS); + if (pribus !=3D bus) { + qpci_config_writeb(dev, PCI_PRIMARY_BUS, bus); + } + + secbus =3D qpci_config_readb(dev, PCI_SECONDARY_BUS); + (*pci_bus)++; + if (*pci_bus !=3D secbus) { + secbus =3D *pci_bus; + qpci_config_writeb(dev, PCI_SECONDARY_BUS, secbus); + } + + subbus =3D qpci_config_readb(dev, PCI_SUBORDINATE_BUS); + qpci_config_writeb(dev, PCI_SUBORDINATE_BUS, 255); + + qpci_secondary_buses_rec(qbus, secbus << 5, pci_bus); + + if (subbus !=3D *pci_bus) { + uint8_t res_bus =3D *pci_bus; + uint8_t cap =3D qpci_find_resource_reserve_capability(dev); + + if (cap) { + uint32_t tmp_res_bus; + + tmp_res_bus =3D qpci_config_readl(dev, cap + + REDHAT_PCI_CAP_RES_RESERVE_BUS= _RES); + if (tmp_res_bus !=3D (uint32_t)-1) { + res_bus =3D tmp_res_bus & 0xFF; + if ((uint8_t)(res_bus + secbus) < secbus || + (uint8_t)(res_bus + secbus) < res_bus) { + res_bus =3D 0; + } + if (secbus + res_bus > *pci_bus) { + res_bus =3D secbus + res_bus; + } + } + } + subbus =3D res_bus; + *pci_bus =3D res_bus; + } + + qpci_config_writeb(dev, PCI_SUBORDINATE_BUS, subbus); + g_free(dev); + } +} + +int qpci_secondary_buses_init(QPCIBus *bus) +{ + int last_bus =3D 0; + + qpci_secondary_buses_rec(bus, 0, &last_bus); + + return last_bus; +} + + void qpci_device_enable(QPCIDevice *dev) { uint16_t cmd; diff --git a/tests/qtest/libqos/pci.h b/tests/qtest/libqos/pci.h index ee64fdecbda8..becb800f9e6a 100644 --- a/tests/qtest/libqos/pci.h +++ b/tests/qtest/libqos/pci.h @@ -81,6 +81,7 @@ void qpci_device_foreach(QPCIBus *bus, int vendor_id, int= device_id, void *data); QPCIDevice *qpci_device_find(QPCIBus *bus, int devfn); void qpci_device_init(QPCIDevice *dev, QPCIBus *bus, QPCIAddress *addr); +int qpci_secondary_buses_init(QPCIBus *bus); =20 bool qpci_has_buggy_msi(QPCIDevice *dev); bool qpci_check_buggy_msi(QPCIDevice *dev); --=20 2.33.1 From nobody Sat May 18 23:44:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1637313124626494.84260066038223; Fri, 19 Nov 2021 01:12:04 -0800 (PST) Received: from localhost ([::1]:49416 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mnzwB-0006n1-BE for importer@patchew.org; Fri, 19 Nov 2021 04:12:03 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60656) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mnzt6-0003wQ-Lc for qemu-devel@nongnu.org; Fri, 19 Nov 2021 04:08:52 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:51336) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mnzt3-0003ql-0I for qemu-devel@nongnu.org; Fri, 19 Nov 2021 04:08:51 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-247-7sL3Lb8bPxO9vXuyHbWJag-1; Fri, 19 Nov 2021 04:08:45 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 24B959F92C; Fri, 19 Nov 2021 09:08:44 +0000 (UTC) Received: from thinkpad.redhat.com (unknown [10.39.194.176]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3C1CF5D740; Fri, 19 Nov 2021 09:08:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637312928; 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=Kc5pSclgFT7YdC90QWBPadBEcEoE0BMXLDuHaXzsrX8=; b=dVoRHLDzkr3YWOhE9QyuN3/v7SQhEjJ14F5W68aVECIK3wEhoFvcEq/KpDiYLOYNixbxfL WhDDuiEaJ7EQ8mDTyY97gCbeN3nr58SdRK4o/nKMt0xn8GG1SctK8AL3wKmwhY1tDHMkeC gYWatURaJYjWyUDBo8kZGshLKu/IzFg= X-MC-Unique: 7sL3Lb8bPxO9vXuyHbWJag-1 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PATCH v5 2/4] tests/qtest: add some tests for virtio-net failover Date: Fri, 19 Nov 2021 10:07:16 +0100 Message-Id: <20211119090718.440793-3-lvivier@redhat.com> In-Reply-To: <20211119090718.440793-1-lvivier@redhat.com> References: <20211119090718.440793-1-lvivier@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=lvivier@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.7, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Thomas Huth , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Juan Quintela , Michael Roth , "Michael S. Tsirkin" , Gerd Hoffmann , Igor Mammedov , Ani Sinha , Paolo Bonzini , Jens Freimann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1637313125795100001 Content-Type: text/plain; charset="utf-8" Add test cases to test several error cases that must be generated by invalid failover configuration. Add a combination of coldplug and hotplug test cases to be sure the primary is correctly managed according the presence or not of the STANDBY feature. Signed-off-by: Laurent Vivier Reviewed-by: Michael S. Tsirkin --- tests/qtest/meson.build | 3 + tests/qtest/virtio-net-failover.c | 658 ++++++++++++++++++++++++++++++ 2 files changed, 661 insertions(+) create mode 100644 tests/qtest/virtio-net-failover.c diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index c9d8458062ff..6d66bf522156 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -22,6 +22,9 @@ qtests_generic =3D \ (config_all_devices.has_key('CONFIG_VIRTIO_SCSI') ? ['fuzz-virtio-scsi-t= est'] : []) + \ (config_all_devices.has_key('CONFIG_SB16') ? ['fuzz-sb16-test'] : []) + \ (config_all_devices.has_key('CONFIG_SDHCI_PCI') ? ['fuzz-sdcard-test'] := []) + \ + (config_all_devices.has_key('CONFIG_VIRTIO_NET') and \ + config_all_devices.has_key('CONFIG_Q35') and \ + config_all_devices.has_key('CONFIG_VIRTIO_PCI') ? ['virtio-net-failover= '] : []) + \ [ 'cdrom-test', 'device-introspect-test', diff --git a/tests/qtest/virtio-net-failover.c b/tests/qtest/virtio-net-fai= lover.c new file mode 100644 index 000000000000..11fa0b21f8bf --- /dev/null +++ b/tests/qtest/virtio-net-failover.c @@ -0,0 +1,658 @@ +#include "qemu/osdep.h" +#include "libqos/libqtest.h" +#include "libqos/pci.h" +#include "libqos/pci-pc.h" +#include "qapi/qmp/qdict.h" +#include "qapi/qmp/qlist.h" +#include "qapi/qmp/qjson.h" +#include "libqos/malloc-pc.h" +#include "libqos/virtio-pci.h" +#include "hw/pci/pci.h" + +#define ACPI_PCIHP_ADDR_ICH9 0x0cc0 +#define PCI_EJ_BASE 0x0008 + +#define BASE_MACHINE "-M q35 -nodefaults " \ + "-device pcie-root-port,id=3Droot0,addr=3D0x1,bus=3Dpcie.0,chassis=3D1= " \ + "-device pcie-root-port,id=3Droot1,addr=3D0x2,bus=3Dpcie.0,chassis=3D2= " + +#define MAC_PRIMARY "52:54:00:11:11:11" +#define MAC_STANDBY "52:54:00:22:22:22" + +static QGuestAllocator guest_malloc; +static QPCIBus *pcibus; + +static QTestState *machine_start(const char *args) +{ + QTestState *qts; + QPCIDevice *dev; + + qts =3D qtest_init(args); + + pc_alloc_init(&guest_malloc, qts, 0); + pcibus =3D qpci_new_pc(qts, &guest_malloc); + g_assert(qpci_secondary_buses_init(pcibus) =3D=3D 2); + + dev =3D qpci_device_find(pcibus, QPCI_DEVFN(1, 0)); /* root0 */ + g_assert_nonnull(dev); + + qpci_device_enable(dev); + qpci_iomap(dev, 4, NULL); + + g_free(dev); + + dev =3D qpci_device_find(pcibus, QPCI_DEVFN(2, 0)); /* root1 */ + g_assert_nonnull(dev); + + qpci_device_enable(dev); + qpci_iomap(dev, 4, NULL); + + g_free(dev); + + return qts; +} + +static void machine_stop(QTestState *qts) +{ + qpci_free_pc(pcibus); + alloc_destroy(&guest_malloc); + qtest_quit(qts); +} + +static void test_error_id(void) +{ + QTestState *qts; + QDict *resp; + QDict *err; + + qts =3D machine_start(BASE_MACHINE + "-device virtio-net,bus=3Droot0,id=3Dstandby0,fail= over=3Don"); + + resp =3D qtest_qmp(qts, "{'execute': 'device_add'," + "'arguments': {" + "'driver': 'virtio-net'," + "'bus': 'root1'," + "'failover_pair_id': 'standby0'" + "} }"); + g_assert(qdict_haskey(resp, "error")); + + err =3D qdict_get_qdict(resp, "error"); + g_assert(qdict_haskey(err, "desc")); + + g_assert_cmpstr(qdict_get_str(err, "desc"), =3D=3D, + "Device with failover_pair_id needs to have id"); + + qobject_unref(resp); + + machine_stop(qts); +} + +static void test_error_pcie(void) +{ + QTestState *qts; + QDict *resp; + QDict *err; + + qts =3D machine_start(BASE_MACHINE + "-device virtio-net,bus=3Droot0,id=3Dstandby0,fail= over=3Don"); + + resp =3D qtest_qmp(qts, "{'execute': 'device_add'," + "'arguments': {" + "'driver': 'virtio-net'," + "'id': 'primary0'," + "'bus': 'pcie.0'," + "'failover_pair_id': 'standby0'" + "} }"); + g_assert(qdict_haskey(resp, "error")); + + err =3D qdict_get_qdict(resp, "error"); + g_assert(qdict_haskey(err, "desc")); + + g_assert_cmpstr(qdict_get_str(err, "desc"), =3D=3D, + "Bus 'pcie.0' does not support hotplugging"); + + qobject_unref(resp); + + machine_stop(qts); +} + +static QDict *find_device(QDict *bus, const char *name) +{ + const QObject *obj; + QList *devices; + QList *list; + + devices =3D qdict_get_qlist(bus, "devices"); + if (devices =3D=3D NULL) { + return NULL; + } + + list =3D qlist_copy(devices); + while ((obj =3D qlist_pop(list))) { + QDict *device; + + device =3D qobject_to(QDict, obj); + + if (qdict_haskey(device, "pci_bridge")) { + QDict *bridge; + QDict *bridge_device; + + bridge =3D qdict_get_qdict(device, "pci_bridge"); + + if (qdict_haskey(bridge, "devices")) { + bridge_device =3D find_device(bridge, name); + if (bridge_device) { + qobject_unref(list); + return bridge_device; + } + } + } + + if (!qdict_haskey(device, "qdev_id")) { + continue; + } + + if (strcmp(qdict_get_str(device, "qdev_id"), name) =3D=3D 0) { + qobject_ref(device); + qobject_unref(list); + return device; + } + } + qobject_unref(list); + + return NULL; +} + +static QDict *get_bus(QTestState *qts, int num) +{ + QObject *obj; + QDict *resp; + QList *ret; + + resp =3D qtest_qmp(qts, "{ 'execute': 'query-pci' }"); + g_assert(qdict_haskey(resp, "return")); + + ret =3D qdict_get_qlist(resp, "return"); + g_assert_nonnull(ret); + + while ((obj =3D qlist_pop(ret))) { + QDict *bus; + + bus =3D qobject_to(QDict, obj); + if (!qdict_haskey(bus, "bus")) { + continue; + } + if (qdict_get_int(bus, "bus") =3D=3D num) { + qobject_ref(bus); + qobject_unref(resp); + return bus; + } + } + qobject_unref(resp); + + return NULL; +} + +static char *get_mac(QTestState *qts, const char *name) +{ + QDict *resp; + char *mac; + + resp =3D qtest_qmp(qts, "{ 'execute': 'qom-get', " + "'arguments': { " + "'path': %s, " + "'property': 'mac' } }", name); + + g_assert(qdict_haskey(resp, "return")); + + mac =3D g_strdup( qdict_get_str(resp, "return")); + + qobject_unref(resp); + + return mac; +} + +static void check_cards(QTestState *qts, bool standby, bool primary) +{ + QDict *device; + QDict *bus; + char *mac; + + bus =3D get_bus(qts, 0); + device =3D find_device(bus, "standby0"); + if (standby) { + g_assert_nonnull(device); + qobject_unref(device); + + mac =3D get_mac(qts, "/machine/peripheral/standby0"); + g_assert_cmpstr(mac, =3D=3D, MAC_STANDBY); + g_free(mac); + } else { + g_assert_null(device); + } + + device =3D find_device(bus, "primary0"); + if (primary) { + g_assert_nonnull(device); + qobject_unref(device); + + mac =3D get_mac(qts, "/machine/peripheral/primary0"); + g_assert_cmpstr(mac, =3D=3D, MAC_PRIMARY); + g_free(mac); + } else { + g_assert_null(device); + } + qobject_unref(bus); +} + +static void test_on(void) +{ + QTestState *qts; + + qts =3D machine_start(BASE_MACHINE + "-netdev user,id=3Dhs0 " + "-device virtio-net,bus=3Droot0,id=3Dstandby0," + "failover=3Don,netdev=3Dhs0,mac=3D"MAC_STANDBY" " + "-device virtio-net,bus=3Droot1,id=3Dprimary0," + "failover_pair_id=3Dstandby0,netdev=3Dhs1,mac=3D"M= AC_PRIMARY); + + check_cards(qts, true, false); /* standby, no primary */ + + machine_stop(qts); +} + +static void test_on_mismatch(void) +{ + QTestState *qts; + + qts =3D machine_start(BASE_MACHINE + "-netdev user,id=3Dhs0 " + "-device virtio-net,bus=3Droot0,id=3Dstandby0," + "failover=3Don,netdev=3Dhs0,mac=3D"MAC_STANDBY" " + "-netdev user,id=3Dhs1 " + "-device virtio-net,bus=3Droot1,id=3Dprimary0," + "failover_pair_id=3Dstandby1,netdev=3Dhs1,mac=3D"MAC_= PRIMARY); + + check_cards(qts, true, true); /* standby, primary (but no failover) */ + + machine_stop(qts); +} + +static void test_off(void) +{ + QTestState *qts; + + qts =3D machine_start(BASE_MACHINE + "-netdev user,id=3Dhs0 " + "-device virtio-net,bus=3Droot0,id=3Dstandby0," + "failover=3Doff,netdev=3Dhs0,mac=3D"MAC_STANDBY" " + "-netdev user,id=3Dhs1 " + "-device virtio-net,bus=3Droot1,id=3Dprimary0," + "failover_pair_id=3Dstandby0,netdev=3Dhs1,mac=3D"MAC_= PRIMARY); + + check_cards(qts, true, true); /* standby, primary (but no failover) */ + + machine_stop(qts); +} + +static void start_virtio_net(QTestState *qts, int bus, int slot) +{ + QVirtioPCIDevice *dev; + uint64_t features; + QPCIAddress addr; + QDict *resp; + QDict *data; + + addr.devfn =3D QPCI_DEVFN((bus << 5) + slot, 0); + dev =3D virtio_pci_new(pcibus, &addr); + g_assert_nonnull(dev); + qvirtio_pci_device_enable(dev); + qvirtio_start_device(&dev->vdev); + features =3D qvirtio_get_features(&dev->vdev); + features =3D features & ~(QVIRTIO_F_BAD_FEATURE | + (1ull << VIRTIO_RING_F_INDIRECT_DESC) | + (1ull << VIRTIO_RING_F_EVENT_IDX)); + qvirtio_set_features(&dev->vdev, features); + qvirtio_set_driver_ok(&dev->vdev); + + resp =3D qtest_qmp_eventwait_ref(qts, "FAILOVER_NEGOTIATED"); + g_assert(qdict_haskey(resp, "data")); + + data =3D qdict_get_qdict(resp, "data"); + g_assert(qdict_haskey(data, "device-id")); + g_assert_cmpstr(qdict_get_str(data, "device-id"), =3D=3D, "standby0"); + + qobject_unref(resp); +} + +static void test_enabled(void) +{ + QTestState *qts; + + qts =3D machine_start(BASE_MACHINE + "-netdev user,id=3Dhs0 " + "-device virtio-net,bus=3Droot0,id=3Dstandby0," + "failover=3Don,netdev=3Dhs0,mac=3D"MAC_STANDBY" " + "-netdev user,id=3Dhs1 " + "-device virtio-net,bus=3Droot1,id=3Dprimary0," + "failover_pair_id=3Dstandby0,netdev=3Dhs1,mac=3D"MAC_= PRIMARY" " + ); + + check_cards(qts, true, false); /* standby, no primary */ + + start_virtio_net(qts, 1, 0); + + check_cards(qts, true, true); /* standby, primary with failover */ + + machine_stop(qts); +} + +static void test_hotplug_1(void) +{ + QTestState *qts; + + qts =3D machine_start(BASE_MACHINE + "-netdev user,id=3Dhs0 " + "-device virtio-net,bus=3Droot0,id=3Dstandby0," + "failover=3Don,netdev=3Dhs0,mac=3D"MAC_STANDBY" " + "-netdev user,id=3Dhs1 " + ); + + check_cards(qts, true, false); /* no standby, no primary */ + + start_virtio_net(qts, 1, 0); + + check_cards(qts, true, false); + + qtest_qmp_device_add(qts, "virtio-net", "primary0", + "{'bus': 'root1'," + "'failover_pair_id': 'standby0'," + "'netdev': 'hs1'," + "'mac': '"MAC_PRIMARY"'}"); + + check_cards(qts, true, true); + + machine_stop(qts); +} + +static void test_hotplug_1_reverse(void) +{ + QTestState *qts; + + qts =3D machine_start(BASE_MACHINE + "-netdev user,id=3Dhs0 " + "-netdev user,id=3Dhs1 " + "-device virtio-net,bus=3Droot1,id=3Dprimary0," + "failover_pair_id=3Dstandby0,netdev=3Dhs1,mac=3D"MAC_= PRIMARY" " + ); + + check_cards(qts, false, true); + + qtest_qmp_device_add(qts, "virtio-net", "standby0", + "{'bus': 'root0'," + "'failover': 'on'," + "'netdev': 'hs0'," + "'mac': '"MAC_STANDBY"'}"); + + check_cards(qts, true, true); /* XXX: sounds like a bug */ + + start_virtio_net(qts, 1, 0); + + check_cards(qts, true, true); + + machine_stop(qts); +} + +static void test_hotplug_2(void) +{ + QTestState *qts; + + qts =3D machine_start(BASE_MACHINE + "-netdev user,id=3Dhs0 " + "-netdev user,id=3Dhs1 " + ); + + check_cards(qts, false, false); /* no standby, no primary */ + + qtest_qmp_device_add(qts, "virtio-net", "standby0", + "{'bus': 'root0'," + "'failover': 'on'," + "'netdev': 'hs0'," + "'mac': '"MAC_STANDBY"'}"); + + check_cards(qts, true, false); + + start_virtio_net(qts, 1, 0); + + check_cards(qts, true, false); + + qtest_qmp_device_add(qts, "virtio-net", "primary0", + "{'bus': 'root1'," + "'failover_pair_id': 'standby0'," + "'netdev': 'hs1'," + "'mac': '"MAC_PRIMARY"'}"); + + check_cards(qts, true, true); + + machine_stop(qts); +} + +static void test_hotplug_2_reverse(void) +{ + QTestState *qts; + + qts =3D machine_start(BASE_MACHINE + "-netdev user,id=3Dhs0 " + "-netdev user,id=3Dhs1 " + ); + + check_cards(qts, false, false); /* no standby, no primary */ + + qtest_qmp_device_add(qts, "virtio-net", "primary0", + "{'bus': 'root1'," + "'failover_pair_id': 'standby0'," + "'netdev': 'hs1'," + "'mac': '"MAC_PRIMARY"'}"); + + check_cards(qts, false, true); + + qtest_qmp_device_add(qts, "virtio-net", "standby0", + "{'bus': 'root0'," + "'failover': 'on'," + "'netdev': 'hs0'," + "'rombar': 0," + "'romfile': ''," + "'mac': '"MAC_STANDBY"'}"); + + check_cards(qts, true, true); /* XXX: sounds like a bug */ + + start_virtio_net(qts, 1, 0); + + check_cards(qts, true, true); + + machine_stop(qts); +} + +static QDict *migrate_status(QTestState *qts) +{ + QDict *resp, *ret; + + resp =3D qtest_qmp(qts, "{ 'execute': 'query-migrate' }"); + g_assert(qdict_haskey(resp, "return")); + + ret =3D qdict_get_qdict(resp, "return"); + g_assert(qdict_haskey(ret, "status")); + qobject_ref(ret); + qobject_unref(resp); + + return ret; +} + +static void test_outmigrate(gconstpointer opaque) +{ + QTestState *qts; + QDict *resp, *args, *data, *ret; + g_autofree gchar *uri =3D g_strdup_printf("exec: cat > %s", (gchar *)o= paque); + + qts =3D machine_start(BASE_MACHINE + "-netdev user,id=3Dhs0 " + "-netdev user,id=3Dhs1 " + ); + + check_cards(qts, false, false); /* no standby, no primary */ + + qtest_qmp_device_add(qts, "virtio-net", "standby0", + "{'bus': 'root0'," + "'failover': 'on'," + "'netdev': 'hs0'," + "'mac': '"MAC_STANDBY"'}"); + + check_cards(qts, true, false); + + start_virtio_net(qts, 1, 0); + + check_cards(qts, true, false); + + qtest_qmp_device_add(qts, "virtio-net", "primary0", + "{'bus': 'root1'," + "'failover_pair_id': 'standby0'," + "'netdev': 'hs1'," + "'rombar': 0," + "'romfile': ''," + "'mac': '"MAC_PRIMARY"'}"); + + check_cards(qts, true, true); + + args =3D qdict_from_jsonf_nofail("{}"); + g_assert_nonnull(args); + qdict_put_str(args, "uri", uri); + + resp =3D qtest_qmp(qts, "{ 'execute': 'migrate', 'arguments': %p}", ar= gs); + g_assert(qdict_haskey(resp, "return")); + qobject_unref(resp); + + /* the event is sent whan QEMU asks the OS to unplug the card */ + resp =3D qtest_qmp_eventwait_ref(qts, "UNPLUG_PRIMARY"); + g_assert(qdict_haskey(resp, "data")); + + data =3D qdict_get_qdict(resp, "data"); + g_assert(qdict_haskey(data, "device-id")); + g_assert_cmpstr(qdict_get_str(data, "device-id"), =3D=3D, "primary0"); + + qobject_unref(resp); + + qtest_outl(qts, ACPI_PCIHP_ADDR_ICH9 + PCI_EJ_BASE, 1); + + qtest_qmp_eventwait(qts, "STOP"); + + ret =3D migrate_status(qts); + g_assert_cmpstr(qdict_get_str(ret, "status"), =3D=3D, "completed"); + qobject_unref(ret); + + /* + * in fact, the card is ejected from the point of view of kernel + * but not really from QEMU to be able to hotplug it back if + * migration fails. So we can't check that: + * check_cards(qts, true, false); + */ + + machine_stop(qts); +} + +static void test_inmigrate(gconstpointer opaque) +{ + QTestState *qts; + QDict *resp, *args, *ret; + g_autofree gchar *uri =3D g_strdup_printf("exec: cat %s", (gchar *)opa= que); + + qts =3D machine_start(BASE_MACHINE + "-netdev user,id=3Dhs0 " + "-netdev user,id=3Dhs1 " + "-incoming defer " + ); + + check_cards(qts, false, false); /* no standby, no primary */ + + qtest_qmp_device_add(qts, "virtio-net", "standby0", + "{'bus': 'root0'," + "'failover': 'on'," + "'netdev': 'hs0'," + "'mac': '"MAC_STANDBY"'}"); + + check_cards(qts, true, false); + + qtest_qmp_device_add(qts, "virtio-net", "primary0", + "{'bus': 'root1'," + "'failover_pair_id': 'standby0'," + "'netdev': 'hs1'," + "'rombar': 0," + "'romfile': ''," + "'mac': '"MAC_PRIMARY"'}"); + + check_cards(qts, true, false); + + args =3D qdict_from_jsonf_nofail("{}"); + g_assert_nonnull(args); + qdict_put_str(args, "uri", uri); + + resp =3D qtest_qmp(qts, "{ 'execute': 'migrate-incoming', 'arguments':= %p}", + args); + g_assert(qdict_haskey(resp, "return")); + qobject_unref(resp); + + qtest_qmp_eventwait(qts, "MIGRATION"); + qtest_qmp_eventwait(qts, "FAILOVER_NEGOTIATED"); + + check_cards(qts, true, true); + + qtest_qmp_eventwait(qts, "RESUME"); + + ret =3D migrate_status(qts); + g_assert_cmpstr(qdict_get_str(ret, "status"), =3D=3D, "completed"); + qobject_unref(ret); + + machine_stop(qts); +} + +int main(int argc, char **argv) +{ + gchar *tmpfile =3D g_strdup_printf("/tmp/failover_test_migrate-%u-%u", + getpid(), g_test_rand_int()); + const char *arch; + int ret; + + g_test_init(&argc, &argv, NULL); + + arch =3D qtest_get_arch(); + if (strcmp(arch, "i386") && strcmp(arch, "x86_64")) { + g_test_message("Skipping test for non-x86"); + return g_test_run(); + } + + qtest_add_func("failover-virtio-net/params/error/id", test_error_id); + qtest_add_func("failover-virtio-net/params/error/pcie", test_error_pci= e); + qtest_add_func("failover-virtio-net/params/error/on", test_on); + qtest_add_func("failover-virtio-net/params/error/on_mismatch", + test_on_mismatch); + qtest_add_func("failover-virtio-net/params/error/off", test_off); + qtest_add_func("failover-virtio-net/params/error/enabled", test_enable= d); + qtest_add_func("failover-virtio-net/params/error/hotplug_1", + test_hotplug_1); + qtest_add_func("failover-virtio-net/params/error/hotplug_1_reverse", + test_hotplug_1_reverse); + qtest_add_func("failover-virtio-net/params/error/hotplug_2", + test_hotplug_2); + qtest_add_func("failover-virtio-net/params/error/hotplug_2_reverse", + test_hotplug_2_reverse); + qtest_add_data_func("failover-virtio-net/params/error/outmigrate", + tmpfile, test_outmigrate); + qtest_add_data_func("failover-virtio-net/params/error/inmigrate", + tmpfile, test_inmigrate); + + ret =3D g_test_run(); + + unlink(tmpfile); + g_free(tmpfile); + + return ret; +} --=20 2.33.1 From nobody Sat May 18 23:44:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1637313382717598.9137410383498; Fri, 19 Nov 2021 01:16:22 -0800 (PST) Received: from localhost ([::1]:55876 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mo00J-0002xX-N6 for importer@patchew.org; Fri, 19 Nov 2021 04:16:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60674) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mnztB-0003z9-Oa for qemu-devel@nongnu.org; Fri, 19 Nov 2021 04:08:57 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:36192) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mnzt9-0003rW-7E for qemu-devel@nongnu.org; Fri, 19 Nov 2021 04:08:56 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-561-Kjwvx1lgPROhZSsKQkkuSw-1; Fri, 19 Nov 2021 04:08:51 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6737C1023F5A; Fri, 19 Nov 2021 09:08:50 +0000 (UTC) Received: from thinkpad.redhat.com (unknown [10.39.194.176]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7B8A35D740; Fri, 19 Nov 2021 09:08:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637312934; 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=UPYKx9uhzqpV56MxW183OXn607XHAZablOEesagsGDs=; b=delo6M7yG0OJ3kSbp4hjePEbBfhWLJIhPktguIC1m0mwkRGaRW4d5bMm8zt2QjnaroxWEn RfHqMCzvCcz/WTnCt6IY9UimLEWnYHBXXI/4gkrvtlV0DLLbsdW/967ZWgiyaoO5jYV8cP wHwZIN7abD7F7FsCHy0hVAuRzblHwMo= X-MC-Unique: Kjwvx1lgPROhZSsKQkkuSw-1 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PATCH v5 3/4] failover: fix unplug pending detection Date: Fri, 19 Nov 2021 10:07:17 +0100 Message-Id: <20211119090718.440793-4-lvivier@redhat.com> In-Reply-To: <20211119090718.440793-1-lvivier@redhat.com> References: <20211119090718.440793-1-lvivier@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.7, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Thomas Huth , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Juan Quintela , Michael Roth , "Michael S. Tsirkin" , Gerd Hoffmann , Igor Mammedov , Ani Sinha , Paolo Bonzini , Jens Freimann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1637313384123100001 Content-Type: text/plain; charset="utf-8" Failover needs to detect the end of the PCI unplug to start migration after the VFIO card has been unplugged. To do that, a flag is set in pcie_cap_slot_unplug_request_cb() and reset in pcie_unplug_device(). But since 17858a169508 ("hw/acpi/ich9: Set ACPI PCI hot-plug as default on Q35") we have switched to ACPI unplug and these functions are not called anymore and the flag not set. So failover migration is not able to detect if card is really unplugged and acts as it's done as soon as it's started. So it doesn't wait the end of the unplug to start the migration. We don't see any problem when we test that because ACPI unplug is faster than PCIe native hotplug and when the migration really starts the unplug operation is already done. See c000a9bd06ea ("pci: mark device having guest unplug request pending") a99c4da9fc2a ("pci: mark devices partially unplugged") Signed-off-by: Laurent Vivier Reviewed-by: Ani Sinha Reviewed-by: Michael S. Tsirkin --- hw/acpi/pcihp.c | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c index f610a25d2ef9..30405b5113d7 100644 --- a/hw/acpi/pcihp.c +++ b/hw/acpi/pcihp.c @@ -222,9 +222,27 @@ static void acpi_pcihp_eject_slot(AcpiPciHpState *s, u= nsigned bsel, unsigned slo PCIDevice *dev =3D PCI_DEVICE(qdev); if (PCI_SLOT(dev->devfn) =3D=3D slot) { if (!acpi_pcihp_pc_no_hotplug(s, dev)) { - hotplug_ctrl =3D qdev_get_hotplug_handler(qdev); - hotplug_handler_unplug(hotplug_ctrl, qdev, &error_abort); - object_unparent(OBJECT(qdev)); + /* + * partially_hotplugged is used by virtio-net failover: + * failover has asked the guest OS to unplug the device + * but we need to keep some references to the device + * to be able to plug it back in case of failure so + * we don't execute hotplug_handler_unplug(). + */ + if (dev->partially_hotplugged) { + /* + * pending_deleted_event is set to true when + * virtio-net failover asks to unplug the device, + * and set to false here when the operation is done + * This is used by the migration loop to detect the + * end of the operation and really start the migration. + */ + qdev->pending_deleted_event =3D false; + } else { + hotplug_ctrl =3D qdev_get_hotplug_handler(qdev); + hotplug_handler_unplug(hotplug_ctrl, qdev, &error_abor= t); + object_unparent(OBJECT(qdev)); + } } } } @@ -396,6 +414,12 @@ void acpi_pcihp_device_unplug_request_cb(HotplugHandle= r *hotplug_dev, return; } =20 + /* + * pending_deleted_event is used by virtio-net failover to detect the + * end of the unplug operation, the flag is set to false in + * acpi_pcihp_eject_slot() when the operation is completed. + */ + pdev->qdev.pending_deleted_event =3D true; s->acpi_pcihp_pci_status[bsel].down |=3D (1U << slot); acpi_send_event(DEVICE(hotplug_dev), ACPI_PCI_HOTPLUG_STATUS); } --=20 2.33.1 From nobody Sat May 18 23:44:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1637313521009140.52286457487378; Fri, 19 Nov 2021 01:18:41 -0800 (PST) Received: from localhost ([::1]:33872 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mo02Z-0007W6-RI for importer@patchew.org; Fri, 19 Nov 2021 04:18:39 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60772) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mnztY-0004Vu-4X for qemu-devel@nongnu.org; Fri, 19 Nov 2021 04:09:23 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:43779) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mnztV-0003tl-WC for qemu-devel@nongnu.org; Fri, 19 Nov 2021 04:09:19 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-468-jPq6fYT4OfG00q37YJIXWQ-1; Fri, 19 Nov 2021 04:09:14 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 454F21023F4E; Fri, 19 Nov 2021 09:09:13 +0000 (UTC) Received: from thinkpad.redhat.com (unknown [10.39.194.176]) by smtp.corp.redhat.com (Postfix) with ESMTP id C66E862A41; Fri, 19 Nov 2021 09:08:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637312957; 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=EocQ4KUZF6qnZeGCQI3/6edVKmrKAfowhRq9ao3tx9g=; b=PLCsPZ8gBfAepT+WP5ueCSfjdQ9xsLZvFbfPt0Nvar+LLzkk0/t4J0oF8oFk8kgtePucxy viOTYeHBTI8QSTzoT+33n6syC8vN0qhNpfZpeV4wpycLzBct/1Zphi3Dq06yfz/VmxFirG eBn0trpnoJsow6xh2fMZKwVpOaxm9Hc= X-MC-Unique: jPq6fYT4OfG00q37YJIXWQ-1 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PATCH v5 4/4] tests/libqtest: update virtio-net failover test Date: Fri, 19 Nov 2021 10:07:18 +0100 Message-Id: <20211119090718.440793-5-lvivier@redhat.com> In-Reply-To: <20211119090718.440793-1-lvivier@redhat.com> References: <20211119090718.440793-1-lvivier@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=lvivier@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.7, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Thomas Huth , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Juan Quintela , Michael Roth , "Michael S. Tsirkin" , Gerd Hoffmann , Igor Mammedov , Ani Sinha , Paolo Bonzini , Jens Freimann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1637313522420100003 Content-Type: text/plain; charset="utf-8" Update the migration test to check we correctly wait the end of the card unplug before doing the migration. Signed-off-by: Laurent Vivier Reviewed-by: Michael S. Tsirkin --- tests/qtest/virtio-net-failover.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/tests/qtest/virtio-net-failover.c b/tests/qtest/virtio-net-fai= lover.c index 11fa0b21f8bf..9a81133154d6 100644 --- a/tests/qtest/virtio-net-failover.c +++ b/tests/qtest/virtio-net-failover.c @@ -541,6 +541,29 @@ static void test_outmigrate(gconstpointer opaque) =20 qobject_unref(resp); =20 + /* wait the end of the migration setup phase */ + while (true) { + const gchar *status; + + ret =3D migrate_status(qts); + + status =3D qdict_get_str(ret, "status"); + if (strcmp(status, "wait-unplug") =3D=3D 0) { + break; + } + + /* The migration must not start if the card is not ejected */ + g_assert_cmpstr(status, !=3D, "active"); + g_assert_cmpstr(status, !=3D, "completed"); + g_assert_cmpstr(status, !=3D, "failed"); + g_assert_cmpstr(status, !=3D, "cancelling"); + g_assert_cmpstr(status, !=3D, "cancelled"); + + qobject_unref(ret); + } + 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); =20 qtest_qmp_eventwait(qts, "STOP"); --=20 2.33.1