[PATCH 1/2] VFIO-AER: Vfio-pci driver changes for supporting AER

[PATCH 1/2] VFIO-AER: Vfio-pci driver changes for supporting AER

[Pandarathil, Vijaymohan R]

	- New ioctl which is used to pass the eventfd that is signaled when
          an error occurs in the vfio_pci_device

	- Register pci_error_handler for the vfio_pci driver

	- When the device encounters an error, the error handler registered by
          the vfio_pci driver gets invoked by the AER infrastructure

	- In the error handler, signal the eventfd registered for the device.

	- This results in the qemu eventfd handler getting invoked and
          appropriate action taken for the guest.

Signed-off-by: Vijay Mohan Pandarathil <vijaymohan.pandarathil@hp.com>
---
 drivers/vfio/pci/vfio_pci.c         | 29 +++++++++++++++++++++++++++++
 drivers/vfio/pci/vfio_pci_private.h |  1 +
 drivers/vfio/vfio.c                 |  8 ++++++++
 include/linux/vfio.h                |  1 +
 include/uapi/linux/vfio.h           |  9 +++++++++
 5 files changed, 48 insertions(+)

diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c
index 6c11994..4ae9526 100644
--- a/drivers/vfio/pci/vfio_pci.c
+++ b/drivers/vfio/pci/vfio_pci.c
@@ -207,6 +207,8 @@ static long vfio_pci_ioctl(void *device_data,
 		if (vdev->reset_works)
 			info.flags |= VFIO_DEVICE_FLAGS_RESET;
 
+		info.flags |= VFIO_DEVICE_FLAGS_AER_NOTIFY;
+
 		info.num_regions = VFIO_PCI_NUM_REGIONS;
 		info.num_irqs = VFIO_PCI_NUM_IRQS;
 
@@ -348,6 +350,19 @@ static long vfio_pci_ioctl(void *device_data,
 
 		return ret;
 
+	} else if (cmd == VFIO_DEVICE_SET_ERRFD) {
+		int32_t fd = (int32_t)arg;
+
+		if (fd < 0)
+			return -EINVAL;
+
+		vdev->err_trigger = eventfd_ctx_fdget(fd);
+
+		if (IS_ERR(vdev->err_trigger))
+			return PTR_ERR(vdev->err_trigger);
+
+		return 0;
+
 	} else if (cmd == VFIO_DEVICE_RESET)
 		return vdev->reset_works ?
 			pci_reset_function(vdev->pdev) : -EINVAL;
@@ -527,11 +542,25 @@ static void vfio_pci_remove(struct pci_dev *pdev)
 	kfree(vdev);
 }
 
+static pci_ers_result_t vfio_err_detected(struct pci_dev *pdev,
+				pci_channel_state_t state)
+{
+	struct vfio_pci_device *vdev = vfio_get_vdev(&pdev->dev);
+
+	eventfd_signal(vdev->err_trigger, 1);
+	return PCI_ERS_RESULT_CAN_RECOVER;
+}
+
+static const struct pci_error_handlers vfio_err_handlers = {
+	.error_detected = vfio_err_detected,
+};
+
 static struct pci_driver vfio_pci_driver = {
 	.name		= "vfio-pci",
 	.id_table	= NULL, /* only dynamic ids */
 	.probe		= vfio_pci_probe,
 	.remove		= vfio_pci_remove,
+	.err_handler	= &vfio_err_handlers,
 };
 
 static void __exit vfio_pci_cleanup(void)
diff --git a/drivers/vfio/pci/vfio_pci_private.h b/drivers/vfio/pci/vfio_pci_private.h
index 611827c..daee62f 100644
--- a/drivers/vfio/pci/vfio_pci_private.h
+++ b/drivers/vfio/pci/vfio_pci_private.h
@@ -55,6 +55,7 @@ struct vfio_pci_device {
 	bool			bardirty;
 	struct pci_saved_state	*pci_saved_state;
 	atomic_t		refcnt;
+	struct eventfd_ctx	*err_trigger;
 };
 
 #define is_intx(vdev) (vdev->irq_type == VFIO_PCI_INTX_IRQ_INDEX)
diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c
index 56097c6..5ed5a54 100644
--- a/drivers/vfio/vfio.c
+++ b/drivers/vfio/vfio.c
@@ -693,6 +693,14 @@ void *vfio_del_group_dev(struct device *dev)
 }
 EXPORT_SYMBOL_GPL(vfio_del_group_dev);
 
+void *vfio_get_vdev(struct device *dev)
+{
+	struct vfio_device *device = dev_get_drvdata(dev);
+
+	return device->device_data;
+}
+EXPORT_SYMBOL_GPL(vfio_get_vdev);
+
 /**
  * VFIO base fd, /dev/vfio/vfio
  */
diff --git a/include/linux/vfio.h b/include/linux/vfio.h
index ab9e862..3c97b03 100644
--- a/include/linux/vfio.h
+++ b/include/linux/vfio.h
@@ -45,6 +45,7 @@ extern int vfio_add_group_dev(struct device *dev,
 			      void *device_data);
 
 extern void *vfio_del_group_dev(struct device *dev);
+extern void *vfio_get_vdev(struct device *dev);
 
 /**
  * struct vfio_iommu_driver_ops - VFIO IOMMU driver callbacks
diff --git a/include/uapi/linux/vfio.h b/include/uapi/linux/vfio.h
index 4758d1b..fa67213 100644
--- a/include/uapi/linux/vfio.h
+++ b/include/uapi/linux/vfio.h
@@ -147,6 +147,7 @@ struct vfio_device_info {
 	__u32	flags;
 #define VFIO_DEVICE_FLAGS_RESET	(1 << 0)	/* Device supports reset */
 #define VFIO_DEVICE_FLAGS_PCI	(1 << 1)	/* vfio-pci device */
+#define VFIO_DEVICE_FLAGS_AER_NOTIFY (1 << 2)	/* Supports aer notify */
 	__u32	num_regions;	/* Max region index + 1 */
 	__u32	num_irqs;	/* Max IRQ index + 1 */
 };
