Commit a3906855 authored Feb 11, 2019 by Alexey Kardashevskiy Committed by Alex Williamson Feb 13, 2019

vfio/spapr_tce: Skip unsetting already unset table



VFIO TCE IOMMU v2 owns IOMMU tables. When we detach an IOMMU group from
a container, we need to unset these tables from the group which we do by
calling unset_window(). We also unset tables when removing a DMA window
via the VFIO_IOMMU_SPAPR_TCE_REMOVE ioctl.

The window removal checks if the table actually exists (hidden inside
tce_iommu_find_table()) but the group detaching does not so the user
may see duplicating messages:
pci 0009:03     : [PE# fd] Removing DMA window #0
pci 0009:03     : [PE# fd] Removing DMA window #1
pci 0009:03     : [PE# fd] Removing DMA window #0
pci 0009:03     : [PE# fd] Removing DMA window #1

At the moment this is not a problem as the second invocation
of unset_window() writes zeroes to the HW registers again and exits early
as there is no table.

Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>

parent 3e4835f7

drivers/vfio/vfio_iommu_spapr_tce.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1235,6 +1235,7 @@ static void tce_iommu_release_ownership_ddw(struct tce_container *container,
		}

		for (i = 0; i < IOMMU_TABLE_GROUP_MAX_TABLES; ++i)
		if (container->tables[i])
		table_group->ops->unset_window(table_group, i);

		table_group->ops->release_ownership(table_group);