Commit 423d39d8 authored by Liu Yi L's avatar Liu Yi L Committed by Joerg Roedel
Browse files

iommu/vt-d: Add present bit check in pasid entry setup helpers 



The helper functions should not modify the pasid entries which are still
in use. Add a check against present bit.

Signed-off-by: default avatarLiu Yi L <yi.l.liu@intel.com>
Link: https://lore.kernel.org/r/20210817042425.1784279-1-yi.l.liu@intel.com


Signed-off-by: default avatarLu Baolu <baolu.lu@linux.intel.com>
Link: https://lore.kernel.org/r/20210818134852.1847070-10-baolu.lu@linux.intel.com


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

drivers/iommu/intel/pasid.c

+16 −0
Original line number Diff line number Diff line
@@ -534,6 +534,10 @@ void intel_pasid_tear_down_entry(struct intel_iommu *iommu, struct device *dev, 
		devtlb_invalidation_with_pasid(iommu, dev, pasid);

}



/*

 * This function flushes cache for a newly setup pasid table entry.

 * Caller of it should not modify the in-use pasid table entries.

 */

static void pasid_flush_caches(struct intel_iommu *iommu,

				struct pasid_entry *pte,

			       u32 pasid, u16 did)
@@ -585,6 +589,10 @@ int intel_pasid_setup_first_level(struct intel_iommu *iommu, 
	if (WARN_ON(!pte))

		return -EINVAL;



	/* Caller must ensure PASID entry is not in use. */

	if (pasid_pte_is_present(pte))

		return -EBUSY;



	pasid_clear_entry(pte);



	/* Setup the first level page table pointer: */
@@ -684,6 +692,10 @@ int intel_pasid_setup_second_level(struct intel_iommu *iommu, 
		return -ENODEV;

	}



	/* Caller must ensure PASID entry is not in use. */

	if (pasid_pte_is_present(pte))

		return -EBUSY;



	pasid_clear_entry(pte);

	pasid_set_domain_id(pte, did);

	pasid_set_slptr(pte, pgd_val);
@@ -723,6 +735,10 @@ int intel_pasid_setup_pass_through(struct intel_iommu *iommu, 
		return -ENODEV;

	}



	/* Caller must ensure PASID entry is not in use. */

	if (pasid_pte_is_present(pte))

		return -EBUSY;



	pasid_clear_entry(pte);

	pasid_set_domain_id(pte, did);

	pasid_set_address_width(pte, iommu->agaw);