@@ -288,6 +289,14 @@ struct vfio_irq_set {
  */
 #define VFIO_DEVICE_RESET		_IO(VFIO_TYPE, VFIO_BASE + 11)
 
+/**
+ * VFIO_DEVICE_SET_ERRFD - _IO(VFIO_TYPE, VFIO_BASE + 12)
+ *
+ * Pass the eventfd to the vfio-pci driver for signalling any device
+ * error notifications
+ */
+#define VFIO_DEVICE_SET_ERRFD		_IO(VFIO_TYPE, VFIO_BASE + 12)
+
 /*
  * The VFIO-PCI bus driver makes use of the following fixed region and
  * IRQ index mapping.  Unimplemented regions return a size of zero.
-- 
1.7.11.3

Re: [PATCH 1/2] VFIO-AER: Vfio-pci driver changes for supporting AER

[Alex Williamson]

On Wed, 2013-01-09 at 06:26 +0000, Pandarathil, Vijaymohan R wrote:
> 	- New ioctl which is used to pass the eventfd that is signaled when
>           an error occurs in the vfio_pci_device
> 
> 	- Register pci_error_handler for the vfio_pci driver
> 
> 	- When the device encounters an error, the error handler registered by
>           the vfio_pci driver gets invoked by the AER infrastructure
> 
> 	- In the error handler, signal the eventfd registered for the device.
> 
> 	- This results in the qemu eventfd handler getting invoked and
>           appropriate action taken for the guest.
> 
> Signed-off-by: Vijay Mohan Pandarathil <vijaymohan.pandarathil@hp.com>
> ---
>  drivers/vfio/pci/vfio_pci.c         | 29 +++++++++++++++++++++++++++++
>  drivers/vfio/pci/vfio_pci_private.h |  1 +
>  drivers/vfio/vfio.c                 |  8 ++++++++
>  include/linux/vfio.h                |  1 +
>  include/uapi/linux/vfio.h           |  9 +++++++++
>  5 files changed, 48 insertions(+)
> 
> diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c
> index 6c11994..4ae9526 100644
> --- a/drivers/vfio/pci/vfio_pci.c
> +++ b/drivers/vfio/pci/vfio_pci.c
> @@ -207,6 +207,8 @@ static long vfio_pci_ioctl(void *device_data,
>  		if (vdev->reset_works)
>  			info.flags |= VFIO_DEVICE_FLAGS_RESET;
>  
> +		info.flags |= VFIO_DEVICE_FLAGS_AER_NOTIFY;
> +

This appears to be a PCI specific flag, so the name should include
_PCI_.  We also support non-PCIe devices and it seems like it would be
possible to not have AER support available, so shouldn't this be
conditional?

>  		info.num_regions = VFIO_PCI_NUM_REGIONS;
>  		info.num_irqs = VFIO_PCI_NUM_IRQS;
>  
> @@ -348,6 +350,19 @@ static long vfio_pci_ioctl(void *device_data,
>  
>  		return ret;
>  
> +	} else if (cmd == VFIO_DEVICE_SET_ERRFD) {
> +		int32_t fd = (int32_t)arg;
> +
> +		if (fd < 0)
> +			return -EINVAL;
> +
> +		vdev->err_trigger = eventfd_ctx_fdget(fd);
> +
> +		if (IS_ERR(vdev->err_trigger))
> +			return PTR_ERR(vdev->err_trigger);
> +
> +		return 0;
> +

I'm not sure why we wouldn't describe this as just another interrupt
from the device and configure it via SET_IRQ.  This ioctl has very
limited use and doesn't follow any of the conventions of all the other
vfio ioctls.

>  	} else if (cmd == VFIO_DEVICE_RESET)
>  		return vdev->reset_works ?
>  			pci_reset_function(vdev->pdev) : -EINVAL;
> @@ -527,11 +542,25 @@ static void vfio_pci_remove(struct pci_dev *pdev)
>  	kfree(vdev);
>  }
>  
> +static pci_ers_result_t vfio_err_detected(struct pci_dev *pdev,
> +				pci_channel_state_t state)
> +{
> +	struct vfio_pci_device *vdev = vfio_get_vdev(&pdev->dev);
> +
> +	eventfd_signal(vdev->err_trigger, 1);
> +	return PCI_ERS_RESULT_CAN_RECOVER;
> +}

What if err_trigger hasn't been set?

> +
> +static const struct pci_error_handlers vfio_err_handlers = {
> +	.error_detected = vfio_err_detected,
> +};
> +
>  static struct pci_driver vfio_pci_driver = {
>  	.name		= "vfio-pci",
>  	.id_table	= NULL, /* only dynamic ids */
>  	.probe		= vfio_pci_probe,
>  	.remove		= vfio_pci_remove,
> +	.err_handler	= &vfio_err_handlers,
>  };
>  
>  static void __exit vfio_pci_cleanup(void)
> diff --git a/drivers/vfio/pci/vfio_pci_private.h b/drivers/vfio/pci/vfio_pci_private.h
> index 611827c..daee62f 100644
> --- a/drivers/vfio/pci/vfio_pci_private.h
> +++ b/drivers/vfio/pci/vfio_pci_private.h
> @@ -55,6 +55,7 @@ struct vfio_pci_device {
>  	bool			bardirty;
>  	struct pci_saved_state	*pci_saved_state;
>  	atomic_t		refcnt;
> +	struct eventfd_ctx	*err_trigger;
>  };
>  
>  #define is_intx(vdev) (vdev->irq_type == VFIO_PCI_INTX_IRQ_INDEX)
> diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c
> index 56097c6..5ed5a54 100644
> --- a/drivers/vfio/vfio.c
> +++ b/drivers/vfio/vfio.c
> @@ -693,6 +693,14 @@ void *vfio_del_group_dev(struct device *dev)
>  }
>  EXPORT_SYMBOL_GPL(vfio_del_group_dev);
>  
> +void *vfio_get_vdev(struct device *dev)
> +{
> +	struct vfio_device *device = dev_get_drvdata(dev);
> +
> +	return device->device_data;
> +}
> +EXPORT_SYMBOL_GPL(vfio_get_vdev);
> +

This is unsafe.  How do we know dev is a vfio device?  How do we keep
that drvdata valid while you're using it?  I think you want to export
the existing vfio_group_get_device() and vfio_device_put().  Thanks,

Alex

