mirror of https://github.com/xemu-project/xemu.git
virtio-iommu: Add memory notifiers for map/unmap
Extend VIRTIO_IOMMU_T_MAP/UNMAP request to notify memory listeners. It will call VFIO notifier to map/unmap regions in the physical IOMMU. Signed-off-by: Bharat Bhushan <bbhushan2@marvell.com> Signed-off-by: Eric Auger <eric.auger@redhat.com> Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org> Message-Id: <20201030180510.747225-4-jean-philippe@linaro.org> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
parent
31aa323fb9
commit
15e4c8f01b
|
@ -106,6 +106,8 @@ virtio_iommu_put_domain(uint32_t domain_id) "Free domain=%d"
|
||||||
virtio_iommu_translate_out(uint64_t virt_addr, uint64_t phys_addr, uint32_t sid) "0x%"PRIx64" -> 0x%"PRIx64 " for sid=%d"
|
virtio_iommu_translate_out(uint64_t virt_addr, uint64_t phys_addr, uint32_t sid) "0x%"PRIx64" -> 0x%"PRIx64 " for sid=%d"
|
||||||
virtio_iommu_report_fault(uint8_t reason, uint32_t flags, uint32_t endpoint, uint64_t addr) "FAULT reason=%d flags=%d endpoint=%d address =0x%"PRIx64
|
virtio_iommu_report_fault(uint8_t reason, uint32_t flags, uint32_t endpoint, uint64_t addr) "FAULT reason=%d flags=%d endpoint=%d address =0x%"PRIx64
|
||||||
virtio_iommu_fill_resv_property(uint32_t devid, uint8_t subtype, uint64_t start, uint64_t end) "dev= %d, type=%d start=0x%"PRIx64" end=0x%"PRIx64
|
virtio_iommu_fill_resv_property(uint32_t devid, uint8_t subtype, uint64_t start, uint64_t end) "dev= %d, type=%d start=0x%"PRIx64" end=0x%"PRIx64
|
||||||
|
virtio_iommu_notify_map(const char *name, uint64_t virt_start, uint64_t virt_end, uint64_t phys_start, uint32_t flags) "mr=%s virt_start=0x%"PRIx64" virt_end=0x%"PRIx64" phys_start=0x%"PRIx64" flags=%d"
|
||||||
|
virtio_iommu_notify_unmap(const char *name, uint64_t virt_start, uint64_t virt_end) "mr=%s virt_start=0x%"PRIx64" virt_end=0x%"PRIx64
|
||||||
|
|
||||||
# virtio-mem.c
|
# virtio-mem.c
|
||||||
virtio_mem_send_response(uint16_t type) "type=%" PRIu16
|
virtio_mem_send_response(uint16_t type) "type=%" PRIu16
|
||||||
|
|
|
@ -125,6 +125,51 @@ static gint interval_cmp(gconstpointer a, gconstpointer b, gpointer user_data)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void virtio_iommu_notify_map(IOMMUMemoryRegion *mr, hwaddr virt_start,
|
||||||
|
hwaddr virt_end, hwaddr paddr,
|
||||||
|
uint32_t flags)
|
||||||
|
{
|
||||||
|
IOMMUTLBEntry entry;
|
||||||
|
IOMMUAccessFlags perm = IOMMU_ACCESS_FLAG(flags & VIRTIO_IOMMU_MAP_F_READ,
|
||||||
|
flags & VIRTIO_IOMMU_MAP_F_WRITE);
|
||||||
|
|
||||||
|
if (!(mr->iommu_notify_flags & IOMMU_NOTIFIER_MAP) ||
|
||||||
|
(flags & VIRTIO_IOMMU_MAP_F_MMIO) || !perm) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
trace_virtio_iommu_notify_map(mr->parent_obj.name, virt_start, virt_end,
|
||||||
|
paddr, perm);
|
||||||
|
|
||||||
|
entry.target_as = &address_space_memory;
|
||||||
|
entry.addr_mask = virt_end - virt_start;
|
||||||
|
entry.iova = virt_start;
|
||||||
|
entry.perm = perm;
|
||||||
|
entry.translated_addr = paddr;
|
||||||
|
|
||||||
|
memory_region_notify_iommu(mr, 0, entry);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void virtio_iommu_notify_unmap(IOMMUMemoryRegion *mr, hwaddr virt_start,
|
||||||
|
hwaddr virt_end)
|
||||||
|
{
|
||||||
|
IOMMUTLBEntry entry;
|
||||||
|
|
||||||
|
if (!(mr->iommu_notify_flags & IOMMU_NOTIFIER_UNMAP)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
trace_virtio_iommu_notify_unmap(mr->parent_obj.name, virt_start, virt_end);
|
||||||
|
|
||||||
|
entry.target_as = &address_space_memory;
|
||||||
|
entry.addr_mask = virt_end - virt_start;
|
||||||
|
entry.iova = virt_start;
|
||||||
|
entry.perm = IOMMU_NONE;
|
||||||
|
entry.translated_addr = 0;
|
||||||
|
|
||||||
|
memory_region_notify_iommu(mr, 0, entry);
|
||||||
|
}
|
||||||
|
|
||||||
static void virtio_iommu_detach_endpoint_from_domain(VirtIOIOMMUEndpoint *ep)
|
static void virtio_iommu_detach_endpoint_from_domain(VirtIOIOMMUEndpoint *ep)
|
||||||
{
|
{
|
||||||
if (!ep->domain) {
|
if (!ep->domain) {
|
||||||
|
@ -315,6 +360,7 @@ static int virtio_iommu_map(VirtIOIOMMU *s,
|
||||||
VirtIOIOMMUDomain *domain;
|
VirtIOIOMMUDomain *domain;
|
||||||
VirtIOIOMMUInterval *interval;
|
VirtIOIOMMUInterval *interval;
|
||||||
VirtIOIOMMUMapping *mapping;
|
VirtIOIOMMUMapping *mapping;
|
||||||
|
VirtIOIOMMUEndpoint *ep;
|
||||||
|
|
||||||
if (flags & ~VIRTIO_IOMMU_MAP_F_MASK) {
|
if (flags & ~VIRTIO_IOMMU_MAP_F_MASK) {
|
||||||
return VIRTIO_IOMMU_S_INVAL;
|
return VIRTIO_IOMMU_S_INVAL;
|
||||||
|
@ -344,6 +390,11 @@ static int virtio_iommu_map(VirtIOIOMMU *s,
|
||||||
|
|
||||||
g_tree_insert(domain->mappings, interval, mapping);
|
g_tree_insert(domain->mappings, interval, mapping);
|
||||||
|
|
||||||
|
QLIST_FOREACH(ep, &domain->endpoint_list, next) {
|
||||||
|
virtio_iommu_notify_map(ep->iommu_mr, virt_start, virt_end, phys_start,
|
||||||
|
flags);
|
||||||
|
}
|
||||||
|
|
||||||
return VIRTIO_IOMMU_S_OK;
|
return VIRTIO_IOMMU_S_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -356,6 +407,7 @@ static int virtio_iommu_unmap(VirtIOIOMMU *s,
|
||||||
VirtIOIOMMUMapping *iter_val;
|
VirtIOIOMMUMapping *iter_val;
|
||||||
VirtIOIOMMUInterval interval, *iter_key;
|
VirtIOIOMMUInterval interval, *iter_key;
|
||||||
VirtIOIOMMUDomain *domain;
|
VirtIOIOMMUDomain *domain;
|
||||||
|
VirtIOIOMMUEndpoint *ep;
|
||||||
int ret = VIRTIO_IOMMU_S_OK;
|
int ret = VIRTIO_IOMMU_S_OK;
|
||||||
|
|
||||||
trace_virtio_iommu_unmap(domain_id, virt_start, virt_end);
|
trace_virtio_iommu_unmap(domain_id, virt_start, virt_end);
|
||||||
|
@ -373,6 +425,10 @@ static int virtio_iommu_unmap(VirtIOIOMMU *s,
|
||||||
uint64_t current_high = iter_key->high;
|
uint64_t current_high = iter_key->high;
|
||||||
|
|
||||||
if (interval.low <= current_low && interval.high >= current_high) {
|
if (interval.low <= current_low && interval.high >= current_high) {
|
||||||
|
QLIST_FOREACH(ep, &domain->endpoint_list, next) {
|
||||||
|
virtio_iommu_notify_unmap(ep->iommu_mr, current_low,
|
||||||
|
current_high);
|
||||||
|
}
|
||||||
g_tree_remove(domain->mappings, iter_key);
|
g_tree_remove(domain->mappings, iter_key);
|
||||||
trace_virtio_iommu_unmap_done(domain_id, current_low, current_high);
|
trace_virtio_iommu_unmap_done(domain_id, current_low, current_high);
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in New Issue