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 16/28] vfio: Helper to get IRQ info including capabilities
Date: Thu, 25 Feb 2021 11:52:21 +0100 [thread overview]
Message-ID: <20210225105233.650545-17-eric.auger@redhat.com> (raw)
In-Reply-To: <20210225105233.650545-1-eric.auger@redhat.com>
As done for vfio regions, add helpers to retrieve irq info
including their optional capabilities.
Signed-off-by: Eric Auger <eric.auger@redhat.com>
---
hw/vfio/common.c | 97 +++++++++++++++++++++++++++++++++++
hw/vfio/trace-events | 1 +
include/hw/vfio/vfio-common.h | 7 +++
3 files changed, 105 insertions(+)
diff --git a/hw/vfio/common.c b/hw/vfio/common.c
index 8a64ba414b..9c8533c9c5 100644
--- a/hw/vfio/common.c
+++ b/hw/vfio/common.c
@@ -1419,6 +1419,25 @@ bool vfio_get_info_dma_avail(struct vfio_iommu_type1_info *info,
return true;
}
+struct vfio_info_cap_header *
+vfio_get_irq_info_cap(struct vfio_irq_info *info, uint16_t id)
+{
+ struct vfio_info_cap_header *hdr;
+ void *ptr = info;
+
+ if (!(info->flags & VFIO_IRQ_INFO_FLAG_CAPS)) {
+ return NULL;
+ }
+
+ for (hdr = ptr + info->cap_offset; hdr != ptr; hdr = ptr + hdr->next) {
+ if (hdr->id == id) {
+ return hdr;
+ }
+ }
+
+ return NULL;
+}
+
static int vfio_setup_region_sparse_mmaps(VFIORegion *region,
struct vfio_region_info *info)
{
@@ -2352,6 +2371,33 @@ retry:
return 0;
}
+int vfio_get_irq_info(VFIODevice *vbasedev, int index,
+ struct vfio_irq_info **info)
+{
+ size_t argsz = sizeof(struct vfio_irq_info);
+
+ *info = g_malloc0(argsz);
+
+ (*info)->index = index;
+retry:
+ (*info)->argsz = argsz;
+
+ if (ioctl(vbasedev->fd, VFIO_DEVICE_GET_IRQ_INFO, *info)) {
+ g_free(*info);
+ *info = NULL;
+ return -errno;
+ }
+
+ if ((*info)->argsz > argsz) {
+ argsz = (*info)->argsz;
+ *info = g_realloc(*info, argsz);
+
+ goto retry;
+ }
+
+ return 0;
+}
+
int vfio_get_dev_region_info(VFIODevice *vbasedev, uint32_t type,
uint32_t subtype, struct vfio_region_info **info)
{
@@ -2387,6 +2433,42 @@ int vfio_get_dev_region_info(VFIODevice *vbasedev, uint32_t type,
return -ENODEV;
}
+int vfio_get_dev_irq_info(VFIODevice *vbasedev, uint32_t type,
+ uint32_t subtype, struct vfio_irq_info **info)
+{
+ int i;
+
+ for (i = 0; i < vbasedev->num_irqs; i++) {
+ struct vfio_info_cap_header *hdr;
+ struct vfio_irq_info_cap_type *cap_type;
+
+ if (vfio_get_irq_info(vbasedev, i, info)) {
+ continue;
+ }
+
+ hdr = vfio_get_irq_info_cap(*info, VFIO_IRQ_INFO_CAP_TYPE);
+ if (!hdr) {
+ g_free(*info);
+ continue;
+ }
+
+ cap_type = container_of(hdr, struct vfio_irq_info_cap_type, header);
+
+ trace_vfio_get_dev_irq(vbasedev->name, i,
+ cap_type->type, cap_type->subtype);
+
+ if (cap_type->type == type && cap_type->subtype == subtype) {
+ return 0;
+ }
+
+ g_free(*info);
+ }
+
+ *info = NULL;
+ return -ENODEV;
+}
+
+
bool vfio_has_region_cap(VFIODevice *vbasedev, int region, uint16_t cap_type)
{
struct vfio_region_info *info = NULL;
@@ -2402,6 +2484,21 @@ bool vfio_has_region_cap(VFIODevice *vbasedev, int region, uint16_t cap_type)
return ret;
}
+bool vfio_has_irq_cap(VFIODevice *vbasedev, int region, uint16_t cap_type)
+{
+ struct vfio_region_info *info = NULL;
+ bool ret = false;
+
+ if (!vfio_get_region_info(vbasedev, region, &info)) {
+ if (vfio_get_region_info_cap(info, cap_type)) {
+ ret = true;
+ }
+ g_free(info);
+ }
+
+ return ret;
+}
+
/*
* Interfaces for IBM EEH (Enhanced Error Handling)
*/
diff --git a/hw/vfio/trace-events b/hw/vfio/trace-events
index 8e2a297a4c..815a71e099 100644
--- a/hw/vfio/trace-events
+++ b/hw/vfio/trace-events
@@ -119,6 +119,7 @@ vfio_region_unmap(const char *name, unsigned long offset, unsigned long end) "Re
vfio_region_sparse_mmap_header(const char *name, int index, int nr_areas) "Device %s region %d: %d sparse mmap entries"
vfio_region_sparse_mmap_entry(int i, unsigned long start, unsigned long end) "sparse entry %d [0x%lx - 0x%lx]"
vfio_get_dev_region(const char *name, int index, uint32_t type, uint32_t subtype) "%s index %d, %08x/%0x8"
+vfio_get_dev_irq(const char *name, int index, uint32_t type, uint32_t subtype) "%s index %d, %08x/%0x8"
vfio_dma_unmap_overflow_workaround(void) ""
vfio_iommu_addr_inv_iotlb(int asid, uint64_t addr, uint64_t size, uint64_t nb_granules, bool leaf) "nested IOTLB invalidate asid=%d, addr=0x%"PRIx64" granule_size=0x%"PRIx64" nb_granules=0x%"PRIx64" leaf=%d"
vfio_iommu_asid_inv_iotlb(int asid) "nested IOTLB invalidate asid=%d"
diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h
index f30133b2a3..fcbda2d071 100644
--- a/include/hw/vfio/vfio-common.h
+++ b/include/hw/vfio/vfio-common.h
@@ -232,6 +232,13 @@ bool vfio_get_info_dma_avail(struct vfio_iommu_type1_info *info,
unsigned int *avail);
struct vfio_info_cap_header *
vfio_get_device_info_cap(struct vfio_device_info *info, uint16_t id);
+int vfio_get_irq_info(VFIODevice *vbasedev, int index,
+ struct vfio_irq_info **info);
+int vfio_get_dev_irq_info(VFIODevice *vbasedev, uint32_t type,
+ uint32_t subtype, struct vfio_irq_info **info);
+bool vfio_has_irq_cap(VFIODevice *vbasedev, int irq, uint16_t cap_type);
+struct vfio_info_cap_header *
+vfio_get_irq_info_cap(struct vfio_irq_info *info, uint16_t id);
#endif
extern const MemoryListener vfio_prereg_listener;
--
2.26.2
next prev parent reply other threads:[~2021-02-25 11:08 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 ` Eric Auger [this message]
2021-02-25 10:52 ` [RFC v8 17/28] vfio/pci: Register handler for iommu fault Eric Auger
2021-02-25 10:52 ` [RFC v8 18/28] vfio/pci: Set up the DMA FAULT region Eric Auger
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-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=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).