>  /**
>   * VFIO base fd, /dev/vfio/vfio
>   */
> diff --git a/include/linux/vfio.h b/include/linux/vfio.h
> index ab9e862..3c97b03 100644
> --- a/include/linux/vfio.h
> +++ b/include/linux/vfio.h
> @@ -45,6 +45,7 @@ extern int vfio_add_group_dev(struct device *dev,
>  			      void *device_data);
>  
>  extern void *vfio_del_group_dev(struct device *dev);
> +extern void *vfio_get_vdev(struct device *dev);
>  
>  /**
>   * struct vfio_iommu_driver_ops - VFIO IOMMU driver callbacks
> diff --git a/include/uapi/linux/vfio.h b/include/uapi/linux/vfio.h
> index 4758d1b..fa67213 100644
> --- a/include/uapi/linux/vfio.h
> +++ b/include/uapi/linux/vfio.h
> @@ -147,6 +147,7 @@ struct vfio_device_info {
>  	__u32	flags;
>  #define VFIO_DEVICE_FLAGS_RESET	(1 << 0)	/* Device supports reset */
>  #define VFIO_DEVICE_FLAGS_PCI	(1 << 1)	/* vfio-pci device */
> +#define VFIO_DEVICE_FLAGS_AER_NOTIFY (1 << 2)	/* Supports aer notify */
>  	__u32	num_regions;	/* Max region index + 1 */
>  	__u32	num_irqs;	/* Max IRQ index + 1 */
>  };
> @@ -288,6 +289,14 @@ struct vfio_irq_set {
>   */
>  #define VFIO_DEVICE_RESET		_IO(VFIO_TYPE, VFIO_BASE + 11)
>  
> +/**
> + * VFIO_DEVICE_SET_ERRFD - _IO(VFIO_TYPE, VFIO_BASE + 12)
> + *
> + * Pass the eventfd to the vfio-pci driver for signalling any device
> + * error notifications
> + */
> +#define VFIO_DEVICE_SET_ERRFD		_IO(VFIO_TYPE, VFIO_BASE + 12)
> +
>  /*
>   * The VFIO-PCI bus driver makes use of the following fixed region and
>   * IRQ index mapping.  Unimplemented regions return a size of zero.

Re: [PATCH 1/2] VFIO-AER: Vfio-pci driver changes for supporting AER

[Alex Williamson]

On Wed, 2013-01-09 at 10:52 -0700, Alex Williamson wrote:
> On Wed, 2013-01-09 at 06:26 +0000, Pandarathil, Vijaymohan R wrote:
> > 	- New ioctl which is used to pass the eventfd that is signaled when
> >           an error occurs in the vfio_pci_device
> > 
> > 	- Register pci_error_handler for the vfio_pci driver
> > 
> > 	- When the device encounters an error, the error handler registered by
> >           the vfio_pci driver gets invoked by the AER infrastructure
> > 
> > 	- In the error handler, signal the eventfd registered for the device.
> > 
> > 	- This results in the qemu eventfd handler getting invoked and
> >           appropriate action taken for the guest.
> > 
> > Signed-off-by: Vijay Mohan Pandarathil <vijaymohan.pandarathil@hp.com>
> > ---
> >  drivers/vfio/pci/vfio_pci.c         | 29 +++++++++++++++++++++++++++++
> >  drivers/vfio/pci/vfio_pci_private.h |  1 +
> >  drivers/vfio/vfio.c                 |  8 ++++++++
> >  include/linux/vfio.h                |  1 +
> >  include/uapi/linux/vfio.h           |  9 +++++++++
> >  5 files changed, 48 insertions(+)
> > 
> > diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c
> > index 6c11994..4ae9526 100644
> > --- a/drivers/vfio/pci/vfio_pci.c
> > +++ b/drivers/vfio/pci/vfio_pci.c
> > @@ -207,6 +207,8 @@ static long vfio_pci_ioctl(void *device_data,
> >  		if (vdev->reset_works)
> >  			info.flags |= VFIO_DEVICE_FLAGS_RESET;
> >  
> > +		info.flags |= VFIO_DEVICE_FLAGS_AER_NOTIFY;
> > +
> 
> This appears to be a PCI specific flag, so the name should include
> _PCI_.  We also support non-PCIe devices and it seems like it would be
> possible to not have AER support available, so shouldn't this be
> conditional?
> 
> >  		info.num_regions = VFIO_PCI_NUM_REGIONS;
> >  		info.num_irqs = VFIO_PCI_NUM_IRQS;
> >  
> > @@ -348,6 +350,19 @@ static long vfio_pci_ioctl(void *device_data,
> >  
> >  		return ret;
> >  
> > +	} else if (cmd == VFIO_DEVICE_SET_ERRFD) {
> > +		int32_t fd = (int32_t)arg;
> > +
> > +		if (fd < 0)
> > +			return -EINVAL;
> > +
> > +		vdev->err_trigger = eventfd_ctx_fdget(fd);
> > +
> > +		if (IS_ERR(vdev->err_trigger))
> > +			return PTR_ERR(vdev->err_trigger);
> > +
> > +		return 0;
> > +
> 
> I'm not sure why we wouldn't describe this as just another interrupt
> from the device and configure it via SET_IRQ.  This ioctl has very
> limited use and doesn't follow any of the conventions of all the other
> vfio ioctls.
> 
> >  	} else if (cmd == VFIO_DEVICE_RESET)
> >  		return vdev->reset_works ?
> >  			pci_reset_function(vdev->pdev) : -EINVAL;
> > @@ -527,11 +542,25 @@ static void vfio_pci_remove(struct pci_dev *pdev)
> >  	kfree(vdev);
> >  }
> >  
> > +static pci_ers_result_t vfio_err_detected(struct pci_dev *pdev,
> > +				pci_channel_state_t state)
> > +{
> > +	struct vfio_pci_device *vdev = vfio_get_vdev(&pdev->dev);
> > +
> > +	eventfd_signal(vdev->err_trigger, 1);
> > +	return PCI_ERS_RESULT_CAN_RECOVER;
> > +}
> 
> What if err_trigger hasn't been set?
> 
> > +
> > +static const struct pci_error_handlers vfio_err_handlers = {
> > +	.error_detected = vfio_err_detected,
> > +};
> > +
> >  static struct pci_driver vfio_pci_driver = {
> >  	.name		= "vfio-pci",
> >  	.id_table	= NULL, /* only dynamic ids */
> >  	.probe		= vfio_pci_probe,
> >  	.remove		= vfio_pci_remove,
> > +	.err_handler	= &vfio_err_handlers,
> >  };
> >  
> >  static void __exit vfio_pci_cleanup(void)
> > diff --git a/drivers/vfio/pci/vfio_pci_private.h b/drivers/vfio/pci/vfio_pci_private.h
> > index 611827c..daee62f 100644
> > --- a/drivers/vfio/pci/vfio_pci_private.h
> > +++ b/drivers/vfio/pci/vfio_pci_private.h
> > @@ -55,6 +55,7 @@ struct vfio_pci_device {
> >  	bool			bardirty;
> >  	struct pci_saved_state	*pci_saved_state;
> >  	atomic_t		refcnt;
> > +	struct eventfd_ctx	*err_trigger;
> >  };
> >  
> >  #define is_intx(vdev) (vdev->irq_type == VFIO_PCI_INTX_IRQ_INDEX)
> > diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c
> > index 56097c6..5ed5a54 100644
> > --- a/drivers/vfio/vfio.c
> > +++ b/drivers/vfio/vfio.c
> > @@ -693,6 +693,14 @@ void *vfio_del_group_dev(struct device *dev)
> >  }
> >  EXPORT_SYMBOL_GPL(vfio_del_group_dev);
> >  
> > +void *vfio_get_vdev(struct device *dev)
> > +{
> > +	struct vfio_device *device = dev_get_drvdata(dev);
> > +
> > +	return device->device_data;
> > +}
> > +EXPORT_SYMBOL_GPL(vfio_get_vdev);
> > +
> 
> This is unsafe.  How do we know dev is a vfio device?  How do we keep
> that drvdata valid while you're using it?  I think you want to export
> the existing vfio_group_get_device() and vfio_device_put().  Thanks,

vfio_group_get_device() isn't quite what you want either since it
assumes a reference count on the group.  You'll want something like
vfio_add_group_dev() or vfio_dev_present(), perhaps moving the
iommu_group_get -> vfio_group_get_from_iommu -> vfio_group_get_device
into a helper function.  Thanks,

Alex

