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 16/26] vfio/pci: Set up the DMA FAULT region
Date: Mon, 16 Nov 2020 19:13:39 +0100 [thread overview]
Message-ID: <20201116181349.11908-17-eric.auger@redhat.com> (raw)
In-Reply-To: <20201116181349.11908-1-eric.auger@redhat.com>
Set up the fault region which is composed of the actual fault
queue (mmappable) and a header used to handle it. The fault
queue is mmapped.
Signed-off-by: Eric Auger <eric.auger@redhat.com>
---
v4 -> v5:
- use a single DMA FAULT region. No version selection anymore
---
hw/vfio/pci.h | 1 +
hw/vfio/pci.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 65 insertions(+)
diff --git a/hw/vfio/pci.h b/hw/vfio/pci.h
index c5f06f4ae4..d6cc689f5e 100644
--- a/hw/vfio/pci.h
+++ b/hw/vfio/pci.h
@@ -145,6 +145,7 @@ struct VFIOPCIDevice {
EventNotifier err_notifier;
EventNotifier req_notifier;
VFIOPCIExtIRQ *ext_irqs;
+ VFIORegion dma_fault_region;
int (*resetfn)(struct VFIOPCIDevice *);
uint32_t vendor_id;
uint32_t device_id;
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index d7ab7a1525..35551bfd1d 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -2576,11 +2576,67 @@ int vfio_populate_vga(VFIOPCIDevice *vdev, Error **errp)
return 0;
}
+static void vfio_init_fault_regions(VFIOPCIDevice *vdev, Error **errp)
+{
+ struct vfio_region_info *fault_region_info = NULL;
+ struct vfio_region_info_cap_fault *cap_fault;
+ VFIODevice *vbasedev = &vdev->vbasedev;
+ struct vfio_info_cap_header *hdr;
+ char *fault_region_name;
+ int ret;
+
+ ret = vfio_get_dev_region_info(&vdev->vbasedev,
+ VFIO_REGION_TYPE_NESTED,
+ VFIO_REGION_SUBTYPE_NESTED_DMA_FAULT,
+ &fault_region_info);
+ if (ret) {
+ goto out;
+ }
+
+ hdr = vfio_get_region_info_cap(fault_region_info,
+ VFIO_REGION_INFO_CAP_DMA_FAULT);
+ if (!hdr) {
+ error_setg(errp, "failed to retrieve DMA FAULT capability");
+ goto out;
+ }
+ cap_fault = container_of(hdr, struct vfio_region_info_cap_fault,
+ header);
+ if (cap_fault->version != 1) {
+ error_setg(errp, "Unsupported DMA FAULT API version %d",
+ cap_fault->version);
+ goto out;
+ }
+
+ fault_region_name = g_strdup_printf("%s DMA FAULT %d",
+ vbasedev->name,
+ fault_region_info->index);
+
+ ret = vfio_region_setup(OBJECT(vdev), vbasedev,
+ &vdev->dma_fault_region,
+ fault_region_info->index,
+ fault_region_name);
+ g_free(fault_region_name);
+ if (ret) {
+ error_setg_errno(errp, -ret,
+ "failed to set up the DMA FAULT region %d",
+ fault_region_info->index);
+ goto out;
+ }
+
+ ret = vfio_region_mmap(&vdev->dma_fault_region);
+ if (ret) {
+ error_setg_errno(errp, -ret, "Failed to mmap the DMA FAULT queue");
+ }
+out:
+ g_free(fault_region_info);
+}
+
static void vfio_populate_device(VFIOPCIDevice *vdev, Error **errp)
{
VFIODevice *vbasedev = &vdev->vbasedev;
struct vfio_region_info *reg_info;
struct vfio_irq_info irq_info = { .argsz = sizeof(irq_info) };
+ Error *err = NULL;
int i, ret = -1;
/* Sanity check device */
@@ -2644,6 +2700,12 @@ static void vfio_populate_device(VFIOPCIDevice *vdev, Error **errp)
}
}
+ vfio_init_fault_regions(vdev, &err);
+ if (err) {
+ error_propagate(errp, err);
+ return;
+ }
+
irq_info.index = VFIO_PCI_ERR_IRQ_INDEX;
ret = ioctl(vdev->vbasedev.fd, VFIO_DEVICE_GET_IRQ_INFO, &irq_info);
@@ -3236,6 +3298,7 @@ static void vfio_instance_finalize(Object *obj)
vfio_display_finalize(vdev);
vfio_bars_finalize(vdev);
+ vfio_region_finalize(&vdev->dma_fault_region);
g_free(vdev->emulated_config_bits);
g_free(vdev->rom);
/*
@@ -3256,6 +3319,7 @@ static void vfio_exitfn(PCIDevice *pdev)
vfio_unregister_req_notifier(vdev);
vfio_unregister_err_notifier(vdev);
vfio_unregister_ext_irq_notifiers(vdev);
+ vfio_region_exit(&vdev->dma_fault_region);
pci_device_set_intx_routing_notifier(&vdev->pdev, NULL);
if (vdev->irqchip_change_notifier.notify) {
kvm_irqchip_remove_change_notifier(&vdev->irqchip_change_notifier);
--
2.21.3
next prev parent reply other threads:[~2020-11-16 18:29 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 ` [RFC v7 05/26] memory: Introduce IOMMU Memory Region inject_faults API Eric Auger
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 ` Eric Auger [this message]
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-17-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).