All of lore.kernel.org
 help / color / mirror / Atom feed
From: Eric Auger <eric.auger@redhat.com>
To: eric.auger.pro@gmail.com, eric.auger@redhat.com,
	iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org,
	kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu,
	joro@8bytes.org, alex.williamson@redhat.com,
	jacob.jun.pan@linux.intel.com, yi.l.liu@linux.intel.com,
	jean-philippe.brucker@arm.com, will.deacon@arm.com,
	robin.murphy@arm.com
Cc: kevin.tian@intel.com, ashok.raj@intel.com, marc.zyngier@arm.com,
	christoffer.dall@arm.com, peter.maydell@linaro.org,
	vincent.stehle@arm.com
Subject: [PATCH v5 19/22] vfio-pci: Register an iommu fault handler
Date: Fri, 15 Mar 2019 17:09:03 +0100	[thread overview]
Message-ID: <20190315160906.12900-20-eric.auger@redhat.com> (raw)
In-Reply-To: <20190315160906.12900-1-eric.auger@redhat.com>

This patch registers a fault handler which records faults in
a circular buffer and then signals an eventfd. This buffer is
exposed within the fault region.

Signed-off-by: Eric Auger <eric.auger@redhat.com>

---

v3 -> v4:
- move iommu_unregister_device_fault_handler to vfio_pci_release
---
 drivers/vfio/pci/vfio_pci.c         | 49 +++++++++++++++++++++++++++++
 drivers/vfio/pci/vfio_pci_private.h |  1 +
 2 files changed, 50 insertions(+)

diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c
index 01b1b4cb8349..cf12204486c3 100644
--- a/drivers/vfio/pci/vfio_pci.c
+++ b/drivers/vfio/pci/vfio_pci.c
@@ -29,6 +29,7 @@
 #include <linux/vfio.h>
 #include <linux/vgaarb.h>
 #include <linux/nospec.h>
+#include <linux/circ_buf.h>
 
 #include "vfio_pci_private.h"
 
@@ -295,6 +296,46 @@ static const struct vfio_pci_regops vfio_pci_fault_prod_regops = {
 	.add_capability = vfio_pci_fault_prod_add_capability,
 };
 
