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: Yi Liu <yi.l.liu@intel.com>
Reviewed-by: Kevin Tian <kevin.tian@intel.com>
Link: https://lore.kernel.org/r/20241025143339.2328991-1-yi.l.liu@intel.com
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>

diff --git a/drivers/iommu/intel/iommu.h b/drivers/iommu/intel/iommu.h
index 79692d7a26d18806a25b890846e2fe3e5c9ff90f..4c6135a2e2f8f6457669e88c0562cfa825c636a1 100644 (file)
--- a/drivers/iommu/intel/iommu.h
+++ b/drivers/iommu/intel/iommu.h
@@ -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 */

diff --git a/drivers/iommu/intel/nested.c b/drivers/iommu/intel/nested.c
index 96016bc40f94a6799b292dde0327cce627eb795f..989ca5cc04eb680e18072330a9d646ae73389573 100644 (file)
--- a/drivers/iommu/intel/nested.c
+++ b/drivers/iommu/intel/nested.c
@@ -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;

diff --git a/drivers/iommu/intel/pasid.c b/drivers/iommu/intel/pasid.c
index 7ef157615e0f8f518562e0cf8d514348a2b6806b..7e76062a7ad22497f68e19901fe5a63a11ce286a 100644 (file)
--- a/drivers/iommu/intel/pasid.c
+++ b/drivers/iommu/intel/pasid.c
@@ -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);