Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af395073 authored by Lu Baolu's avatar Lu Baolu Committed by Joerg Roedel
Browse files

iommu/vt-d: Apply global PASID in SVA 



This patch applies the global pasid name space in the shared
virtual address (SVA) implementation.

Cc: Ashok Raj <ashok.raj@intel.com>
Cc: Jacob Pan <jacob.jun.pan@linux.intel.com>
Cc: Kevin Tian <kevin.tian@intel.com>
Cc: Liu Yi L <yi.l.liu@intel.com>
Signed-off-by: default avatarLu Baolu <baolu.lu@linux.intel.com>
Reviewed-by: default avatarKevin Tian <kevin.tian@intel.com>
Reviewed-by: default avatarLiu Yi L <yi.l.liu@intel.com>
Reviewed-by: default avatarPeter Xu <peterx@redhat.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 51261aac

drivers/iommu/intel-svm.c

+11 −11
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ 
#include <linux/interrupt.h>

#include <asm/page.h>



#include "intel-pasid.h"



#define PASID_ENTRY_P		BIT_ULL(0)

#define PASID_ENTRY_FLPM_5LP	BIT_ULL(9)

#define PASID_ENTRY_SRE		BIT_ULL(11)
@@ -85,8 +87,6 @@ int intel_svm_alloc_pasid_tables(struct intel_iommu *iommu) 
				iommu->name);

	}



	idr_init(&iommu->pasid_idr);



	return 0;

}
@@ -102,7 +102,7 @@ int intel_svm_free_pasid_tables(struct intel_iommu *iommu) 
		free_pages((unsigned long)iommu->pasid_state_table, order);

		iommu->pasid_state_table = NULL;

	}

	idr_destroy(&iommu->pasid_idr);



	return 0;

}
@@ -392,7 +392,7 @@ int intel_svm_bind_mm(struct device *dev, int *pasid, int flags, struct svm_dev_ 
			pasid_max = iommu->pasid_max;



		/* Do not use PASID 0 in caching mode (virtualised IOMMU) */

		ret = idr_alloc(&iommu->pasid_idr, svm,

		ret = intel_pasid_alloc_id(svm,

					   !!cap_caching_mode(iommu->cap),

					   pasid_max - 1, GFP_KERNEL);

		if (ret < 0) {
@@ -410,7 +410,7 @@ int intel_svm_bind_mm(struct device *dev, int *pasid, int flags, struct svm_dev_ 
		if (mm) {

			ret = mmu_notifier_register(&svm->notifier, mm);

			if (ret) {

				idr_remove(&svm->iommu->pasid_idr, svm->pasid);

				intel_pasid_free_id(svm->pasid);

				kfree(svm);

				kfree(sdev);

				goto out;
@@ -460,7 +460,7 @@ int intel_svm_unbind_mm(struct device *dev, int pasid) 
	if (!iommu || !iommu->pasid_table)

		goto out;



	svm = idr_find(&iommu->pasid_idr, pasid);

	svm = intel_pasid_lookup_id(pasid);

	if (!svm)

		goto out;
@@ -485,7 +485,7 @@ int intel_svm_unbind_mm(struct device *dev, int pasid) 
					svm->iommu->pasid_table[svm->pasid].val = 0;

					wmb();



					idr_remove(&svm->iommu->pasid_idr, svm->pasid);

					intel_pasid_free_id(svm->pasid);

					if (svm->mm)

						mmu_notifier_unregister(&svm->notifier, svm->mm);
@@ -520,7 +520,7 @@ int intel_svm_is_pasid_valid(struct device *dev, int pasid) 
	if (!iommu || !iommu->pasid_table)

		goto out;



	svm = idr_find(&iommu->pasid_idr, pasid);

	svm = intel_pasid_lookup_id(pasid);

	if (!svm)

		goto out;
@@ -618,7 +618,7 @@ static irqreturn_t prq_event_thread(int irq, void *d) 


		if (!svm || svm->pasid != req->pasid) {

			rcu_read_lock();

			svm = idr_find(&iommu->pasid_idr, req->pasid);

			svm = intel_pasid_lookup_id(req->pasid);

			/* It *can't* go away, because the driver is not permitted

			 * to unbind the mm while any page faults are outstanding.

			 * So we only need RCU to protect the internal idr code. */

include/linux/intel-iommu.h

+0 −1
Original line number Diff line number Diff line
@@ -420,7 +420,6 @@ struct intel_iommu { 
	struct pasid_state_entry *pasid_state_table;

	struct page_req_dsc *prq;

	unsigned char prq_name[16];    /* Name for PRQ interrupt */

	struct idr pasid_idr;

	u32 pasid_max;

#endif

	struct q_inval  *qi;            /* Queued invalidation info */