Commit 64e6fc27 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-iommufd' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd 

Pull more iommufd updates from Jason Gunthorpe:
 "Change the driver callback op domain_alloc_user() into two ops:
  domain_alloc_paging_flags() and domain_alloc_nesting() that better
  describe what the ops are expected to do.

  There will be per-driver cleanup based on this going into the next
  cycle via the driver trees"

* tag 'for-linus-iommufd' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd:
  iommu: Rename ops->domain_alloc_user() to domain_alloc_paging_flags()
  iommu: Add ops->domain_alloc_nested()
parents 9ad55a67 d5376472

drivers/iommu/amd/iommu.c

+4 −5
Original line number Diff line number Diff line
@@ -2407,8 +2407,7 @@ static struct iommu_domain *amd_iommu_domain_alloc(unsigned int type) 
}



static struct iommu_domain *

amd_iommu_domain_alloc_user(struct device *dev, u32 flags,

			    struct iommu_domain *parent,

amd_iommu_domain_alloc_paging_flags(struct device *dev, u32 flags,

				    const struct iommu_user_data *user_data)



{
@@ -2420,7 +2419,7 @@ amd_iommu_domain_alloc_user(struct device *dev, u32 flags, 
	if (dev)

		iommu = get_amd_iommu_from_dev(dev);



	if ((flags & ~supported_flags) || parent || user_data)

	if ((flags & ~supported_flags) || user_data)

		return ERR_PTR(-EOPNOTSUPP);



	/* Allocate domain with v2 page table if IOMMU supports PASID. */
@@ -2884,7 +2883,7 @@ const struct iommu_ops amd_iommu_ops = { 
	.release_domain = &release_domain,

	.identity_domain = &identity_domain.domain,

	.domain_alloc = amd_iommu_domain_alloc,

	.domain_alloc_user = amd_iommu_domain_alloc_user,

	.domain_alloc_paging_flags = amd_iommu_domain_alloc_paging_flags,

	.domain_alloc_sva = amd_iommu_domain_alloc_sva,

	.probe_device = amd_iommu_probe_device,

	.release_device = amd_iommu_release_device,

drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c

+4 −5
Original line number Diff line number Diff line
@@ -3132,8 +3132,7 @@ static struct iommu_domain arm_smmu_blocked_domain = { 
};



static struct iommu_domain *

arm_smmu_domain_alloc_user(struct device *dev, u32 flags,

			   struct iommu_domain *parent,

arm_smmu_domain_alloc_paging_flags(struct device *dev, u32 flags,

				   const struct iommu_user_data *user_data)

{

	struct arm_smmu_master *master = dev_iommu_priv_get(dev);
@@ -3145,7 +3144,7 @@ arm_smmu_domain_alloc_user(struct device *dev, u32 flags, 


	if (flags & ~PAGING_FLAGS)

		return ERR_PTR(-EOPNOTSUPP);

	if (parent || user_data)

	if (user_data)

		return ERR_PTR(-EOPNOTSUPP);



	if (flags & IOMMU_HWPT_ALLOC_PASID)
@@ -3546,7 +3545,7 @@ static struct iommu_ops arm_smmu_ops = { 
	.hw_info		= arm_smmu_hw_info,

	.domain_alloc_paging    = arm_smmu_domain_alloc_paging,

	.domain_alloc_sva       = arm_smmu_sva_domain_alloc,

	.domain_alloc_user	= arm_smmu_domain_alloc_user,

	.domain_alloc_paging_flags = arm_smmu_domain_alloc_paging_flags,

	.probe_device		= arm_smmu_probe_device,

	.release_device		= arm_smmu_release_device,

	.device_group		= arm_smmu_device_group,

drivers/iommu/intel/iommu.c

+4 −11
Original line number Diff line number Diff line
@@ -3328,8 +3328,7 @@ static struct dmar_domain *paging_domain_alloc(struct device *dev, bool first_st 
}



static struct iommu_domain *

intel_iommu_domain_alloc_user(struct device *dev, u32 flags,

			      struct iommu_domain *parent,

intel_iommu_domain_alloc_paging_flags(struct device *dev, u32 flags,

				      const struct iommu_user_data *user_data)

{

	struct device_domain_info *info = dev_iommu_priv_get(dev);
@@ -3340,13 +3339,6 @@ intel_iommu_domain_alloc_user(struct device *dev, u32 flags, 
	struct iommu_domain *domain;

	bool first_stage;



	/* Must be NESTING domain */

	if (parent) {

		if (!nested_supported(iommu) || flags)

			return ERR_PTR(-EOPNOTSUPP);

		return intel_nested_domain_alloc(parent, user_data);

	}



	if (flags &

	    (~(IOMMU_HWPT_ALLOC_NEST_PARENT | IOMMU_HWPT_ALLOC_DIRTY_TRACKING

	       | IOMMU_HWPT_FAULT_ID_VALID)))
@@ -4472,9 +4464,10 @@ const struct iommu_ops intel_iommu_ops = { 
	.identity_domain	= &identity_domain,

	.capable		= intel_iommu_capable,

	.hw_info		= intel_iommu_hw_info,

	.domain_alloc_user	= intel_iommu_domain_alloc_user,

	.domain_alloc_paging_flags = intel_iommu_domain_alloc_paging_flags,

	.domain_alloc_sva	= intel_svm_domain_alloc,

	.domain_alloc_paging	= intel_iommu_domain_alloc_paging,

	.domain_alloc_nested	= intel_iommu_domain_alloc_nested,

	.probe_device		= intel_iommu_probe_device,

	.release_device		= intel_iommu_release_device,

	.get_resv_regions	= intel_iommu_get_resv_regions,

drivers/iommu/intel/iommu.h

+4 −2
Original line number Diff line number Diff line
@@ -1265,7 +1265,9 @@ int __domain_setup_first_level(struct intel_iommu *iommu, 
int dmar_ir_support(void);



void iommu_flush_write_buffer(struct intel_iommu *iommu);

struct iommu_domain *intel_nested_domain_alloc(struct iommu_domain *parent,

struct iommu_domain *

intel_iommu_domain_alloc_nested(struct device *dev, struct iommu_domain *parent,

				u32 flags,

				const struct iommu_user_data *user_data);

struct device *device_rbtree_find(struct intel_iommu *iommu, u16 rid);

drivers/iommu/intel/nested.c

+9 −2
Original line number Diff line number Diff line
@@ -186,14 +186,21 @@ static const struct iommu_domain_ops intel_nested_domain_ops = { 
	.cache_invalidate_user	= intel_nested_cache_invalidate_user,

};



struct iommu_domain *intel_nested_domain_alloc(struct iommu_domain *parent,

struct iommu_domain *

intel_iommu_domain_alloc_nested(struct device *dev, struct iommu_domain *parent,

				u32 flags,

				const struct iommu_user_data *user_data)

{

	struct device_domain_info *info = dev_iommu_priv_get(dev);

	struct dmar_domain *s2_domain = to_dmar_domain(parent);

	struct intel_iommu *iommu = info->iommu;

	struct iommu_hwpt_vtd_s1 vtd;

	struct dmar_domain *domain;

	int ret;



	if (!nested_supported(iommu) || flags)

		return ERR_PTR(-EOPNOTSUPP);



	/* Must be nested domain */

	if (user_data->type != IOMMU_HWPT_DATA_VTD_S1)

		return ERR_PTR(-EOPNOTSUPP);