| Message ID | 20230501020221.188376-3-viktor@daynix.com |
|---|---|
| State | New |
| Headers | show |
| Series | None | expand |
On Mon, May 1, 2023 at 10:02 AM Viktor Prutyanov <viktor@daynix.com> wrote: > > Guest may enable or disable PCI ATS and, accordingly, Device-TLB for > the device. Add a flag and a trigger function to handle Device-TLB > enable/disable in VirtIO devices and hook it to ATS enable/disable for > PCI transport. > > Signed-off-by: Viktor Prutyanov <viktor@daynix.com> > --- > hw/virtio/virtio-pci.c | 17 +++++++++++++++++ > include/hw/virtio/virtio.h | 2 ++ > 2 files changed, 19 insertions(+) > > diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c > index 247325c193..ccd8c4efa1 100644 > --- a/hw/virtio/virtio-pci.c > +++ b/hw/virtio/virtio-pci.c > @@ -716,6 +716,18 @@ virtio_address_space_read(VirtIOPCIProxy *proxy, hwaddr addr, > } > } > > +static void virtio_pci_ats_ctrl_trigger(PCIDevice *pci_dev, bool enable) > +{ > + VirtIOPCIProxy *proxy = VIRTIO_PCI(pci_dev); > + VirtIODevice *vdev = virtio_bus_get_device(&proxy->bus); > + VirtioDeviceClass *k = VIRTIO_DEVICE_GET_CLASS(vdev); > + > + vdev->device_iotlb_enabled = enable; > + > + if (k->toggle_device_iotlb) > + k->toggle_device_iotlb(vdev, enable); > +} > + > static void virtio_write_config(PCIDevice *pci_dev, uint32_t address, > uint32_t val, int len) > { > @@ -729,6 +741,11 @@ static void virtio_write_config(PCIDevice *pci_dev, uint32_t address, > pcie_cap_flr_write_config(pci_dev, address, val, len); > } > > + if (proxy->flags & VIRTIO_PCI_FLAG_ATS) { > + pcie_ats_config_write(pci_dev, address, val, len, > + virtio_pci_ats_ctrl_trigger); I think we can directly call virtio_pci_ats_ctrl_trigger instead of using an indirection like pcie_ats_config_write? Thanks > + } > + > if (range_covers_byte(address, len, PCI_COMMAND)) { > if (!(pci_dev->config[PCI_COMMAND] & PCI_COMMAND_MASTER)) { > virtio_set_disabled(vdev, true); > diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h > index f236e94ca6..83d07bb6b7 100644 > --- a/include/hw/virtio/virtio.h > +++ b/include/hw/virtio/virtio.h > @@ -155,6 +155,7 @@ struct VirtIODevice > QLIST_HEAD(, VirtQueue) *vector_queues; > QTAILQ_ENTRY(VirtIODevice) next; > EventNotifier config_notifier; > + bool device_iotlb_enabled; > }; > > struct VirtioDeviceClass { > @@ -212,6 +213,7 @@ struct VirtioDeviceClass { > const VMStateDescription *vmsd; > bool (*primary_unplug_pending)(void *opaque); > struct vhost_dev *(*get_vhost)(VirtIODevice *vdev); > + void (*toggle_device_iotlb)(VirtIODevice *vdev, bool enable); > }; > > void virtio_instance_init_common(Object *proxy_obj, void *data, > -- > 2.35.1 >
diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index 247325c193..ccd8c4efa1 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -716,6 +716,18 @@ virtio_address_space_read(VirtIOPCIProxy *proxy, hwaddr addr, } } +static void virtio_pci_ats_ctrl_trigger(PCIDevice *pci_dev, bool enable) +{ + VirtIOPCIProxy *proxy = VIRTIO_PCI(pci_dev); + VirtIODevice *vdev = virtio_bus_get_device(&proxy->bus); + VirtioDeviceClass *k = VIRTIO_DEVICE_GET_CLASS(vdev); + + vdev->device_iotlb_enabled = enable; + + if (k->toggle_device_iotlb) + k->toggle_device_iotlb(vdev, enable); +} + static void virtio_write_config(PCIDevice *pci_dev, uint32_t address, uint32_t val, int len) { @@ -729,6 +741,11 @@ static void virtio_write_config(PCIDevice *pci_dev, uint32_t address, pcie_cap_flr_write_config(pci_dev, address, val, len); } + if (proxy->flags & VIRTIO_PCI_FLAG_ATS) { + pcie_ats_config_write(pci_dev, address, val, len, + virtio_pci_ats_ctrl_trigger); + } + if (range_covers_byte(address, len, PCI_COMMAND)) { if (!(pci_dev->config[PCI_COMMAND] & PCI_COMMAND_MASTER)) { virtio_set_disabled(vdev, true); diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h index f236e94ca6..83d07bb6b7 100644 --- a/include/hw/virtio/virtio.h +++ b/include/hw/virtio/virtio.h @@ -155,6 +155,7 @@ struct VirtIODevice QLIST_HEAD(, VirtQueue) *vector_queues; QTAILQ_ENTRY(VirtIODevice) next; EventNotifier config_notifier; + bool device_iotlb_enabled; }; struct VirtioDeviceClass { @@ -212,6 +213,7 @@ struct VirtioDeviceClass { const VMStateDescription *vmsd; bool (*primary_unplug_pending)(void *opaque); struct vhost_dev *(*get_vhost)(VirtIODevice *vdev); + void (*toggle_device_iotlb)(VirtIODevice *vdev, bool enable); }; void virtio_instance_init_common(Object *proxy_obj, void *data,
Guest may enable or disable PCI ATS and, accordingly, Device-TLB for the device. Add a flag and a trigger function to handle Device-TLB enable/disable in VirtIO devices and hook it to ATS enable/disable for PCI transport. Signed-off-by: Viktor Prutyanov <viktor@daynix.com> --- hw/virtio/virtio-pci.c | 17 +++++++++++++++++ include/hw/virtio/virtio.h | 2 ++ 2 files changed, 19 insertions(+)