From: Lu Baolu <baolu.lu@linux.intel.com>
To: Robin Murphy <robin.murphy@arm.com>, joro@8bytes.org, will@kernel.org
Cc: linux-kernel@vger.kernel.org, dianders@chromium.org,
iommu@lists.linux-foundation.org,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH 17/23] iommu/vt-d: Prepare for multiple DMA domain types
Date: Sat, 24 Jul 2021 13:23:33 +0800 [thread overview]
Message-ID: <7599b48f-169d-283f-782b-e54c667346e8@linux.intel.com> (raw)
In-Reply-To: <11efdfa4ee223d12769d17459fcf789c626d7b82.1626888445.git.robin.murphy@arm.com>
Hi Robin,
On 2021/7/22 2:20, Robin Murphy wrote:
> In preparation for the strict vs. non-strict decision for DMA domains to
> be expressed in the domain type, make sure we expose our flush queue
> awareness by accepting the new domain type, and test the specific
> feature flag where we want to identify DMA domains in general. The DMA
> ops setup can simply be made unconditional, since iommu-dma already
> knows not to touch identity domains.
>
> Signed-off-by: Robin Murphy <robin.murphy@arm.com>
> ---
> drivers/iommu/intel/iommu.c | 15 ++++++---------
> 1 file changed, 6 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
> index e2add5a0caef..77d322272743 100644
> --- a/drivers/iommu/intel/iommu.c
> +++ b/drivers/iommu/intel/iommu.c
> @@ -601,7 +601,7 @@ struct intel_iommu *domain_get_iommu(struct dmar_domain *domain)
> int iommu_id;
>
> /* si_domain and vm domain should not get here. */
> - if (WARN_ON(domain->domain.type != IOMMU_DOMAIN_DMA))
> + if (WARN_ON(!(domain->domain.type & __IOMMU_DOMAIN_DMA)))
> return NULL;
>
> for_each_domain_iommu(iommu_id, domain)
> @@ -1035,7 +1035,7 @@ static struct dma_pte *pfn_to_dma_pte(struct dmar_domain *domain,
> pteval = ((uint64_t)virt_to_dma_pfn(tmp_page) << VTD_PAGE_SHIFT) | DMA_PTE_READ | DMA_PTE_WRITE;
> if (domain_use_first_level(domain)) {
> pteval |= DMA_FL_PTE_XD | DMA_FL_PTE_US;
> - if (domain->domain.type == IOMMU_DOMAIN_DMA)
> + if (domain->domain.type & __IOMMU_DOMAIN_DMA_API)
> pteval |= DMA_FL_PTE_ACCESS;
> }
> if (cmpxchg64(&pte->val, 0ULL, pteval))
> @@ -2346,7 +2346,7 @@ __domain_mapping(struct dmar_domain *domain, unsigned long iov_pfn,
> if (domain_use_first_level(domain)) {
> attr |= DMA_FL_PTE_XD | DMA_FL_PTE_US;
>
> - if (domain->domain.type == IOMMU_DOMAIN_DMA) {
> + if (domain->domain.type & __IOMMU_DOMAIN_DMA_API) {
> attr |= DMA_FL_PTE_ACCESS;
> if (prot & DMA_PTE_WRITE)
> attr |= DMA_FL_PTE_DIRTY;
> @@ -4528,6 +4528,7 @@ static struct iommu_domain *intel_iommu_domain_alloc(unsigned type)
>
> switch (type) {
> case IOMMU_DOMAIN_DMA:
> + case IOMMU_DOMAIN_DMA_FQ:
> case IOMMU_DOMAIN_UNMANAGED:
> dmar_domain = alloc_domain(0);
> if (!dmar_domain) {
> @@ -5164,12 +5165,8 @@ static void intel_iommu_release_device(struct device *dev)
>
> static void intel_iommu_probe_finalize(struct device *dev)
> {
> - struct iommu_domain *domain = iommu_get_domain_for_dev(dev);
> -
> - if (domain && domain->type == IOMMU_DOMAIN_DMA)
> - iommu_setup_dma_ops(dev, 0, U64_MAX);
> - else
> - set_dma_ops(dev, NULL);
> + set_dma_ops(dev, NULL);
Is it reasonable to remove above line? The idea is that vendor iommu
driver should not override the dma_ops if device doesn't have a DMA
domain.
> + iommu_setup_dma_ops(dev, 0, U64_MAX);
> }
>
> static void intel_iommu_get_resv_regions(struct device *device,
>
Best regards,
baolu
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
next prev parent reply other threads:[~2021-07-24 5:23 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-21 18:20 [PATCH 00/23] iommu: Refactor DMA domain strictness Robin Murphy
2021-07-21 18:20 ` [PATCH 01/23] iommu: Pull IOVA cookie management into the core Robin Murphy
2021-07-21 18:20 ` [PATCH 02/23] iommu/amd: Drop IOVA cookie management Robin Murphy
2021-07-21 18:20 ` [PATCH 03/23] iommu/arm-smmu: " Robin Murphy
2021-07-21 18:20 ` [PATCH 04/23] iommu/vt-d: " Robin Murphy
2021-07-21 18:20 ` [PATCH 05/23] iommu/exynos: " Robin Murphy
2021-07-21 18:20 ` [PATCH 06/23] iommu/ipmmu-vmsa: " Robin Murphy
2021-07-21 18:20 ` [PATCH 07/23] iommu/mtk: " Robin Murphy
2021-07-21 18:20 ` [PATCH 08/23] iommu/rockchip: " Robin Murphy
2021-07-21 18:20 ` [PATCH 09/23] iommu/sprd: " Robin Murphy
2021-07-21 18:20 ` [PATCH 10/23] iommu/sun50i: " Robin Murphy
2021-07-21 18:20 ` [PATCH 11/23] iommu/virtio: " Robin Murphy
2021-07-21 18:20 ` [PATCH 12/23] iommu/dma: Unexport " Robin Murphy
2021-07-21 18:20 ` [PATCH 13/23] iommu/dma: Remove redundant "!dev" checks Robin Murphy
2021-07-26 8:28 ` John Garry
2021-07-21 18:20 ` [PATCH 14/23] iommu: Introduce explicit type for non-strict DMA domains Robin Murphy
2021-07-21 18:20 ` [PATCH 15/23] iommu/amd: Prepare for multiple DMA domain types Robin Murphy
2021-07-21 18:20 ` [PATCH 16/23] iommu/arm-smmu: " Robin Murphy
2021-07-26 12:46 ` Joerg Roedel
2021-07-26 13:09 ` Robin Murphy
2021-07-26 18:43 ` Joerg Roedel
2021-07-21 18:20 ` [PATCH 17/23] iommu/vt-d: " Robin Murphy
2021-07-22 16:44 ` kernel test robot
2021-07-22 17:30 ` Robin Murphy
2021-07-22 18:44 ` kernel test robot
2021-07-24 5:23 ` Lu Baolu [this message]
2021-07-26 8:30 ` Robin Murphy
2021-07-21 18:20 ` [PATCH 18/23] iommu: Express DMA strictness via the domain type Robin Murphy
2021-07-24 5:29 ` Lu Baolu
2021-07-26 8:27 ` Robin Murphy
2021-07-26 11:31 ` Lu Baolu
2021-07-26 12:29 ` Lu Baolu
2021-07-26 12:43 ` Robin Murphy
2021-07-21 18:20 ` [PATCH 19/23] iommu: Expose DMA domain strictness via sysfs Robin Murphy
2021-07-21 18:20 ` [PATCH 20/23] iommu: Allow choosing DMA strictness at build time Robin Murphy
2021-07-21 18:20 ` [PATCH 21/23] iommu/dma: Factor out flush queue init Robin Murphy
2021-07-21 18:20 ` [PATCH 22/23] iommu: Allow enabling non-strict mode dynamically Robin Murphy
2021-07-21 18:20 ` [PATCH 23/23] iommu/arm-smmu: Allow non-strict in pgtable_quirks interface Robin Murphy
2021-07-26 8:13 ` [PATCH 00/23] iommu: Refactor DMA domain strictness John Garry
2021-07-26 12:06 ` Robin Murphy
2021-07-26 13:02 ` 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=7599b48f-169d-283f-782b-e54c667346e8@linux.intel.com \
--to=baolu.lu@linux.intel.com \
--cc=dianders@chromium.org \
--cc=iommu@lists.linux-foundation.org \
--cc=joro@8bytes.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robin.murphy@arm.com \
--cc=will@kernel.org \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).