mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-11-05 20:35:44 +00:00
vfio-pci: Fail initfn on DMA mapping errors
The vfio-pci initfn will currently succeed even if DMA mappings fail. A typical reason for failure is if the user does not have sufficient privilege to lock all the memory for the guest. In this case, the device gets attached, but can only access a portion of guest memory and is extremely unlikely to work. DMA mappings are done via a MemoryListener, which provides no direct error return path. We therefore stuff the errno into our container structure and check for error after registration completes. We can also test for mapping errors during runtime, but our only option for resolution at that point is to kill the guest with a hw_error. Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
This commit is contained in:
parent
d3a2fd9b29
commit
87ca1f77b1
1 changed files with 38 additions and 6 deletions
|
@ -135,12 +135,18 @@ enum {
|
|||
|
||||
struct VFIOGroup;
|
||||
|
||||
typedef struct VFIOType1 {
|
||||
MemoryListener listener;
|
||||
int error;
|
||||
bool initialized;
|
||||
} VFIOType1;
|
||||
|
||||
typedef struct VFIOContainer {
|
||||
int fd; /* /dev/vfio/vfio, empowered by the attached groups */
|
||||
struct {
|
||||
/* enable abstraction to support various iommu backends */
|
||||
union {
|
||||
MemoryListener listener; /* Used by type1 iommu */
|
||||
VFIOType1 type1;
|
||||
};
|
||||
void (*release)(struct VFIOContainer *);
|
||||
} iommu_data;
|
||||
|
@ -2170,7 +2176,7 @@ static void vfio_listener_region_add(MemoryListener *listener,
|
|||
MemoryRegionSection *section)
|
||||
{
|
||||
VFIOContainer *container = container_of(listener, VFIOContainer,
|
||||
iommu_data.listener);
|
||||
iommu_data.type1.listener);
|
||||
hwaddr iova, end;
|
||||
void *vaddr;
|
||||
int ret;
|
||||
|
@ -2212,6 +2218,19 @@ static void vfio_listener_region_add(MemoryListener *listener,
|
|||
error_report("vfio_dma_map(%p, 0x%"HWADDR_PRIx", "
|
||||
"0x%"HWADDR_PRIx", %p) = %d (%m)",
|
||||
container, iova, end - iova, vaddr, ret);
|
||||
|
||||
/*
|
||||
* On the initfn path, store the first error in the container so we
|
||||
* can gracefully fail. Runtime, there's not much we can do other
|
||||
* than throw a hardware error.
|
||||
*/
|
||||
if (!container->iommu_data.type1.initialized) {
|
||||
if (!container->iommu_data.type1.error) {
|
||||
container->iommu_data.type1.error = ret;
|
||||
}
|
||||
} else {
|
||||
hw_error("vfio: DMA mapping failed, unable to continue\n");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -2219,7 +2238,7 @@ static void vfio_listener_region_del(MemoryListener *listener,
|
|||
MemoryRegionSection *section)
|
||||
{
|
||||
VFIOContainer *container = container_of(listener, VFIOContainer,
|
||||
iommu_data.listener);
|
||||
iommu_data.type1.listener);
|
||||
hwaddr iova, end;
|
||||
int ret;
|
||||
|
||||
|
@ -2264,7 +2283,7 @@ static MemoryListener vfio_memory_listener = {
|
|||
|
||||
static void vfio_listener_release(VFIOContainer *container)
|
||||
{
|
||||
memory_listener_unregister(&container->iommu_data.listener);
|
||||
memory_listener_unregister(&container->iommu_data.type1.listener);
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -3236,10 +3255,23 @@ static int vfio_connect_container(VFIOGroup *group)
|
|||
return -errno;
|
||||
}
|
||||
|
||||
container->iommu_data.listener = vfio_memory_listener;
|
||||
container->iommu_data.type1.listener = vfio_memory_listener;
|
||||
container->iommu_data.release = vfio_listener_release;
|
||||
|
||||
memory_listener_register(&container->iommu_data.listener, &address_space_memory);
|
||||
memory_listener_register(&container->iommu_data.type1.listener,
|
||||
&address_space_memory);
|
||||
|
||||
if (container->iommu_data.type1.error) {
|
||||
ret = container->iommu_data.type1.error;
|
||||
vfio_listener_release(container);
|
||||
g_free(container);
|
||||
close(fd);
|
||||
error_report("vfio: memory listener initialization failed for container\n");
|
||||
return ret;
|
||||
}
|
||||
|
||||
container->iommu_data.type1.initialized = true;
|
||||
|
||||
} else {
|
||||
error_report("vfio: No available IOMMU models");
|
||||
g_free(container);
|
||||
|
|
Loading…
Reference in a new issue