From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E3C99C4338F for ; Sat, 24 Jul 2021 05:23:43 +0000 (UTC) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4632A60EAF for ; Sat, 24 Jul 2021 05:23:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 4632A60EAF Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.linux-foundation.org Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id DD776405C9; Sat, 24 Jul 2021 05:23:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id APgMuBKek4iN; Sat, 24 Jul 2021 05:23:42 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp4.osuosl.org (Postfix) with ESMTPS id 92461405C8; Sat, 24 Jul 2021 05:23:41 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 55411C0010; Sat, 24 Jul 2021 05:23:41 +0000 (UTC) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by lists.linuxfoundation.org (Postfix) with ESMTP id EC03FC000E for ; Sat, 24 Jul 2021 05:23:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id E6E43405C9 for ; Sat, 24 Jul 2021 05:23:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 27cXnfNoZrUS for ; Sat, 24 Jul 2021 05:23:38 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by smtp4.osuosl.org (Postfix) with ESMTPS id B530E405C8 for ; Sat, 24 Jul 2021 05:23:38 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10054"; a="297564638" X-IronPort-AV: E=Sophos;i="5.84,265,1620716400"; d="scan'208";a="297564638" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jul 2021 22:23:37 -0700 X-IronPort-AV: E=Sophos;i="5.84,265,1620716400"; d="scan'208";a="502965794" Received: from yuhaipen-mobl.ccr.corp.intel.com (HELO [10.254.209.247]) ([10.254.209.247]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jul 2021 22:23:35 -0700 To: Robin Murphy , joro@8bytes.org, will@kernel.org References: <11efdfa4ee223d12769d17459fcf789c626d7b82.1626888445.git.robin.murphy@arm.com> From: Lu Baolu Subject: Re: [PATCH 17/23] iommu/vt-d: Prepare for multiple DMA domain types Message-ID: <7599b48f-169d-283f-782b-e54c667346e8@linux.intel.com> Date: Sat, 24 Jul 2021 13:23:33 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.12.0 MIME-Version: 1.0 In-Reply-To: <11efdfa4ee223d12769d17459fcf789c626d7b82.1626888445.git.robin.murphy@arm.com> Content-Language: en-US Cc: linux-kernel@vger.kernel.org, dianders@chromium.org, iommu@lists.linux-foundation.org, linux-arm-kernel@lists.infradead.org X-BeenThere: iommu@lists.linux-foundation.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Development issues for Linux IOMMU support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: iommu-bounces@lists.linux-foundation.org Sender: "iommu" 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 > --- > 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 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E3C39C4338F for ; Sat, 24 Jul 2021 05:25:10 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A5F9360E95 for ; Sat, 24 Jul 2021 05:25:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org A5F9360E95 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:Message-ID:Subject: From:References:To:Cc:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=hdyVoP+Df5UFMXjGohK1rGUifYvCPLLIIV3FcsqAr2k=; b=BSWdS+TqijRnLol25GYcRsKbNS VBiEmLOO1eYwJvuiePtVXxqMuxWnxNABKnXtIpCqNQtzIdYneKnB2bBgjsnk9THKZhKVt0LEDeqB7 7wZRCmvQDMrt4VKq0iuPfNsNzWFxqW4UcDvkw4YhzdE0CND7Cm5X7bnwlttYh6Qz6TRc+RpOPu80q x6yEFPn8ZAblF5imgk2loPisrRKW2Anf00XWfGAZMYPdbIr4eaZ7v0lkVQC1usJHcz/5LJbX++sp5 EW1Oo+NJFRyivfVft9k2fiWg/irWzzAgACfY3Rc4RAOPAr+z/JobBxLYLn7tJ10IXlRcuI/VzMatj LIV/aHmw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1m7A8c-006jQT-5j; Sat, 24 Jul 2021 05:23:50 +0000 Received: from mga09.intel.com ([134.134.136.24]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1m7A8Y-006jPQ-7c for linux-arm-kernel@lists.infradead.org; Sat, 24 Jul 2021 05:23:47 +0000 X-IronPort-AV: E=McAfee;i="6200,9189,10054"; a="211996272" X-IronPort-AV: E=Sophos;i="5.84,265,1620716400"; d="scan'208";a="211996272" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jul 2021 22:23:38 -0700 X-IronPort-AV: E=Sophos;i="5.84,265,1620716400"; d="scan'208";a="502965794" Received: from yuhaipen-mobl.ccr.corp.intel.com (HELO [10.254.209.247]) ([10.254.209.247]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jul 2021 22:23:35 -0700 Cc: baolu.lu@linux.intel.com, iommu@lists.linux-foundation.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, suravee.suthikulpanit@amd.com, john.garry@huawei.com, dianders@chromium.org To: Robin Murphy , joro@8bytes.org, will@kernel.org References: <11efdfa4ee223d12769d17459fcf789c626d7b82.1626888445.git.robin.murphy@arm.com> From: Lu Baolu Subject: Re: [PATCH 17/23] iommu/vt-d: Prepare for multiple DMA domain types Message-ID: <7599b48f-169d-283f-782b-e54c667346e8@linux.intel.com> Date: Sat, 24 Jul 2021 13:23:33 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.12.0 MIME-Version: 1.0 In-Reply-To: <11efdfa4ee223d12769d17459fcf789c626d7b82.1626888445.git.robin.murphy@arm.com> Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210723_222346_360643_9E41E073 X-CRM114-Status: GOOD ( 21.64 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 > --- > 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 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7EE50C4320A for ; Sat, 24 Jul 2021 05:23:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5A57160EB5 for ; Sat, 24 Jul 2021 05:23:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230063AbhGXEnG (ORCPT ); Sat, 24 Jul 2021 00:43:06 -0400 Received: from mga07.intel.com ([134.134.136.100]:30523 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229824AbhGXEnF (ORCPT ); Sat, 24 Jul 2021 00:43:05 -0400 X-IronPort-AV: E=McAfee;i="6200,9189,10054"; a="275807925" X-IronPort-AV: E=Sophos;i="5.84,265,1620716400"; d="scan'208";a="275807925" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jul 2021 22:23:37 -0700 X-IronPort-AV: E=Sophos;i="5.84,265,1620716400"; d="scan'208";a="502965794" Received: from yuhaipen-mobl.ccr.corp.intel.com (HELO [10.254.209.247]) ([10.254.209.247]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jul 2021 22:23:35 -0700 Cc: baolu.lu@linux.intel.com, iommu@lists.linux-foundation.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, suravee.suthikulpanit@amd.com, john.garry@huawei.com, dianders@chromium.org To: Robin Murphy , joro@8bytes.org, will@kernel.org References: <11efdfa4ee223d12769d17459fcf789c626d7b82.1626888445.git.robin.murphy@arm.com> From: Lu Baolu Subject: Re: [PATCH 17/23] iommu/vt-d: Prepare for multiple DMA domain types Message-ID: <7599b48f-169d-283f-782b-e54c667346e8@linux.intel.com> Date: Sat, 24 Jul 2021 13:23:33 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.12.0 MIME-Version: 1.0 In-Reply-To: <11efdfa4ee223d12769d17459fcf789c626d7b82.1626888445.git.robin.murphy@arm.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > --- > 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