Commit cb1efcf4 authored by Peter Maydell's avatar Peter Maydell
Browse files

iommu: Add IOMMU index argument to notifier APIs 



Add support for multiple IOMMU indexes to the IOMMU notifier APIs.
When initializing a notifier with iommu_notifier_init(), the caller
must pass the IOMMU index that it is interested in. When a change
happens, the IOMMU implementation must pass
memory_region_notify_iommu() the IOMMU index that has changed and
that notifiers must be called for.

IOMMUs which support only a single index don't need to change.
Callers which only really support working with IOMMUs with a single
index can use the result of passing MEMTXATTRS_UNSPECIFIED to
memory_region_iommu_attrs_to_index().

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Reviewed-by: default avatarAlex Bennée <alex.bennee@linaro.org>
Message-id: 20180604152941.20374-3-peter.maydell@linaro.org
parent 21f40209

hw/i386/intel_iommu.c

+3 −3
Original line number Diff line number Diff line
@@ -1023,7 +1023,7 @@ static int vtd_dev_to_context_entry(IntelIOMMUState *s, uint8_t bus_num, 
static int vtd_sync_shadow_page_hook(IOMMUTLBEntry *entry,

                                     void *private)

{

    memory_region_notify_iommu((IOMMUMemoryRegion *)private, *entry);

    memory_region_notify_iommu((IOMMUMemoryRegion *)private, 0, *entry);

    return 0;

}
@@ -1581,7 +1581,7 @@ static void vtd_iotlb_page_invalidate_notify(IntelIOMMUState *s, 
                    .addr_mask = size - 1,

                    .perm = IOMMU_NONE,

                };

                memory_region_notify_iommu(&vtd_as->iommu, entry);

                memory_region_notify_iommu(&vtd_as->iommu, 0, entry);

            }

        }

    }
@@ -2015,7 +2015,7 @@ static bool vtd_process_device_iotlb_desc(IntelIOMMUState *s, 
    entry.iova = addr;

    entry.perm = IOMMU_NONE;

    entry.translated_addr = 0;

    memory_region_notify_iommu(&vtd_dev_as->iommu, entry);

    memory_region_notify_iommu(&vtd_dev_as->iommu, 0, entry);



done:

    return true;

hw/ppc/spapr_iommu.c

+1 −1
Original line number Diff line number Diff line
@@ -428,7 +428,7 @@ static target_ulong put_tce_emu(sPAPRTCETable *tcet, target_ulong ioba, 
    entry.translated_addr = tce & page_mask;

    entry.addr_mask = ~page_mask;

    entry.perm = spapr_tce_iommu_access_flags(tce);

    memory_region_notify_iommu(&tcet->iommu, entry);

    memory_region_notify_iommu(&tcet->iommu, 0, entry);



    return H_SUCCESS;

}

hw/s390x/s390-pci-inst.c

+2 −2
Original line number Diff line number Diff line
@@ -589,7 +589,7 @@ static void s390_pci_update_iotlb(S390PCIIOMMU *iommu, S390IOTLBEntry *entry) 
            }



            notify.perm = IOMMU_NONE;

            memory_region_notify_iommu(&iommu->iommu_mr, notify);

            memory_region_notify_iommu(&iommu->iommu_mr, 0, notify);

            notify.perm = entry->perm;

        }
@@ -601,7 +601,7 @@ static void s390_pci_update_iotlb(S390PCIIOMMU *iommu, S390IOTLBEntry *entry) 
        g_hash_table_replace(iommu->iotlb, &cache->iova, cache);

    }



    memory_region_notify_iommu(&iommu->iommu_mr, notify);

    memory_region_notify_iommu(&iommu->iommu_mr, 0, notify);

}



int rpcit_service_call(S390CPU *cpu, uint8_t r1, uint8_t r2, uintptr_t ra)

hw/vfio/common.c

+5 −1
Original line number Diff line number Diff line
@@ -507,6 +507,7 @@ static void vfio_listener_region_add(MemoryListener *listener, 
    if (memory_region_is_iommu(section->mr)) {

        VFIOGuestIOMMU *giommu;

        IOMMUMemoryRegion *iommu_mr = IOMMU_MEMORY_REGION(section->mr);

        int iommu_idx;



        trace_vfio_listener_region_add_iommu(iova, end);

        /*
@@ -523,10 +524,13 @@ static void vfio_listener_region_add(MemoryListener *listener, 
        llend = int128_add(int128_make64(section->offset_within_region),

                           section->size);

        llend = int128_sub(llend, int128_one());

        iommu_idx = memory_region_iommu_attrs_to_index(iommu_mr,

                                                       MEMTXATTRS_UNSPECIFIED);

        iommu_notifier_init(&giommu->n, vfio_iommu_map_notify,

                            IOMMU_NOTIFIER_ALL,

                            section->offset_within_region,

                            int128_get64(llend));

                            int128_get64(llend),

                            iommu_idx);

        QLIST_INSERT_HEAD(&container->giommu_list, giommu, giommu_next);



        memory_region_register_iommu_notifier(section->mr, &giommu->n);

hw/virtio/vhost.c

+6 −1
Original line number Diff line number Diff line
@@ -662,6 +662,8 @@ static void vhost_iommu_region_add(MemoryListener *listener, 
                                         iommu_listener);

    struct vhost_iommu *iommu;

    Int128 end;

    int iommu_idx;

    IOMMUMemoryRegion *iommu_mr = IOMMU_MEMORY_REGION(section->mr);



    if (!memory_region_is_iommu(section->mr)) {

        return;
@@ -671,10 +673,13 @@ static void vhost_iommu_region_add(MemoryListener *listener, 
    end = int128_add(int128_make64(section->offset_within_region),

                     section->size);

    end = int128_sub(end, int128_one());

    iommu_idx = memory_region_iommu_attrs_to_index(iommu_mr,

                                                   MEMTXATTRS_UNSPECIFIED);

    iommu_notifier_init(&iommu->n, vhost_iommu_unmap_notify,

                        IOMMU_NOTIFIER_UNMAP,

                        section->offset_within_region,

                        int128_get64(end));

                        int128_get64(end),

                        iommu_idx);

    iommu->mr = section->mr;

    iommu->iommu_offset = section->offset_within_address_space -

                          section->offset_within_region;