diff mbox

[RFC,14/20] intel_iommu: add FOR_EACH_ASSIGN_DEVICE macro

Message ID 1493201210-14357-15-git-send-email-yi.l.liu@linux.intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Liu, Yi L April 26, 2017, 10:06 a.m. UTC 
Add FOR_EACH_ASSIGN_DEVICE. It would be used to loop all assigned
devices when processing guest pasid table linking and iommu cache
invalidate propagation.

Signed-off-by: Liu, Yi L <yi.l.liu@linux.intel.com>
---
 hw/i386/intel_iommu.c          | 32 ++++++++++++++++++++++++++++++++
 hw/i386/intel_iommu_internal.h | 11 +++++++++++
 2 files changed, 43 insertions(+)

Comments

lan,Tianyu April 28, 2017, 7:33 a.m. UTC | #1 
On 2017年04月26日 18:06, Liu, Yi L wrote:
> Add FOR_EACH_ASSIGN_DEVICE. It would be used to loop all assigned
> devices when processing guest pasid table linking and iommu cache
> invalidate propagation.
> 
> Signed-off-by: Liu, Yi L <yi.l.liu@linux.intel.com>
> ---
>  hw/i386/intel_iommu.c          | 32 ++++++++++++++++++++++++++++++++
>  hw/i386/intel_iommu_internal.h | 11 +++++++++++
>  2 files changed, 43 insertions(+)
> 
> diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c
> index 0c412d2..f291995 100644
> --- a/hw/i386/intel_iommu.c
> +++ b/hw/i386/intel_iommu.c
> @@ -55,6 +55,38 @@ static int vtd_dbgflags = VTD_DBGBIT(GENERAL) | VTD_DBGBIT(CSR);
>  #define VTD_DPRINTF(what, fmt, ...) do {} while (0)
>  #endif
>  
> +#define FOR_EACH_ASSIGN_DEVICE(__notify_info_type, \
> +                               __opaque_type, \
> +                               __hook_info, \
> +                               __hook_fn) \
> +do { \
> +    IntelIOMMUNotifierNode *node; \
> +    VTDNotifierIterator iterator; \
> +    int ret = 0; \
> +    __notify_info_type *notify_info; \
> +    __opaque_type *opaq; \
> +    int argsz; \
> +    argsz = sizeof(*notify_info) + sizeof(*opaq); \
> +    notify_info = g_malloc0(argsz); \
> +    QLIST_FOREACH(node, &(s->notifiers_list), next) { \
> +        VTDAddressSpace *vtd_as = node->vtd_as; \
> +        VTDContextEntry ce[2]; \
> +        iterator.bus = pci_bus_num(vtd_as->bus); \
> +        ret = vtd_dev_to_context_entry(s, iterator.bus, \
> +                               vtd_as->devfn, &ce[0]); \
> +        if (ret != 0) { \
> +            continue; \
> +        } \
> +        iterator.sid = vtd_make_source_id(iterator.bus, vtd_as->devfn); \
> +        iterator.did =  VTD_CONTEXT_ENTRY_DID(ce[0].hi); \
> +        iterator.host_sid = node->host_sid; \
> +        iterator.vtd_as = vtd_as; \
> +        iterator.ce = &ce[0]; \
> +        __hook_fn(&iterator, __hook_info, notify_info); \
> +    } \
> +    g_free(notify_info); \
> +} while (0)
> +
>  static void vtd_define_quad(IntelIOMMUState *s, hwaddr addr, uint64_t val,
>                              uint64_t wmask, uint64_t w1cmask)
>  {
> diff --git a/hw/i386/intel_iommu_internal.h b/hw/i386/intel_iommu_internal.h
> index f2a7d12..5178398 100644
> --- a/hw/i386/intel_iommu_internal.h
> +++ b/hw/i386/intel_iommu_internal.h
> @@ -439,6 +439,17 @@ typedef struct VTDRootEntry VTDRootEntry;
>  #define VTD_EXT_CONTEXT_TT_NO_DEV_IOTLB   (4ULL << 2)
>  #define VTD_EXT_CONTEXT_TT_DEV_IOTLB      (5ULL << 2)
>  
> +struct VTDNotifierIterator {
> +    VTDAddressSpace *vtd_as;
> +    VTDContextEntry *ce;
> +    uint16_t host_sid;
> +    uint16_t sid;
> +    uint16_t did;
> +    uint8_t  bus;

The "bus" seems to be redundant.
It is already contained in the "sid", right?

> +};
> +
> +typedef struct VTDNotifierIterator VTDNotifierIterator;
> +
>  /* Paging Structure common */
>  #define VTD_SL_PT_PAGE_SIZE_MASK    (1ULL << 7)
>  /* Bits to decide the offset for each level */
>
diff mbox

Patch

diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c
index 0c412d2..f291995 100644
--- a/hw/i386/intel_iommu.c
+++ b/hw/i386/intel_iommu.c
@@ -55,6 +55,38 @@  static int vtd_dbgflags = VTD_DBGBIT(GENERAL) | VTD_DBGBIT(CSR);
 #define VTD_DPRINTF(what, fmt, ...) do {} while (0)
 #endif
 
+#define FOR_EACH_ASSIGN_DEVICE(__notify_info_type, \
+                               __opaque_type, \
+                               __hook_info, \
+                               __hook_fn) \
+do { \
+    IntelIOMMUNotifierNode *node; \
+    VTDNotifierIterator iterator; \
+    int ret = 0; \
+    __notify_info_type *notify_info; \
+    __opaque_type *opaq; \
+    int argsz; \
+    argsz = sizeof(*notify_info) + sizeof(*opaq); \
+    notify_info = g_malloc0(argsz); \
+    QLIST_FOREACH(node, &(s->notifiers_list), next) { \
+        VTDAddressSpace *vtd_as = node->vtd_as; \
+        VTDContextEntry ce[2]; \
+        iterator.bus = pci_bus_num(vtd_as->bus); \
+        ret = vtd_dev_to_context_entry(s, iterator.bus, \
+                               vtd_as->devfn, &ce[0]); \
+        if (ret != 0) { \
+            continue; \
+        } \
+        iterator.sid = vtd_make_source_id(iterator.bus, vtd_as->devfn); \
+        iterator.did =  VTD_CONTEXT_ENTRY_DID(ce[0].hi); \
+        iterator.host_sid = node->host_sid; \
+        iterator.vtd_as = vtd_as; \
+        iterator.ce = &ce[0]; \
+        __hook_fn(&iterator, __hook_info, notify_info); \
+    } \
+    g_free(notify_info); \
+} while (0)
+
 static void vtd_define_quad(IntelIOMMUState *s, hwaddr addr, uint64_t val,
                             uint64_t wmask, uint64_t w1cmask)
 {
diff --git a/hw/i386/intel_iommu_internal.h b/hw/i386/intel_iommu_internal.h
index f2a7d12..5178398 100644
--- a/hw/i386/intel_iommu_internal.h
+++ b/hw/i386/intel_iommu_internal.h
@@ -439,6 +439,17 @@  typedef struct VTDRootEntry VTDRootEntry;
 #define VTD_EXT_CONTEXT_TT_NO_DEV_IOTLB   (4ULL << 2)
 #define VTD_EXT_CONTEXT_TT_DEV_IOTLB      (5ULL << 2)
 
+struct VTDNotifierIterator {
+    VTDAddressSpace *vtd_as;
+    VTDContextEntry *ce;
+    uint16_t host_sid;
+    uint16_t sid;
+    uint16_t did;
+    uint8_t  bus;
+};
+
+typedef struct VTDNotifierIterator VTDNotifierIterator;
+
 /* Paging Structure common */
 #define VTD_SL_PT_PAGE_SIZE_MASK    (1ULL << 7)
 /* Bits to decide the offset for each level */