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

iommu/vt-d: Add PASID_FLAG_FL5LP for first-level pasid setup 



Current intel_pasid_setup_first_level() use 5-level paging for
first level translation if CPUs use 5-level paging mode too.
This makes sense for SVA usages since the page table is shared
between CPUs and IOMMUs. But it makes no sense if we only want
to use first level for IOVA translation. Add PASID_FLAG_FL5LP
bit in the flags which indicates whether the 5-level paging
mode should be used.

Signed-off-by: default avatarLu Baolu <baolu.lu@linux.intel.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 2cd1311a

drivers/iommu/intel-pasid.c

+2 −5
Original line number Diff line number Diff line
@@ -477,18 +477,15 @@ int intel_pasid_setup_first_level(struct intel_iommu *iommu, 
		pasid_set_sre(pte);

	}



#ifdef CONFIG_X86

	/* Both CPU and IOMMU paging mode need to match */

	if (cpu_feature_enabled(X86_FEATURE_LA57)) {

	if (flags & PASID_FLAG_FL5LP) {

		if (cap_5lp_support(iommu->cap)) {

			pasid_set_flpm(pte, 1);

		} else {

			pr_err("VT-d has no 5-level paging support for CPU\n");

			pr_err("No 5-level paging support for first-level\n");

			pasid_clear_entry(pte);

			return -EINVAL;

		}

	}

#endif /* CONFIG_X86 */



	pasid_set_domain_id(pte, did);

	pasid_set_address_width(pte, iommu->agaw);

drivers/iommu/intel-pasid.h

+6 −0
Original line number Diff line number Diff line
@@ -37,6 +37,12 @@ 
 */

#define PASID_FLAG_SUPERVISOR_MODE	BIT(0)



/*

 * The PASID_FLAG_FL5LP flag Indicates using 5-level paging for first-

 * level translation, otherwise, 4-level paging will be used.

 */

#define PASID_FLAG_FL5LP		BIT(1)



struct pasid_dir_entry {

	u64 val;

};

drivers/iommu/intel-svm.c

+6 −2
Original line number Diff line number Diff line
@@ -364,7 +364,9 @@ int intel_svm_bind_mm(struct device *dev, int *pasid, int flags, struct svm_dev_ 
		ret = intel_pasid_setup_first_level(iommu, dev,

				mm ? mm->pgd : init_mm.pgd,

				svm->pasid, FLPT_DEFAULT_DID,

				mm ? 0 : PASID_FLAG_SUPERVISOR_MODE);

				(mm ? 0 : PASID_FLAG_SUPERVISOR_MODE) |

				(cpu_feature_enabled(X86_FEATURE_LA57) ?

				 PASID_FLAG_FL5LP : 0));

		spin_unlock(&iommu->lock);

		if (ret) {

			if (mm)
@@ -385,7 +387,9 @@ int intel_svm_bind_mm(struct device *dev, int *pasid, int flags, struct svm_dev_ 
		ret = intel_pasid_setup_first_level(iommu, dev,

						mm ? mm->pgd : init_mm.pgd,

						svm->pasid, FLPT_DEFAULT_DID,

						mm ? 0 : PASID_FLAG_SUPERVISOR_MODE);

						(mm ? 0 : PASID_FLAG_SUPERVISOR_MODE) |

						(cpu_feature_enabled(X86_FEATURE_LA57) ?

						PASID_FLAG_FL5LP : 0));

		spin_unlock(&iommu->lock);

		if (ret) {

			kfree(sdev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE