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,
	qemu-devel@nongnu.org, qemu-arm@nongnu.org,
	peter.maydell@linaro.org
Cc: alex.williamson@redhat.com, mst@redhat.com,
	jean-philippe.brucker@arm.com, peterx@redhat.com,
	yi.l.liu@intel.com, vincent.stehle@arm.com
Subject: [Qemu-devel] [RFC v3 23/27] memory: Introduce IOMMU Memory Region inject_faults API
Date: Fri, 12 Apr 2019 12:03:50 +0200	[thread overview]
Message-ID: <20190412100354.6409-24-eric.auger@redhat.com> (raw)
In-Reply-To: <20190412100354.6409-1-eric.auger@redhat.com>

This new API allows to inject @count iommu_faults into
the IOMMU memory region.

Signed-off-by: Eric Auger <eric.auger@redhat.com>
---
 include/exec/memory.h | 26 ++++++++++++++++++++++++++
 memory.c              | 12 ++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/include/exec/memory.h b/include/exec/memory.h
index aedebc8471..6262de1684 100644
--- a/include/exec/memory.h
+++ b/include/exec/memory.h
@@ -400,6 +400,20 @@ typedef struct IOMMUMemoryRegionClass {
      * @iommu: the IOMMUMemoryRegion
      */
     int (*num_indexes)(IOMMUMemoryRegion *iommu);
+
+#ifdef CONFIG_LINUX
+    /* Inject @count faults into the IOMMU memory region
+     *
+     * Optional method: if this method is not provided, then
+     * memory_region_injection_faults() will return -ENOENT
+     *
+     * @iommu: the IOMMU memory region to inject the faults in
+     * @count: number of faults to inject
+     * @buf: fault buffer
+     */
+    int (*inject_faults)(IOMMUMemoryRegion *iommu, int count,
+                         struct iommu_fault *buf);
+#endif
 } IOMMUMemoryRegionClass;
 
 typedef struct CoalescedMemoryRange CoalescedMemoryRange;
@@ -1216,6 +1230,18 @@ int memory_region_iommu_attrs_to_index(IOMMUMemoryRegion *iommu_mr,
  */
 int memory_region_iommu_num_indexes(IOMMUMemoryRegion *iommu_mr);
 
+#ifdef CONFIG_LINUX
+/**
+ * memory_region_inject_faults : inject @count faults stored in @buf
+ *
+ * @iommu_mr: the IOMMU memory region
+ * @count: number of faults to be injected
+ * @buf: buffer containing the faults
+ */
+int memory_region_inject_faults(IOMMUMemoryRegion *iommu_mr, int count,
+                                struct iommu_fault *buf);
+#endif
+
 /**
  * memory_region_name: get a memory region's name
  *
diff --git a/memory.c b/memory.c
index 8cd3c65872..2eac24cb80 100644
--- a/memory.c
+++ b/memory.c
@@ -2037,6 +2037,18 @@ int memory_region_iommu_num_indexes(IOMMUMemoryRegion *iommu_mr)
     return imrc->num_indexes(iommu_mr);
 }
 
+#ifdef CONFIG_LINUX
+int memory_region_inject_faults(IOMMUMemoryRegion *iommu_mr, int count,
+                                struct iommu_fault *buf)
+{
+    IOMMUMemoryRegionClass *imrc = IOMMU_MEMORY_REGION_GET_CLASS(iommu_mr);
+    if (!imrc->inject_faults) {
+        return -ENOENT;
+    }
+    return imrc->inject_faults(iommu_mr, count, buf);
+}
+#endif
+
 void memory_region_set_log(MemoryRegion *mr, bool log, unsigned client)
 {
     uint8_t mask = 1 << client;
-- 
2.20.1

WARNING: multiple messages have this Message-ID (diff)
From: Eric Auger <eric.auger@redhat.com>
To: eric.auger.pro@gmail.com, eric.auger@redhat.com,
	qemu-devel@nongnu.org, qemu-arm@nongnu.org,
	peter.maydell@linaro.org
Cc: yi.l.liu@intel.com, mst@redhat.com,
	jean-philippe.brucker@arm.com, peterx@redhat.com,
	alex.williamson@redhat.com, vincent.stehle@arm.com
Subject: [Qemu-devel] [RFC v3 23/27] memory: Introduce IOMMU Memory Region inject_faults API
Date: Fri, 12 Apr 2019 12:03:50 +0200	[thread overview]
Message-ID: <20190412100354.6409-24-eric.auger@redhat.com> (raw)
Message-ID: <20190412100350.YDRIRQKgUzsbizQTRSLbIBb6IhFCHw4IEgsMXW7uLjE@z> (raw)
In-Reply-To: <20190412100354.6409-1-eric.auger@redhat.com>

This new API allows to inject @count iommu_faults into
the IOMMU memory region.

Signed-off-by: Eric Auger <eric.auger@redhat.com>
---
 include/exec/memory.h | 26 ++++++++++++++++++++++++++
 memory.c              | 12 ++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/include/exec/memory.h b/include/exec/memory.h
index aedebc8471..6262de1684 100644
--- a/include/exec/memory.h
+++ b/include/exec/memory.h
@@ -400,6 +400,20 @@ typedef struct IOMMUMemoryRegionClass {
      * @iommu: the IOMMUMemoryRegion
      */
     int (*num_indexes)(IOMMUMemoryRegion *iommu);
+
+#ifdef CONFIG_LINUX
+    /* Inject @count faults into the IOMMU memory region
+     *
+     * Optional method: if this method is not provided, then
+     * memory_region_injection_faults() will return -ENOENT
+     *
+     * @iommu: the IOMMU memory region to inject the faults in
+     * @count: number of faults to inject
+     * @buf: fault buffer
+     */
+    int (*inject_faults)(IOMMUMemoryRegion *iommu, int count,
+                         struct iommu_fault *buf);
+#endif
 } IOMMUMemoryRegionClass;
 
 typedef struct CoalescedMemoryRange CoalescedMemoryRange;
