From: Joerg Roedel <joro@8bytes.org> To: Joerg Roedel <joro@8bytes.org> Cc: linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org, Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>, jroedel@suse.de Subject: [PATCH 03/10] iommu/amd: Let free_pagetable() not rely on domain->pt_root Date: Wed, 27 May 2020 13:53:06 +0200 [thread overview] Message-ID: <20200527115313.7426-4-joro@8bytes.org> (raw) In-Reply-To: <20200527115313.7426-1-joro@8bytes.org> From: Joerg Roedel <jroedel@suse.de> Use 'struct domain_pgtable' instead to free_pagetable(). This solves the problem that amd_iommu_domain_direct_map() needs to restore domain->pt_root after the device table has been updated just to make free_pagetable release the domain page-table. Signed-off-by: Joerg Roedel <jroedel@suse.de> --- drivers/iommu/amd/iommu.c | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c index 8368f6b9c17f..c7e47a7f0d45 100644 --- a/drivers/iommu/amd/iommu.c +++ b/drivers/iommu/amd/iommu.c @@ -1391,20 +1391,19 @@ static struct page *free_sub_pt(unsigned long root, int mode, return freelist; } -static void free_pagetable(struct protection_domain *domain) +static void free_pagetable(struct domain_pgtable *pgtable) { - struct domain_pgtable pgtable; struct page *freelist = NULL; unsigned long root; - amd_iommu_domain_get_pgtable(domain, &pgtable); - atomic64_set(&domain->pt_root, 0); + if (pgtable->mode == PAGE_MODE_NONE) + return; - BUG_ON(pgtable.mode < PAGE_MODE_NONE || - pgtable.mode > PAGE_MODE_6_LEVEL); + BUG_ON(pgtable->mode < PAGE_MODE_NONE || + pgtable->mode > PAGE_MODE_6_LEVEL); - root = (unsigned long)pgtable.root; - freelist = free_sub_pt(root, pgtable.mode, freelist); + root = (unsigned long)pgtable->root; + freelist = free_sub_pt(root, pgtable->mode, freelist); free_page_list(freelist); } @@ -1823,12 +1822,16 @@ static void free_gcr3_table(struct protection_domain *domain) */ static void dma_ops_domain_free(struct protection_domain *domain) { + struct domain_pgtable pgtable; + if (!domain) return; iommu_put_dma_cookie(&domain->domain); - free_pagetable(domain); + amd_iommu_domain_get_pgtable(domain, &pgtable); + atomic64_set(&domain->pt_root, 0); + free_pagetable(&pgtable); if (domain->id) domain_id_free(domain->id); @@ -2496,9 +2499,8 @@ static void amd_iommu_domain_free(struct iommu_domain *dom) break; default: amd_iommu_domain_get_pgtable(domain, &pgtable); - - if (pgtable.mode != PAGE_MODE_NONE) - free_pagetable(domain); + atomic64_set(&domain->pt_root, 0); + free_pagetable(&pgtable); if (domain->flags & PD_IOMMUV2_MASK) free_gcr3_table(domain); @@ -2796,7 +2798,6 @@ void amd_iommu_domain_direct_map(struct iommu_domain *dom) struct protection_domain *domain = to_pdomain(dom); struct domain_pgtable pgtable; unsigned long flags; - u64 pt_root; spin_lock_irqsave(&domain->lock, flags); @@ -2804,18 +2805,13 @@ void amd_iommu_domain_direct_map(struct iommu_domain *dom) amd_iommu_domain_get_pgtable(domain, &pgtable); /* Update data structure */ - pt_root = amd_iommu_domain_encode_pgtable(NULL, PAGE_MODE_NONE); - atomic64_set(&domain->pt_root, pt_root); + atomic64_set(&domain->pt_root, 0); /* Make changes visible to IOMMUs */ update_domain(domain); - /* Restore old pgtable in domain->ptroot to free page-table */ - pt_root = amd_iommu_domain_encode_pgtable(pgtable.root, pgtable.mode); - atomic64_set(&domain->pt_root, pt_root); - /* Page-table is not visible to IOMMU anymore, so free it */ - free_pagetable(domain); + free_pagetable(&pgtable); spin_unlock_irqrestore(&domain->lock, flags); } -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: Joerg Roedel <joro@8bytes.org> To: Joerg Roedel <joro@8bytes.org> Cc: iommu@lists.linux-foundation.org, jroedel@suse.de, linux-kernel@vger.kernel.org Subject: [PATCH 03/10] iommu/amd: Let free_pagetable() not rely on domain->pt_root Date: Wed, 27 May 2020 13:53:06 +0200 [thread overview] Message-ID: <20200527115313.7426-4-joro@8bytes.org> (raw) In-Reply-To: <20200527115313.7426-1-joro@8bytes.org> From: Joerg Roedel <jroedel@suse.de> Use 'struct domain_pgtable' instead to free_pagetable(). This solves the problem that amd_iommu_domain_direct_map() needs to restore domain->pt_root after the device table has been updated just to make free_pagetable release the domain page-table. Signed-off-by: Joerg Roedel <jroedel@suse.de> --- drivers/iommu/amd/iommu.c | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c index 8368f6b9c17f..c7e47a7f0d45 100644 --- a/drivers/iommu/amd/iommu.c +++ b/drivers/iommu/amd/iommu.c @@ -1391,20 +1391,19 @@ static struct page *free_sub_pt(unsigned long root, int mode, return freelist; } -static void free_pagetable(struct protection_domain *domain) +static void free_pagetable(struct domain_pgtable *pgtable) { - struct domain_pgtable pgtable; struct page *freelist = NULL; unsigned long root; - amd_iommu_domain_get_pgtable(domain, &pgtable); - atomic64_set(&domain->pt_root, 0); + if (pgtable->mode == PAGE_MODE_NONE) + return; - BUG_ON(pgtable.mode < PAGE_MODE_NONE || - pgtable.mode > PAGE_MODE_6_LEVEL); + BUG_ON(pgtable->mode < PAGE_MODE_NONE || + pgtable->mode > PAGE_MODE_6_LEVEL); - root = (unsigned long)pgtable.root; - freelist = free_sub_pt(root, pgtable.mode, freelist); + root = (unsigned long)pgtable->root; + freelist = free_sub_pt(root, pgtable->mode, freelist); free_page_list(freelist); } @@ -1823,12 +1822,16 @@ static void free_gcr3_table(struct protection_domain *domain) */ static void dma_ops_domain_free(struct protection_domain *domain) { + struct domain_pgtable pgtable; + if (!domain) return; iommu_put_dma_cookie(&domain->domain); - free_pagetable(domain); + amd_iommu_domain_get_pgtable(domain, &pgtable); + atomic64_set(&domain->pt_root, 0); + free_pagetable(&pgtable); if (domain->id) domain_id_free(domain->id); @@ -2496,9 +2499,8 @@ static void amd_iommu_domain_free(struct iommu_domain *dom) break; default: amd_iommu_domain_get_pgtable(domain, &pgtable); - - if (pgtable.mode != PAGE_MODE_NONE) - free_pagetable(domain); + atomic64_set(&domain->pt_root, 0); + free_pagetable(&pgtable); if (domain->flags & PD_IOMMUV2_MASK) free_gcr3_table(domain); @@ -2796,7 +2798,6 @@ void amd_iommu_domain_direct_map(struct iommu_domain *dom) struct protection_domain *domain = to_pdomain(dom); struct domain_pgtable pgtable; unsigned long flags; - u64 pt_root; spin_lock_irqsave(&domain->lock, flags); @@ -2804,18 +2805,13 @@ void amd_iommu_domain_direct_map(struct iommu_domain *dom) amd_iommu_domain_get_pgtable(domain, &pgtable); /* Update data structure */ - pt_root = amd_iommu_domain_encode_pgtable(NULL, PAGE_MODE_NONE); - atomic64_set(&domain->pt_root, pt_root); + atomic64_set(&domain->pt_root, 0); /* Make changes visible to IOMMUs */ update_domain(domain); - /* Restore old pgtable in domain->ptroot to free page-table */ - pt_root = amd_iommu_domain_encode_pgtable(pgtable.root, pgtable.mode); - atomic64_set(&domain->pt_root, pt_root); - /* Page-table is not visible to IOMMU anymore, so free it */ - free_pagetable(domain); + free_pagetable(&pgtable); spin_unlock_irqrestore(&domain->lock, flags); } -- 2.17.1 _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu
next prev parent reply other threads:[~2020-05-27 11:54 UTC|newest] Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-05-27 11:53 [PATCH 00/10] iommu/amd: Updates and Cleanups Joerg Roedel 2020-05-27 11:53 ` Joerg Roedel 2020-05-27 11:53 ` [PATCH 01/10] iommu/amd: Move AMD IOMMU driver to a subdirectory Joerg Roedel 2020-05-27 11:53 ` Joerg Roedel 2020-05-29 15:38 ` Joerg Roedel 2020-05-29 15:38 ` Joerg Roedel 2020-05-27 11:53 ` [PATCH 02/10] iommu/amd: Unexport get_dev_data() Joerg Roedel 2020-05-27 11:53 ` Joerg Roedel 2020-05-28 6:13 ` Christoph Hellwig 2020-05-28 6:13 ` Christoph Hellwig 2020-05-28 6:42 ` Joerg Roedel 2020-05-28 6:42 ` Joerg Roedel 2020-05-27 11:53 ` Joerg Roedel [this message] 2020-05-27 11:53 ` [PATCH 03/10] iommu/amd: Let free_pagetable() not rely on domain->pt_root Joerg Roedel 2020-05-27 11:53 ` [PATCH 04/10] iommu/amd: Allocate page-table in protection_domain_init() Joerg Roedel 2020-05-27 11:53 ` Joerg Roedel 2020-05-27 11:53 ` [PATCH 05/10] iommu/amd: Free page-table in protection_domain_free() Joerg Roedel 2020-05-27 11:53 ` Joerg Roedel 2020-05-27 11:53 ` [PATCH 06/10] iommu/amd: Consolidate domain allocation/freeing Joerg Roedel 2020-05-27 11:53 ` Joerg Roedel 2020-05-27 11:53 ` [PATCH 07/10] iommu/amd: Remove PD_DMA_OPS_MASK Joerg Roedel 2020-05-27 11:53 ` Joerg Roedel 2020-05-27 11:53 ` [PATCH 08/10] iommu/amd: Merge private header files Joerg Roedel 2020-05-27 11:53 ` Joerg Roedel 2020-05-27 11:53 ` [PATCH 09/10] iommu/amd: Store dev_data as device iommu private data Joerg Roedel 2020-05-27 11:53 ` Joerg Roedel 2020-05-27 11:53 ` [PATCH 10/10] iommu/amd: Remove redundant devid checks Joerg Roedel 2020-05-27 11:53 ` Joerg Roedel 2020-05-29 12:15 ` [PATCH 00/10] iommu/amd: Updates and Cleanups Suravee Suthikulpanit 2020-05-29 12:15 ` Suravee Suthikulpanit 2020-05-29 13:08 ` Joerg Roedel 2020-05-29 13:08 ` Joerg Roedel
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200527115313.7426-4-joro@8bytes.org \ --to=joro@8bytes.org \ --cc=iommu@lists.linux-foundation.org \ --cc=jroedel@suse.de \ --cc=linux-kernel@vger.kernel.org \ --cc=suravee.suthikulpanit@amd.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.