Commit ce574c27 authored by Joerg Roedel's avatar Joerg Roedel
Browse files

iommu: Move iommu_group_create_direct_mappings() out of iommu_group_add_device() 



After the previous changes the iommu group may not have a default
domain when iommu_group_add_device() is called. With no default domain
iommu_group_create_direct_mappings() will do nothing and no direct
mappings will be created.

Rename iommu_group_create_direct_mappings() to
iommu_create_device_direct_mappings() to better reflect that the
function creates direct mappings only for one device and not for all
devices in the group. Then move the call to the places where a default
domain actually exists.

Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
Tested-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Acked-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Link: https://lore.kernel.org/r/20200429133712.31431-13-joro@8bytes.org


Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent deac0b3b

drivers/iommu/iommu.c

+30 −5
Original line number Diff line number Diff line
@@ -89,6 +89,8 @@ static int __iommu_attach_group(struct iommu_domain *domain, 
				struct iommu_group *group);

static void __iommu_detach_group(struct iommu_domain *domain,

				 struct iommu_group *group);

static int iommu_create_device_direct_mappings(struct iommu_group *group,

					       struct device *dev);



#define IOMMU_GROUP_ATTR(_name, _mode, _show, _store)		\

struct iommu_group_attribute iommu_group_attr_##_name =		\
@@ -243,6 +245,8 @@ static int __iommu_probe_device_helper(struct device *dev) 
	if (group->default_domain)

		ret = __iommu_attach_device(group->default_domain, dev);



	iommu_create_device_direct_mappings(group, dev);



	iommu_group_put(group);



	if (ret)
@@ -263,6 +267,7 @@ err_out: 
int iommu_probe_device(struct device *dev)

{

	const struct iommu_ops *ops = dev->bus->iommu_ops;

	struct iommu_group *group;

	int ret;



	WARN_ON(dev->iommu_group);
@@ -285,6 +290,10 @@ int iommu_probe_device(struct device *dev) 
	if (ret)

		goto err_module_put;



	group = iommu_group_get(dev);

	iommu_create_device_direct_mappings(group, dev);

	iommu_group_put(group);



	if (ops->probe_finalize)

		ops->probe_finalize(dev);
@@ -736,7 +745,7 @@ int iommu_group_set_name(struct iommu_group *group, const char *name) 
}

EXPORT_SYMBOL_GPL(iommu_group_set_name);



static int iommu_group_create_direct_mappings(struct iommu_group *group,

static int iommu_create_device_direct_mappings(struct iommu_group *group,

					       struct device *dev)

{

	struct iommu_domain *domain = group->default_domain;
@@ -841,8 +850,6 @@ rename: 


	dev->iommu_group = group;



	iommu_group_create_direct_mappings(group, dev);



	mutex_lock(&group->mutex);

	list_add_tail(&device->list, &group->devices);

	if (group->domain)
@@ -1736,6 +1743,7 @@ static void probe_alloc_default_domain(struct bus_type *bus, 
		gtype.type = iommu_def_domain_type;



	iommu_group_alloc_default_domain(bus, group, gtype.type);



}



static int iommu_group_do_dma_attach(struct device *dev, void *data)
@@ -1760,6 +1768,21 @@ static int __iommu_group_dma_attach(struct iommu_group *group) 
					  iommu_group_do_dma_attach);

}



static int iommu_do_create_direct_mappings(struct device *dev, void *data)

{

	struct iommu_group *group = data;



	iommu_create_device_direct_mappings(group, dev);



	return 0;

}



static int iommu_group_create_direct_mappings(struct iommu_group *group)

{

	return __iommu_group_for_each_dev(group, group,

					  iommu_do_create_direct_mappings);

}



static int bus_iommu_probe(struct bus_type *bus)

{

	const struct iommu_ops *ops = bus->iommu_ops;
@@ -1792,6 +1815,8 @@ static int bus_iommu_probe(struct bus_type *bus) 
				continue;

			}



			iommu_group_create_direct_mappings(group);



			ret = __iommu_group_dma_attach(group);



			mutex_unlock(&group->mutex);
@@ -2632,7 +2657,7 @@ request_default_domain_for_dev(struct device *dev, unsigned long type) 
		iommu_domain_free(group->default_domain);

	group->default_domain = domain;



	iommu_group_create_direct_mappings(group, dev);

	iommu_create_device_direct_mappings(group, dev);



	dev_info(dev, "Using iommu %s mapping\n",

		 type == IOMMU_DOMAIN_DMA ? "dma" : "direct");

CRA Git | Maintained and supported by SUSTech CRA and CCSE