vfio/igd: VFIOConfigMirrorQuirk for igd mirrored registers
cover vfio/igd: VFIOConfigMirrorQuirk for igd mirrored registers
In commit 1a2623b5c9e7 ("vfio/igd: add macro for declaring mirrored registers"), I introduced a macro to handle mirrored registers in igd bar0. However, using the existing VFIOConfigMirrorQuirk should be a better approach I think after going through the vfio code.
This patch set introduces a new header file, pci-quirks.h, to hold generic quirk declarations, and extends VFIOConfigMirrorQuirk to support offsets in PCI config space. This eliminates the need for the previously introduced macro.
Happy new year :)
Tomita Moeko (3):
vfio/pci: declare generic quirks in a new header file vfio/pci: introduce config_offset field in VFIOConfigMirrorQuirk vfio/igd: use VFIOConfigMirrorQuirk for mirrored registers
hw/vfio/igd.c | 128 ++++++++++++------------------------------- hw/vfio/pci-quirks.c | 64 ++++------------------ hw/vfio/pci-quirks.h | 72 ++++++++++++++++++++++++ 3 files changed, 119 insertions(+), 145 deletions(-) create mode 100644 hw/vfio/pci-quirks.h
Signature · 1 line
2.45.2
PATCH 1/3 vfio/pci: declare generic quirks in a new header file
Declare generic vfio_generic_{window_address,window_data,mirror}_quirk in newly created pci_quirks.h so that they can be used elsewhere, like igd.c.
--- hw/vfio/pci-quirks.c | 59 ++++-------------------------------- hw/vfio/pci-quirks.h | 71 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 53 deletions(-) create mode 100644 hw/vfio/pci-quirks.h
hw/vfio/pci-quirks.c +6 -53
@@ -25,6 +25,7 @@#include "hw/nvram/fw_cfg.h" #include "hw/qdev-properties.h" #include "pci.h" +#include "pci-quirks.h" #include "trace.h" /*
@@ -66,40 +67,6 @@ bool vfio_opt_rom_in_denylist(VFIOPCIDevice *vdev)* Device specific region quirks (mostly backdoors to PCI config space) */ -/* -* The generic window quirks operate on an address and data register, -* vfio_generic_window_address_quirk handles the address register and -* vfio_generic_window_data_quirk handles the data register. These ops -* pass reads and writes through to hardware until a value matching the -* stored address match/mask is written. When this occurs, the data -* register access emulated PCI config space for the device rather than -* passing through accesses. This enables devices where PCI config space -* is accessible behind a window register to maintain the virtualization -* provided through vfio. -*/ -typedef struct VFIOConfigWindowMatch { -uint32_t match; -uint32_t mask; -}VFIOConfigWindowMatch ; - -typedef struct VFIOConfigWindowQuirk { -struct VFIOPCIDevice *vdev; - -uint32_t address_val; - -uint32_t address_offset; -uint32_t data_offset; - -bool window_enabled; -uint8_t bar; - -MemoryRegion *addr_mem; -MemoryRegion *data_mem; - -uint32_t nr_matches; -VFIOConfigWindowMatch matches[]; -}VFIOConfigWindowQuirk ; -static uint64_t vfio_generic_window_quirk_address_read (void *opaque,hwaddr addr,unsigned size)
@@ -135,7 +102,7 @@ static void vfio_generic_window_quirk_address_write(void *opaque, hwaddr addr, } } -static const MemoryRegionOps vfio_generic_window_address_quirk = { +const MemoryRegionOps vfio_generic_window_address_quirk = { .read = vfio_generic_window_quirk_address_read, .write = vfio_generic_window_quirk_address_write, .endianness =DEVICE_LITTLE_ENDIAN ,
@@ -178,26 +145,12 @@ static void vfio_generic_window_quirk_data_write(void *opaque, hwaddr addr, addr + window->data_offset, data, size); } -static const MemoryRegionOps vfio_generic_window_data_quirk = { +const MemoryRegionOps vfio_generic_window_data_quirk = { .read = vfio_generic_window_quirk_data_read, .write = vfio_generic_window_quirk_data_write, .endianness =DEVICE_LITTLE_ENDIAN , }; -/* -* The generic mirror quirk handles devices which expose PCI config space -* through a region within a BAR. When enabled, reads and writes are -* redirected through to emulated PCI config space. XXX if PCI config space -* used memory regions, this could just be an alias. -*/ -typedef struct VFIOConfigMirrorQuirk { -struct VFIOPCIDevice *vdev; -uint32_t offset; -uint8_t bar; -MemoryRegion *mem; -uint8_t data[]; -}VFIOConfigMirrorQuirk ; -static uint64_t vfio_generic_quirk_mirror_read (void *opaque,hwaddr addr,unsigned size) {
@@ -228,7 +181,7 @@ static void vfio_generic_quirk_mirror_write(void *opaque, hwaddr addr, addr, data); } -static const MemoryRegionOps vfio_generic_mirror_quirk = { +const MemoryRegionOps vfio_generic_mirror_quirk = { .read = vfio_generic_quirk_mirror_read, .write = vfio_generic_quirk_mirror_write, .endianness =DEVICE_LITTLE_ENDIAN ,
@@ -1499,7 +1452,7 @@ static void get_nv_gpudirect_clique_id(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { - const Property *prop = opaque; + Property *prop = opaque;uint8_t *ptr =object_field_prop_ptr (obj, prop);visit_type_uint8 (v, name, ptr, errp);
@@ -1509,7 +1462,7 @@ static void set_nv_gpudirect_clique_id(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { - const Property *prop = opaque; + Property *prop = opaque;uint8_t value, *ptr =object_field_prop_ptr (obj, prop);if (!visit_type_uint8 (v, name, &value, errp)) {
hw/vfio/pci-quirks.h new file +71 -0
71 lines not on this page · raw message
Signature · 1 line
2.45.2
Re: [PATCH 1/3] vfio/pci: declare generic quirks in a new header file
Quoted 111 lines · Tomita Moeko
Declare generic vfio_generic_{window_address,window_data,mirror}_quirk in newly created
pci_quirks.hso that they can be used elsewhere, likeigd.c.Signed-off-by Tomita Moeko <[email protected]>--- hw/vfio/pci-quirks.c | 59 ++++-------------------------------- hw/vfio/pci-quirks.h | 71 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 53 deletions(-) create mode 100644 hw/vfio/pci-quirks.hhw/vfio/pci-quirks.c +4
-51@@ -25,6 +25,7 @@#include "hw/nvram/fw_cfg.h" #include "hw/qdev-properties.h" #include "pci.h" +#include "pci-quirks.h" #include "trace.h" /* @@ -66,40 +67,6 @@ bool vfio_opt_rom_in_denylist(VFIOPCIDevice *vdev)* Device specific region quirks (mostly backdoors to PCI config space) */ -/* -* The generic window quirks operate on an address and data register, -* vfio_generic_window_address_quirk handles the address register and -* vfio_generic_window_data_quirk handles the data register. These ops -* pass reads and writes through to hardware until a value matching the -* stored address match/mask is written. When this occurs, the data -* register access emulated PCI config space for the device rather than -* passing through accesses. This enables devices where PCI config space -* is accessible behind a window register to maintain the virtualization -* provided through vfio. -*/ -typedef struct VFIOConfigWindowMatch { -uint32_t match; -uint32_t mask; -}VFIOConfigWindowMatch ; - -typedef struct VFIOConfigWindowQuirk { -struct VFIOPCIDevice *vdev; - -uint32_t address_val; - -uint32_t address_offset; -uint32_t data_offset; - -bool window_enabled; -uint8_t bar; - -MemoryRegion *addr_mem; -MemoryRegion *data_mem; - -uint32_t nr_matches; -VFIOConfigWindowMatch matches[]; -}VFIOConfigWindowQuirk ; -static uint64_t vfio_generic_window_quirk_address_read (void *opaque,hwaddr addr,unsigned size)@@ -135,7 +102,7 @@ static void vfio_generic_window_quirk_address_write(void *opaque, hwaddr addr, } } -static const MemoryRegionOps vfio_generic_window_address_quirk = { +const MemoryRegionOps vfio_generic_window_address_quirk = { .read = vfio_generic_window_quirk_address_read, .write = vfio_generic_window_quirk_address_write, .endianness =DEVICE_LITTLE_ENDIAN ,@@ -178,26 +145,12 @@ static void vfio_generic_window_quirk_data_write(void *opaque, hwaddr addr, addr + window->data_offset, data, size); } -static const MemoryRegionOps vfio_generic_window_data_quirk = { +const MemoryRegionOps vfio_generic_window_data_quirk = { .read = vfio_generic_window_quirk_data_read, .write = vfio_generic_window_quirk_data_write, .endianness =DEVICE_LITTLE_ENDIAN , }; -/* -* The generic mirror quirk handles devices which expose PCI config space -* through a region within a BAR. When enabled, reads and writes are -* redirected through to emulated PCI config space. XXX if PCI config space -* used memory regions, this could just be an alias. -*/ -typedef struct VFIOConfigMirrorQuirk { -struct VFIOPCIDevice *vdev; -uint32_t offset; -uint8_t bar; -MemoryRegion *mem; -uint8_t data[]; -}VFIOConfigMirrorQuirk ; -static uint64_t vfio_generic_quirk_mirror_read (void *opaque,hwaddr addr,unsigned size) {@@ -228,7 +181,7 @@ static void vfio_generic_quirk_mirror_write(void *opaque, hwaddr addr, addr, data); } -static const MemoryRegionOps vfio_generic_mirror_quirk = { +const MemoryRegionOps vfio_generic_mirror_quirk = { .read = vfio_generic_quirk_mirror_read, .write = vfio_generic_quirk_mirror_write, .endianness =DEVICE_LITTLE_ENDIAN ,
hw/vfio/pci-quirks.c static void get_nv_gpudirect_clique_id(Object *obj, Visitor *v, · line 1455
Quoted 5 lines
hw/vfio/pci-quirks.c +1
-1@@ -1499,7 +1452,7 @@ static void get_nv_gpudirect_clique_id(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { - const Property *prop = opaque; + Property *prop = opaque;
Sorry this was a mistake when I rebasing my changes. I will revert this in v2.
hw/vfio/pci-quirks.c static void set_nv_gpudirect_clique_id(Object *obj, Visitor *v, · line 1465
Quoted 9 lines
hw/vfio/pci-quirks.c +1
-1uint8_t *ptr =object_field_prop_ptr (obj, prop);visit_type_uint8 (v, name, ptr, errp);@@ -1509,7 +1462,7 @@ static void set_nv_gpudirect_clique_id(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { - const Property *prop = opaque; + Property *prop = opaque;
ditto
Quoted 80 lines
hw/vfio/pci-quirks.c +0
-0uint8_t value, *ptr =object_field_prop_ptr (obj, prop);if (!visit_type_uint8 (v, name, &value, errp)) {hw/vfio/pci-quirks.h new file +71
-0@@ -0,0 +1,71 @@ +/* +* vfio generic region quirks (mostly backdoors to PCI config space) +* +* Copyright Red Hat, Inc. 2012-2015 +* +* Authors: +* Alex Williamson <[email protected]> +* +* This work is licensed under the terms of the GNU GPL, version 2. See +* the COPYING file in the top-level directory. +*/ +#ifndef HW_VFIO_VFIO_PCI_QUIRKS_H +#define HW_VFIO_VFIO_PCI_QUIRKS_H + +#include "qemu/osdep.h" +#include "exec/memop.h" + +/* +* The generic window quirks operate on an address and data register, +* vfio_generic_window_address_quirk handles the address register and +* vfio_generic_window_data_quirk handles the data register. These ops +* pass reads and writes through to hardware until a value matching the +* stored address match/mask is written. When this occurs, the data +* register access emulated PCI config space for the device rather than +* passing through accesses. This enables devices where PCI config space +* is accessible behind a window register to maintain the virtualization +* provided through vfio. +*/ +typedef struct VFIOConfigWindowMatch { +uint32_t match; +uint32_t mask; +}VFIOConfigWindowMatch ; + +typedef struct VFIOConfigWindowQuirk { +struct VFIOPCIDevice *vdev; + +uint32_t address_val; + +uint32_t address_offset; +uint32_t data_offset; + +bool window_enabled; +uint8_t bar; + +MemoryRegion *addr_mem; +MemoryRegion *data_mem; + +uint32_t nr_matches; +VFIOConfigWindowMatch matches[]; +}VFIOConfigWindowQuirk ; + +extern const MemoryRegionOps vfio_generic_window_address_quirk; +extern const MemoryRegionOps vfio_generic_window_data_quirk; + +/* +* The generic mirror quirk handles devices which expose PCI config space +* through a region within a BAR. When enabled, reads and writes are +* redirected through to emulated PCI config space. XXX if PCI config space +* used memory regions, this could just be an alias. +*/ +typedef struct VFIOConfigMirrorQuirk { +struct VFIOPCIDevice *vdev; +uint32_t offset; +uint8_t bar; +MemoryRegion *mem; +uint8_t data[]; +}VFIOConfigMirrorQuirk ; + +extern const MemoryRegionOps vfio_generic_mirror_quirk; + +#endif /* HW_VFIO_VFIO_PCI_QUIRKS_H */
PATCH 2/3 vfio/pci: introduce config_offset field in VFIOConfigMirrorQuirk
In reply to Tomita MoekoDevice may only expose a specific portion of PCI config space through a region in a BAR, such behavior is seen in igd GGC and BDSM mirrors in BAR0. To handle these, config_offset is introduced to allow mirroring arbitrary region in PCI config space.
--- hw/vfio/pci-quirks.c | 5 +++++ hw/vfio/pci-quirks.h | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-)
hw/vfio/pci-quirks.c +5 -0
@@ -162,6 +162,7 @@ static uint64_t vfio_generic_quirk_mirror_read(void *opaque, (void )vfio_region_read (&vdev->bars[mirror->bar].region, addr + mirror->offset, size); + addr += mirror->config_offset; data =vfio_pci_read_config (&vdev->pdev, addr, size); trace_vfio_quirk_generic_mirror_read(vdev->vbasedev.name, memory_region_name(mirror->mem),
@@ -175,6 +176,7 @@ static void vfio_generic_quirk_mirror_write(void *opaque, hwaddr addr,VFIOConfigMirrorQuirk *mirror = opaque;VFIOPCIDevice *vdev = mirror->vdev; + addr += mirror->config_offset;vfio_pci_write_config (&vdev->pdev, addr, data, size); trace_vfio_quirk_generic_mirror_write(vdev->vbasedev.name, memory_region_name(mirror->mem),
@@ -456,6 +458,7 @@ static void vfio_probe_ati_bar2_quirk(VFIOPCIDevice *vdev, int nr) mirror->mem = quirk->mem; mirror->vdev = vdev; mirror->offset =0x4000 ; + mirror->config_offset =0 ; mirror->bar = nr; memory_region_init_io(mirror->mem, OBJECT(vdev),
@@ -908,6 +911,7 @@ static void vfio_probe_nvidia_bar0_quirk(VFIOPCIDevice *vdev, int nr) mirror->mem = quirk->mem; mirror->vdev = vdev; mirror->offset =0x88000 ; + mirror->config_offset =0 ; mirror->bar = nr; last = (LastDataSet *)&mirror->data; last->quirk = quirk;
@@ -929,6 +933,7 @@ static void vfio_probe_nvidia_bar0_quirk(VFIOPCIDevice *vdev, int nr) mirror->mem = quirk->mem; mirror->vdev = vdev; mirror->offset =0x1800 ; + mirror->config_offset =0 ; mirror->bar = nr; last = (LastDataSet *)&mirror->data; last->quirk = quirk;
hw/vfio/pci-quirks.h +2 -1
@@ -60,7 +60,8 @@ extern const MemoryRegionOps vfio_generic_window_data_quirk;*/ typedef struct VFIOConfigMirrorQuirk { struct VFIOPCIDevice *vdev; - uint32_t offset; + uint32_t offset; /* Offset in BAR */ + uint32_t config_offset; /* Offset in PCI config space */ uint8_t bar; MemoryRegion *mem; uint8_t data[];
Signature · 1 line
2.45.2
Re: [PATCH 2/3] vfio/pci: introduce config_offset field in VFIOConfigMirrorQuirk
Quoted 32 lines · On Tue, 31 Dec 2024 23:19:52 +0800 Tomita Moeko <[email protected]> wrote:
Device may only expose a specific portion of PCI config space through a region in a BAR, such behavior is seen in igd GGC and BDSM mirrors in BAR0. To handle these,
config_offsetis introduced to allow mirroring arbitrary region in PCI config space.Signed-off-by Tomita Moeko <[email protected]>--- hw/vfio/pci-quirks.c | 5 +++++ hw/vfio/pci-quirks.h | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-)hw/vfio/pci-quirks.c +2
-0@@ -162,6 +162,7 @@ static uint64_t vfio_generic_quirk_mirror_read(void *opaque, (void )vfio_region_read (&vdev->bars[mirror->bar].region, addr + mirror->offset, size); + addr += mirror->config_offset; data =vfio_pci_read_config (&vdev->pdev, addr, size); trace_vfio_quirk_generic_mirror_read(vdev->vbasedev.name, memory_region_name(mirror->mem),@@ -175,6 +176,7 @@ static void vfio_generic_quirk_mirror_write(void *opaque, hwaddr addr,VFIOConfigMirrorQuirk *mirror = opaque;VFIOPCIDevice *vdev = mirror->vdev; + addr += mirror->config_offset;vfio_pci_write_config (&vdev->pdev, addr, data, size); trace_vfio_quirk_generic_mirror_write(vdev->vbasedev.name, memory_region_name(mirror->mem),
hw/vfio/pci-quirks.c static void vfio_probe_ati_bar2_quirk(VFIOPCIDevice *vdev, int nr) · line 461
Quoted 4 lines
hw/vfio/pci-quirks.c +1
-0@@ -456,6 +458,7 @@ static void vfio_probe_ati_bar2_quirk(VFIOPCIDevice *vdev, int nr) mirror->mem = quirk->mem; mirror->vdev = vdev; mirror->offset =0x4000 ; + mirror->config_offset =0 ;
These are all allocated with g_malloc0(), we don't need to explicitly initialize this field in any of these existing uses. Thanks,
Alex
Quoted 33 lines
hw/vfio/pci-quirks.c +2
-0mirror->bar = nr; memory_region_init_io(mirror->mem, OBJECT(vdev),@@ -908,6 +911,7 @@ static void vfio_probe_nvidia_bar0_quirk(VFIOPCIDevice *vdev, int nr) mirror->mem = quirk->mem; mirror->vdev = vdev; mirror->offset =0x88000 ; + mirror->config_offset =0 ; mirror->bar = nr; last = (LastDataSet *)&mirror->data; last->quirk = quirk;@@ -929,6 +933,7 @@ static void vfio_probe_nvidia_bar0_quirk(VFIOPCIDevice *vdev, int nr) mirror->mem = quirk->mem; mirror->vdev = vdev; mirror->offset =0x1800 ; + mirror->config_offset =0 ; mirror->bar = nr; last = (LastDataSet *)&mirror->data; last->quirk = quirk;hw/vfio/pci-quirks.h +2
-1@@ -60,7 +60,8 @@ extern const MemoryRegionOps vfio_generic_window_data_quirk;*/ typedef struct VFIOConfigMirrorQuirk { struct VFIOPCIDevice *vdev; - uint32_t offset; + uint32_t offset; /* Offset in BAR */ + uint32_t config_offset; /* Offset in PCI config space */ uint8_t bar; MemoryRegion *mem; uint8_t data[];
PATCH 3/3 vfio/igd: use VFIOConfigMirrorQuirk for mirrored registers
In reply to Tomita MoekoWith the introduction of config_offset field, VFIOConfigMirrorQuirk can now be used for those mirrored register in igd bar0. This eliminates the need for the macro intoduced in 1a2623b5c9e7 ("vfio/igd: add macro for declaring mirrored registers").
--- hw/vfio/igd.c | 128 ++++++++++++++------------------------------------ 1 file changed, 36 insertions(+), 92 deletions(-)
hw/vfio/igd.c +36 -92
@@ -18,6 +18,7 @@#include "hw/hw.h" #include "hw/nvram/fw_cfg.h" #include "pci.h" +#include "pci-quirks.h" #include "trace.h" /*
@@ -422,84 +423,21 @@ static const MemoryRegionOps vfio_igd_index_quirk = { .endianness = DEVICE_LITTLE_ENDIAN, }; -static uint64_t vfio_igd_pci_config_read (VFIOPCIDevice *vdev,uint64_t offset, -unsigned size) -{ -switch (size) { -case 1 : -return pci_get_byte (vdev->pdev.config + offset); -case 2 : -return pci_get_word (vdev->pdev.config + offset); -case 4 : -return pci_get_long (vdev->pdev.config + offset); -case 8 : -return pci_get_quad (vdev->pdev.config + offset); -default : -hw_error ("igd: unsupported pci config read at %" PRIx64", size %u" , - offset, size); -break ; - } - -return 0 ; -} - -static void vfio_igd_pci_config_write (VFIOPCIDevice *vdev,uint64_t offset, -uint64_t data,unsigned size) -{ -switch (size) { -case 1 : -pci_set_byte (vdev->pdev.config + offset, data); -break ; -case 2 : -pci_set_word (vdev->pdev.config + offset, data); -break ; -case 4 : -pci_set_long (vdev->pdev.config + offset, data); -break ; -case 8 : -pci_set_quad (vdev->pdev.config + offset, data); -break ; -default : -hw_error ("igd: unsupported pci config write at %" PRIx64", size %u" , - offset, size); -break ; - } -} - -#define VFIO_IGD_QUIRK_MIRROR_REG (reg, name) \ -static uint64_t vfio_igd_quirk_read_##name(void *opaque, \ - hwaddr addr, unsigned size) \ -{ \ - VFIOPCIDevice *vdev = opaque; \ - \ - return vfio_igd_pci_config_read(vdev, reg + addr, size); \ -} \ - \ -static void vfio_igd_quirk_write_##name(void *opaque, hwaddr addr, \ - uint64_t data, unsigned size) \ -{ \ - VFIOPCIDevice *vdev = opaque; \ - \ - vfio_igd_pci_config_write(vdev, reg + addr, data, size); \ -} \ - \ -static const MemoryRegionOps vfio_igd_quirk_mirror_##name = { \ - .read = vfio_igd_quirk_read_##name, \ - .write = vfio_igd_quirk_write_##name, \ - .endianness = DEVICE_LITTLE_ENDIAN, \ -}; - -VFIO_IGD_QUIRK_MIRROR_REG(IGD_GMCH, ggc) -VFIO_IGD_QUIRK_MIRROR_REG(IGD_BDSM, bdsm) -VFIO_IGD_QUIRK_MIRROR_REG(IGD_BDSM_GEN11, bdsm64) -#define IGD_GGC_MMIO_OFFSET 0x108040#define IGD_BDSM_MMIO_OFFSET 0x1080C0 +typedef struct VFIOIGDBAR0Quirk { +VFIOConfigMirrorQuirk ggc_mirror; +VFIOConfigMirrorQuirk bdsm_mirror; +}VFIOIGDBAR0Quirk ; +void vfio_probe_igd_bar0_quirk (VFIOPCIDevice *vdev,int nr) {VFIOQuirk *quirk; +VFIOIGDBAR0Quirk *bar0; +VFIOConfigMirrorQuirk *ggc_mirror, *bdsm_mirror;int gen; +uint32_t bdsm_reg_size;/* * This must be an Intel VGA device at address 00:02.0 for us to even
@@ -523,30 +461,36 @@ void vfio_probe_igd_bar0_quirk(VFIOPCIDevice *vdev, int nr) } quirk =vfio_quirk_alloc (2 ); - quirk->data = vdev; - -memory_region_init_io (&quirk->mem[0 ],OBJECT (vdev), - &vfio_igd_quirk_mirror_ggc, vdev, + bar0 = quirk->data =g_malloc0 (sizeof (*bar0)); + + ggc_mirror = &bar0->ggc_mirror; + ggc_mirror->vdev = vdev; + ggc_mirror->mem = &quirk->mem[0 ]; + ggc_mirror->bar = nr; + ggc_mirror->offset =IGD_GGC_MMIO_OFFSET ; + ggc_mirror->config_offset =IGD_GMCH ; + + bdsm_mirror = &bar0->bdsm_mirror; + bdsm_mirror->mem = &quirk->mem[1 ]; + bdsm_mirror->vdev = vdev; + bdsm_mirror->offset =IGD_BDSM_MMIO_OFFSET ; + bdsm_mirror->config_offset = (gen <11 ) ?IGD_BDSM :IGD_BDSM_GEN11 ; + bdsm_mirror->bar = nr; + bdsm_reg_size = (gen <11 ) ?4 :8 ; + +memory_region_init_io (ggc_mirror->mem,OBJECT (vdev), + &vfio_generic_mirror_quirk, ggc_mirror,"vfio-igd-ggc-quirk" ,2 ); -memory_region_add_subregion_overlap (vdev->bars[0 ].region.mem, -IGD_GGC_MMIO_OFFSET , &quirk->mem[0 ], +memory_region_add_subregion_overlap (vdev->bars[nr].region.mem, + ggc_mirror->offset, ggc_mirror->mem,1 ); -if (gen <11 ) { -memory_region_init_io (&quirk->mem[1 ],OBJECT (vdev), - &vfio_igd_quirk_mirror_bdsm, vdev, -"vfio-igd-bdsm-quirk" ,4 ); -memory_region_add_subregion_overlap (vdev->bars[0 ].region.mem, -IGD_BDSM_MMIO_OFFSET , - &quirk->mem[1 ],1 ); - }else { -memory_region_init_io (&quirk->mem[1 ],OBJECT (vdev), - &vfio_igd_quirk_mirror_bdsm64, vdev, -"vfio-igd-bdsm-quirk" ,8 ); -memory_region_add_subregion_overlap (vdev->bars[0 ].region.mem, -IGD_BDSM_MMIO_OFFSET , - &quirk->mem[1 ],1 ); - } +memory_region_init_io (bdsm_mirror->mem,OBJECT (vdev), + &vfio_generic_mirror_quirk, bdsm_mirror, +"vfio-igd-bdsm-quirk" , bdsm_reg_size); +memory_region_add_subregion_overlap (vdev->bars[nr].region.mem, + bdsm_mirror->offset, bdsm_mirror->mem, +1 );QLIST_INSERT_HEAD (&vdev->bars[nr].quirks, quirk, next); }
Signature · 1 line
2.45.2
Re: [PATCH 3/3] vfio/igd: use VFIOConfigMirrorQuirk for mirrored registers
Quoted 95 lines · On Tue, 31 Dec 2024 23:19:53 +0800 Tomita Moeko <[email protected]> wrote:
With the introduction of
config_offsetfield, VFIOConfigMirrorQuirk can now be used for those mirrored register in igd bar0. This eliminates the need for the macro intoduced in1a2623b5c9e7("vfio/igd: add macro for declaring mirrored registers").Signed-off-by Tomita Moeko <[email protected]>--- hw/vfio/igd.c | 128 ++++++++++++++------------------------------------ 1 file changed, 36 insertions(+), 92 deletions(-)hw/vfio/igd.c +1
-69@@ -18,6 +18,7 @@#include "hw/hw.h" #include "hw/nvram/fw_cfg.h" #include "pci.h" +#include "pci-quirks.h" #include "trace.h" /* @@ -422,84 +423,21 @@ static const MemoryRegionOps vfio_igd_index_quirk = { .endianness = DEVICE_LITTLE_ENDIAN, }; -static uint64_t vfio_igd_pci_config_read (VFIOPCIDevice *vdev,uint64_t offset, -unsigned size) -{ -switch (size) { -case 1 : -return pci_get_byte (vdev->pdev.config + offset); -case 2 : -return pci_get_word (vdev->pdev.config + offset); -case 4 : -return pci_get_long (vdev->pdev.config + offset); -case 8 : -return pci_get_quad (vdev->pdev.config + offset); -default : -hw_error ("igd: unsupported pci config read at %" PRIx64", size %u" , - offset, size); -break ; - } - -return 0 ; -} - -static void vfio_igd_pci_config_write (VFIOPCIDevice *vdev,uint64_t offset, -uint64_t data,unsigned size) -{ -switch (size) { -case 1 : -pci_set_byte (vdev->pdev.config + offset, data); -break ; -case 2 : -pci_set_word (vdev->pdev.config + offset, data); -break ; -case 4 : -pci_set_long (vdev->pdev.config + offset, data); -break ; -case 8 : -pci_set_quad (vdev->pdev.config + offset, data); -break ; -default : -hw_error ("igd: unsupported pci config write at %" PRIx64", size %u" , - offset, size); -break ; - } -} - -#define VFIO_IGD_QUIRK_MIRROR_REG (reg, name) \ -static uint64_t vfio_igd_quirk_read_##name(void *opaque, \ - hwaddr addr, unsigned size) \ -{ \ - VFIOPCIDevice *vdev = opaque; \ - \ - return vfio_igd_pci_config_read(vdev, reg + addr, size); \ -} \ - \ -static void vfio_igd_quirk_write_##name(void *opaque, hwaddr addr, \ - uint64_t data, unsigned size) \ -{ \ - VFIOPCIDevice *vdev = opaque; \ - \ - vfio_igd_pci_config_write(vdev, reg + addr, data, size); \ -} \ - \ -static const MemoryRegionOps vfio_igd_quirk_mirror_##name = { \ - .read = vfio_igd_quirk_read_##name, \ - .write = vfio_igd_quirk_write_##name, \ - .endianness = DEVICE_LITTLE_ENDIAN, \ -}; - -VFIO_IGD_QUIRK_MIRROR_REG(IGD_GMCH, ggc) -VFIO_IGD_QUIRK_MIRROR_REG (IGD_BDSM , bdsm)
hw/vfio/igd.c static const MemoryRegionOps vfio_igd_index_quirk = { · line 433
Quoted 10 lines
hw/vfio/igd.c +5
-2-VFIO_IGD_QUIRK_MIRROR_REG(IGD_BDSM_GEN11, bdsm64) -#define IGD_GGC_MMIO_OFFSET 0x108040#define IGD_BDSM_MMIO_OFFSET 0x1080C0 +typedef struct VFIOIGDBAR0Quirk { +VFIOConfigMirrorQuirk ggc_mirror; +VFIOConfigMirrorQuirk bdsm_mirror; +}VFIOIGDBAR0Quirk ; +
I don't understand why this needs to exist. There's really no reason that the ggc and bdsm mirrors need to be tied to the same quirk, just do something like vfio_probe_nvidia_bar0_quirk() where we allocate a quirk with a single memory region, setup the mirror, init the region, add the overlap, insert into the quirk list, then repeat for the other.
Quoted 24 lines
hw/vfio/igd.c +9
-4void vfio_probe_igd_bar0_quirk (VFIOPCIDevice *vdev,int nr) {VFIOQuirk *quirk; +VFIOIGDBAR0Quirk *bar0; +VFIOConfigMirrorQuirk *ggc_mirror, *bdsm_mirror;int gen; +uint32_t bdsm_reg_size;/* * This must be an Intel VGA device at address 00:02.0 for us to even @@ -523,30 +461,36 @@ void vfio_probe_igd_bar0_quirk(VFIOPCIDevice *vdev, int nr) } quirk =vfio_quirk_alloc (2 ); - quirk->data = vdev; - - memory_region_init_io(&quirk->mem[0], OBJECT(vdev), - &vfio_igd_quirk_mirror_ggc, vdev, + bar0 = quirk->data =g_malloc0 (sizeof (*bar0)); + + ggc_mirror = &bar0->ggc_mirror; + ggc_mirror->vdev = vdev; + ggc_mirror->mem = &quirk->mem[0 ]; + ggc_mirror->bar = nr;
hw/vfio/igd.c void vfio_probe_igd_bar0_quirk(VFIOPCIDevice *vdev, int nr) · line 479
Quoted 10 lines
hw/vfio/igd.c +10
-0+ ggc_mirror->offset =IGD_GGC_MMIO_OFFSET ; + ggc_mirror->config_offset =IGD_GMCH ; + + bdsm_mirror = &bar0->bdsm_mirror; + bdsm_mirror->mem = &quirk->mem[1 ]; + bdsm_mirror->vdev = vdev; + bdsm_mirror->offset =IGD_BDSM_MMIO_OFFSET ; + bdsm_mirror->config_offset = (gen <11 ) ?IGD_BDSM :IGD_BDSM_GEN11 ; + bdsm_mirror->bar = nr; + bdsm_reg_size = (gen <11 ) ?4 :8 ;
This looks like it could just be calculated inline when the region is initialized. Thanks,
Alex
Quoted 34 lines
hw/vfio/igd.c +11
-17+ +memory_region_init_io (ggc_mirror->mem,OBJECT (vdev), + &vfio_generic_mirror_quirk, ggc_mirror,"vfio-igd-ggc-quirk" ,2 ); -memory_region_add_subregion_overlap (vdev->bars[0 ].region.mem, -IGD_GGC_MMIO_OFFSET , &quirk->mem[0 ], +memory_region_add_subregion_overlap (vdev->bars[nr].region.mem, + ggc_mirror->offset, ggc_mirror->mem,1 ); -if (gen <11 ) { -memory_region_init_io (&quirk->mem[1 ],OBJECT (vdev), - &vfio_igd_quirk_mirror_bdsm, vdev, -"vfio-igd-bdsm-quirk" ,4 ); -memory_region_add_subregion_overlap (vdev->bars[0 ].region.mem, -IGD_BDSM_MMIO_OFFSET , - &quirk->mem[1 ],1 ); - }else { -memory_region_init_io (&quirk->mem[1 ],OBJECT (vdev), - &vfio_igd_quirk_mirror_bdsm64, vdev, -"vfio-igd-bdsm-quirk" ,8 ); -memory_region_add_subregion_overlap (vdev->bars[0 ].region.mem, -IGD_BDSM_MMIO_OFFSET , - &quirk->mem[1 ],1 ); - } +memory_region_init_io (bdsm_mirror->mem,OBJECT (vdev), + &vfio_generic_mirror_quirk, bdsm_mirror, +"vfio-igd-bdsm-quirk" , bdsm_reg_size); +memory_region_add_subregion_overlap (vdev->bars[nr].region.mem, + bdsm_mirror->offset, bdsm_mirror->mem, +1 );QLIST_INSERT_HEAD (&vdev->bars[nr].quirks, quirk, next); }