| Message ID | 1465474173-53960-2-git-send-email-ilyal@mellanox.com |
|---|---|
| State | Superseded |
| Headers | show |
On Thu, 9 Jun 2016 15:09:29 +0300 Ilya Lesokhin <ilyal@mellanox.com> wrote: > When a new device is added to a live VFIO group, > use driver_override to force the device to be probed by > the VFIO driver. > > Signed-off-by: Ilya Lesokhin <ilyal@mellanox.com> > --- > drivers/vfio/vfio.c | 18 ++++++++++++++---- > 1 file changed, 14 insertions(+), 4 deletions(-) > > diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c > index 6fd6fa5..32bc1b4 100644 > --- a/drivers/vfio/vfio.c > +++ b/drivers/vfio/vfio.c > @@ -646,6 +646,7 @@ static int vfio_dev_viable(struct device *dev, void *data) > static int vfio_group_nb_add_dev(struct vfio_group *group, struct device *dev) > { > struct vfio_device *device; > + struct pci_dev *pdev; > > /* Do we already know about it? We shouldn't */ > device = vfio_group_get_device(group, dev); > @@ -658,10 +659,19 @@ static int vfio_group_nb_add_dev(struct vfio_group *group, struct device *dev) > if (!atomic_read(&group->container_users)) > return 0; > > - /* TODO Prevent device auto probing */ > - WARN(1, "Device %s added to live group %d!\n", dev_name(dev), > - iommu_group_id(group->iommu_group)); > - > + if (dev_is_pci(dev)) { declare pdev here. > + /* a device that shares a group with another VFIO > + * device should also be probed by VFIO > + */ Use existing comment style: /* * comment */ > + pdev = to_pci_dev(dev); > + if (pdev->driver_override) > + kfree(pdev->driver_override); > + pdev->driver_override = kstrdup("vfio-pci", GFP_KERNEL); kstrdup can fail. Probably want to issue a dev_info message about capturing the device as well. Thanks, Alex > + } else { > + /* TODO Prevent device auto probing */ > + WARN(1, "Device %s added to live group %d!\n", dev_name(dev), > + iommu_group_id(group->iommu_group)); > + } > return 0; > } > -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
> -----Original Message----- > From: Alex Williamson [mailto:alex.williamson@redhat.com] > Sent: Friday, June 10, 2016 1:22 AM > To: Ilya Lesokhin <ilyal@mellanox.com> > Cc: kvm@vger.kernel.org; linux-pci@vger.kernel.org; bhelgaas@google.com; > Noa Osherovich <noaos@mellanox.com>; Haggai Eran > <haggaie@mellanox.com>; Or Gerlitz <ogerlitz@mellanox.com>; Liran Liss > <liranl@mellanox.com> > Subject: Re: [PATCH 1/4] VFIO: Probe new devices in a live VFIO group with > the VFIO driver ... > > + pdev = to_pci_dev(dev); > > + if (pdev->driver_override) > > + kfree(pdev->driver_override); > > + pdev->driver_override = kstrdup("vfio-pci", GFP_KERNEL); > > kstrdup can fail. Probably want to issue a about capturing > the device as well. Thanks, > Any recommendation as to what I should do in case kstrdup fails? Fallback to the existing warning ("device added to a live group") ? Thanks, Ilya. -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, 13 Jun 2016 06:33:53 +0000 Ilya Lesokhin <ilyal@mellanox.com> wrote: > > -----Original Message----- > > From: Alex Williamson [mailto:alex.williamson@redhat.com] > > Sent: Friday, June 10, 2016 1:22 AM > > To: Ilya Lesokhin <ilyal@mellanox.com> > > Cc: kvm@vger.kernel.org; linux-pci@vger.kernel.org; bhelgaas@google.com; > > Noa Osherovich <noaos@mellanox.com>; Haggai Eran > > <haggaie@mellanox.com>; Or Gerlitz <ogerlitz@mellanox.com>; Liran Liss > > <liranl@mellanox.com> > > Subject: Re: [PATCH 1/4] VFIO: Probe new devices in a live VFIO group with > > the VFIO driver > ... > > > + pdev = to_pci_dev(dev); > > > + if (pdev->driver_override) > > > + kfree(pdev->driver_override); > > > + pdev->driver_override = kstrdup("vfio-pci", GFP_KERNEL); > > > > kstrdup can fail. Probably want to issue a about capturing > > the device as well. Thanks, > > > > Any recommendation as to what I should do in case kstrdup fails? > Fallback to the existing warning ("device added to a live group") ? Probably so. Thanks, Alex -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c index 6fd6fa5..32bc1b4 100644 --- a/drivers/vfio/vfio.c +++ b/drivers/vfio/vfio.c @@ -646,6 +646,7 @@ static int vfio_dev_viable(struct device *dev, void *data) static int vfio_group_nb_add_dev(struct vfio_group *group, struct device *dev) { struct vfio_device *device; + struct pci_dev *pdev; /* Do we already know about it? We shouldn't */ device = vfio_group_get_device(group, dev); @@ -658,10 +659,19 @@ static int vfio_group_nb_add_dev(struct vfio_group *group, struct device *dev) if (!atomic_read(&group->container_users)) return 0; - /* TODO Prevent device auto probing */ - WARN(1, "Device %s added to live group %d!\n", dev_name(dev), - iommu_group_id(group->iommu_group)); - + if (dev_is_pci(dev)) { + /* a device that shares a group with another VFIO + * device should also be probed by VFIO + */ + pdev = to_pci_dev(dev); + if (pdev->driver_override) + kfree(pdev->driver_override); + pdev->driver_override = kstrdup("vfio-pci", GFP_KERNEL); + } else { + /* TODO Prevent device auto probing */ + WARN(1, "Device %s added to live group %d!\n", dev_name(dev), + iommu_group_id(group->iommu_group)); + } return 0; }
When a new device is added to a live VFIO group, use driver_override to force the device to be probed by the VFIO driver. Signed-off-by: Ilya Lesokhin <ilyal@mellanox.com> --- drivers/vfio/vfio.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)