iommu/vt-d: Misc macro clean up for SVM (034d4731) · Commits · 戴 / test

drivers/iommu/intel-svm.c

+39 −40

Original line number	Diff line number	Diff line
		@@ -222,6 +222,10 @@ static const struct mmu_notifier_ops intel_mmuops = {
		static DEFINE_MUTEX(pasid_mutex);
		static LIST_HEAD(global_svm_list);

		#define for_each_svm_dev(sdev, svm, d) \
		list_for_each_entry((sdev), &(svm)->devs, list) \
		if ((d) != (sdev)->dev) {} else

		int intel_svm_bind_mm(struct device dev, int pasid, int flags, struct svm_dev_ops *ops)
		{
		struct intel_iommu *iommu = intel_svm_device_to_iommu(dev);
		@@ -270,8 +274,8 @@ int intel_svm_bind_mm(struct device dev, int pasid, int flags, struct svm_dev_
		goto out;
		}

		list_for_each_entry(sdev, &svm->devs, list) {
		if (dev == sdev->dev) {
		/* Find the matching device in svm list */
		for_each_svm_dev(sdev, svm, dev) {
		if (sdev->ops != ops) {
		ret = -EBUSY;
		goto out;
		@@ -279,7 +283,6 @@ int intel_svm_bind_mm(struct device dev, int pasid, int flags, struct svm_dev_
		sdev->users++;
		goto success;
		}
		}

		break;
		}
		@@ -423,8 +426,7 @@ int intel_svm_unbind_mm(struct device *dev, int pasid)
		goto out;
		}

		list_for_each_entry(sdev, &svm->devs, list) {
		if (dev == sdev->dev) {
		for_each_svm_dev(sdev, svm, dev) {
		ret = 0;
		sdev->users--;
		if (!sdev->users) {
		@@ -444,9 +446,7 @@ int intel_svm_unbind_mm(struct device *dev, int pasid)
		ioasid_free(svm->pasid);
		if (svm->mm)
		mmu_notifier_unregister(&svm->notifier, svm->mm);

		list_del(&svm->list);

		/* We mandate that no page faults may be outstanding
		* for the PASID when intel_svm_unbind_mm() is called.
		* If that is not obeyed, subtle errors will happen.
		@@ -457,7 +457,6 @@ int intel_svm_unbind_mm(struct device *dev, int pasid)
		}
		break;
		}
		}
		out:
		mutex_unlock(&pasid_mutex);

Admin message