+int vfio_pci_iommu_dev_fault_handler(struct iommu_fault_event *evt, void *data)
+{
+	struct vfio_pci_device *vdev = (struct vfio_pci_device *) data;
+	struct vfio_region_fault_prod *prod_region =
+		(struct vfio_region_fault_prod *)vdev->fault_pages;
+	struct vfio_region_fault_cons *cons_region =
+		(struct vfio_region_fault_cons *)(vdev->fault_pages + 2 * PAGE_SIZE);
+	struct iommu_fault *new =
+		(struct iommu_fault *)(vdev->fault_pages + prod_region->offset +
+			prod_region->prod * prod_region->entry_size);
+	int prod, cons, size;
+
+	mutex_lock(&vdev->fault_queue_lock);
+
+	if (!vdev->fault_abi)
+		goto unlock;
+
+	prod = prod_region->prod;
+	cons = cons_region->cons;
+	size = prod_region->nb_entries;
+
+	if (CIRC_SPACE(prod, cons, size) < 1)
+		goto unlock;
+
+	*new = evt->fault;
+	prod = (prod + 1) % size;
+	prod_region->prod = prod;
+	mutex_unlock(&vdev->fault_queue_lock);
+
+	mutex_lock(&vdev->igate);
+	if (vdev->dma_fault_trigger)
+		eventfd_signal(vdev->dma_fault_trigger, 1);
+	mutex_unlock(&vdev->igate);
+	return 0;
+
+unlock:
+	mutex_unlock(&vdev->fault_queue_lock);
+	return -EINVAL;
+}
+
 static int vfio_pci_init_fault_region(struct vfio_pci_device *vdev)
 {
 	struct vfio_region_fault_prod *header;
@@ -327,6 +368,13 @@ static int vfio_pci_init_fault_region(struct vfio_pci_device *vdev)
 	header = (struct vfio_region_fault_prod *)vdev->fault_pages;
 	header->version = -1;
 	header->offset = PAGE_SIZE;
+
+	ret = iommu_register_device_fault_handler(&vdev->pdev->dev,
+					vfio_pci_iommu_dev_fault_handler,
+					vdev);
+	if (ret)
+		goto out;
+
 	return 0;
 out:
 	kfree(vdev->fault_pages);
@@ -574,6 +622,7 @@ static void vfio_pci_release(void *device_data)
 	if (!(--vdev->refcnt)) {
 		vfio_spapr_pci_eeh_release(vdev->pdev);
 		vfio_pci_disable(vdev);
+		iommu_unregister_device_fault_handler(&vdev->pdev->dev);
 	}
 
 	mutex_unlock(&vdev->reflck->lock);
diff --git a/drivers/vfio/pci/vfio_pci_private.h b/drivers/vfio/pci/vfio_pci_private.h
index 8e0a55682d3f..a9276926f008 100644
--- a/drivers/vfio/pci/vfio_pci_private.h
+++ b/drivers/vfio/pci/vfio_pci_private.h
@@ -122,6 +122,7 @@ struct vfio_pci_device {
 	int			ioeventfds_nr;
 	struct eventfd_ctx	*err_trigger;
 	struct eventfd_ctx	*req_trigger;
+	struct eventfd_ctx	*dma_fault_trigger;
 	struct mutex		fault_queue_lock;
 	int			fault_abi;
 	struct list_head	dummy_resources_list;
-- 
2.20.1


  parent reply	other threads:[~2019-03-15 16:11 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-03-15 16:08 [PATCH v5 00/22] SMMUv3 Nested Stage Setup Eric Auger
2019-03-15 16:08 ` Eric Auger
2019-03-15 16:08 ` [PATCH v5 01/22] driver core: add per device iommu param Eric Auger
2019-03-15 16:08   ` Eric Auger
2019-03-15 16:08 ` [PATCH v5 02/22] iommu: introduce device fault data Eric Auger
2019-03-15 16:08   ` Eric Auger
2019-03-15 16:08 ` [PATCH v5 03/22] iommu: introduce device fault report API Eric Auger
2019-03-15 16:08 ` [PATCH v5 04/22] iommu: Introduce attach/detach_pasid_table API Eric Auger
2019-03-15 16:08   ` Eric Auger
2019-03-15 16:08 ` [PATCH v5 05/22] iommu: Introduce cache_invalidate API Eric Auger
2019-03-15 18:37   ` Jacob Pan
2019-03-17 16:43     ` Auger Eric
2019-03-17 16:43       ` Auger Eric
2019-03-18 11:01       ` Jean-Philippe Brucker
2019-03-18 11:01         ` Jean-Philippe Brucker
2019-03-18 11:01         ` Jean-Philippe Brucker
2019-03-18 12:44         ` Auger Eric
2019-03-18 12:44           ` Auger Eric
2019-03-18 12:44           ` Auger Eric
2019-03-15 16:08 ` [PATCH v5 06/22] iommu: Introduce bind/unbind_guest_msi Eric Auger
2019-03-15 16:08   ` Eric Auger
2019-03-15 16:08 ` [PATCH v5 07/22] vfio: VFIO_IOMMU_ATTACH/DETACH_PASID_TABLE Eric Auger
2019-03-15 16:08   ` Eric Auger
2019-03-15 16:08 ` [PATCH v5 08/22] vfio: VFIO_IOMMU_CACHE_INVALIDATE Eric Auger
2019-03-15 16:08 ` [PATCH v5 09/22] vfio: VFIO_IOMMU_BIND/UNBIND_MSI Eric Auger
2019-03-15 16:08 ` [PATCH v5 10/22] iommu/arm-smmu-v3: Link domains and devices Eric Auger
2019-03-15 16:08 ` [PATCH v5 11/22] iommu/arm-smmu-v3: Maintain a SID->device structure Eric Auger
2019-03-15 16:08   ` Eric Auger
2019-03-15 16:08 ` [PATCH v5 12/22] iommu/smmuv3: Get prepared for nested stage support Eric Auger
2019-03-15 16:08   ` Eric Auger
2019-03-15 16:08 ` [PATCH v5 13/22] iommu/smmuv3: Implement attach/detach_pasid_table Eric Auger
2019-03-15 16:08 ` [PATCH v5 14/22] iommu/smmuv3: Implement cache_invalidate Eric Auger
2019-03-15 16:08   ` Eric Auger
2019-03-15 16:08 ` [PATCH v5 15/22] dma-iommu: Implement NESTED_MSI cookie Eric Auger
2019-03-15 16:09 ` [PATCH v5 16/22] iommu/smmuv3: Implement bind/unbind_guest_msi Eric Auger
2019-03-15 16:09 ` [PATCH v5 17/22] iommu/smmuv3: Report non recoverable faults Eric Auger
2019-03-15 16:09 ` [PATCH v5 18/22] vfio-pci: Add a new VFIO_REGION_TYPE_NESTED region type Eric Auger
2019-03-15 16:09 ` Eric Auger [this message]
2019-03-15 16:09 ` [PATCH v5 20/22] vfio_pci: Allow to mmap the fault queue Eric Auger
2019-03-15 16:09   ` Eric Auger
2019-03-15 16:09 ` [PATCH v5 21/22] vfio-pci: Add VFIO_PCI_DMA_FAULT_IRQ_INDEX Eric Auger
2019-03-15 16:09   ` Eric Auger
2019-03-15 16:09 ` [PATCH v5 22/22] vfio: Document nested stage control Eric Auger
2019-03-15 16:09   ` Eric Auger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190315160906.12900-20-eric.auger@redhat.com \
    --to=eric.auger@redhat.com \
    --cc=alex.williamson@redhat.com \
    --cc=ashok.raj@intel.com \
    --cc=christoffer.dall@arm.com \
    --cc=eric.auger.pro@gmail.com \
    --cc=iommu@lists.linux-foundation.org \
    --cc=jacob.jun.pan@linux.intel.com \
    --cc=jean-philippe.brucker@arm.com \
    --cc=joro@8bytes.org \
    --cc=kevin.tian@intel.com \
    --cc=kvm@vger.kernel.org \
    --cc=kvmarm@lists.cs.columbia.edu \
    --cc=linux-kernel@vger.kernel.org \
    --cc=marc.zyngier@arm.com \
    --cc=peter.maydell@linaro.org \
    --cc=robin.murphy@arm.com \
    --cc=vincent.stehle@arm.com \
    --cc=will.deacon@arm.com \
    --cc=yi.l.liu@linux.intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.