qemu-devel.nongnu.org archive mirror
 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,
	alex.williamson@redhat.com
Cc: peter.maydell@linaro.org, jacob.jun.pan@linux.intel.com,
	jean-philippe@linaro.org, tn@semihalf.com,
	shameerali.kolothum.thodi@huawei.com, nicoleotsuka@gmail.com,
	vivek.gautam@arm.com, yi.l.liu@intel.com, peterx@redhat.com,
	zhangfei.gao@gmail.com, yuzenghui@huawei.com
Subject: [RFC v7 05/26] memory: Introduce IOMMU Memory Region inject_faults API
Date: Mon, 16 Nov 2020 19:13:28 +0100	[thread overview]
Message-ID: <20201116181349.11908-6-eric.auger@redhat.com> (raw)
In-Reply-To: <20201116181349.11908-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 | 24 ++++++++++++++++++++++++
 softmmu/memory.c      | 10 ++++++++++
 2 files changed, 34 insertions(+)

diff --git a/include/exec/memory.h b/include/exec/memory.h
index 023aa83c55..a7364875ef 100644
--- a/include/exec/memory.h
+++ b/include/exec/memory.h
@@ -67,6 +67,8 @@ struct ReservedRegion {
     unsigned type;
 };
 
+struct iommu_fault;
+
 typedef struct IOMMUTLBEntry IOMMUTLBEntry;
 
 /* See address_space_translate: bit 0 is read, bit 1 is write.  */
@@ -425,6 +427,19 @@ struct IOMMUMemoryRegionClass {
      int (*iommu_set_page_size_mask)(IOMMUMemoryRegion *iommu,
                                      uint64_t page_size_mask,
                                      Error **errp);
+
+    /*
+     * 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);
 };
 
 typedef struct CoalescedMemoryRange CoalescedMemoryRange;
@@ -1448,6 +1463,15 @@ int memory_region_iommu_num_indexes(IOMMUMemoryRegion *iommu_mr);
 int memory_region_iommu_set_page_size_mask(IOMMUMemoryRegion *iommu_mr,
                                            uint64_t page_size_mask,
                                            Error **errp);
+/**
+ * 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);
 
 /**
  * memory_region_name: get a memory region's name
diff --git a/softmmu/memory.c b/softmmu/memory.c
index 71951fe4dc..297ef50545 100644
--- a/softmmu/memory.c
+++ b/softmmu/memory.c
@@ -2010,6 +2010,16 @@ int memory_region_iommu_num_indexes(IOMMUMemoryRegion *iommu_mr)
     return imrc->num_indexes(iommu_mr);
 }
 
+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);
+}
+
 void memory_region_set_log(MemoryRegion *mr, bool log, unsigned client)
 {
     uint8_t mask = 1 << client;
-- 
2.21.3



  parent reply	other threads:[~2020-11-16 18:26 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-16 18:13 [RFC v7 00/26] vSMMUv3/pSMMUv3 2 stage VFIO integration Eric Auger
2020-11-16 18:13 ` [RFC v7 01/26] update-linux-headers: Import iommu.h Eric Auger
2020-11-16 18:13 ` [RFC v7 02/26] header update against 5.10-rc4 and IOMMU/VFIO nested stage APIs Eric Auger
2020-11-16 18:13 ` [RFC v7 03/26] memory: Add IOMMU_ATTR_VFIO_NESTED IOMMU memory region attribute Eric Auger
2020-11-16 18:13 ` [RFC v7 04/26] memory: Add IOMMU_ATTR_MSI_TRANSLATE " Eric Auger
2020-11-16 18:13 ` Eric Auger [this message]
2020-11-16 18:13 ` [RFC v7 06/26] memory: Add arch_id and leaf fields in IOTLBEntry Eric Auger
2020-11-16 18:13 ` [RFC v7 07/26] iommu: Introduce generic header Eric Auger
2020-11-16 18:13 ` [RFC v7 08/26] pci: introduce PCIPASIDOps to PCIDevice Eric Auger
2020-11-16 18:13 ` [RFC v7 09/26] vfio: Force nested if iommu requires it Eric Auger
2020-11-16 18:13 ` [RFC v7 10/26] vfio: Introduce hostwin_from_range helper Eric Auger
2020-11-16 18:13 ` [RFC v7 11/26] vfio: Introduce helpers to DMA map/unmap a RAM section Eric Auger
2020-11-16 18:13 ` [RFC v7 12/26] vfio: Set up nested stage mappings Eric Auger
2020-12-24  8:42   ` Zenghui Yu
2020-11-16 18:13 ` [RFC v7 13/26] vfio: Pass stage 1 MSI bindings to the host Eric Auger
2020-11-16 18:13 ` [RFC v7 14/26] vfio: Helper to get IRQ info including capabilities Eric Auger
2020-11-16 18:13 ` [RFC v7 15/26] vfio/pci: Register handler for iommu fault Eric Auger
2020-11-16 18:13 ` [RFC v7 16/26] vfio/pci: Set up the DMA FAULT region Eric Auger
2020-11-16 18:13 ` [RFC v7 17/26] vfio/pci: Implement the DMA fault handler Eric Auger
2020-11-16 18:13 ` [RFC v7 18/26] hw/arm/smmuv3: Advertise MSI_TRANSLATE attribute Eric Auger
2020-11-16 18:13 ` [RFC v7 19/26] hw/arm/smmuv3: Store the PASID table GPA in the translation config Eric Auger
2020-11-16 18:13 ` [RFC v7 20/26] hw/arm/smmuv3: Fill the IOTLBEntry arch_id on NH_VA invalidation Eric Auger
2020-11-16 18:13 ` [RFC v7 21/26] hw/arm/smmuv3: Fill the IOTLBEntry leaf field " Eric Auger
2020-11-16 18:13 ` [RFC v7 22/26] hw/arm/smmuv3: Pass stage 1 configurations to the host Eric Auger
2020-11-16 18:13 ` [RFC v7 23/26] hw/arm/smmuv3: Implement fault injection Eric Auger
2020-11-16 18:13 ` [RFC v7 24/26] hw/arm/smmuv3: Allow MAP notifiers Eric Auger
2020-11-16 18:13 ` [RFC v7 25/26] pci: Add return_page_response pci ops Eric Auger
2020-11-16 18:13 ` [RFC v7 26/26] vfio/pci: Implement return_page_response page response callback Eric Auger
2021-02-18 10:19   ` Shameerali Kolothum Thodi
2021-02-18 10:41     ` Auger Eric
2021-02-18 11:46       ` Shameerali Kolothum Thodi
2021-02-18 13:32         ` Auger Eric
2021-02-24 13:43           ` Auger Eric
2021-02-24 15:38             ` Shameerali Kolothum Thodi

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=20201116181349.11908-6-eric.auger@redhat.com \
    --to=eric.auger@redhat.com \
    --cc=alex.williamson@redhat.com \
    --cc=eric.auger.pro@gmail.com \
    --cc=jacob.jun.pan@linux.intel.com \
    --cc=jean-philippe@linaro.org \
    --cc=nicoleotsuka@gmail.com \
    --cc=peter.maydell@linaro.org \
    --cc=peterx@redhat.com \
    --cc=qemu-arm@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=shameerali.kolothum.thodi@huawei.com \
    --cc=tn@semihalf.com \
    --cc=vivek.gautam@arm.com \
    --cc=yi.l.liu@intel.com \
    --cc=yuzenghui@huawei.com \
    --cc=zhangfei.gao@gmail.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).