> >  /**
> >   * VFIO base fd, /dev/vfio/vfio
> >   */
> > diff --git a/include/linux/vfio.h b/include/linux/vfio.h
> > index ab9e862..3c97b03 100644
> > --- a/include/linux/vfio.h
> > +++ b/include/linux/vfio.h
> > @@ -45,6 +45,7 @@ extern int vfio_add_group_dev(struct device *dev,
> >  			      void *device_data);
> >  
> >  extern void *vfio_del_group_dev(struct device *dev);
> > +extern void *vfio_get_vdev(struct device *dev);
> >  
> >  /**
> >   * struct vfio_iommu_driver_ops - VFIO IOMMU driver callbacks
> > diff --git a/include/uapi/linux/vfio.h b/include/uapi/linux/vfio.h
> > index 4758d1b..fa67213 100644
> > --- a/include/uapi/linux/vfio.h
> > +++ b/include/uapi/linux/vfio.h
> > @@ -147,6 +147,7 @@ struct vfio_device_info {
> >  	__u32	flags;
> >  #define VFIO_DEVICE_FLAGS_RESET	(1 << 0)	/* Device supports reset */
> >  #define VFIO_DEVICE_FLAGS_PCI	(1 << 1)	/* vfio-pci device */
> > +#define VFIO_DEVICE_FLAGS_AER_NOTIFY (1 << 2)	/* Supports aer notify */
> >  	__u32	num_regions;	/* Max region index + 1 */
> >  	__u32	num_irqs;	/* Max IRQ index + 1 */
> >  };
> > @@ -288,6 +289,14 @@ struct vfio_irq_set {
> >   */
> >  #define VFIO_DEVICE_RESET		_IO(VFIO_TYPE, VFIO_BASE + 11)
> >  
> > +/**
> > + * VFIO_DEVICE_SET_ERRFD - _IO(VFIO_TYPE, VFIO_BASE + 12)
> > + *
> > + * Pass the eventfd to the vfio-pci driver for signalling any device
> > + * error notifications
> > + */
> > +#define VFIO_DEVICE_SET_ERRFD		_IO(VFIO_TYPE, VFIO_BASE + 12)
> > +
> >  /*
> >   * The VFIO-PCI bus driver makes use of the following fixed region and
> >   * IRQ index mapping.  Unimplemented regions return a size of zero.
> 
> 

RE: [PATCH 1/2] VFIO-AER: Vfio-pci driver changes for supporting AER

[Pandarathil, Vijaymohan R]

DQoNCj4gLS0tLS1PcmlnaW5hbCBNZXNzYWdlLS0tLS0NCj4gRnJvbTogQWxleCBXaWxsaWFtc29u
IFttYWlsdG86YWxleC53aWxsaWFtc29uQHJlZGhhdC5jb21dDQo+IFNlbnQ6IFdlZG5lc2RheSwg
SmFudWFyeSAwOSwgMjAxMyAxMTowNSBBTQ0KPiBUbzogUGFuZGFyYXRoaWwsIFZpamF5bW9oYW4g
Ug0KPiBDYzogQmpvcm4gSGVsZ2FhczsgR2xlYiBOYXRhcG92OyBrdm1Admdlci5rZXJuZWwub3Jn
OyBxZW11LQ0KPiBkZXZlbEBub25nbnUub3JnOyBsaW51eC1wY2lAdmdlci5rZXJuZWwub3JnOyBs
aW51eC1rZXJuZWxAdmdlci5rZXJuZWwub3JnDQo+IFN1YmplY3Q6IFJlOiBbUEFUQ0ggMS8yXSBW
RklPLUFFUjogVmZpby1wY2kgZHJpdmVyIGNoYW5nZXMgZm9yIHN1cHBvcnRpbmcNCj4gQUVSDQo+
IA0KPiBPbiBXZWQsIDIwMTMtMDEtMDkgYXQgMTA6NTIgLTA3MDAsIEFsZXggV2lsbGlhbXNvbiB3
cm90ZToNCj4gPiBPbiBXZWQsIDIwMTMtMDEtMDkgYXQgMDY6MjYgKzAwMDAsIFBhbmRhcmF0aGls
LCBWaWpheW1vaGFuIFIgd3JvdGU6DQo+ID4gPiAJLSBOZXcgaW9jdGwgd2hpY2ggaXMgdXNlZCB0
byBwYXNzIHRoZSBldmVudGZkIHRoYXQgaXMgc2lnbmFsZWQgd2hlbg0KPiA+ID4gICAgICAgICAg
IGFuIGVycm9yIG9jY3VycyBpbiB0aGUgdmZpb19wY2lfZGV2aWNlDQo+ID4gPg0KPiA+ID4gCS0g
UmVnaXN0ZXIgcGNpX2Vycm9yX2hhbmRsZXIgZm9yIHRoZSB2ZmlvX3BjaSBkcml2ZXINCj4gPiA+
DQo+ID4gPiAJLSBXaGVuIHRoZSBkZXZpY2UgZW5jb3VudGVycyBhbiBlcnJvciwgdGhlIGVycm9y
IGhhbmRsZXIgcmVnaXN0ZXJlZA0KPiBieQ0KPiA+ID4gICAgICAgICAgIHRoZSB2ZmlvX3BjaSBk
cml2ZXIgZ2V0cyBpbnZva2VkIGJ5IHRoZSBBRVIgaW5mcmFzdHJ1Y3R1cmUNCj4gPiA+DQo+ID4g
PiAJLSBJbiB0aGUgZXJyb3IgaGFuZGxlciwgc2lnbmFsIHRoZSBldmVudGZkIHJlZ2lzdGVyZWQg
Zm9yIHRoZSBkZXZpY2UuDQo+ID4gPg0KPiA+ID4gCS0gVGhpcyByZXN1bHRzIGluIHRoZSBxZW11
IGV2ZW50ZmQgaGFuZGxlciBnZXR0aW5nIGludm9rZWQgYW5kDQo+ID4gPiAgICAgICAgICAgYXBw
cm9wcmlhdGUgYWN0aW9uIHRha2VuIGZvciB0aGUgZ3Vlc3QuDQo+ID4gPg0KPiA+ID4gU2lnbmVk
LW9mZi1ieTogVmlqYXkgTW9oYW4gUGFuZGFyYXRoaWwgPHZpamF5bW9oYW4ucGFuZGFyYXRoaWxA
aHAuY29tPg0KPiA+ID4gLS0tDQo+ID4gPiAgZHJpdmVycy92ZmlvL3BjaS92ZmlvX3BjaS5jICAg
ICAgICAgfCAyOSArKysrKysrKysrKysrKysrKysrKysrKysrKysrKw0KPiA+ID4gIGRyaXZlcnMv
dmZpby9wY2kvdmZpb19wY2lfcHJpdmF0ZS5oIHwgIDEgKw0KPiA+ID4gIGRyaXZlcnMvdmZpby92
ZmlvLmMgICAgICAgICAgICAgICAgIHwgIDggKysrKysrKysNCj4gPiA+ICBpbmNsdWRlL2xpbnV4
L3ZmaW8uaCAgICAgICAgICAgICAgICB8ICAxICsNCj4gPiA+ICBpbmNsdWRlL3VhcGkvbGludXgv
dmZpby5oICAgICAgICAgICB8ICA5ICsrKysrKysrKw0KPiA+ID4gIDUgZmlsZXMgY2hhbmdlZCwg
NDggaW5zZXJ0aW9ucygrKQ0KPiA+ID4NCj4gPiA+IGRpZmYgLS1naXQgYS9kcml2ZXJzL3ZmaW8v
cGNpL3ZmaW9fcGNpLmMgYi9kcml2ZXJzL3ZmaW8vcGNpL3ZmaW9fcGNpLmMNCj4gPiA+IGluZGV4
IDZjMTE5OTQuLjRhZTk1MjYgMTAwNjQ0DQo+ID4gPiAtLS0gYS9kcml2ZXJzL3ZmaW8vcGNpL3Zm
aW9fcGNpLmMNCj4gPiA+ICsrKyBiL2RyaXZlcnMvdmZpby9wY2kvdmZpb19wY2kuYw0KPiA+ID4g
QEAgLTIwNyw2ICsyMDcsOCBAQCBzdGF0aWMgbG9uZyB2ZmlvX3BjaV9pb2N0bCh2b2lkICpkZXZp
Y2VfZGF0YSwNCj4gPiA+ICAJCWlmICh2ZGV2LT5yZXNldF93b3JrcykNCj4gPiA+ICAJCQlpbmZv
LmZsYWdzIHw9IFZGSU9fREVWSUNFX0ZMQUdTX1JFU0VUOw0KPiA+ID4NCj4gPiA+ICsJCWluZm8u
ZmxhZ3MgfD0gVkZJT19ERVZJQ0VfRkxBR1NfQUVSX05PVElGWTsNCj4gPiA+ICsNCj4gPg0KPiA+
IFRoaXMgYXBwZWFycyB0byBiZSBhIFBDSSBzcGVjaWZpYyBmbGFnLCBzbyB0aGUgbmFtZSBzaG91
bGQgaW5jbHVkZQ0KPiA+IF9QQ0lfLiAgV2UgYWxzbyBzdXBwb3J0IG5vbi1QQ0llIGRldmljZXMg
YW5kIGl0IHNlZW1zIGxpa2UgaXQgd291bGQgYmUNCj4gPiBwb3NzaWJsZSB0byBub3QgaGF2ZSBB
RVIgc3VwcG9ydCBhdmFpbGFibGUsIHNvIHNob3VsZG4ndCB0aGlzIGJlDQo+ID4gY29uZGl0aW9u
YWw/DQoNCldpbGwgZG8gdGhhdC4NCg0KPiA+DQo+ID4gPiAgCQlpbmZvLm51bV9yZWdpb25zID0g
VkZJT19QQ0lfTlVNX1JFR0lPTlM7DQo+ID4gPiAgCQlpbmZvLm51bV9pcnFzID0gVkZJT19QQ0lf
TlVNX0lSUVM7DQo+ID4gPg0KPiA+ID4gQEAgLTM0OCw2ICszNTAsMTkgQEAgc3RhdGljIGxvbmcg
dmZpb19wY2lfaW9jdGwodm9pZCAqZGV2aWNlX2RhdGEsDQo+ID4gPg0KPiA+ID4gIAkJcmV0dXJu
IHJldDsNCj4gPiA+DQo+ID4gPiArCX0gZWxzZSBpZiAoY21kID09IFZGSU9fREVWSUNFX1NFVF9F
UlJGRCkgew0KPiA+ID4gKwkJaW50MzJfdCBmZCA9IChpbnQzMl90KWFyZzsNCj4gPiA+ICsNCj4g
PiA+ICsJCWlmIChmZCA8IDApDQo+ID4gPiArCQkJcmV0dXJuIC1FSU5WQUw7DQo+ID4gPiArDQo+
ID4gPiArCQl2ZGV2LT5lcnJfdHJpZ2dlciA9IGV2ZW50ZmRfY3R4X2ZkZ2V0KGZkKTsNCj4gPiA+
ICsNCj4gPiA+ICsJCWlmIChJU19FUlIodmRldi0+ZXJyX3RyaWdnZXIpKQ0KPiA+ID4gKwkJCXJl
dHVybiBQVFJfRVJSKHZkZXYtPmVycl90cmlnZ2VyKTsNCj4gPiA+ICsNCj4gPiA+ICsJCXJldHVy
biAwOw0KPiA+ID4gKw0KPiA+DQo+ID4gSSdtIG5vdCBzdXJlIHdoeSB3ZSB3b3VsZG4ndCBkZXNj
cmliZSB0aGlzIGFzIGp1c3QgYW5vdGhlciBpbnRlcnJ1cHQNCj4gPiBmcm9tIHRoZSBkZXZpY2Ug
YW5kIGNvbmZpZ3VyZSBpdCB2aWEgU0VUX0lSUS4gIFRoaXMgaW9jdGwgaGFzIHZlcnkNCj4gPiBs
aW1pdGVkIHVzZSBhbmQgZG9lc24ndCBmb2xsb3cgYW55IG9mIHRoZSBjb252ZW50aW9ucyBvZiBh
bGwgdGhlIG90aGVyDQo+ID4gdmZpbyBpb2N0bHMuDQoNCkkgdGhvdWdodCB0aGlzIHdhcyBhIGZh
aXJseSBzaW1wbGUgaW9jdGwgdG8gaW1wbGVtZW50IHRoaXMgd2F5LiBNb3Jlb3ZlciwgDQp0aGVy
ZSBpcyBubyBkZXZpY2UgaW50ZXJydXB0IGludm9sdmVkLiBMZXQgbWUga25vdyBpZiB5b3UgcmVh
bGx5IHdhbnQgdG8gDQptb2RlbCBpdCBhcyBhIFNFVF9JUlEgaW9jdGwuDQoNCj4gPg0KPiA+ID4g
IAl9IGVsc2UgaWYgKGNtZCA9PSBWRklPX0RFVklDRV9SRVNFVCkNCj4gPiA+ICAJCXJldHVybiB2
ZGV2LT5yZXNldF93b3JrcyA/DQo+ID4gPiAgCQkJcGNpX3Jlc2V0X2Z1bmN0aW9uKHZkZXYtPnBk
ZXYpIDogLUVJTlZBTDsNCj4gPiA+IEBAIC01MjcsMTEgKzU0MiwyNSBAQCBzdGF0aWMgdm9pZCB2
ZmlvX3BjaV9yZW1vdmUoc3RydWN0IHBjaV9kZXYgKnBkZXYpDQo+ID4gPiAgCWtmcmVlKHZkZXYp
Ow0KPiA+ID4gIH0NCj4gPiA+DQo+ID4gPiArc3RhdGljIHBjaV9lcnNfcmVzdWx0X3QgdmZpb19l
cnJfZGV0ZWN0ZWQoc3RydWN0IHBjaV9kZXYgKnBkZXYsDQo+ID4gPiArCQkJCXBjaV9jaGFubmVs
X3N0YXRlX3Qgc3RhdGUpDQo+ID4gPiArew0KPiA+ID4gKwlzdHJ1Y3QgdmZpb19wY2lfZGV2aWNl
ICp2ZGV2ID0gdmZpb19nZXRfdmRldigmcGRldi0+ZGV2KTsNCj4gPiA+ICsNCj4gPiA+ICsJZXZl
bnRmZF9zaWduYWwodmRldi0+ZXJyX3RyaWdnZXIsIDEpOw0KPiA+ID4gKwlyZXR1cm4gUENJX0VS
U19SRVNVTFRfQ0FOX1JFQ09WRVI7DQo+ID4gPiArfQ0KPiA+DQo+ID4gV2hhdCBpZiBlcnJfdHJp
Z2dlciBoYXNuJ3QgYmVlbiBzZXQ/DQoNCldpbGwgZml4IHRoYXQuDQoNCj4gPg0KPiA+ID4gKw0K
PiA+ID4gK3N0YXRpYyBjb25zdCBzdHJ1Y3QgcGNpX2Vycm9yX2hhbmRsZXJzIHZmaW9fZXJyX2hh
bmRsZXJzID0gew0KPiA+ID4gKwkuZXJyb3JfZGV0ZWN0ZWQgPSB2ZmlvX2Vycl9kZXRlY3RlZCwN
Cj4gPiA+ICt9Ow0KPiA+ID4gKw0KPiA+ID4gIHN0YXRpYyBzdHJ1Y3QgcGNpX2RyaXZlciB2Zmlv
X3BjaV9kcml2ZXIgPSB7DQo+ID4gPiAgCS5uYW1lCQk9ICJ2ZmlvLXBjaSIsDQo+ID4gPiAgCS5p
ZF90YWJsZQk9IE5VTEwsIC8qIG9ubHkgZHluYW1pYyBpZHMgKi8NCj4gPiA+ICAJLnByb2JlCQk9
IHZmaW9fcGNpX3Byb2JlLA0KPiA+ID4gIAkucmVtb3ZlCQk9IHZmaW9fcGNpX3JlbW92ZSwNCj4g
PiA+ICsJLmVycl9oYW5kbGVyCT0gJnZmaW9fZXJyX2hhbmRsZXJzLA0KPiA+ID4gIH07DQo+ID4g
Pg0KPiA+ID4gIHN0YXRpYyB2b2lkIF9fZXhpdCB2ZmlvX3BjaV9jbGVhbnVwKHZvaWQpDQo+ID4g
PiBkaWZmIC0tZ2l0IGEvZHJpdmVycy92ZmlvL3BjaS92ZmlvX3BjaV9wcml2YXRlLmgNCj4gYi9k
cml2ZXJzL3ZmaW8vcGNpL3ZmaW9fcGNpX3ByaXZhdGUuaA0KPiA+ID4gaW5kZXggNjExODI3Yy4u
ZGFlZTYyZiAxMDA2NDQNCj4gPiA+IC0tLSBhL2RyaXZlcnMvdmZpby9wY2kvdmZpb19wY2lfcHJp
dmF0ZS5oDQo+ID4gPiArKysgYi9kcml2ZXJzL3ZmaW8vcGNpL3ZmaW9fcGNpX3ByaXZhdGUuaA0K
PiA+ID4gQEAgLTU1LDYgKzU1LDcgQEAgc3RydWN0IHZmaW9fcGNpX2RldmljZSB7DQo+ID4gPiAg
CWJvb2wJCQliYXJkaXJ0eTsNCj4gPiA+ICAJc3RydWN0IHBjaV9zYXZlZF9zdGF0ZQkqcGNpX3Nh
dmVkX3N0YXRlOw0KPiA+ID4gIAlhdG9taWNfdAkJcmVmY250Ow0KPiA+ID4gKwlzdHJ1Y3QgZXZl
bnRmZF9jdHgJKmVycl90cmlnZ2VyOw0KPiA+ID4gIH07DQo+ID4gPg0KPiA+ID4gICNkZWZpbmUg
aXNfaW50eCh2ZGV2KSAodmRldi0+aXJxX3R5cGUgPT0gVkZJT19QQ0lfSU5UWF9JUlFfSU5ERVgp
DQo+ID4gPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy92ZmlvL3ZmaW8uYyBiL2RyaXZlcnMvdmZpby92
ZmlvLmMNCj4gPiA+IGluZGV4IDU2MDk3YzYuLjVlZDVhNTQgMTAwNjQ0DQo+ID4gPiAtLS0gYS9k
cml2ZXJzL3ZmaW8vdmZpby5jDQo+ID4gPiArKysgYi9kcml2ZXJzL3ZmaW8vdmZpby5jDQo+ID4g
PiBAQCAtNjkzLDYgKzY5MywxNCBAQCB2b2lkICp2ZmlvX2RlbF9ncm91cF9kZXYoc3RydWN0IGRl
dmljZSAqZGV2KQ0KPiA+ID4gIH0NCj4gPiA+ICBFWFBPUlRfU1lNQk9MX0dQTCh2ZmlvX2RlbF9n
cm91cF9kZXYpOw0KPiA+ID4NCj4gPiA+ICt2b2lkICp2ZmlvX2dldF92ZGV2KHN0cnVjdCBkZXZp
Y2UgKmRldikNCj4gPiA+ICt7DQo+ID4gPiArCXN0cnVjdCB2ZmlvX2RldmljZSAqZGV2aWNlID0g
ZGV2X2dldF9kcnZkYXRhKGRldik7DQo+ID4gPiArDQo+ID4gPiArCXJldHVybiBkZXZpY2UtPmRl
dmljZV9kYXRhOw0KPiA+ID4gK30NCj4gPiA+ICtFWFBPUlRfU1lNQk9MX0dQTCh2ZmlvX2dldF92
ZGV2KTsNCj4gPiA+ICsNCj4gPg0KPiA+IFRoaXMgaXMgdW5zYWZlLiAgSG93IGRvIHdlIGtub3cg
ZGV2IGlzIGEgdmZpbyBkZXZpY2U/ICBIb3cgZG8gd2Uga2VlcA0KPiA+IHRoYXQgZHJ2ZGF0YSB2
YWxpZCB3aGlsZSB5b3UncmUgdXNpbmcgaXQ/ICBJIHRoaW5rIHlvdSB3YW50IHRvIGV4cG9ydA0K
PiA+IHRoZSBleGlzdGluZyB2ZmlvX2dyb3VwX2dldF9kZXZpY2UoKSBhbmQgdmZpb19kZXZpY2Vf
cHV0KCkuICBUaGFua3MsDQo+IA0KPiB2ZmlvX2dyb3VwX2dldF9kZXZpY2UoKSBpc24ndCBxdWl0
ZSB3aGF0IHlvdSB3YW50IGVpdGhlciBzaW5jZSBpdA0KPiBhc3N1bWVzIGEgcmVmZXJlbmNlIGNv
dW50IG9uIHRoZSBncm91cC4gIFlvdSdsbCB3YW50IHNvbWV0aGluZyBsaWtlDQo+IHZmaW9fYWRk
X2dyb3VwX2RldigpIG9yIHZmaW9fZGV2X3ByZXNlbnQoKSwgcGVyaGFwcyBtb3ZpbmcgdGhlDQo+
IGlvbW11X2dyb3VwX2dldCAtPiB2ZmlvX2dyb3VwX2dldF9mcm9tX2lvbW11IC0+IHZmaW9fZ3Jv
dXBfZ2V0X2RldmljZQ0KPiBpbnRvIGEgaGVscGVyIGZ1bmN0aW9uLiAgVGhhbmtzLA0KDQpUaGFu
a3MgZm9yIHRoZSBwb2ludGVycy4gV2lsbCBtYWtlIHRoZSBjaGFuZ2UuDQoNClZpamF5DQoNCj4g
DQo+IEFsZXgNCj4gDQo+ID4gPiAgLyoqDQo+ID4gPiAgICogVkZJTyBiYXNlIGZkLCAvZGV2L3Zm
aW8vdmZpbw0KPiA+ID4gICAqLw0KPiA+ID4gZGlmZiAtLWdpdCBhL2luY2x1ZGUvbGludXgvdmZp
by5oIGIvaW5jbHVkZS9saW51eC92ZmlvLmgNCj4gPiA+IGluZGV4IGFiOWU4NjIuLjNjOTdiMDMg
MTAwNjQ0DQo+ID4gPiAtLS0gYS9pbmNsdWRlL2xpbnV4L3ZmaW8uaA0KPiA+ID4gKysrIGIvaW5j
bHVkZS9saW51eC92ZmlvLmgNCj4gPiA+IEBAIC00NSw2ICs0NSw3IEBAIGV4dGVybiBpbnQgdmZp
b19hZGRfZ3JvdXBfZGV2KHN0cnVjdCBkZXZpY2UgKmRldiwNCj4gPiA+ICAJCQkgICAgICB2b2lk
ICpkZXZpY2VfZGF0YSk7DQo+ID4gPg0KPiA+ID4gIGV4dGVybiB2b2lkICp2ZmlvX2RlbF9ncm91
cF9kZXYoc3RydWN0IGRldmljZSAqZGV2KTsNCj4gPiA+ICtleHRlcm4gdm9pZCAqdmZpb19nZXRf
dmRldihzdHJ1Y3QgZGV2aWNlICpkZXYpOw0KPiA+ID4NCj4gPiA+ICAvKioNCj4gPiA+ICAgKiBz
dHJ1Y3QgdmZpb19pb21tdV9kcml2ZXJfb3BzIC0gVkZJTyBJT01NVSBkcml2ZXIgY2FsbGJhY2tz
DQo+ID4gPiBkaWZmIC0tZ2l0IGEvaW5jbHVkZS91YXBpL2xpbnV4L3ZmaW8uaCBiL2luY2x1ZGUv
dWFwaS9saW51eC92ZmlvLmgNCj4gPiA+IGluZGV4IDQ3NThkMWIuLmZhNjcyMTMgMTAwNjQ0DQo+
ID4gPiAtLS0gYS9pbmNsdWRlL3VhcGkvbGludXgvdmZpby5oDQo+ID4gPiArKysgYi9pbmNsdWRl
L3VhcGkvbGludXgvdmZpby5oDQo+ID4gPiBAQCAtMTQ3LDYgKzE0Nyw3IEBAIHN0cnVjdCB2Zmlv
X2RldmljZV9pbmZvIHsNCj4gPiA+ICAJX191MzIJZmxhZ3M7DQo+ID4gPiAgI2RlZmluZSBWRklP
X0RFVklDRV9GTEFHU19SRVNFVAkoMSA8PCAwKQkvKiBEZXZpY2Ugc3VwcG9ydHMNCj4gcmVzZXQg
Ki8NCj4gPiA+ICAjZGVmaW5lIFZGSU9fREVWSUNFX0ZMQUdTX1BDSQkoMSA8PCAxKQkvKiB2Zmlv
LXBjaSBkZXZpY2UgKi8NCj4gPiA+ICsjZGVmaW5lIFZGSU9fREVWSUNFX0ZMQUdTX0FFUl9OT1RJ
RlkgKDEgPDwgMikJLyogU3VwcG9ydHMgYWVyDQo+IG5vdGlmeSAqLw0KPiA+ID4gIAlfX3UzMglu
dW1fcmVnaW9uczsJLyogTWF4IHJlZ2lvbiBpbmRleCArIDEgKi8NCj4gPiA+ICAJX191MzIJbnVt
X2lycXM7CS8qIE1heCBJUlEgaW5kZXggKyAxICovDQo+ID4gPiAgfTsNCj4gPiA+IEBAIC0yODgs
NiArMjg5LDE0IEBAIHN0cnVjdCB2ZmlvX2lycV9zZXQgew0KPiA+ID4gICAqLw0KPiA+ID4gICNk
ZWZpbmUgVkZJT19ERVZJQ0VfUkVTRVQJCV9JTyhWRklPX1RZUEUsIFZGSU9fQkFTRSArIDExKQ0K
PiA+ID4NCj4gPiA+ICsvKioNCj4gPiA+ICsgKiBWRklPX0RFVklDRV9TRVRfRVJSRkQgLSBfSU8o
VkZJT19UWVBFLCBWRklPX0JBU0UgKyAxMikNCj4gPiA+ICsgKg0KPiA+ID4gKyAqIFBhc3MgdGhl
IGV2ZW50ZmQgdG8gdGhlIHZmaW8tcGNpIGRyaXZlciBmb3Igc2lnbmFsbGluZyBhbnkgZGV2aWNl
DQo+ID4gPiArICogZXJyb3Igbm90aWZpY2F0aW9ucw0KPiA+ID4gKyAqLw0KPiA+ID4gKyNkZWZp
bmUgVkZJT19ERVZJQ0VfU0VUX0VSUkZECQlfSU8oVkZJT19UWVBFLCBWRklPX0JBU0UgKyAxMikN
Cj4gPiA+ICsNCj4gPiA+ICAvKg0KPiA+ID4gICAqIFRoZSBWRklPLVBDSSBidXMgZHJpdmVyIG1h
a2VzIHVzZSBvZiB0aGUgZm9sbG93aW5nIGZpeGVkIHJlZ2lvbiBhbmQNCj4gPiA+ICAgKiBJUlEg
aW5kZXggbWFwcGluZy4gIFVuaW1wbGVtZW50ZWQgcmVnaW9ucyByZXR1cm4gYSBzaXplIG9mIHpl
cm8uDQo+ID4NCj4gPg0KPiANCj4gDQoNCg==

Re: [PATCH 1/2] VFIO-AER: Vfio-pci driver changes for supporting AER

[Alex Williamson]

On Fri, 2013-01-11 at 08:45 +0000, Pandarathil, Vijaymohan R wrote:
> 
> > -----Original Message-----
> > From: Alex Williamson [mailto:alex.williamson@redhat.com]
> > Sent: Wednesday, January 09, 2013 11:05 AM
> > To: Pandarathil, Vijaymohan R
> > Cc: Bjorn Helgaas; Gleb Natapov; kvm@vger.kernel.org; qemu-
> > devel@nongnu.org; linux-pci@vger.kernel.org; linux-kernel@vger.kernel.org
> > Subject: Re: [PATCH 1/2] VFIO-AER: Vfio-pci driver changes for supporting
> > AER
> > 
> > On Wed, 2013-01-09 at 10:52 -0700, Alex Williamson wrote:
> > > On Wed, 2013-01-09 at 06:26 +0000, Pandarathil, Vijaymohan R wrote:
> > > > 	- New ioctl which is used to pass the eventfd that is signaled when
> > > >           an error occurs in the vfio_pci_device
> > > >
> > > > 	- Register pci_error_handler for the vfio_pci driver
> > > >
> > > > 	- When the device encounters an error, the error handler registered
> > by
> > > >           the vfio_pci driver gets invoked by the AER infrastructure
> > > >
> > > > 	- In the error handler, signal the eventfd registered for the device.
> > > >
> > > > 	- This results in the qemu eventfd handler getting invoked and
> > > >           appropriate action taken for the guest.
> > > >
> > > > Signed-off-by: Vijay Mohan Pandarathil <vijaymohan.pandarathil@hp.com>
> > > > ---
> > > >  drivers/vfio/pci/vfio_pci.c         | 29 +++++++++++++++++++++++++++++
> > > >  drivers/vfio/pci/vfio_pci_private.h |  1 +
> > > >  drivers/vfio/vfio.c                 |  8 ++++++++
> > > >  include/linux/vfio.h                |  1 +
> > > >  include/uapi/linux/vfio.h           |  9 +++++++++
> > > >  5 files changed, 48 insertions(+)
> > > >
> > > > diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c
> > > > index 6c11994..4ae9526 100644
> > > > --- a/drivers/vfio/pci/vfio_pci.c
> > > > +++ b/drivers/vfio/pci/vfio_pci.c
> > > > @@ -207,6 +207,8 @@ static long vfio_pci_ioctl(void *device_data,
> > > >  		if (vdev->reset_works)
> > > >  			info.flags |= VFIO_DEVICE_FLAGS_RESET;
> > > >
> > > > +		info.flags |= VFIO_DEVICE_FLAGS_AER_NOTIFY;
> > > > +
> > >
> > > This appears to be a PCI specific flag, so the name should include
> > > _PCI_.  We also support non-PCIe devices and it seems like it would be
> > > possible to not have AER support available, so shouldn't this be
> > > conditional?
> 
> Will do that.
> 
> > >
> > > >  		info.num_regions = VFIO_PCI_NUM_REGIONS;
> > > >  		info.num_irqs = VFIO_PCI_NUM_IRQS;
> > > >
> > > > @@ -348,6 +350,19 @@ static long vfio_pci_ioctl(void *device_data,
> > > >
> > > >  		return ret;
> > > >
> > > > +	} else if (cmd == VFIO_DEVICE_SET_ERRFD) {
> > > > +		int32_t fd = (int32_t)arg;
> > > > +
> > > > +		if (fd < 0)
> > > > +			return -EINVAL;
> > > > +
> > > > +		vdev->err_trigger = eventfd_ctx_fdget(fd);
> > > > +
> > > > +		if (IS_ERR(vdev->err_trigger))
> > > > +			return PTR_ERR(vdev->err_trigger);
> > > > +
> > > > +		return 0;
> > > > +
> > >
> > > I'm not sure why we wouldn't describe this as just another interrupt
> > > from the device and configure it via SET_IRQ.  This ioctl has very
> > > limited use and doesn't follow any of the conventions of all the other
> > > vfio ioctls.
> 
> I thought this was a fairly simple ioctl to implement this way. Moreover, 
> there is no device interrupt involved. Let me know if you really want to 
> model it as a SET_IRQ ioctl.

I'd like to see something else for sure.  We're trying to do AER
piecemeal but this ioctl leaves no room for anything else.  Seems like a
soon to be wasted ioctl number.  Note that there isn't even a de-assign
interface, nor a flag to set to indicate de-assignment.  The SET_IRQ
ioctl already handles these in a very similar way to how we'd want to
handle it for error signaling.  It doesn't seem like that much of a
stretch to me to include it there, but I'd also entertain other ideas.
Thanks,

Alex

> > >
> > > >  	} else if (cmd == VFIO_DEVICE_RESET)
> > > >  		return vdev->reset_works ?
> > > >  			pci_reset_function(vdev->pdev) : -EINVAL;
> > > > @@ -527,11 +542,25 @@ static void vfio_pci_remove(struct pci_dev *pdev)
> > > >  	kfree(vdev);
> > > >  }
> > > >
> > > > +static pci_ers_result_t vfio_err_detected(struct pci_dev *pdev,
> > > > +				pci_channel_state_t state)
> > > > +{
> > > > +	struct vfio_pci_device *vdev = vfio_get_vdev(&pdev->dev);
> > > > +
> > > > +	eventfd_signal(vdev->err_trigger, 1);
> > > > +	return PCI_ERS_RESULT_CAN_RECOVER;
> > > > +}
> > >
> > > What if err_trigger hasn't been set?
> 
> Will fix that.
> 
> > >
> > > > +
> > > > +static const struct pci_error_handlers vfio_err_handlers = {
> > > > +	.error_detected = vfio_err_detected,
> > > > +};
> > > > +
> > > >  static struct pci_driver vfio_pci_driver = {
> > > >  	.name		= "vfio-pci",
> > > >  	.id_table	= NULL, /* only dynamic ids */
> > > >  	.probe		= vfio_pci_probe,
> > > >  	.remove		= vfio_pci_remove,
> > > > +	.err_handler	= &vfio_err_handlers,
> > > >  };
> > > >
> > > >  static void __exit vfio_pci_cleanup(void)
> > > > diff --git a/drivers/vfio/pci/vfio_pci_private.h
> > b/drivers/vfio/pci/vfio_pci_private.h
> > > > index 611827c..daee62f 100644
> > > > --- a/drivers/vfio/pci/vfio_pci_private.h
> > > > +++ b/drivers/vfio/pci/vfio_pci_private.h
> > > > @@ -55,6 +55,7 @@ struct vfio_pci_device {
> > > >  	bool			bardirty;
> > > >  	struct pci_saved_state	*pci_saved_state;
> > > >  	atomic_t		refcnt;
> > > > +	struct eventfd_ctx	*err_trigger;
> > > >  };
> > > >
> > > >  #define is_intx(vdev) (vdev->irq_type == VFIO_PCI_INTX_IRQ_INDEX)
> > > > diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c
> > > > index 56097c6..5ed5a54 100644
> > > > --- a/drivers/vfio/vfio.c
> > > > +++ b/drivers/vfio/vfio.c
> > > > @@ -693,6 +693,14 @@ void *vfio_del_group_dev(struct device *dev)
> > > >  }
> > > >  EXPORT_SYMBOL_GPL(vfio_del_group_dev);
> > > >
> > > > +void *vfio_get_vdev(struct device *dev)
> > > > +{
> > > > +	struct vfio_device *device = dev_get_drvdata(dev);
> > > > +
> > > > +	return device->device_data;
> > > > +}
> > > > +EXPORT_SYMBOL_GPL(vfio_get_vdev);
> > > > +
> > >
> > > This is unsafe.  How do we know dev is a vfio device?  How do we keep
> > > that drvdata valid while you're using it?  I think you want to export
> > > the existing vfio_group_get_device() and vfio_device_put().  Thanks,
> > 
> > vfio_group_get_device() isn't quite what you want either since it
> > assumes a reference count on the group.  You'll want something like
> > vfio_add_group_dev() or vfio_dev_present(), perhaps moving the
> > iommu_group_get -> vfio_group_get_from_iommu -> vfio_group_get_device
> > into a helper function.  Thanks,
> 
> Thanks for the pointers. Will make the change.
> 
> Vijay
> 
> > 
> > Alex
> > 
> > > >  /**
> > > >   * VFIO base fd, /dev/vfio/vfio
> > > >   */
> > > > diff --git a/include/linux/vfio.h b/include/linux/vfio.h
> > > > index ab9e862..3c97b03 100644
> > > > --- a/include/linux/vfio.h
> > > > +++ b/include/linux/vfio.h
> > > > @@ -45,6 +45,7 @@ extern int vfio_add_group_dev(struct device *dev,
> > > >  			      void *device_data);
> > > >
> > > >  extern void *vfio_del_group_dev(struct device *dev);
> > > > +extern void *vfio_get_vdev(struct device *dev);
> > > >
> > > >  /**
> > > >   * struct vfio_iommu_driver_ops - VFIO IOMMU driver callbacks
> > > > diff --git a/include/uapi/linux/vfio.h b/include/uapi/linux/vfio.h
> > > > index 4758d1b..fa67213 100644
> > > > --- a/include/uapi/linux/vfio.h
> > > > +++ b/include/uapi/linux/vfio.h
> > > > @@ -147,6 +147,7 @@ struct vfio_device_info {
> > > >  	__u32	flags;
> > > >  #define VFIO_DEVICE_FLAGS_RESET	(1 << 0)	/* Device supports
> > reset */
> > > >  #define VFIO_DEVICE_FLAGS_PCI	(1 << 1)	/* vfio-pci device */
> > > > +#define VFIO_DEVICE_FLAGS_AER_NOTIFY (1 << 2)	/* Supports aer
> > notify */
> > > >  	__u32	num_regions;	/* Max region index + 1 */
> > > >  	__u32	num_irqs;	/* Max IRQ index + 1 */
> > > >  };
> > > > @@ -288,6 +289,14 @@ struct vfio_irq_set {
> > > >   */
> > > >  #define VFIO_DEVICE_RESET		_IO(VFIO_TYPE, VFIO_BASE + 11)
> > > >
> > > > +/**
> > > > + * VFIO_DEVICE_SET_ERRFD - _IO(VFIO_TYPE, VFIO_BASE + 12)
> > > > + *
> > > > + * Pass the eventfd to the vfio-pci driver for signalling any device
> > > > + * error notifications
> > > > + */
> > > > +#define VFIO_DEVICE_SET_ERRFD		_IO(VFIO_TYPE, VFIO_BASE + 12)
> > > > +
> > > >  /*
> > > >   * The VFIO-PCI bus driver makes use of the following fixed region and
> > > >   * IRQ index mapping.  Unimplemented regions return a size of zero.
> > >
> > >
> > 
> > 
> 

Re: [PATCH 1/2] VFIO-AER: Vfio-pci driver changes for supporting AER

[Marcelo Tosatti]

On Fri, Jan 11, 2013 at 08:46:35AM -0700, Alex Williamson wrote:
> On Fri, 2013-01-11 at 08:45 +0000, Pandarathil, Vijaymohan R wrote:
> > 
> > > -----Original Message-----
> > > From: Alex Williamson [mailto:alex.williamson@redhat.com]
> > > Sent: Wednesday, January 09, 2013 11:05 AM
> > > To: Pandarathil, Vijaymohan R
> > > Cc: Bjorn Helgaas; Gleb Natapov; kvm@vger.kernel.org; qemu-
> > > devel@nongnu.org; linux-pci@vger.kernel.org; linux-kernel@vger.kernel.org
> > > Subject: Re: [PATCH 1/2] VFIO-AER: Vfio-pci driver changes for supporting
> > > AER
> > > 
> > > On Wed, 2013-01-09 at 10:52 -0700, Alex Williamson wrote:
> > > > On Wed, 2013-01-09 at 06:26 +0000, Pandarathil, Vijaymohan R wrote:
> > > > > 	- New ioctl which is used to pass the eventfd that is signaled when
> > > > >           an error occurs in the vfio_pci_device
> > > > >
> > > > > 	- Register pci_error_handler for the vfio_pci driver
> > > > >
> > > > > 	- When the device encounters an error, the error handler registered
> > > by
> > > > >           the vfio_pci driver gets invoked by the AER infrastructure
> > > > >
> > > > > 	- In the error handler, signal the eventfd registered for the device.
> > > > >
> > > > > 	- This results in the qemu eventfd handler getting invoked and
> > > > >           appropriate action taken for the guest.
> > > > >
> > > > > Signed-off-by: Vijay Mohan Pandarathil <vijaymohan.pandarathil@hp.com>
> > > > > ---
> > > > >  drivers/vfio/pci/vfio_pci.c         | 29 +++++++++++++++++++++++++++++
> > > > >  drivers/vfio/pci/vfio_pci_private.h |  1 +
> > > > >  drivers/vfio/vfio.c                 |  8 ++++++++
> > > > >  include/linux/vfio.h                |  1 +
> > > > >  include/uapi/linux/vfio.h           |  9 +++++++++
> > > > >  5 files changed, 48 insertions(+)
> > > > >
> > > > > diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c
> > > > > index 6c11994..4ae9526 100644
> > > > > --- a/drivers/vfio/pci/vfio_pci.c
> > > > > +++ b/drivers/vfio/pci/vfio_pci.c
> > > > > @@ -207,6 +207,8 @@ static long vfio_pci_ioctl(void *device_data,
> > > > >  		if (vdev->reset_works)
> > > > >  			info.flags |= VFIO_DEVICE_FLAGS_RESET;
> > > > >
> > > > > +		info.flags |= VFIO_DEVICE_FLAGS_AER_NOTIFY;
> > > > > +
> > > >
> > > > This appears to be a PCI specific flag, so the name should include
> > > > _PCI_.  We also support non-PCIe devices and it seems like it would be
> > > > possible to not have AER support available, so shouldn't this be
> > > > conditional?
> > 
> > Will do that.
> > 
> > > >
> > > > >  		info.num_regions = VFIO_PCI_NUM_REGIONS;
> > > > >  		info.num_irqs = VFIO_PCI_NUM_IRQS;
> > > > >
> > > > > @@ -348,6 +350,19 @@ static long vfio_pci_ioctl(void *device_data,
> > > > >
> > > > >  		return ret;
> > > > >
> > > > > +	} else if (cmd == VFIO_DEVICE_SET_ERRFD) {
> > > > > +		int32_t fd = (int32_t)arg;
> > > > > +
> > > > > +		if (fd < 0)
> > > > > +			return -EINVAL;
> > > > > +
> > > > > +		vdev->err_trigger = eventfd_ctx_fdget(fd);
> > > > > +
> > > > > +		if (IS_ERR(vdev->err_trigger))
> > > > > +			return PTR_ERR(vdev->err_trigger);
> > > > > +
> > > > > +		return 0;
> > > > > +
> > > >
> > > > I'm not sure why we wouldn't describe this as just another interrupt
> > > > from the device and configure it via SET_IRQ.  This ioctl has very
> > > > limited use and doesn't follow any of the conventions of all the other
> > > > vfio ioctls.
> > 
> > I thought this was a fairly simple ioctl to implement this way. Moreover, 
> > there is no device interrupt involved. Let me know if you really want to 
> > model it as a SET_IRQ ioctl.
> 
> I'd like to see something else for sure.  We're trying to do AER
> piecemeal but this ioctl leaves no room for anything else.  Seems like a
> soon to be wasted ioctl number.  Note that there isn't even a de-assign
> interface, nor a flag to set to indicate de-assignment.  The SET_IRQ
> ioctl already handles these in a very similar way to how we'd want to
> handle it for error signaling.  It doesn't seem like that much of a
> stretch to me to include it there, but I'd also entertain other ideas.
> Thanks,
> 
> Alex

Yes it would be good to have a picture of the dependencies necessary to
implement passthrough, before introducing an incompatible interface.