From nobody Sat Apr 20 10:02:17 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=reject dis=none) header.from=aol.com ARC-Seal: i=1; a=rsa-sha256; t=1674298987; cv=none; d=zohomail.com; s=zohoarc; b=A6QArp3rpOkvn131WT1iMaPe1VVfH2dmYEU1vC1pI9MzrbxwnXyYjxBXk1gIEyTsadHymtfaqXqYbSLS34SWQ45oNEuMca2OO8vbyr4aGflwD3LTqo+Ysh8sn8xg36aZ+qg4lb4eM7cEWHfqiqMdn4tv9qJEo4zoEI7jSVrHvKQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1674298987; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=qIkaR++hz4xSQPpKu8moORRYKu9TRC+UxcCbUMfWnzc=; b=g+acAG3JOltKn+vPwFKtKQteOrnURmvgsR5Z6Xwf2/NajnMSewbQG25/aqe/d9q28GMNUus17SH8xkXodrNTDmIGrFN2+mtZko9xVQwIRm7KPB8zjlDQS9+8P53iqcYC9DcYlVppmTJ8LiYxfnbbtsVgI++CSf8N40Nc8XAfPD8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1674298987262809.9433539479348; Sat, 21 Jan 2023 03:03:07 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pJBdd-0006KS-UQ; Sat, 21 Jan 2023 06:02:21 -0500 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 1pJBdc-0006Jm-7y for qemu-devel@nongnu.org; Sat, 21 Jan 2023 06:02:20 -0500 Received: from sonic309-20.consmr.mail.gq1.yahoo.com ([98.137.65.146]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pJBdY-0000tW-Sq for qemu-devel@nongnu.org; Sat, 21 Jan 2023 06:02:19 -0500 Received: from sonic.gate.mail.ne1.yahoo.com by sonic309.consmr.mail.gq1.yahoo.com with HTTP; Sat, 21 Jan 2023 11:02:13 +0000 Received: by hermes--production-ne1-749986b79f-kcqbz (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 99bb84dd0c6e14c52c100f8a2c2801b6; Sat, 21 Jan 2023 11:02:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aol.com; s=a2048; t=1674298933; bh=qIkaR++hz4xSQPpKu8moORRYKu9TRC+UxcCbUMfWnzc=; h=From:To:Cc:Subject:Date:References:From:Subject:Reply-To; b=aE36dgXl1qm7nmhWw+QqN6pSrFR6ZQHEs8PSdyEbmRArHigHAvSa7lPlM+RlU3BvyIaUGGgfOv1rCGeUPawL1V9DsnFggDTfdmZ8krd3EKZ8pgrOMi1JQerA9YcjbUVvY40/ABQEFn5xsEnMz5oeQi/xu3Z/m/yx2AQXwc+OwQpDL1Y4KNWl7L597qIBCBqR5x2Ozd07Ad5qRBpICI+6vS6hIhlw/bCnP8vBpMKi4Ph6mvbXw3QDJNJss31kUNKchq9D1NdggfT7DtRNcG7eE2D8WYOgxQfqERNI/zr0nqdhS3WKzMQt9sx6JdgbIiMq87n8LeC+RGe/c/xWyri4QA== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1674298933; bh=c2uQhMKlr2ixzdC5oATKnSBYYGXXl3l1O6ybzgxEu5F=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=IQucvig0yQN5kpBSUOpSTALbpdOccxnfSMbuTG6K3dYFxZkz749+ElKqf/cFiA0B6GIAwXhZGIr1VPytby8E6yGqaWPS5KPMFxx6KBVDkrmIiTZgJqm5OPtWFHTEANoqVHn5L9253wDH/RCdzI6pImvePFdhmFgwHY4z/n/SpwjR6UGHGYMcmPh9aeiCJ0X6mxAbnmyG60sm5CZuKsSBhIBJDZbGWqLoClO8OX6fKTCDnQ4q7bkwgB6aOBmkUVmZFw5YIvj3Umx7NQL7q+TqaXJQZ2UuDqXduLCctbVoJckBGc7ZWTfDFbFPt0Gqgb02Yp6zOUHkuwNgj0oB91MK9A== X-YMail-OSG: alwsZq8VM1nrrDYQHaCCIns6A2i5LvVnIsZlybOVsoWhYjbuY.MV8GVLplY348V 6QiGI5K607i1uPcb1v_5fJX8FP7PoO7CcthW3WpOXLybmSCkiBdC1nAC0UoS0WOzIAEZqJy_mQgW SWpZtv3ovFSiZhDtNue_jYz3hzs8AWujiOROFRjAZqFKQgjvPFm9dMi2ThalloSO62L.hFr3_NQ4 9Yw3yZYWhXhgWFaXhTr93sIuSu4tlMak80slUMsrgTYUWshwr4Q2Yh8_jF8qF0N0766meHkzMgnx jNyz3jSkx4LkQZv_7UeM7WcaPmxyGPnULDD1PVLv0u6dvnRG1tOcXDwxyaSzqO065d824YQMTM2K aaQsjFlRY0yi91dNLm0VAO4fZgwB6TBnDMZNn6s6vFeTHV1Fm.oRL1uJCmgdTo0PwC5ldBrecrba QafmENbz6XxEqPZm43UTcoe2LU_x9.xd4uIkzb7RpKQmkxRdF9XjtIb6ysQ7Hz2U6RDDRZEB_DP_ ONCzoj7MH4YTRwbjwkYMh4SRgGXizbsigE4VWKUrLpg.T3d7LM9MkA8y5lBnTQ9MHiS1AHk1OWbw JPdviWftpDkZA94YZLCeTQb4BOgWsKyIIwVCY8X09HWHO9vluWDf3QVOYEdrc.o6qgvVv2sWAB6g RYSQSpra9hl_8oxHuP7rLMTGdzXddL4.EFJ_pDjhjrzuPvpBksSVpoc_lVbwIuoNGBnkJ6I315eW OJ6ZHJ8U4Iiqh3R8Me.ZxIvrHlJifotSUX4uXjIzw6NlJMmB42rMfp1VBWoc4lNHiZJq9.64Xcqx ri2lb204wQq5FmjAZgTBGqBaweffluRODKKn0PmMsj4JprrxST8X0imScL3HbPLU1MQAxkT56sXC qO4pGblhqGuj5ISeDuebXMCBDn2UVVxpuOV3HGr_rNt4zsprtfj_Mk8Yf4NZn5lybm0q3VpbkaOp kshbwIzVM3Im3GoEQZjOSWKKSlWSnthfl5kILlbPa5rbYClTjp87SM.C8WMXWASO5J.bG305W5SD M55bleHuO5n2gm1FzsvGGErv2mnCyvWPuDW6yu9FM_mS4_0phXTRgdkg.Ytw1r.vOSIX_PZlrlGL LkZMZK02Q5x8lG1APzQYXi2Gk3mrhshcc7JGOiia7OGDZIiNsWgyuwFfezcLgknNTG0iXj7lMR7j zGQ5Vr1fvlp0xtdFmQnBWtRLCNeVmqbp_8dILy__nyynwC0.n8bkaUcrGAtk1fdEpSRtRMKTcX48 JH1I1q0eKCo1NOuhvtb33iE9Iuzk.j8NKFgae5HK_0TQKLHwh1SucYx.rxkovT7gHc8YcRSUc_7f SPP_OKTiyRK9i.BBE6mlgvrivC25w2K5CCtmLzCwciD6s7L8HjEVdwkt6QjiPf077Z64Q4LjIZJl 0AtEC7nUVcFpQya4J2WeJ7uW_bZsMfZcxOD7ndxgPI.HcgLvuXjJ5nVB_4RwFr319_FsqOIoQkrV uwLOBVrjDRPOKIjl2.J1PEmeiYwcrkZQAMLdveHWyW5AKJ5q06HpFWZqKhQKPZe3LQPo53._c8IJ C6qUxeIQRinMAZTuKPW8B7r5HWWn2svv09Io893O2OyGH2lvufnAfuj6X86.zZymTGNL48cE9N9y _ulZ_E76xz0T5iBNqg2June1wOVMwX.nALcpoOPxihj22dJDGYp7JSNx_4YVyU651nr.aHRQYkwi 6OkQB6UGj3U0zdoEYnw0G.2_sSMxJX7kQ2G5_tEE_rEp_zSDenPd9yteiV1HPoD2FQrW4ovZMoRQ zWhnLJCsdvEn8LuS1qzFQ9o.yct9udSNkbw8k17gia4zZ74p4PKYVlLzx0ITTLhVReTtjswlInRQ L_0twHGOe1Yt9tB0hH4oMwWzmm1MvEsgIxBYvPEjabRj5B.k_M0ZyCOp3wTUgccyjOVNtRW1oaXm Emt3Jgo0fS5iRfx.lJF0O63ydnlIY7PeUogdlsS.2MSJLL77kXLODFSLKtmAewyXq0d9sbkjYwNO rnABTBxlT2TMLjRRFzCRDJsjMaRbDDUqPxuYx1NzIVJ0rVBU4_fleitWk4kPJ9sl1fgd3DxVE7AD f_HX4lplhSMuHq6cPm.N4Cj0wkYQh6_eix6zmfiq_4Z3Gsr_ikH.jD3dqdJZxzhKJCDEklygk8w8 9vTJM.osqI_mc2.CiphiBS_O7_Drg4WB_o8JeQ.3lplooiDqlmprmMesBJKFl90xv3ZBDH4KdMZw vw5g8FFiaYPwZL1yEig-- X-Sonic-MF: From: Chuck Zmudzinski To: qemu-devel@nongnu.org Cc: Stefano Stabellini , Anthony Perard , Paul Durrant , Paolo Bonzini , Richard Henderson , Eduardo Habkost , "Michael S. Tsirkin" , Marcel Apfelbaum , Igor Mammedov , xen-devel@lists.xenproject.org, qemu-stable@nongnu.org Subject: [PATCH v10] xen/pt: reserve PCI slot 2 for Intel igd-passthru Date: Sat, 21 Jan 2023 06:02:00 -0500 Message-Id: X-Mailer: git-send-email 2.39.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable References: Content-Length: 15929 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=98.137.65.146; envelope-from=brchuckz@aim.com; helo=sonic309-20.consmr.mail.gq1.yahoo.com X-Spam_score_int: -4 X-Spam_score: -0.5 X-Spam_bar: / X-Spam_report: (-0.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, FREEMAIL_REPLY=1, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @aol.com) X-ZM-MESSAGEID: 1674298989578100001 Content-Type: text/plain; charset="utf-8" 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 workarounds are 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 or use the "pc" machine type instead of the "xenfv" machine type and add the xen platform device at slot 3 using a command line option instead of patching qemu to fix the "xenfv" machine type directly. The second workaround causes some degredation in startup performance such as a longer boot time and reduced resolution of the grub menu that is displayed on the monitor. This patch avoids that reduced startup performance when using the Qemu upstream device model for Xen HVM guests configured with the igd-passthru=3Don option. To implement this feature in the Qemu upstream device model for Xen HVM guests, introduce the following new 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 Michael Tsirkin: * Introduce XEN_PCI_IGD_DOMAIN, XEN_PCI_IGD_BUS, XEN_PCI_IGD_DEV, and XEN_PCI_IGD_FN - use them to compute the value of XEN_PCI_IGD_SLOT_MASK 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=3Don 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=3Don. Move the call to xen_host_pci_device_get, and the associated error handling, from xen_pt_realize to the new xen_igd_clear_slot function to initialize the device class and vendor values which enables the checks for the Intel IGD to succeed. The verification that the host device is an Intel IGD to be passed through is done by checking the domain, bus, slot, and function values as well as by checking that gfx_passthru is enabled, the device class is VGA, and the device vendor in Intel. 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=3Don 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 =3D=3D PCI_VENDOR_ID_INTEL)) { is changed to if (xen_igd_gfx_pt_enabled() && (s->hostaddr.slot =3D=3D 2) && (s->hostaddr.function =3D=3D 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 =20 Change variable for XEN_PT_DEVICE_CLASS: xptc changed to xpdc v5: The patch of xen_pt.c was re-worked to allow a more consistent test for the Intel IGD that uses the same criteria as in other places. This involved moving the call to xen_host_pci_device_get from xen_pt_realize to xen_igd_clear_slot and updating the checks for the Intel IGD in xen_igd_clear_slot: =20 if (xen_igd_gfx_pt_enabled() && (s->hostaddr.slot =3D=3D 2) && (s->hostaddr.function =3D=3D 0)) { is changed to if (is_igd_vga_passthrough(&s->real_device) && s->real_device.domain =3D=3D 0 && s->real_device.bus =3D=3D 0 && s->real_device.dev =3D=3D 2 && s->real_device.func =3D=3D 0 && s->real_device.vendor_id =3D=3D PCI_VENDOR_ID_INTEL) { Added an explanation for the move of xen_host_pci_device_get from xen_pt_realize to xen_igd_clear_slot to the commit message. Rebase. v6: Fix logging by removing these lines from the move from xen_pt_realize to xen_igd_clear_slot that was done in v5: XEN_PT_LOG(d, "Assigning real physical device %02x:%02x.%d" " to devfn 0x%x\n", s->hostaddr.bus, s->hostaddr.slot, s->hostaddr.function, s->dev.devfn); This log needs to be in xen_pt_realize because s->dev.devfn is not set yet in xen_igd_clear_slot. v7: The v7 that was posted to the mailing list was incorrect. v8 is what v7 was intended to be. v8: Inhibit out of context log message and needless processing by adding 2 lines at the top of the new xen_igd_clear_slot function: if (!(pci_bus->slot_reserved_mask & XEN_PCI_IGD_SLOT_MASK)) return; Rebase. This removed an unnecessary header file from xen_pt.h=20 v9: Move check for xen_igd_gfx_pt_enabled() from pc_piix.c to xen_pt.c Move #include "hw/pci/pci_bus.h" from xen_pt.h to xen_pt.c Introduce macros for the IGD devfn constants and use them to compute the value of XEN_PCI_IGD_SLOT_MASK Also use the new macros at an appropriate place in xen_pt_realize Add Cc: to stable - This has been broken for a long time, ever since support for igd-passthru was added to Qemu 7 years ago. Mention new macros in the commit message (Michael Tsirkin) N.B.: I could not follow the suggestion to move the statement pci_bus->slot_reserved_mask &=3D ~XEN_PCI_IGD_SLOT_MASK; to after pci_qdev_realize for symmetry. Doing that results in an error when creating the guest: =20 libxl: error: libxl_qmp.c:1837:qmp_ev_parse_error_messages: Domain 4:PC= I: slot 2 function 0 not available for xen-pci-passthrough, reserved libxl: error: libxl_pci.c:1809:device_pci_add_done: Domain 4:libxl__dev= ice_pci_add failed for PCI device 0:0:2.0 (rc -28) libxl: error: libxl_create.c:1921:domcreate_attach_devices: Domain 4:un= able to add pci devices v10: Change in xen_pt.c at xen_igd_clear_slot from if (!(pci_bus->slot_reserved_mask & XEN_PCI_IGD_SLOT_MASK)) return; xen_host_pci_device_get(&s->real_device, s->hostaddr.domain, s->hostaddr.bus, s->hostaddr.slot, s->hostaddr.function, errp); if (*errp) { error_append_hint(errp, "Failed to \"open\" the real pci device"); return; } to: xen_host_pci_device_get(&s->real_device, s->hostaddr.domain, s->hostaddr.bus, s->hostaddr.slot, s->hostaddr.function, errp); if (*errp) { error_append_hint(errp, "Failed to \"open\" the real pci device"); return; } if (!(pci_bus->slot_reserved_mask & XEN_PCI_IGD_SLOT_MASK)) { xpdc->pci_qdev_realize(qdev, errp); return; } Testing shows this fixes the problem of xen_host_pci_device_get and xpdc->pci_qdev_realize not being called if xen_igd_clear_slot returns because the bit to reserve slot 2 in slot_reserved_mask is not set. Without this change, guest creation fails in the cases when the bit to reserve slot 2 in slot_reserved_mask is not set. Thanks, Stefano! =20 Also, in addition to mentioning the workaround of using the traditional qemu device model available from xenbits.xen.org in the commit message, also mention in the commit message the workaround of using the "pc" machine type instead of the "xenfv" machine type, which results in reduced startup performance. =20 Rebase. =20 Add Igor Mammedov to Cc. hw/i386/pc_piix.c | 1 + hw/xen/xen_pt.c | 63 ++++++++++++++++++++++++++++++++++++-------- hw/xen/xen_pt.h | 20 ++++++++++++++ hw/xen/xen_pt_stub.c | 4 +++ 4 files changed, 77 insertions(+), 11 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index df64dd8dcc..a9d535c815 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -421,6 +421,7 @@ static void pc_xen_hvm_init(MachineState *machine) } =20 pc_xen_hvm_init_pci(machine); + 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 8db0532632..4716ce6d4e 100644 --- a/hw/xen/xen_pt.c +++ b/hw/xen/xen_pt.c @@ -57,6 +57,7 @@ #include =20 #include "hw/pci/pci.h" +#include "hw/pci/pci_bus.h" #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/xen/xen.h" @@ -780,15 +781,6 @@ static void xen_pt_realize(PCIDevice *d, Error **errp) s->hostaddr.bus, s->hostaddr.slot, s->hostaddr.function, s->dev.devfn); =20 - xen_host_pci_device_get(&s->real_device, - s->hostaddr.domain, s->hostaddr.bus, - s->hostaddr.slot, s->hostaddr.function, - errp); - if (*errp) { - error_append_hint(errp, "Failed to \"open\" the real pci device"); - return; - } - s->is_virtfn =3D s->real_device.is_virtfn; if (s->is_virtfn) { XEN_PT_LOG(d, "%04x:%02x:%02x.%d is a SR-IOV Virtual Function\n", @@ -803,8 +795,10 @@ static void xen_pt_realize(PCIDevice *d, Error **errp) s->io_listener =3D xen_pt_io_listener; =20 /* Setup VGA bios for passthrough GFX */ - if ((s->real_device.domain =3D=3D 0) && (s->real_device.bus =3D=3D 0) = && - (s->real_device.dev =3D=3D 2) && (s->real_device.func =3D=3D 0)) { + if ((s->real_device.domain =3D=3D XEN_PCI_IGD_DOMAIN) && + (s->real_device.bus =3D=3D XEN_PCI_IGD_BUS) && + (s->real_device.dev =3D=3D XEN_PCI_IGD_DEV) && + (s->real_device.func =3D=3D XEN_PCI_IGD_FN)) { if (!is_igd_vga_passthrough(&s->real_device)) { error_setg(errp, "Need to enable igd-passthru if you're trying" " to passthrough IGD GFX"); @@ -950,11 +944,57 @@ static void xen_pci_passthrough_instance_init(Object = *obj) PCI_DEVICE(obj)->cap_present |=3D QEMU_PCI_CAP_EXPRESS; } =20 +void xen_igd_reserve_slot(PCIBus *pci_bus) +{ + if (!xen_igd_gfx_pt_enabled()) + return; + + XEN_PT_LOG(0, "Reserving PCI slot 2 for IGD\n"); + pci_bus->slot_reserved_mask |=3D XEN_PCI_IGD_SLOT_MASK; +} + +static void xen_igd_clear_slot(DeviceState *qdev, Error **errp) +{ + ERRP_GUARD(); + PCIDevice *pci_dev =3D (PCIDevice *)qdev; + XenPCIPassthroughState *s =3D XEN_PT_DEVICE(pci_dev); + XenPTDeviceClass *xpdc =3D XEN_PT_DEVICE_GET_CLASS(s); + PCIBus *pci_bus =3D pci_get_bus(pci_dev); + + xen_host_pci_device_get(&s->real_device, + s->hostaddr.domain, s->hostaddr.bus, + s->hostaddr.slot, s->hostaddr.function, + errp); + if (*errp) { + error_append_hint(errp, "Failed to \"open\" the real pci device"); + return; + } + + if (!(pci_bus->slot_reserved_mask & XEN_PCI_IGD_SLOT_MASK)) { + xpdc->pci_qdev_realize(qdev, errp); + return; + } + + if (is_igd_vga_passthrough(&s->real_device) && + s->real_device.domain =3D=3D XEN_PCI_IGD_DOMAIN && + s->real_device.bus =3D=3D XEN_PCI_IGD_BUS && + s->real_device.dev =3D=3D XEN_PCI_IGD_DEV && + s->real_device.func =3D=3D XEN_PCI_IGD_FN && + s->real_device.vendor_id =3D=3D PCI_VENDOR_ID_INTEL) { + pci_bus->slot_reserved_mask &=3D ~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 =3D DEVICE_CLASS(klass); PCIDeviceClass *k =3D PCI_DEVICE_CLASS(klass); =20 + XenPTDeviceClass *xpdc =3D XEN_PT_DEVICE_CLASS(klass); + xpdc->pci_qdev_realize =3D dc->realize; + dc->realize =3D xen_igd_clear_slot; k->realize =3D xen_pt_realize; k->exit =3D xen_pt_unregister_device; k->config_read =3D xen_pt_pci_read_config; @@ -977,6 +1017,7 @@ static const TypeInfo xen_pci_passthrough_info =3D { .instance_size =3D sizeof(XenPCIPassthroughState), .instance_finalize =3D xen_pci_passthrough_finalize, .class_init =3D xen_pci_passthrough_class_init, + .class_size =3D sizeof(XenPTDeviceClass), .instance_init =3D xen_pci_passthrough_instance_init, .interfaces =3D (InterfaceInfo[]) { { INTERFACE_CONVENTIONAL_PCI_DEVICE }, diff --git a/hw/xen/xen_pt.h b/hw/xen/xen_pt.h index cf10fc7bbf..e184699740 100644 --- a/hw/xen/xen_pt.h +++ b/hw/xen/xen_pt.h @@ -40,7 +40,20 @@ typedef struct XenPTReg XenPTReg; #define TYPE_XEN_PT_DEVICE "xen-pci-passthrough" OBJECT_DECLARE_SIMPLE_TYPE(XenPCIPassthroughState, XEN_PT_DEVICE) =20 +#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); @@ -75,6 +88,13 @@ typedef int (*xen_pt_conf_byte_read) =20 #define XEN_PCI_INTEL_OPREGION 0xfc =20 +#define XEN_PCI_IGD_DOMAIN 0 +#define XEN_PCI_IGD_BUS 0 +#define XEN_PCI_IGD_DEV 2 +#define XEN_PCI_IGD_FN 0 +#define XEN_PCI_IGD_SLOT_MASK \ + (1UL << PCI_SLOT(PCI_DEVFN(XEN_PCI_IGD_DEV, XEN_PCI_IGD_FN))) + typedef enum { XEN_PT_GRP_TYPE_HARDWIRED =3D 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) +{ +} --=20 2.39.0