| Message ID | 20200603182322.196940-1-mortonm@chromium.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | vfio: PoC patch for printing IRQs used by i2c devices | expand |
On Wed, Jun 3, 2020 at 11:23 AM Micah Morton <mortonm@chromium.org> wrote: > > This patch accesses the ACPI system from vfio_pci_probe to print out > info if the PCI device being attached to vfio_pci is an i2c adapter with > associated i2c client devices that use platform IRQs. The info printed > out is the IRQ numbers that are associated with the given i2c client > devices. This patch doesn't attempt to forward any additional IRQs into > the guest, but shows how it could be possible. > > Signed-off-by: Micah Morton <mortonm@chromium.org> > > Change-Id: I5c77d35f246781a4a80703820860631e2c2091cf > --- > What do you guys think about having code like this somewhere in > vfio_pci? There would have to be some logic added in vfio_pci to forward > these IRQs when they are found. For reference, below is what is printed > out during vfio_pci_probe on my development machine when I attach some > I2C adapter PCI devices to vfio_pci: > > [ 48.742699] ACPI i2c client device WCOM50C1:00 uses irq 31 > [ 53.913295] ACPI i2c client device GOOG0005:00 uses irq 24 > [ 58.040076] ACPI i2c client device ACPI0C50:00 uses irq 51 > > Ideally we could add code like this for other bus types (e.g. SPI). > > NOTE: developed on v5.4 > > drivers/vfio/pci/vfio_pci.c | 158 ++++++++++++++++++++++++++++++++++++ > 1 file changed, 158 insertions(+) > > diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c > index 02206162eaa9..9ce3f34aa548 100644 > --- a/drivers/vfio/pci/vfio_pci.c > +++ b/drivers/vfio/pci/vfio_pci.c > @@ -28,6 +28,10 @@ > #include <linux/vgaarb.h> > #include <linux/nospec.h> > > +#include <linux/acpi.h> > +#include <acpi/actypes.h> > +#include <linux/i2c.h> > + > #include "vfio_pci_private.h" > > #define DRIVER_VERSION "0.2" > @@ -1289,12 +1293,166 @@ static const struct vfio_device_ops vfio_pci_ops = { > static int vfio_pci_reflck_attach(struct vfio_pci_device *vdev); > static void vfio_pci_reflck_put(struct vfio_pci_reflck *reflck); > > + > +struct i2c_acpi_lookup { > + struct i2c_board_info *info; > + acpi_handle adapter_handle; > + acpi_handle device_handle; > + acpi_handle search_handle; > + int n; > + int index; > + u32 speed; > + u32 min_speed; > + u32 force_speed; > +}; > + > +static const struct acpi_device_id i2c_acpi_ignored_device_ids[] = { > + /* > + * ACPI video acpi_devices, which are handled by the acpi-video driver > + * sometimes contain a SERIAL_TYPE_I2C ACPI resource, ignore these. > + */ > + { ACPI_VIDEO_HID, 0 }, > + {} > +}; > + > +static int i2c_acpi_get_info_for_node(struct acpi_resource *ares, void *data) > +{ > + struct i2c_acpi_lookup *lookup = data; > + struct i2c_board_info *info = lookup->info; > + struct acpi_resource_i2c_serialbus *sb; > + acpi_status status; > + > + if (info->addr || !i2c_acpi_get_i2c_resource(ares, &sb)) > + return 1; > + > + if (lookup->index != -1 && lookup->n++ != lookup->index) > + return 1; > + > + status = acpi_get_handle(lookup->device_handle, > + sb->resource_source.string_ptr, > + &lookup->adapter_handle); > + if (ACPI_FAILURE(status)) > + return 1; > + > + info->addr = sb->slave_address; > + > + return 1; > +} > + > +static int print_irq_info_if_i2c_slave(struct acpi_device *adev, > + struct i2c_acpi_lookup *lookup, acpi_handle adapter) > +{ > + struct i2c_board_info *info = lookup->info; > + struct list_head resource_list, resource_list2; > + struct resource_entry *entry; > + int ret; > + > + if (acpi_bus_get_status(adev) || !adev->status.present) > + return -EINVAL; > + > + if (acpi_match_device_ids(adev, i2c_acpi_ignored_device_ids) == 0) > + return -ENODEV; > + > + memset(info, 0, sizeof(*info)); > + lookup->device_handle = acpi_device_handle(adev); > + > + /* Look up for I2cSerialBus resource */ > + INIT_LIST_HEAD(&resource_list); > + ret = acpi_dev_get_resources(adev, &resource_list, > + i2c_acpi_get_info_for_node, lookup); > + > + > + if (ret < 0 || !info->addr) { > + acpi_dev_free_resource_list(&resource_list); > + return -EINVAL; > + } > + > + if (adapter) { > + /* The adapter must match the one in I2cSerialBus() connector */ > + if (adapter != lookup->adapter_handle) > + return -ENODEV; > + } > + > + INIT_LIST_HEAD(&resource_list2); > + ret = acpi_dev_get_resources(adev, &resource_list2, NULL, NULL); > + if (ret < 0) > + return -EINVAL; > + > + resource_list_for_each_entry(entry, &resource_list2) { > + if (resource_type(entry->res) == IORESOURCE_IRQ) { In reference to Eric's question, it's also simple to check for other types of resources here (like IORESOURCE_IO (I/O port) or IORESOURCE_MEM (MMIO)), which would allow for making those types of resources for devices behind the bus controller available to the guest as well. I think MMIO would be simple enough. I/O ports would require a way for VFIO to tell KVM to set the right bits in the VMCS I/O port bitmap* when initializing the guest so that the guest can access the needed I/O ports without trapping to the host. Or I/O ports could just be trapped and then the read/write carried out in the host. Alex, does it seem reasonable to consult ACPI in this way and use this info to make sub-device resources available in the guest? I don't anticipate a case where any sub-devices are DMA-capable and could circumvent IOMMU translation to write to host memory. Do you see any other potential pitfalls? I guess the only drawback I see is needing code in the VMM to copy chunks of the ACPI tables from host to guest to tell it about the sub-devices -- but that's pretty doable. I think this might be Intel specific, would have to check how to do the equivalent thing on AMD. > + printk(KERN_EMERG "ACPI i2c client device %s uses irq %d\n", > + dev_name(&adev->dev), entry->res->start); > + break; > + } > + } > + > + acpi_dev_free_resource_list(&resource_list2); > + > + return 0; > +} > + > +static int i2c_acpi_get_info(struct acpi_device *adev, > + struct i2c_board_info *info, > + acpi_handle adapter, > + acpi_handle *adapter_handle) > +{ > + struct i2c_acpi_lookup lookup; > + > + > + memset(&lookup, 0, sizeof(lookup)); > + lookup.info = info; > + lookup.index = -1; > + > + if (acpi_device_enumerated(adev)) > + return -EINVAL; > + > + return print_irq_info_if_i2c_slave(adev, &lookup, adapter); > +} > + > +static acpi_status process_acpi_node(acpi_handle handle, u32 level, > + void *data, void **return_value) > +{ > + acpi_handle adapter = data; > + struct acpi_device *adev; > + struct i2c_board_info info; > + > + if (acpi_bus_get_device(handle, &adev)) > + return AE_OK; > + > + if (i2c_acpi_get_info(adev, &info, adapter, NULL)) > + return AE_OK; > + > + return AE_OK; > +} > + > +#define MAX_SCAN_DEPTH 32 > + > +void acpi_print_irqs_if_i2c(acpi_handle handle) > +{ > + acpi_status status; > + > + status = acpi_walk_namespace(ACPI_TYPE_DEVICE, handle, > + MAX_SCAN_DEPTH, > + process_acpi_node, NULL, > + handle, NULL); > + if (ACPI_FAILURE(status)) > + printk(KERN_EMERG "failed to enumerate ACPI devices\n"); > +} > + > +static void print_irqs_if_i2c_adapter(struct device *dev) { > + acpi_handle handle = ACPI_HANDLE(dev); > + acpi_print_irqs_if_i2c(handle); > +} > + > static int vfio_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) > { > struct vfio_pci_device *vdev; > struct iommu_group *group; > int ret; > > + if (has_acpi_companion(&pdev->dev)) > + print_irqs_if_i2c_adapter(&pdev->dev); > + > if (pdev->hdr_type != PCI_HEADER_TYPE_NORMAL) > return -EINVAL; > > -- > 2.26.2 >
On Tue, 9 Jun 2020 13:19:19 -0700 Micah Morton <mortonm@chromium.org> wrote: > On Wed, Jun 3, 2020 at 11:23 AM Micah Morton <mortonm@chromium.org> wrote: > > > > This patch accesses the ACPI system from vfio_pci_probe to print out > > info if the PCI device being attached to vfio_pci is an i2c adapter with > > associated i2c client devices that use platform IRQs. The info printed > > out is the IRQ numbers that are associated with the given i2c client > > devices. This patch doesn't attempt to forward any additional IRQs into > > the guest, but shows how it could be possible. > > > > Signed-off-by: Micah Morton <mortonm@chromium.org> > > > > Change-Id: I5c77d35f246781a4a80703820860631e2c2091cf > > --- > > What do you guys think about having code like this somewhere in > > vfio_pci? There would have to be some logic added in vfio_pci to forward > > these IRQs when they are found. For reference, below is what is printed > > out during vfio_pci_probe on my development machine when I attach some > > I2C adapter PCI devices to vfio_pci: > > > > [ 48.742699] ACPI i2c client device WCOM50C1:00 uses irq 31 > > [ 53.913295] ACPI i2c client device GOOG0005:00 uses irq 24 > > [ 58.040076] ACPI i2c client device ACPI0C50:00 uses irq 51 > > > > Ideally we could add code like this for other bus types (e.g. SPI). > > > > NOTE: developed on v5.4 Sorry for the delay, this took some time to reach the top of the heap and process. > > drivers/vfio/pci/vfio_pci.c | 158 ++++++++++++++++++++++++++++++++++++ I think we'd want a separate file with Kconfig options to turn it off if we were to consider adding this sort of thing. The ACPI dependencies may not be present on all platforms anyway. > > 1 file changed, 158 insertions(+) > > > > diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c > > index 02206162eaa9..9ce3f34aa548 100644 > > --- a/drivers/vfio/pci/vfio_pci.c > > +++ b/drivers/vfio/pci/vfio_pci.c > > @@ -28,6 +28,10 @@ > > #include <linux/vgaarb.h> > > #include <linux/nospec.h> > > > > +#include <linux/acpi.h> > > +#include <acpi/actypes.h> > > +#include <linux/i2c.h> > > + > > #include "vfio_pci_private.h" > > > > #define DRIVER_VERSION "0.2" > > @@ -1289,12 +1293,166 @@ static const struct vfio_device_ops vfio_pci_ops = { > > static int vfio_pci_reflck_attach(struct vfio_pci_device *vdev); > > static void vfio_pci_reflck_put(struct vfio_pci_reflck *reflck); > > > > + > > +struct i2c_acpi_lookup { > > + struct i2c_board_info *info; > > + acpi_handle adapter_handle; > > + acpi_handle device_handle; > > + acpi_handle search_handle; > > + int n; > > + int index; > > + u32 speed; > > + u32 min_speed; > > + u32 force_speed; > > +}; > > + > > +static const struct acpi_device_id i2c_acpi_ignored_device_ids[] = { > > + /* > > + * ACPI video acpi_devices, which are handled by the acpi-video driver > > + * sometimes contain a SERIAL_TYPE_I2C ACPI resource, ignore these. > > + */ > > + { ACPI_VIDEO_HID, 0 }, I don't understand this, why are these devices special? What other devices might be special? If the behavior of a host driver that's independent of the PCI device driver makes it special, that seems like a general problem with this approach, we can't have userspace and host drivers competing for the same resources. > > + {} > > +}; > > + > > +static int i2c_acpi_get_info_for_node(struct acpi_resource *ares, void *data) > > +{ > > + struct i2c_acpi_lookup *lookup = data; > > + struct i2c_board_info *info = lookup->info; > > + struct acpi_resource_i2c_serialbus *sb; > > + acpi_status status; > > + > > + if (info->addr || !i2c_acpi_get_i2c_resource(ares, &sb)) > > + return 1; > > + > > + if (lookup->index != -1 && lookup->n++ != lookup->index) > > + return 1; > > + > > + status = acpi_get_handle(lookup->device_handle, > > + sb->resource_source.string_ptr, > > + &lookup->adapter_handle); > > + if (ACPI_FAILURE(status)) > > + return 1; > > + > > + info->addr = sb->slave_address; > > + > > + return 1; > > +} > > + > > +static int print_irq_info_if_i2c_slave(struct acpi_device *adev, > > + struct i2c_acpi_lookup *lookup, acpi_handle adapter) > > +{ > > + struct i2c_board_info *info = lookup->info; > > + struct list_head resource_list, resource_list2; > > + struct resource_entry *entry; > > + int ret; > > + > > + if (acpi_bus_get_status(adev) || !adev->status.present) > > + return -EINVAL; > > + > > + if (acpi_match_device_ids(adev, i2c_acpi_ignored_device_ids) == 0) > > + return -ENODEV; > > + > > + memset(info, 0, sizeof(*info)); > > + lookup->device_handle = acpi_device_handle(adev); > > + > > + /* Look up for I2cSerialBus resource */ > > + INIT_LIST_HEAD(&resource_list); > > + ret = acpi_dev_get_resources(adev, &resource_list, > > + i2c_acpi_get_info_for_node, lookup); > > + > > + > > + if (ret < 0 || !info->addr) { > > + acpi_dev_free_resource_list(&resource_list); > > + return -EINVAL; > > + } > > + > > + if (adapter) { > > + /* The adapter must match the one in I2cSerialBus() connector */ > > + if (adapter != lookup->adapter_handle) > > + return -ENODEV; > > + } > > + > > + INIT_LIST_HEAD(&resource_list2); > > + ret = acpi_dev_get_resources(adev, &resource_list2, NULL, NULL); > > + if (ret < 0) > > + return -EINVAL; > > + > > + resource_list_for_each_entry(entry, &resource_list2) { Let me see if I understand what's happening here, first we walk all the ACPI resources of the device to verify that it does have a ACPI_RESOURCE_SERIAL_TYPE_I2C and we're able to get a handle for that pathname. info->addr is some throw-away data we use to determine success (seems like we could return -1 on ACPI_FAILURE to stop iterating at that point as we won't get past the index check for anything else, and avoid info->addr). Then once we know the device includes the necessary i2c type, we collect all the resources (for some reason using a different list even though our previous callback only returns 1 so will never have anything added to the list). Right? > > + if (resource_type(entry->res) == IORESOURCE_IRQ) { > > In reference to Eric's question, it's also simple to check for other > types of resources here (like IORESOURCE_IO (I/O port) or > IORESOURCE_MEM (MMIO)), which would allow for making those types of > resources for devices behind the bus controller available to the guest > as well. I think MMIO would be simple enough. I/O ports would require > a way for VFIO to tell KVM to set the right bits in the VMCS I/O port > bitmap* when initializing the guest so that the guest can access the > needed I/O ports without trapping to the host. Or I/O ports could just > be trapped and then the read/write carried out in the host. The latter is how we support I/O port space, VFIO is a userspace driver interface, not a KVM device interface. I/O port access has not been shown to be worth any further optimization. > Alex, does it seem reasonable to consult ACPI in this way and use this > info to make sub-device resources available in the guest? I don't > anticipate a case where any sub-devices are DMA-capable and could > circumvent IOMMU translation to write to host memory. Do you see any > other potential pitfalls? I guess the only drawback I see is needing > code in the VMM to copy chunks of the ACPI tables from host to guest > to tell it about the sub-devices -- but that's pretty doable. Is there a concern about shared versus exclusive resources? For example an interrupt could be shared among multiple i2c endpoints, right? We don't know who it might be shared with and we don't know enough about our endpoint to know how to determine if our endpoint is signaling the interrupt or how to mask it from signaling the interrupt at the device level. I assume where we handle SET_IRQS for this device specific interrupt we'd therefore never use IRQF_SHARED, such that we require an exclusive interrupt. MMIO and I/O port resources seem straightforward to expose as device specific regions, but makes me curious what we're really exposing. I'm nervous that we're blurring the line between one device and another, for example if an i2c endpoint is only accessible via the i2c controller on the PCI device then we can claim the user owns those sub-devices, but if the device responds to MMIO or I/O port space independent of the ownership of the PCI i2c controller itself, how do we know we're not conflicting with an ACPI based driver that's already attached to this sub-device? Is this essentially the concern with the ACPI_VIDEO_HID exclusion above? Do we need to take the same approach of requiring an exclusive interrupt by using request_resource() and error on conflicts? Seems like it might be prudent to not only have a Kconfig but require and opt-in for this support at the vfio-pci module level. Somehow we also need to factor in usability, for example how do we provide enough context in describing the device specific region/irq to the user that they can associate the object and perhaps avoid independently parsing AML or providing a magic firmware blob. > I think this might be Intel specific, would have to check how to do > the equivalent thing on AMD. This is all generic ACPI though, are you only suggesting different conventions between the firmware implementations between vendors? > > + printk(KERN_EMERG "ACPI i2c client device %s uses irq %d\n", > > + dev_name(&adev->dev), entry->res->start); > > + break; > > + } > > + } > > + > > + acpi_dev_free_resource_list(&resource_list2); > > + > > + return 0; > > +} > > + > > +static int i2c_acpi_get_info(struct acpi_device *adev, > > + struct i2c_board_info *info, > > + acpi_handle adapter, > > + acpi_handle *adapter_handle) > > +{ > > + struct i2c_acpi_lookup lookup; > > + > > + > > + memset(&lookup, 0, sizeof(lookup)); > > + lookup.info = info; > > + lookup.index = -1; > > + > > + if (acpi_device_enumerated(adev)) > > + return -EINVAL; > > + > > + return print_irq_info_if_i2c_slave(adev, &lookup, adapter); > > +} > > + > > +static acpi_status process_acpi_node(acpi_handle handle, u32 level, > > + void *data, void **return_value) > > +{ > > + acpi_handle adapter = data; > > + struct acpi_device *adev; > > + struct i2c_board_info info; > > + > > + if (acpi_bus_get_device(handle, &adev)) > > + return AE_OK; > > + > > + if (i2c_acpi_get_info(adev, &info, adapter, NULL)) > > + return AE_OK; > > + > > + return AE_OK; > > +} > > + > > +#define MAX_SCAN_DEPTH 32 Arbitrary? Thanks, Alex > > + > > +void acpi_print_irqs_if_i2c(acpi_handle handle) > > +{ > > + acpi_status status; > > + > > + status = acpi_walk_namespace(ACPI_TYPE_DEVICE, handle, > > + MAX_SCAN_DEPTH, > > + process_acpi_node, NULL, > > + handle, NULL); > > + if (ACPI_FAILURE(status)) > > + printk(KERN_EMERG "failed to enumerate ACPI devices\n"); > > +} > > + > > +static void print_irqs_if_i2c_adapter(struct device *dev) { > > + acpi_handle handle = ACPI_HANDLE(dev); > > + acpi_print_irqs_if_i2c(handle); > > +} > > + > > static int vfio_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) > > { > > struct vfio_pci_device *vdev; > > struct iommu_group *group; > > int ret; > > > > + if (has_acpi_companion(&pdev->dev)) > > + print_irqs_if_i2c_adapter(&pdev->dev); > > + > > if (pdev->hdr_type != PCI_HEADER_TYPE_NORMAL) > > return -EINVAL; > > > > -- > > 2.26.2 > > >
On Fri, Jun 19, 2020 at 11:51 AM Alex Williamson <alex.williamson@redhat.com> wrote: > > On Tue, 9 Jun 2020 13:19:19 -0700 > Micah Morton <mortonm@chromium.org> wrote: > > > On Wed, Jun 3, 2020 at 11:23 AM Micah Morton <mortonm@chromium.org> wrote: > > > > > > This patch accesses the ACPI system from vfio_pci_probe to print out > > > info if the PCI device being attached to vfio_pci is an i2c adapter with > > > associated i2c client devices that use platform IRQs. The info printed > > > out is the IRQ numbers that are associated with the given i2c client > > > devices. This patch doesn't attempt to forward any additional IRQs into > > > the guest, but shows how it could be possible. > > > > > > Signed-off-by: Micah Morton <mortonm@chromium.org> > > > > > > Change-Id: I5c77d35f246781a4a80703820860631e2c2091cf > > > --- > > > What do you guys think about having code like this somewhere in > > > vfio_pci? There would have to be some logic added in vfio_pci to forward > > > these IRQs when they are found. For reference, below is what is printed > > > out during vfio_pci_probe on my development machine when I attach some > > > I2C adapter PCI devices to vfio_pci: > > > > > > [ 48.742699] ACPI i2c client device WCOM50C1:00 uses irq 31 > > > [ 53.913295] ACPI i2c client device GOOG0005:00 uses irq 24 > > > [ 58.040076] ACPI i2c client device ACPI0C50:00 uses irq 51 > > > > > > Ideally we could add code like this for other bus types (e.g. SPI). > > > > > > NOTE: developed on v5.4 > > Sorry for the delay, this took some time to reach the top of the heap > and process. > > > > drivers/vfio/pci/vfio_pci.c | 158 ++++++++++++++++++++++++++++++++++++ > > I think we'd want a separate file with Kconfig options to turn it off > if we were to consider adding this sort of thing. The ACPI > dependencies may not be present on all platforms anyway. Agreed. > > > > 1 file changed, 158 insertions(+) > > > > > > diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c > > > index 02206162eaa9..9ce3f34aa548 100644 > > > --- a/drivers/vfio/pci/vfio_pci.c > > > +++ b/drivers/vfio/pci/vfio_pci.c > > > @@ -28,6 +28,10 @@ > > > #include <linux/vgaarb.h> > > > #include <linux/nospec.h> > > > > > > +#include <linux/acpi.h> > > > +#include <acpi/actypes.h> > > > +#include <linux/i2c.h> > > > + > > > #include "vfio_pci_private.h" > > > > > > #define DRIVER_VERSION "0.2" > > > @@ -1289,12 +1293,166 @@ static const struct vfio_device_ops vfio_pci_ops = { > > > static int vfio_pci_reflck_attach(struct vfio_pci_device *vdev); > > > static void vfio_pci_reflck_put(struct vfio_pci_reflck *reflck); > > > > > > + > > > +struct i2c_acpi_lookup { > > > + struct i2c_board_info *info; > > > + acpi_handle adapter_handle; > > > + acpi_handle device_handle; > > > + acpi_handle search_handle; > > > + int n; > > > + int index; > > > + u32 speed; > > > + u32 min_speed; > > > + u32 force_speed; > > > +}; > > > + > > > +static const struct acpi_device_id i2c_acpi_ignored_device_ids[] = { > > > + /* > > > + * ACPI video acpi_devices, which are handled by the acpi-video driver > > > + * sometimes contain a SERIAL_TYPE_I2C ACPI resource, ignore these. > > > + */ > > > + { ACPI_VIDEO_HID, 0 }, > > I don't understand this, why are these devices special? What other > devices might be special? If the behavior of a host driver that's > independent of the PCI device driver makes it special, that seems like > a general problem with this approach, we can't have userspace and host > drivers competing for the same resources. Sorry, I just copied this code from drivers/i2c/i2c-core-acpi.c. It should have been removed. I think it is irrelevant to our discussion. In that case the i2c code is looking for i2c clients to register in the system and wants to avoid registering certain blacklisted devices and avoid attaching to them. This is not relevant to simply passing through the irq/MMIO/io port resources for an i2c client device. VFIO wouldn't actually be trying to attach any driver to the i2c clients in this case, and would defer to the host to choose what it wants to attach to. > > > > + {} > > > +}; > > > + > > > +static int i2c_acpi_get_info_for_node(struct acpi_resource *ares, void *data) > > > +{ > > > + struct i2c_acpi_lookup *lookup = data; > > > + struct i2c_board_info *info = lookup->info; > > > + struct acpi_resource_i2c_serialbus *sb; > > > + acpi_status status; > > > + > > > + if (info->addr || !i2c_acpi_get_i2c_resource(ares, &sb)) > > > + return 1; > > > + > > > + if (lookup->index != -1 && lookup->n++ != lookup->index) > > > + return 1; > > > + > > > + status = acpi_get_handle(lookup->device_handle, > > > + sb->resource_source.string_ptr, > > > + &lookup->adapter_handle); > > > + if (ACPI_FAILURE(status)) > > > + return 1; > > > + > > > + info->addr = sb->slave_address; > > > + > > > + return 1; > > > +} > > > + > > > +static int print_irq_info_if_i2c_slave(struct acpi_device *adev, > > > + struct i2c_acpi_lookup *lookup, acpi_handle adapter) > > > +{ > > > + struct i2c_board_info *info = lookup->info; > > > + struct list_head resource_list, resource_list2; > > > + struct resource_entry *entry; > > > + int ret; > > > + > > > + if (acpi_bus_get_status(adev) || !adev->status.present) > > > + return -EINVAL; > > > + > > > + if (acpi_match_device_ids(adev, i2c_acpi_ignored_device_ids) == 0) > > > + return -ENODEV; > > > + > > > + memset(info, 0, sizeof(*info)); > > > + lookup->device_handle = acpi_device_handle(adev); > > > + > > > + /* Look up for I2cSerialBus resource */ > > > + INIT_LIST_HEAD(&resource_list); > > > + ret = acpi_dev_get_resources(adev, &resource_list, > > > + i2c_acpi_get_info_for_node, lookup); > > > + > > > + > > > + if (ret < 0 || !info->addr) { > > > + acpi_dev_free_resource_list(&resource_list); > > > + return -EINVAL; > > > + } > > > + > > > + if (adapter) { > > > + /* The adapter must match the one in I2cSerialBus() connector */ > > > + if (adapter != lookup->adapter_handle) > > > + return -ENODEV; > > > + } > > > + > > > + INIT_LIST_HEAD(&resource_list2); > > > + ret = acpi_dev_get_resources(adev, &resource_list2, NULL, NULL); > > > + if (ret < 0) > > > + return -EINVAL; > > > + > > > + resource_list_for_each_entry(entry, &resource_list2) { > > Let me see if I understand what's happening here, first we walk all the > ACPI resources of the device to verify that it does have a > ACPI_RESOURCE_SERIAL_TYPE_I2C and we're able to get a handle for that > pathname. info->addr is some throw-away data we use to determine > success (seems like we could return -1 on ACPI_FAILURE to stop > iterating at that point as we won't get past the index check for > anything else, and avoid info->addr). Then once we know the device > includes the necessary i2c type, we collect all the resources (for some > reason using a different list even though our previous callback only > returns 1 so will never have anything added to the list). Right? Yeah, its sloppy PoC code yanked out of drivers/i2c/i2c-core-acpi.c for the most part. I tried to cut out the easy parts of the code that didn't need to be there, but there would obviously be more work to do in optimizing the code for what we would actually want to happen in VFIO. Seems like we're on the same page on all the important points though. > > > > + if (resource_type(entry->res) == IORESOURCE_IRQ) { > > > > In reference to Eric's question, it's also simple to check for other > > types of resources here (like IORESOURCE_IO (I/O port) or > > IORESOURCE_MEM (MMIO)), which would allow for making those types of > > resources for devices behind the bus controller available to the guest > > as well. I think MMIO would be simple enough. I/O ports would require > > a way for VFIO to tell KVM to set the right bits in the VMCS I/O port > > bitmap* when initializing the guest so that the guest can access the > > needed I/O ports without trapping to the host. Or I/O ports could just > > be trapped and then the read/write carried out in the host. > > The latter is how we support I/O port space, VFIO is a userspace driver > interface, not a KVM device interface. I/O port access has not been > shown to be worth any further optimization. Makes sense, thanks. > > > Alex, does it seem reasonable to consult ACPI in this way and use this > > info to make sub-device resources available in the guest? I don't > > anticipate a case where any sub-devices are DMA-capable and could > > circumvent IOMMU translation to write to host memory. Do you see any > > other potential pitfalls? I guess the only drawback I see is needing > > code in the VMM to copy chunks of the ACPI tables from host to guest > > to tell it about the sub-devices -- but that's pretty doable. > > Is there a concern about shared versus exclusive resources? For > example an interrupt could be shared among multiple i2c endpoints, > right? We don't know who it might be shared with and we don't know > enough about our endpoint to know how to determine if our endpoint is > signaling the interrupt or how to mask it from signaling the interrupt > at the device level. I assume where we handle SET_IRQS for this device > specific interrupt we'd therefore never use IRQF_SHARED, such that we > require an exclusive interrupt. MMIO and I/O port resources seem > straightforward to expose as device specific regions, but makes me > curious what we're really exposing. I'm nervous that we're blurring > the line between one device and another, for example if an i2c endpoint > is only accessible via the i2c controller on the PCI device then we can > claim the user owns those sub-devices, but if the device responds to > MMIO or I/O port space independent of the ownership of the PCI i2c > controller itself, how do we know we're not conflicting with an ACPI > based driver that's already attached to this sub-device? Is this > essentially the concern with the ACPI_VIDEO_HID exclusion above? Do we > need to take the same approach of requiring an exclusive interrupt by > using request_resource() and error on conflicts? I'm going to do some further thinking/research on this and will reply sometime early next week. Answering all the other questions now though. > > Seems like it might be prudent to not only have a Kconfig but require > and opt-in for this support at the vfio-pci module level. Agreed. > > Somehow we also need to factor in usability, for example how do we > provide enough context in describing the device specific region/irq to > the user that they can associate the object and perhaps avoid > independently parsing AML or providing a magic firmware blob. > > > I think this might be Intel specific, would have to check how to do > > the equivalent thing on AMD. > > This is all generic ACPI though, are you only suggesting different > conventions between the firmware implementations between vendors? Sorry, there was supposed to be an asterisk before that line pointing to the VMCS I/O port bitmap stuff. All I was saying is that the VMCS stuff may be Intel-specific. Doesn't really matter however as you pointed out its better just to emulate the I/O port access anyway. > > > > + printk(KERN_EMERG "ACPI i2c client device %s uses irq %d\n", > > > + dev_name(&adev->dev), entry->res->start); > > > + break; > > > + } > > > + } > > > + > > > + acpi_dev_free_resource_list(&resource_list2); > > > + > > > + return 0; > > > +} > > > + > > > +static int i2c_acpi_get_info(struct acpi_device *adev, > > > + struct i2c_board_info *info, > > > + acpi_handle adapter, > > > + acpi_handle *adapter_handle) > > > +{ > > > + struct i2c_acpi_lookup lookup; > > > + > > > + > > > + memset(&lookup, 0, sizeof(lookup)); > > > + lookup.info = info; > > > + lookup.index = -1; > > > + > > > + if (acpi_device_enumerated(adev)) > > > + return -EINVAL; > > > + > > > + return print_irq_info_if_i2c_slave(adev, &lookup, adapter); > > > +} > > > + > > > +static acpi_status process_acpi_node(acpi_handle handle, u32 level, > > > + void *data, void **return_value) > > > +{ > > > + acpi_handle adapter = data; > > > + struct acpi_device *adev; > > > + struct i2c_board_info info; > > > + > > > + if (acpi_bus_get_device(handle, &adev)) > > > + return AE_OK; > > > + > > > + if (i2c_acpi_get_info(adev, &info, adapter, NULL)) > > > + return AE_OK; > > > + > > > + return AE_OK; > > > +} > > > + > > > +#define MAX_SCAN_DEPTH 32 > > Arbitrary? Thanks, Again just copied what was done in drivers/i2c/i2c-core-acpi.c. Not really sure how they came up with that number. Seems potentially arbitrary. > > Alex Thanks for the reply, I'll get back to you with my thoughts on shared vs exclusive resource stuff. > > > > + > > > +void acpi_print_irqs_if_i2c(acpi_handle handle) > > > +{ > > > + acpi_status status; > > > + > > > + status = acpi_walk_namespace(ACPI_TYPE_DEVICE, handle, > > > + MAX_SCAN_DEPTH, > > > + process_acpi_node, NULL, > > > + handle, NULL); > > > + if (ACPI_FAILURE(status)) > > > + printk(KERN_EMERG "failed to enumerate ACPI devices\n"); > > > +} > > > + > > > +static void print_irqs_if_i2c_adapter(struct device *dev) { > > > + acpi_handle handle = ACPI_HANDLE(dev); > > > + acpi_print_irqs_if_i2c(handle); > > > +} > > > + > > > static int vfio_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) > > > { > > > struct vfio_pci_device *vdev; > > > struct iommu_group *group; > > > int ret; > > > > > > + if (has_acpi_companion(&pdev->dev)) > > > + print_irqs_if_i2c_adapter(&pdev->dev); > > > + > > > if (pdev->hdr_type != PCI_HEADER_TYPE_NORMAL) > > > return -EINVAL; > > > > > > -- > > > 2.26.2 > > > > > >
On Fri, Jun 19, 2020 at 1:00 PM Micah Morton <mortonm@chromium.org> wrote: > > On Fri, Jun 19, 2020 at 11:51 AM Alex Williamson > <alex.williamson@redhat.com> wrote: > > > > On Tue, 9 Jun 2020 13:19:19 -0700 > > Micah Morton <mortonm@chromium.org> wrote: > > > > > On Wed, Jun 3, 2020 at 11:23 AM Micah Morton <mortonm@chromium.org> wrote: > > > > > > > > This patch accesses the ACPI system from vfio_pci_probe to print out > > > > info if the PCI device being attached to vfio_pci is an i2c adapter with > > > > associated i2c client devices that use platform IRQs. The info printed > > > > out is the IRQ numbers that are associated with the given i2c client > > > > devices. This patch doesn't attempt to forward any additional IRQs into > > > > the guest, but shows how it could be possible. > > > > > > > > Signed-off-by: Micah Morton <mortonm@chromium.org> > > > > > > > > Change-Id: I5c77d35f246781a4a80703820860631e2c2091cf > > > > --- > > > > What do you guys think about having code like this somewhere in > > > > vfio_pci? There would have to be some logic added in vfio_pci to forward > > > > these IRQs when they are found. For reference, below is what is printed > > > > out during vfio_pci_probe on my development machine when I attach some > > > > I2C adapter PCI devices to vfio_pci: > > > > > > > > [ 48.742699] ACPI i2c client device WCOM50C1:00 uses irq 31 > > > > [ 53.913295] ACPI i2c client device GOOG0005:00 uses irq 24 > > > > [ 58.040076] ACPI i2c client device ACPI0C50:00 uses irq 51 > > > > > > > > Ideally we could add code like this for other bus types (e.g. SPI). > > > > > > > > NOTE: developed on v5.4 > > > > Sorry for the delay, this took some time to reach the top of the heap > > and process. > > > > > > drivers/vfio/pci/vfio_pci.c | 158 ++++++++++++++++++++++++++++++++++++ > > > > I think we'd want a separate file with Kconfig options to turn it off > > if we were to consider adding this sort of thing. The ACPI > > dependencies may not be present on all platforms anyway. > > Agreed. > > > > > > > 1 file changed, 158 insertions(+) > > > > > > > > diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c > > > > index 02206162eaa9..9ce3f34aa548 100644 > > > > --- a/drivers/vfio/pci/vfio_pci.c > > > > +++ b/drivers/vfio/pci/vfio_pci.c > > > > @@ -28,6 +28,10 @@ > > > > #include <linux/vgaarb.h> > > > > #include <linux/nospec.h> > > > > > > > > +#include <linux/acpi.h> > > > > +#include <acpi/actypes.h> > > > > +#include <linux/i2c.h> > > > > + > > > > #include "vfio_pci_private.h" > > > > > > > > #define DRIVER_VERSION "0.2" > > > > @@ -1289,12 +1293,166 @@ static const struct vfio_device_ops vfio_pci_ops = { > > > > static int vfio_pci_reflck_attach(struct vfio_pci_device *vdev); > > > > static void vfio_pci_reflck_put(struct vfio_pci_reflck *reflck); > > > > > > > > + > > > > +struct i2c_acpi_lookup { > > > > + struct i2c_board_info *info; > > > > + acpi_handle adapter_handle; > > > > + acpi_handle device_handle; > > > > + acpi_handle search_handle; > > > > + int n; > > > > + int index; > > > > + u32 speed; > > > > + u32 min_speed; > > > > + u32 force_speed; > > > > +}; > > > > + > > > > +static const struct acpi_device_id i2c_acpi_ignored_device_ids[] = { > > > > + /* > > > > + * ACPI video acpi_devices, which are handled by the acpi-video driver > > > > + * sometimes contain a SERIAL_TYPE_I2C ACPI resource, ignore these. > > > > + */ > > > > + { ACPI_VIDEO_HID, 0 }, > > > > I don't understand this, why are these devices special? What other > > devices might be special? If the behavior of a host driver that's > > independent of the PCI device driver makes it special, that seems like > > a general problem with this approach, we can't have userspace and host > > drivers competing for the same resources. > > Sorry, I just copied this code from drivers/i2c/i2c-core-acpi.c. It > should have been removed. I think it is irrelevant to our discussion. > In that case the i2c code is looking for i2c clients to register in > the system and wants to avoid registering certain blacklisted devices > and avoid attaching to them. This is not relevant to simply passing > through the irq/MMIO/io port resources for an i2c client device. VFIO > wouldn't actually be trying to attach any driver to the i2c clients in > this case, and would defer to the host to choose what it wants to > attach to. > > > > > > > + {} > > > > +}; > > > > + > > > > +static int i2c_acpi_get_info_for_node(struct acpi_resource *ares, void *data) > > > > +{ > > > > + struct i2c_acpi_lookup *lookup = data; > > > > + struct i2c_board_info *info = lookup->info; > > > > + struct acpi_resource_i2c_serialbus *sb; > > > > + acpi_status status; > > > > + > > > > + if (info->addr || !i2c_acpi_get_i2c_resource(ares, &sb)) > > > > + return 1; > > > > + > > > > + if (lookup->index != -1 && lookup->n++ != lookup->index) > > > > + return 1; > > > > + > > > > + status = acpi_get_handle(lookup->device_handle, > > > > + sb->resource_source.string_ptr, > > > > + &lookup->adapter_handle); > > > > + if (ACPI_FAILURE(status)) > > > > + return 1; > > > > + > > > > + info->addr = sb->slave_address; > > > > + > > > > + return 1; > > > > +} > > > > + > > > > +static int print_irq_info_if_i2c_slave(struct acpi_device *adev, > > > > + struct i2c_acpi_lookup *lookup, acpi_handle adapter) > > > > +{ > > > > + struct i2c_board_info *info = lookup->info; > > > > + struct list_head resource_list, resource_list2; > > > > + struct resource_entry *entry; > > > > + int ret; > > > > + > > > > + if (acpi_bus_get_status(adev) || !adev->status.present) > > > > + return -EINVAL; > > > > + > > > > + if (acpi_match_device_ids(adev, i2c_acpi_ignored_device_ids) == 0) > > > > + return -ENODEV; > > > > + > > > > + memset(info, 0, sizeof(*info)); > > > > + lookup->device_handle = acpi_device_handle(adev); > > > > + > > > > + /* Look up for I2cSerialBus resource */ > > > > + INIT_LIST_HEAD(&resource_list); > > > > + ret = acpi_dev_get_resources(adev, &resource_list, > > > > + i2c_acpi_get_info_for_node, lookup); > > > > + > > > > + > > > > + if (ret < 0 || !info->addr) { > > > > + acpi_dev_free_resource_list(&resource_list); > > > > + return -EINVAL; > > > > + } > > > > + > > > > + if (adapter) { > > > > + /* The adapter must match the one in I2cSerialBus() connector */ > > > > + if (adapter != lookup->adapter_handle) > > > > + return -ENODEV; > > > > + } > > > > + > > > > + INIT_LIST_HEAD(&resource_list2); > > > > + ret = acpi_dev_get_resources(adev, &resource_list2, NULL, NULL); > > > > + if (ret < 0) > > > > + return -EINVAL; > > > > + > > > > + resource_list_for_each_entry(entry, &resource_list2) { > > > > Let me see if I understand what's happening here, first we walk all the > > ACPI resources of the device to verify that it does have a > > ACPI_RESOURCE_SERIAL_TYPE_I2C and we're able to get a handle for that > > pathname. info->addr is some throw-away data we use to determine > > success (seems like we could return -1 on ACPI_FAILURE to stop > > iterating at that point as we won't get past the index check for > > anything else, and avoid info->addr). Then once we know the device > > includes the necessary i2c type, we collect all the resources (for some > > reason using a different list even though our previous callback only > > returns 1 so will never have anything added to the list). Right? > > Yeah, its sloppy PoC code yanked out of drivers/i2c/i2c-core-acpi.c > for the most part. I tried to cut out the easy parts of the code that > didn't need to be there, but there would obviously be more work to do > in optimizing the code for what we would actually want to happen in > VFIO. Seems like we're on the same page on all the important points > though. > > > > > > > + if (resource_type(entry->res) == IORESOURCE_IRQ) { > > > > > > In reference to Eric's question, it's also simple to check for other > > > types of resources here (like IORESOURCE_IO (I/O port) or > > > IORESOURCE_MEM (MMIO)), which would allow for making those types of > > > resources for devices behind the bus controller available to the guest > > > as well. I think MMIO would be simple enough. I/O ports would require > > > a way for VFIO to tell KVM to set the right bits in the VMCS I/O port > > > bitmap* when initializing the guest so that the guest can access the > > > needed I/O ports without trapping to the host. Or I/O ports could just > > > be trapped and then the read/write carried out in the host. > > > > The latter is how we support I/O port space, VFIO is a userspace driver > > interface, not a KVM device interface. I/O port access has not been > > shown to be worth any further optimization. > > Makes sense, thanks. > > > > > > Alex, does it seem reasonable to consult ACPI in this way and use this > > > info to make sub-device resources available in the guest? I don't > > > anticipate a case where any sub-devices are DMA-capable and could > > > circumvent IOMMU translation to write to host memory. Do you see any > > > other potential pitfalls? I guess the only drawback I see is needing > > > code in the VMM to copy chunks of the ACPI tables from host to guest > > > to tell it about the sub-devices -- but that's pretty doable. > > > > Is there a concern about shared versus exclusive resources? For > > example an interrupt could be shared among multiple i2c endpoints, > > right? We don't know who it might be shared with and we don't know > > enough about our endpoint to know how to determine if our endpoint is > > signaling the interrupt or how to mask it from signaling the interrupt > > at the device level. I assume where we handle SET_IRQS for this device > > specific interrupt we'd therefore never use IRQF_SHARED, such that we > > require an exclusive interrupt. MMIO and I/O port resources seem I think requiring an exclusive interrupt makes sense, since the request_irq() in VFIO will fail when any other driver in the host has a handler registered for that irq (shared or otherwise). This gets into the territory of the user/VMM potentially needing to unbind an ACPI driver from a device before assignment of the PCI controller/adapter to the guest -- I guess that’s not too much to ask given the similar precedent for PCI devices. In fact, that would probably be a requirement for this use case anyway to make sure no drivers in the host are still trying to talk to the MMIOs/ports for a device that is being assigned to a guest. The only alternative I can think of to using exclusively exclusive IRQs would be to have platform-device-specific routines in vfio-pci to check if the device whose IRQ we want to forward into the guest was the one that triggered the shared IRQ (sort of like what is done for reset drivers in vfio-platform: https://elixir.bootlin.com/linux/latest/source/drivers/vfio/platform/reset). This quirk-type approach is probably not the most appealing though. > > straightforward to expose as device specific regions, but makes me > > curious what we're really exposing. I'm nervous that we're blurring > > the line between one device and another, for example if an i2c endpoint > > is only accessible via the i2c controller on the PCI device then we can > > claim the user owns those sub-devices, but if the device responds to > > MMIO or I/O port space independent of the ownership of the PCI i2c > > controller itself, how do we know we're not conflicting with an ACPI > > based driver that's already attached to this sub-device? Is this > > essentially the concern with the ACPI_VIDEO_HID exclusion above? Do we > > need to take the same approach of requiring an exclusive interrupt by > > using request_resource() and error on conflicts? When we discover ACPI sub-devices behind a given PCI device we could just check whether there is any driver attached to that device and deny binding the adapter to vfio-pci if so? The acpi_device struct we get from acpi_bus_get_device() has a “driver” field that points to an acpi_driver struct. I think if we can guarantee there are no drivers attached to the sub-devices then we are in the clear in terms of drivers in the host and guest fighting over MMIOs/ports. What do you think? Maybe additional safeguards like request_resource() make sense as well. > > I'm going to do some further thinking/research on this and will reply > sometime early next week. Answering all the other questions now > though. > > > > > Seems like it might be prudent to not only have a Kconfig but require > > and opt-in for this support at the vfio-pci module level. > > Agreed. > > > > > Somehow we also need to factor in usability, for example how do we > > provide enough context in describing the device specific region/irq to > > the user that they can associate the object and perhaps avoid > > independently parsing AML or providing a magic firmware blob. > > > > > I think this might be Intel specific, would have to check how to do > > > the equivalent thing on AMD. > > > > This is all generic ACPI though, are you only suggesting different > > conventions between the firmware implementations between vendors? > > Sorry, there was supposed to be an asterisk before that line pointing > to the VMCS I/O port bitmap stuff. All I was saying is that the VMCS > stuff may be Intel-specific. Doesn't really matter however as you > pointed out its better just to emulate the I/O port access anyway. > > > > > > > + printk(KERN_EMERG "ACPI i2c client device %s uses irq %d\n", > > > > + dev_name(&adev->dev), entry->res->start); > > > > + break; > > > > + } > > > > + } > > > > + > > > > + acpi_dev_free_resource_list(&resource_list2); > > > > + > > > > + return 0; > > > > +} > > > > + > > > > +static int i2c_acpi_get_info(struct acpi_device *adev, > > > > + struct i2c_board_info *info, > > > > + acpi_handle adapter, > > > > + acpi_handle *adapter_handle) > > > > +{ > > > > + struct i2c_acpi_lookup lookup; > > > > + > > > > + > > > > + memset(&lookup, 0, sizeof(lookup)); > > > > + lookup.info = info; > > > > + lookup.index = -1; > > > > + > > > > + if (acpi_device_enumerated(adev)) > > > > + return -EINVAL; > > > > + > > > > + return print_irq_info_if_i2c_slave(adev, &lookup, adapter); > > > > +} > > > > + > > > > +static acpi_status process_acpi_node(acpi_handle handle, u32 level, > > > > + void *data, void **return_value) > > > > +{ > > > > + acpi_handle adapter = data; > > > > + struct acpi_device *adev; > > > > + struct i2c_board_info info; > > > > + > > > > + if (acpi_bus_get_device(handle, &adev)) > > > > + return AE_OK; > > > > + > > > > + if (i2c_acpi_get_info(adev, &info, adapter, NULL)) > > > > + return AE_OK; > > > > + > > > > + return AE_OK; > > > > +} > > > > + > > > > +#define MAX_SCAN_DEPTH 32 > > > > Arbitrary? Thanks, > > Again just copied what was done in drivers/i2c/i2c-core-acpi.c. Not > really sure how they came up with that number. Seems potentially > arbitrary. > > > > > Alex > > Thanks for the reply, I'll get back to you with my thoughts on shared > vs exclusive resource stuff. > > > > > > > + > > > > +void acpi_print_irqs_if_i2c(acpi_handle handle) > > > > +{ > > > > + acpi_status status; > > > > + > > > > + status = acpi_walk_namespace(ACPI_TYPE_DEVICE, handle, > > > > + MAX_SCAN_DEPTH, > > > > + process_acpi_node, NULL, > > > > + handle, NULL); > > > > + if (ACPI_FAILURE(status)) > > > > + printk(KERN_EMERG "failed to enumerate ACPI devices\n"); > > > > +} > > > > + > > > > +static void print_irqs_if_i2c_adapter(struct device *dev) { > > > > + acpi_handle handle = ACPI_HANDLE(dev); > > > > + acpi_print_irqs_if_i2c(handle); > > > > +} > > > > + > > > > static int vfio_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) > > > > { > > > > struct vfio_pci_device *vdev; > > > > struct iommu_group *group; > > > > int ret; > > > > > > > > + if (has_acpi_companion(&pdev->dev)) > > > > + print_irqs_if_i2c_adapter(&pdev->dev); > > > > + > > > > if (pdev->hdr_type != PCI_HEADER_TYPE_NORMAL) > > > > return -EINVAL; > > > > > > > > -- > > > > 2.26.2 > > > > > > > > >
diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c index 02206162eaa9..9ce3f34aa548 100644 --- a/drivers/vfio/pci/vfio_pci.c +++ b/drivers/vfio/pci/vfio_pci.c @@ -28,6 +28,10 @@ #include <linux/vgaarb.h> #include <linux/nospec.h> +#include <linux/acpi.h> +#include <acpi/actypes.h> +#include <linux/i2c.h> + #include "vfio_pci_private.h" #define DRIVER_VERSION "0.2" @@ -1289,12 +1293,166 @@ static const struct vfio_device_ops vfio_pci_ops = { static int vfio_pci_reflck_attach(struct vfio_pci_device *vdev); static void vfio_pci_reflck_put(struct vfio_pci_reflck *reflck); + +struct i2c_acpi_lookup { + struct i2c_board_info *info; + acpi_handle adapter_handle; + acpi_handle device_handle; + acpi_handle search_handle; + int n; + int index; + u32 speed; + u32 min_speed; + u32 force_speed; +}; + +static const struct acpi_device_id i2c_acpi_ignored_device_ids[] = { + /* + * ACPI video acpi_devices, which are handled by the acpi-video driver + * sometimes contain a SERIAL_TYPE_I2C ACPI resource, ignore these. + */ + { ACPI_VIDEO_HID, 0 }, + {} +}; + +static int i2c_acpi_get_info_for_node(struct acpi_resource *ares, void *data) +{ + struct i2c_acpi_lookup *lookup = data; + struct i2c_board_info *info = lookup->info; + struct acpi_resource_i2c_serialbus *sb; + acpi_status status; + + if (info->addr || !i2c_acpi_get_i2c_resource(ares, &sb)) + return 1; + + if (lookup->index != -1 && lookup->n++ != lookup->index) + return 1; + + status = acpi_get_handle(lookup->device_handle, + sb->resource_source.string_ptr, + &lookup->adapter_handle); + if (ACPI_FAILURE(status)) + return 1; + + info->addr = sb->slave_address; + + return 1; +} + +static int print_irq_info_if_i2c_slave(struct acpi_device *adev, + struct i2c_acpi_lookup *lookup, acpi_handle adapter) +{ + struct i2c_board_info *info = lookup->info; + struct list_head resource_list, resource_list2; + struct resource_entry *entry; + int ret; + + if (acpi_bus_get_status(adev) || !adev->status.present) + return -EINVAL; + + if (acpi_match_device_ids(adev, i2c_acpi_ignored_device_ids) == 0) + return -ENODEV; + + memset(info, 0, sizeof(*info)); + lookup->device_handle = acpi_device_handle(adev); + + /* Look up for I2cSerialBus resource */ + INIT_LIST_HEAD(&resource_list); + ret = acpi_dev_get_resources(adev, &resource_list, + i2c_acpi_get_info_for_node, lookup); + + + if (ret < 0 || !info->addr) { + acpi_dev_free_resource_list(&resource_list); + return -EINVAL; + } + + if (adapter) { + /* The adapter must match the one in I2cSerialBus() connector */ + if (adapter != lookup->adapter_handle) + return -ENODEV; + } + + INIT_LIST_HEAD(&resource_list2); + ret = acpi_dev_get_resources(adev, &resource_list2, NULL, NULL); + if (ret < 0) + return -EINVAL; + + resource_list_for_each_entry(entry, &resource_list2) { + if (resource_type(entry->res) == IORESOURCE_IRQ) { + printk(KERN_EMERG "ACPI i2c client device %s uses irq %d\n", + dev_name(&adev->dev), entry->res->start); + break; + } + } + + acpi_dev_free_resource_list(&resource_list2); + + return 0; +} + +static int i2c_acpi_get_info(struct acpi_device *adev, + struct i2c_board_info *info, + acpi_handle adapter, + acpi_handle *adapter_handle) +{ + struct i2c_acpi_lookup lookup; + + + memset(&lookup, 0, sizeof(lookup)); + lookup.info = info; + lookup.index = -1; + + if (acpi_device_enumerated(adev)) + return -EINVAL; + + return print_irq_info_if_i2c_slave(adev, &lookup, adapter); +} + +static acpi_status process_acpi_node(acpi_handle handle, u32 level, + void *data, void **return_value) +{ + acpi_handle adapter = data; + struct acpi_device *adev; + struct i2c_board_info info; + + if (acpi_bus_get_device(handle, &adev)) + return AE_OK; + + if (i2c_acpi_get_info(adev, &info, adapter, NULL)) + return AE_OK; + + return AE_OK; +} + +#define MAX_SCAN_DEPTH 32 + +void acpi_print_irqs_if_i2c(acpi_handle handle) +{ + acpi_status status; + + status = acpi_walk_namespace(ACPI_TYPE_DEVICE, handle, + MAX_SCAN_DEPTH, + process_acpi_node, NULL, + handle, NULL); + if (ACPI_FAILURE(status)) + printk(KERN_EMERG "failed to enumerate ACPI devices\n"); +} + +static void print_irqs_if_i2c_adapter(struct device *dev) { + acpi_handle handle = ACPI_HANDLE(dev); + acpi_print_irqs_if_i2c(handle); +} + static int vfio_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) { struct vfio_pci_device *vdev; struct iommu_group *group; int ret; + if (has_acpi_companion(&pdev->dev)) + print_irqs_if_i2c_adapter(&pdev->dev); + if (pdev->hdr_type != PCI_HEADER_TYPE_NORMAL) return -EINVAL;
This patch accesses the ACPI system from vfio_pci_probe to print out info if the PCI device being attached to vfio_pci is an i2c adapter with associated i2c client devices that use platform IRQs. The info printed out is the IRQ numbers that are associated with the given i2c client devices. This patch doesn't attempt to forward any additional IRQs into the guest, but shows how it could be possible. Signed-off-by: Micah Morton <mortonm@chromium.org> Change-Id: I5c77d35f246781a4a80703820860631e2c2091cf --- What do you guys think about having code like this somewhere in vfio_pci? There would have to be some logic added in vfio_pci to forward these IRQs when they are found. For reference, below is what is printed out during vfio_pci_probe on my development machine when I attach some I2C adapter PCI devices to vfio_pci: [ 48.742699] ACPI i2c client device WCOM50C1:00 uses irq 31 [ 53.913295] ACPI i2c client device GOOG0005:00 uses irq 24 [ 58.040076] ACPI i2c client device ACPI0C50:00 uses irq 51 Ideally we could add code like this for other bus types (e.g. SPI). NOTE: developed on v5.4 drivers/vfio/pci/vfio_pci.c | 158 ++++++++++++++++++++++++++++++++++++ 1 file changed, 158 insertions(+)