From patchwork Mon Oct 31 21:35:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Zmudzinski X-Patchwork-Id: 1697527 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=aol.com header.i=@aol.com header.a=rsa-sha256 header.s=a2048 header.b=NoGQygL4; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4N1RVV1QdWz23lf for ; Tue, 1 Nov 2022 08:43:46 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opcYG-0002g4-VE; Mon, 31 Oct 2022 17:42:36 -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 1opcSQ-0003pd-Fe for qemu-devel@nongnu.org; Mon, 31 Oct 2022 17:36:36 -0400 Received: from sonic306-21.consmr.mail.gq1.yahoo.com ([98.137.68.84]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1opcSE-00084A-U5 for qemu-devel@nongnu.org; Mon, 31 Oct 2022 17:36:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aol.com; s=a2048; t=1667252171; bh=lUp3HSP1TAIWIvem3keOMtwYZCq25W+DMpaMWizwQ7o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From:Subject:Reply-To; b=NoGQygL4UHhKlwiW+SVvwQKD4IhNC1iniRVPGMuosQiVwzedgpi3nSTsrapsFpjzz71xayZaZDhqP+t72BuS+XSfIDkAjsfVhb2/rrI03pMJHY7lUMIzHdGl/UHHV9ZIvf3/mCwAPLdXbk8IrNvCFb9F32vafI4odYpQY1wCM/E2Rq2kt9alo8oOe/8b4CM94BmiUtQ0aJ3wUf7WIjdknl6NBBpWV/is4SK6xAEic5A22vND6G3hCa7igkJ29e2QdNLaaPc1RHoUFtmbdtQ+0TS6MwxGpN6pqX0Y4/uTNUO7Zu1V/GWw7QWsJDfUk+oQDND0H0Ygw6ZqgqMClbZCIQ== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1667252171; bh=lhYpS8kXk/l9ipGQjwGSK6jo6Jo0+l9WeUuGiT4eAyV=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=HQxPjhR0+gRN0vZ5kYsnd3tQNqcorKUJjnygvO+DLLxVXBM5C5oAY8zUqLTtCsC9fKGe6emW5GKa2YVHOm39rXFTeAnJpB4uyqd7yRq2c3qKJTHSEGJ/3BoeiATuGcdpNVmVu8zJToIk+dG5kLIEVbPXxZIsXl1DnqTMK46mCHSyV/1nHv1IaWKkZpaw6hmOM+l7kk6SiGslIMKbS923skpWPUC4YNqdk1yDwiL07iz75x9YCrZFfLgo02RSXK+EeRyWOgsZA1ICPF2la5GBGgePy4lbzS9b7J2mybZiBCVMtWwvElVhyCGk2/u+QPhyo821wifcF3k0hzctSfHmIw== X-YMail-OSG: RxpTOHUVM1l6UrAaCLg6FTbh7xX3D2u1rQyx6sDqhc1HssSb0N373gH_9z5VOjp vn3avlq_olm8k.kvC3QPBzjn4fgY.MipCt65w8hLRf_d5co6jUshXAOd8kvcZqWKdLcnI_xopgdm Gt9XlnVIqWdeqNRYbFwWXAnCq2cSreKxqSyNsV4X81Y4QeP8yezgr80.YeL9jmeUvYKlvkmqmEEI CgchAN2cbEE5ydOvartSXyZKrNToIWMHay42ASDyeEowMLie1WvHWMypajVotqj6W2TNfLTffnwf I992uHbq5zpzEmQmpsHh4baHXe6Wr2gzmrqJAQymBlVn_uBVwnVxRs2ST83mhSoLRILgV11eZ797 hzZCpmsH3br_tD66DEATlD_qIrb59K1Io6Ixko2xQJohIpUBVQFXnJ5.S.1ocDjs3rgEQmGGE9TL fHhUR79Lszow.SGGXsD6Co7ulHwSdGm06oLR5GppsPSYy2DdXNXm4JO__p0slmgGD.9lwC5vzGuW vvecQmbyOlYxho51VBoJSakq9gwoW.3.Hs025KBsY.jGRJkDGl_u1oMcSZ7jO0nn83yesIX.pWzJ GSN5mxXMVoO59ls29gzMAxKIniEwBVNGTtJsMm08hBot5TSxcdrxq7vsVn7._0Ib7X.9gddNkVmU ms4TeGUHubaVC0ZwGIHwQTj4vVdrUHscn52ZlghNtjOuicufGkC42kwovRLE9OVIjmnv.5D7X3wn sZHrrO_vzm5hWSijXnr7Yi0uG1QlSzoB6dDv3KpmBn2qBeOmrMww2oVbavtZ5aF8VMNyt33mXdg8 nrT_I2P7SZzIzBe_whX3IJsvF2Mbd74v5TNokOu6TCokHwsaf5bYfAdzw_3goMQOjeCCx7.oCmcM y6b8gJ20eZugCqjZJznRyboXbTEezaBNvR4E55aTxC17yhdzkpZn4v1t53BsHedQkcYJ7.GWbHZi 9.g6JxEIAUDpePmbj.971XADLnWwEDEH7LqtvGvjS31jq7kyfcF00MlaaFl2Vbz.6i4Qiw2pv42a s6pv5A1jHAxjN1M0Kxj__t1QfZfUfOUXrRirW2XJTjCkEtclMBWy_hJu1jyhk.1ZphaiTztwCuHe T6ivKZ50Lmm63SdA71nFehhsue1iultH0NvQa3mUue8BhtQIqcnICozlulkjjvjVzmPqDXq8lgSG Kb1kfPv6R3d6CNqU.IHYjzb7nkSSgxB3WUBzAkszozovlo_bsPIwq3w15KS7VzAd71vhVnUG56eZ pdKwlpo0bm06rsMkUI0aytaxMJKaPWEvPJAqn7v1I6eGRQYAj8EJOrqgYNM07hfaYPC.oJ78Wc2D 6jCoMYmJ6L.Fis9dLoZgliMtDjMbj9DIETXIVOPIv8Rtmwadrfu0SsmLwFEBmU3V4yLCTGByJeX9 ETSpwlcCZIrAUcnTUQ.nStTzT6k9RplToRna_LhPV0YRN6rGdCEjkweprdzv0D1rb53PYP7bZns0 Qkp0MDQQms2n4nciTP1agLT9D0kBu77_biIXJLoVSCwy4gAGQtLBxLUg7Y02Tbl91rsHyl02PUf1 iWe1pJKdTdLDuhjFpUFxudKH8nN8lQ8BKbpLQe8adQYa03MUAuFxSvGZb7GgIEEPeHDiimsZrcFw aiHH.1pPOv1bta2UkxPoiAqM3.Gw4NiIIaWs_1NzYieqQkQAqFiX.cFlDSDsfWuH_WFpL.NPTLYr kaw5UUHDLMGBzihMU0_zR7J3ODMeZwg9FeLpZUkIOgC03TsnKe2mdZVGKpXjndPkM2pofjt_Npps T0aWDMT8E77oNXT7gFYgEpSyfUPuAjBEXCUJ8GKzlxchWPJP2iTrz3n55v5rn_Dwcy8gq7MH49f0 Sh3ewmXSasF_wzhVSvnkz.weJDK2NK9uUf3LhJYUOAyFlk_C2VtFjQWQQxs_Mnk.YszQUo_4nQGD 8vZaPqJSNJ55F0E1S.8AESKwjbJ8L4jeEGnUT23AoH40cyu3pCDoLrpt4qfqdO8raOclim_H8Kbb O6hpUOONhgeDjtPq3I03zw2Pj.hIn6ZyYrLGxJPq4Kh8MZ28nlIgORhJu2Sy0y1J.dj5b.0zdk1o icjEGfT1ZENqvv7sVadH5dauVuedHTTSWB_jYkXkJghehEWKK8V.9Ri0Ir4PEpRZ8CByoq9swjB8 HYmDD_HrTVVYw6UViuKAQ.k4a4RSbUATwFns8JsjNwkiyGa4vD0noRzKylKTRB_IBfiQWILC34jz C.9yy01UHU29Xwg-- X-Sonic-MF: Received: from sonic.gate.mail.ne1.yahoo.com by sonic306.consmr.mail.gq1.yahoo.com with HTTP; Mon, 31 Oct 2022 21:36:11 +0000 Received: by hermes--production-ne1-c47ffd5f5-2l5gs (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 1d450870d12d3f727fe97841ca3633d5; Mon, 31 Oct 2022 21:36:06 +0000 (UTC) From: Chuck Zmudzinski To: qemu-devel@nongnu.org Cc: Stefano Stabellini , Anthony Perard , Paul Durrant , "Michael S. Tsirkin" , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson , Eduardo Habkost , xen-devel@lists.xenproject.org Subject: [PATCH v4 2/2] xen/pt: reserve PCI slot 2 for Intel igd-passthru Date: Mon, 31 Oct 2022 17:35:53 -0400 Message-Id: X-Mailer: git-send-email 2.37.2 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=98.137.68.84; envelope-from=brchuckz@aim.com; helo=sonic306-21.consmr.mail.gq1.yahoo.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, FREEMAIL_REPLY=1, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, T_SPF_TEMPERROR=0.01 autolearn=no 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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org+incoming=patchwork.ozlabs.org@nongnu.org Intel specifies that the Intel IGD must occupy slot 2 on the PCI bus, as noted in docs/igd-assign.txt in the Qemu source code. Currently, when the xl toolstack is used to configure a Xen HVM guest with Intel IGD passthrough to the guest with the Qemu upstream device model, a Qemu emulated PCI device will occupy slot 2 and the Intel IGD will occupy a different slot. This problem often prevents the guest from booting. The only available workaround is not good: Configure Xen HVM guests to use the old and no longer maintained Qemu traditional device model available from xenbits.xen.org which does reserve slot 2 for the Intel IGD. To implement this feature in the Qemu upstream device model for Xen HVM guests, introduce the following new class, functions, types, and macros: * XEN_PT_DEVICE_CLASS declaration, based on the existing TYPE_XEN_PT_DEVICE * XEN_PT_DEVICE_GET_CLASS macro helper function for XEN_PT_DEVICE_CLASS * typedef XenPTQdevRealize function pointer * XEN_PCI_IGD_SLOT_MASK, the value of slot_reserved_mask to reserve slot 2 * xen_igd_reserve_slot and xen_igd_clear_slot functions The new xen_igd_reserve_slot function uses the existing slot_reserved_mask member of PCIBus to reserve PCI slot 2 for Xen HVM guests configured using the xl toolstack with the gfx_passthru option enabled, which sets the igd-passthru=on option to Qemu for the Xen HVM machine type. The new xen_igd_reserve_slot function also needs to be implemented in hw/xen/xen_pt_stub.c to prevent FTBFS during the link stage for the case when Qemu is configured with --enable-xen and --disable-xen-pci-passthrough, in which case it does nothing. The new xen_igd_clear_slot function overrides qdev->realize of the parent PCI device class to enable the Intel IGD to occupy slot 2 on the PCI bus since slot 2 was reserved by xen_igd_reserve_slot when the PCI bus was created in hw/i386/pc_piix.c for the case when igd-passthru=on. Signed-off-by: Chuck Zmudzinski --- Notes that might be helpful to reviewers of patched code in hw/xen: The new functions and types are based on recommendations from Qemu docs: https://qemu.readthedocs.io/en/latest/devel/qom.html Notes that might be helpful to reviewers of patched code in hw/i386: The small patch to hw/i386/pc_piix.c is protected by CONFIG_XEN so it does not affect builds that do not have CONFIG_XEN defined. xen_igd_gfx_pt_enabled() in the patched hw/i386/pc_piix.c file is an existing function that is only true when Qemu is built with xen-pci-passthrough enabled and the administrator has configured the Xen HVM guest with Qemu's igd-passthru=on option. v2: Remove From: tag at top of commit message v3: Changed the test for the Intel IGD in xen_igd_clear_slot: if (is_igd_vga_passthrough(&s->real_device) && (s->real_device.vendor_id == PCI_VENDOR_ID_INTEL)) { is changed to if (xen_igd_gfx_pt_enabled() && (s->hostaddr.slot == 2) && (s->hostaddr.function == 0)) { I hoped that I could use the test in v2, since it matches the other tests for the Intel IGD in Qemu and Xen, but those tests do not work because the necessary data structures are not set with their values yet. So instead use the test that the administrator has enabled gfx_passthru and the device address on the host is 02.0. This test does detect the Intel IGD correctly. v4: Use brchuckz@aol.com instead of brchuckz@netscape.net for the author's email address to match the address used by the same author in commits be9c61da and c0e86b76 Change variable for XEN_PT_DEVICE_CLASS: xptc changed to xpdc hw/i386/pc_piix.c | 3 +++ hw/xen/xen_pt.c | 25 +++++++++++++++++++++++++ hw/xen/xen_pt.h | 16 ++++++++++++++++ hw/xen/xen_pt_stub.c | 4 ++++ 4 files changed, 48 insertions(+) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 0b1a79c0fa..a0f04ad62e 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -402,6 +402,9 @@ static void pc_xen_hvm_init(MachineState *machine) } pc_xen_hvm_init_pci(machine); + if (xen_igd_gfx_pt_enabled()) { + xen_igd_reserve_slot(pcms->bus); + } pci_create_simple(pcms->bus, -1, "xen-platform"); } #endif diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c index 0ec7e52183..50a63fe12e 100644 --- a/hw/xen/xen_pt.c +++ b/hw/xen/xen_pt.c @@ -950,11 +950,35 @@ static void xen_pci_passthrough_instance_init(Object *obj) PCI_DEVICE(obj)->cap_present |= QEMU_PCI_CAP_EXPRESS; } +void xen_igd_reserve_slot(PCIBus *pci_bus) +{ + XEN_PT_LOG(0, "Reserving PCI slot 2 for IGD\n"); + pci_bus->slot_reserved_mask |= XEN_PCI_IGD_SLOT_MASK; +} + +static void xen_igd_clear_slot(DeviceState *qdev, Error **errp) +{ + PCIDevice *pci_dev = (PCIDevice *)qdev; + XenPCIPassthroughState *s = XEN_PT_DEVICE(pci_dev); + XenPTDeviceClass *xpdc = XEN_PT_DEVICE_GET_CLASS(s); + PCIBus *pci_bus = pci_get_bus(pci_dev); + + if (xen_igd_gfx_pt_enabled() && (s->hostaddr.slot == 2) + && (s->hostaddr.function == 0)) { + pci_bus->slot_reserved_mask &= ~XEN_PCI_IGD_SLOT_MASK; + XEN_PT_LOG(pci_dev, "Intel IGD found, using slot 2\n"); + } + xpdc->pci_qdev_realize(qdev, errp); +} + static void xen_pci_passthrough_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); + XenPTDeviceClass *xpdc = XEN_PT_DEVICE_CLASS(klass); + xpdc->pci_qdev_realize = dc->realize; + dc->realize = xen_igd_clear_slot; k->realize = xen_pt_realize; k->exit = xen_pt_unregister_device; k->config_read = xen_pt_pci_read_config; @@ -977,6 +1001,7 @@ static const TypeInfo xen_pci_passthrough_info = { .instance_size = sizeof(XenPCIPassthroughState), .instance_finalize = xen_pci_passthrough_finalize, .class_init = xen_pci_passthrough_class_init, + .class_size = sizeof(XenPTDeviceClass), .instance_init = xen_pci_passthrough_instance_init, .interfaces = (InterfaceInfo[]) { { INTERFACE_CONVENTIONAL_PCI_DEVICE }, diff --git a/hw/xen/xen_pt.h b/hw/xen/xen_pt.h index e7c4316a7d..40b31b5263 100644 --- a/hw/xen/xen_pt.h +++ b/hw/xen/xen_pt.h @@ -3,6 +3,7 @@ #include "hw/xen/xen_common.h" #include "hw/pci/pci.h" +#include "hw/pci/pci_bus.h" #include "xen-host-pci-device.h" #include "qom/object.h" @@ -41,7 +42,20 @@ typedef struct XenPTReg XenPTReg; #define TYPE_XEN_PT_DEVICE "xen-pci-passthrough" OBJECT_DECLARE_SIMPLE_TYPE(XenPCIPassthroughState, XEN_PT_DEVICE) +#define XEN_PT_DEVICE_CLASS(klass) \ + OBJECT_CLASS_CHECK(XenPTDeviceClass, klass, TYPE_XEN_PT_DEVICE) +#define XEN_PT_DEVICE_GET_CLASS(obj) \ + OBJECT_GET_CLASS(XenPTDeviceClass, obj, TYPE_XEN_PT_DEVICE) + +typedef void (*XenPTQdevRealize)(DeviceState *qdev, Error **errp); + +typedef struct XenPTDeviceClass { + PCIDeviceClass parent_class; + XenPTQdevRealize pci_qdev_realize; +} XenPTDeviceClass; + uint32_t igd_read_opregion(XenPCIPassthroughState *s); +void xen_igd_reserve_slot(PCIBus *pci_bus); void igd_write_opregion(XenPCIPassthroughState *s, uint32_t val); void xen_igd_passthrough_isa_bridge_create(XenPCIPassthroughState *s, XenHostPCIDevice *dev); @@ -76,6 +90,8 @@ typedef int (*xen_pt_conf_byte_read) #define XEN_PCI_INTEL_OPREGION 0xfc +#define XEN_PCI_IGD_SLOT_MASK 0x4UL /* Intel IGD slot_reserved_mask */ + typedef enum { XEN_PT_GRP_TYPE_HARDWIRED = 0, /* 0 Hardwired reg group */ XEN_PT_GRP_TYPE_EMU, /* emul reg group */ diff --git a/hw/xen/xen_pt_stub.c b/hw/xen/xen_pt_stub.c index 2d8cac8d54..5c108446a8 100644 --- a/hw/xen/xen_pt_stub.c +++ b/hw/xen/xen_pt_stub.c @@ -20,3 +20,7 @@ void xen_igd_gfx_pt_set(bool value, Error **errp) error_setg(errp, "Xen PCI passthrough support not built in"); } } + +void xen_igd_reserve_slot(PCIBus *pci_bus) +{ +}