@@ -1216,6 +1230,18 @@ int memory_region_iommu_attrs_to_index(IOMMUMemoryRegion *iommu_mr,
  */
 int memory_region_iommu_num_indexes(IOMMUMemoryRegion *iommu_mr);
 
+#ifdef CONFIG_LINUX
+/**
+ * memory_region_inject_faults : inject @count faults stored in @buf
+ *
+ * @iommu_mr: the IOMMU memory region
+ * @count: number of faults to be injected
+ * @buf: buffer containing the faults
+ */
+int memory_region_inject_faults(IOMMUMemoryRegion *iommu_mr, int count,
+                                struct iommu_fault *buf);
+#endif
+
 /**
  * memory_region_name: get a memory region's name
  *
diff --git a/memory.c b/memory.c
index 8cd3c65872..2eac24cb80 100644
--- a/memory.c
+++ b/memory.c
@@ -2037,6 +2037,18 @@ int memory_region_iommu_num_indexes(IOMMUMemoryRegion *iommu_mr)
     return imrc->num_indexes(iommu_mr);
 }
 
+#ifdef CONFIG_LINUX
+int memory_region_inject_faults(IOMMUMemoryRegion *iommu_mr, int count,
+                                struct iommu_fault *buf)
+{
+    IOMMUMemoryRegionClass *imrc = IOMMU_MEMORY_REGION_GET_CLASS(iommu_mr);
+    if (!imrc->inject_faults) {
+        return -ENOENT;
+    }
+    return imrc->inject_faults(iommu_mr, count, buf);
+}
+#endif
+
 void memory_region_set_log(MemoryRegion *mr, bool log, unsigned client)
 {
     uint8_t mask = 1 << client;
-- 
2.20.1



  parent reply	other threads:[~2019-04-12 10:06 UTC|newest]

Thread overview: 58+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-12 10:03 [Qemu-devel] [RFC v3 00/27] vSMMUv3/pSMMUv3 2 stage VFIO integration Eric Auger
2019-04-12 10:03 ` Eric Auger
2019-04-12 10:03 ` [Qemu-devel] [RFC v3 01/27] hw/arm/smmuv3: Remove SMMUNotifierNode Eric Auger
2019-04-12 10:03   ` Eric Auger
2019-04-12 10:03 ` [Qemu-devel] [RFC v3 02/27] vfio/common: Introduce vfio_set_irq_signaling helper Eric Auger
2019-04-12 10:03   ` Eric Auger
2019-04-12 10:03 ` [Qemu-devel] [RFC v3 03/27] update-linux-headers: Import iommu.h Eric Auger
2019-04-12 10:03   ` Eric Auger
2019-04-12 10:03 ` [Qemu-devel] [RFC v3 04/27] header update against 5.1-rc3 and IOMMU/VFIO nested stage APIs Eric Auger
2019-04-12 10:03   ` Eric Auger
2019-04-12 10:03 ` [Qemu-devel] [RFC v3 05/27] memory: add IOMMU_ATTR_VFIO_NESTED IOMMU memory region attribute Eric Auger
2019-04-12 10:03   ` Eric Auger
2019-04-12 10:03 ` [Qemu-devel] [RFC v3 06/27] memory: add IOMMU_ATTR_MSI_TRANSLATE " Eric Auger
2019-04-12 10:03   ` Eric Auger
2019-04-12 10:03 ` [Qemu-devel] [RFC v3 07/27] hw/arm/smmuv3: Advertise VFIO_NESTED and MSI_TRANSLATE attributes Eric Auger
2019-04-12 10:03   ` Eric Auger
2019-04-12 10:03 ` [Qemu-devel] [RFC v3 08/27] hw/vfio/common: Force nested if iommu requires it Eric Auger
2019-04-12 10:03   ` Eric Auger
2019-04-12 10:03 ` [Qemu-devel] [RFC v3 09/27] memory: Prepare for different kinds of IOMMU MR notifiers Eric Auger
2019-04-12 10:03   ` Eric Auger
2019-04-12 10:03 ` [Qemu-devel] [RFC v3 10/27] memory: Add IOMMUConfigNotifier Eric Auger
2019-04-12 10:03   ` Eric Auger
2019-04-12 10:03 ` [Qemu-devel] [RFC v3 11/27] memory: Add arch_id and leaf fields in IOTLBEntry Eric Auger
2019-04-12 10:03   ` Eric Auger
2019-04-12 10:03 ` [Qemu-devel] [RFC v3 12/27] hw/arm/smmuv3: Store the PASID table GPA in the translation config Eric Auger
2019-04-12 10:03   ` Eric Auger
2019-04-12 10:03 ` [Qemu-devel] [RFC v3 13/27] hw/arm/smmuv3: Implement dummy replay Eric Auger
2019-04-12 10:03   ` Eric Auger
2019-04-12 10:03 ` [Qemu-devel] [RFC v3 14/27] hw/arm/smmuv3: Fill the IOTLBEntry arch_id on NH_VA invalidation Eric Auger
2019-04-12 10:03   ` Eric Auger
2019-04-12 10:03 ` [Qemu-devel] [RFC v3 15/27] hw/arm/smmuv3: Fill the IOTLBEntry leaf field " Eric Auger
2019-04-12 10:03   ` Eric Auger
2019-04-12 10:03 ` [Qemu-devel] [RFC v3 16/27] hw/arm/smmuv3: Notify on config changes Eric Auger
2019-04-12 10:03   ` Eric Auger
2019-04-12 10:03 ` [Qemu-devel] [RFC v3 17/27] hw/vfio/common: Introduce vfio_alloc_guest_iommu helper Eric Auger
2019-04-12 10:03   ` Eric Auger
2019-04-12 10:03 ` [Qemu-devel] [RFC v3 18/27] hw/vfio/common: Introduce hostwin_from_range helper Eric Auger
2019-04-12 10:03   ` Eric Auger
2019-04-12 10:03 ` [Qemu-devel] [RFC v3 19/27] hw/vfio/common: Introduce helpers to DMA map/unap a RAM section Eric Auger
2019-04-12 10:03   ` Eric Auger
2019-04-12 10:03 ` [Qemu-devel] [RFC v3 20/27] hw/vfio/common: Setup nested stage mappings Eric Auger
2019-04-12 10:03   ` Eric Auger
2019-04-12 10:03 ` [Qemu-devel] [RFC v3 21/27] hw/vfio/common: Register a MAP notifier for MSI binding Eric Auger
2019-04-12 10:03   ` Eric Auger
2019-04-12 10:03 ` [Qemu-devel] [RFC v3 22/27] vfio-pci: Expose MSI stage 1 bindings to the host Eric Auger
2019-04-12 10:03   ` Eric Auger
2019-04-12 10:03 ` Eric Auger [this message]
2019-04-12 10:03   ` [Qemu-devel] [RFC v3 23/27] memory: Introduce IOMMU Memory Region inject_faults API Eric Auger
2019-04-12 10:03 ` [Qemu-devel] [RFC v3 24/27] hw/arm/smmuv3: Implement fault injection Eric Auger
2019-04-12 10:03   ` Eric Auger
2019-04-12 10:03 ` [Qemu-devel] [RFC v3 25/27] vfio-pci: register handler for iommu fault Eric Auger
2019-04-12 10:03   ` Eric Auger
2019-04-12 10:03 ` [Qemu-devel] [RFC v3 26/27] vfio-pci: Set up fault regions Eric Auger
2019-04-12 10:03   ` Eric Auger
2019-04-12 10:03 ` [Qemu-devel] [RFC v3 27/27] vfio-pci: Implement the DMA fault handler Eric Auger
2019-04-12 10:03   ` Eric Auger
2019-04-12 10:46 ` [Qemu-devel] [RFC v3 00/27] vSMMUv3/pSMMUv3 2 stage VFIO integration no-reply
2019-04-12 10:46   ` no-reply

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=20190412100354.6409-24-eric.auger@redhat.com \
    --to=eric.auger@redhat.com \
    --cc=alex.williamson@redhat.com \
    --cc=eric.auger.pro@gmail.com \
    --cc=jean-philippe.brucker@arm.com \
    --cc=mst@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=peterx@redhat.com \
    --cc=qemu-arm@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=vincent.stehle@arm.com \
    --cc=yi.l.liu@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.