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, mst@redhat.com,
alex.williamson@redhat.com, jacob.jun.pan@linux.intel.com,
yi.l.liu@intel.com
Cc: jean-philippe@linaro.org, tnowicki@marvell.com, maz@kernel.org,
jiangkunkun@huawei.com, zhangfei.gao@foxmail.com,
peterx@redhat.com, shameerali.kolothum.thodi@huawei.com,
yuzenghui@huawei.com, zhangfei.gao@linaro.org, will@kernel.org
Subject: [RFC v8 18/28] vfio/pci: Set up the DMA FAULT region
Date: Thu, 25 Feb 2021 11:52:23 +0100 [thread overview]
Message-ID: <20210225105233.650545-19-eric.auger@redhat.com> (raw)
In-Reply-To: <20210225105233.650545-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.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++
hw/vfio/pci.h | 1 +
2 files changed, 65 insertions(+)
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index dfce777556..9fbbf88673 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -2600,11 +2600,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 */
@@ -2668,6 +2724,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);
@@ -3260,6 +3322,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);
/*
@@ -3280,6 +3343,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);
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;
--
2.26.2
next prev parent reply other threads:[~2021-02-25 11:31 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-25 10:52 [RFC v8 00/28] vSMMUv3/pSMMUv3 2 stage VFIO integration Eric Auger
2021-02-25 10:52 ` [RFC v8 01/28] hw/vfio/common: trace vfio_connect_container operations Eric Auger
2021-02-25 10:52 ` [RFC v8 02/28] update-linux-headers: Import iommu.h Eric Auger
2021-02-25 10:52 ` [RFC v8 03/28] header update against 5.11-rc2 and IOMMU/VFIO nested stage APIs Eric Auger
2021-03-04 9:18 ` Kunkun Jiang
2021-02-25 10:52 ` [RFC v8 04/28] memory: Add new fields in IOTLBEntry Eric Auger
2021-02-25 10:52 ` [RFC v8 05/28] hw/arm/smmuv3: Properly propagate S1 asid invalidation Eric Auger
2021-02-25 10:52 ` [RFC v8 06/28] memory: Add IOMMU_ATTR_VFIO_NESTED IOMMU memory region attribute Eric Auger
2021-02-25 10:52 ` [RFC v8 07/28] memory: Add IOMMU_ATTR_MSI_TRANSLATE " Eric Auger
2021-02-25 10:52 ` [RFC v8 08/28] memory: Introduce IOMMU Memory Region inject_faults API Eric Auger
2021-02-25 10:52 ` [RFC v8 09/28] iommu: Introduce generic header Eric Auger
2021-02-25 10:52 ` [RFC v8 10/28] pci: introduce PCIPASIDOps to PCIDevice Eric Auger
2021-02-25 10:52 ` [RFC v8 11/28] vfio: Force nested if iommu requires it Eric Auger
2021-02-25 10:52 ` [RFC v8 12/28] vfio: Introduce hostwin_from_range helper Eric Auger
2021-02-25 10:52 ` [RFC v8 13/28] vfio: Introduce helpers to DMA map/unmap a RAM section Eric Auger
2021-02-25 10:52 ` [RFC v8 14/28] vfio: Set up nested stage mappings Eric Auger
2021-02-25 10:52 ` [RFC v8 15/28] vfio: Pass stage 1 MSI bindings to the host Eric Auger
2021-02-25 10:52 ` [RFC v8 16/28] vfio: Helper to get IRQ info including capabilities Eric Auger
2021-02-25 10:52 ` [RFC v8 17/28] vfio/pci: Register handler for iommu fault Eric Auger
2021-02-25 10:52 ` Eric Auger [this message]
2021-02-25 10:52 ` [RFC v8 19/28] vfio/pci: Implement the DMA fault handler Eric Auger
2021-02-25 10:52 ` [RFC v8 20/28] hw/arm/smmuv3: Advertise MSI_TRANSLATE attribute Eric Auger
2021-02-25 10:52 ` [RFC v8 21/28] hw/arm/smmuv3: Store the PASID table GPA in the translation config Eric Auger
2021-02-25 10:52 ` [RFC v8 22/28] hw/arm/smmuv3: Fill the IOTLBEntry arch_id on NH_VA invalidation Eric Auger
2021-02-25 10:52 ` [RFC v8 23/28] hw/arm/smmuv3: Fill the IOTLBEntry leaf field " Eric Auger
2021-02-25 10:52 ` [RFC v8 24/28] hw/arm/smmuv3: Pass stage 1 configurations to the host Eric Auger
2021-02-25 10:52 ` [RFC v8 25/28] hw/arm/smmuv3: Implement fault injection Eric Auger
2021-02-25 10:52 ` [RFC v8 26/28] hw/arm/smmuv3: Allow MAP notifiers Eric Auger
2021-02-25 10:52 ` [RFC v8 27/28] pci: Add return_page_response pci ops Eric Auger
2021-02-25 10:52 ` [RFC v8 28/28] vfio/pci: Implement return_page_response page response callback 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=20210225105233.650545-19-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=jiangkunkun@huawei.com \
--cc=maz@kernel.org \
--cc=mst@redhat.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=tnowicki@marvell.com \
--cc=will@kernel.org \
--cc=yi.l.liu@intel.com \
--cc=yuzenghui@huawei.com \
--cc=zhangfei.gao@foxmail.com \
--cc=zhangfei.gao@linaro.org \
/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).