Commit 4f178e07 authored by Yi Liu's avatar Yi Liu Committed by Joerg Roedel
Browse files

iommu/vt-d: Drop s1_pgtbl from dmar_domain 



dmar_domian has stored the s1_cfg which includes the s1_pgtbl info, so
no need to store s1_pgtbl, hence drop it.

Signed-off-by: default avatarYi Liu <yi.l.liu@intel.com>
Reviewed-by: default avatarKevin Tian <kevin.tian@intel.com>
Link: https://lore.kernel.org/r/20241025143339.2328991-1-yi.l.liu@intel.com


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

drivers/iommu/intel/iommu.h

+0 −2
Original line number Diff line number Diff line
@@ -653,8 +653,6 @@ struct dmar_domain { 
		struct {

			/* parent page table which the user domain is nested on */

			struct dmar_domain *s2_domain;

			/* user page table pointer (in GPA) */

			unsigned long s1_pgtbl;

			/* page table attributes */

			struct iommu_hwpt_vtd_s1 s1_cfg;

			/* link to parent domain siblings */

drivers/iommu/intel/nested.c

+0 −1
Original line number Diff line number Diff line
@@ -162,7 +162,6 @@ struct iommu_domain *intel_nested_domain_alloc(struct iommu_domain *parent, 


	domain->use_first_level = true;

	domain->s2_domain = s2_domain;

	domain->s1_pgtbl = vtd.pgtbl_addr;

	domain->s1_cfg = vtd;

	domain->domain.ops = &intel_nested_domain_ops;

	domain->domain.type = IOMMU_DOMAIN_NESTED;

drivers/iommu/intel/pasid.c

+1 −2
Original line number Diff line number Diff line
@@ -560,7 +560,6 @@ int intel_pasid_setup_nested(struct intel_iommu *iommu, struct device *dev, 
			     u32 pasid, struct dmar_domain *domain)

{

	struct iommu_hwpt_vtd_s1 *s1_cfg = &domain->s1_cfg;

	pgd_t *s1_gpgd = (pgd_t *)(uintptr_t)domain->s1_pgtbl;

	struct dmar_domain *s2_domain = domain->s2_domain;

	u16 did = domain_id_iommu(domain, iommu);

	struct dma_pte *pgd = s2_domain->pgd;
@@ -611,7 +610,7 @@ int intel_pasid_setup_nested(struct intel_iommu *iommu, struct device *dev, 
	if (s1_cfg->addr_width == ADDR_WIDTH_5LEVEL)

		pasid_set_flpm(pte, 1);



	pasid_set_flptr(pte, (uintptr_t)s1_gpgd);

	pasid_set_flptr(pte, s1_cfg->pgtbl_addr);



	if (s1_cfg->flags & IOMMU_VTD_S1_SRE) {

		pasid_set_sre(pte);