From: Jacob Pan <jacob.jun.pan@linux.intel.com>
To: iommu@lists.linux-foundation.org,
LKML <linux-kernel@vger.kernel.org>,
Joerg Roedel <joro@8bytes.org>, Jason Gunthorpe <jgg@nvidia.com>,
"Christoph Hellwig" <hch@infradead.org>,
"Lu Baolu" <baolu.lu@linux.intel.com>,
Jean-Philippe Brucker <jean-philippe@linaro.com>
Cc: "Tian, Kevin" <kevin.tian@intel.com>,
Tony Luck <tony.luck@intel.com>,
Dave Jiang <dave.jiang@intel.com>,
Raj Ashok <ashok.raj@intel.com>,
"Zanussi, Tom" <tom.zanussi@intel.com>,
"Kumar, Sanjay K" <sanjay.k.kumar@intel.com>,
Jacob Pan <jacob.jun.pan@intel.com>,
Dan Williams <dan.j.williams@intel.com>
Subject: [PATCH v2 4/8] iommu/vt-d: Use device_pasid attach op for RID2PASID
Date: Mon, 14 Mar 2022 22:07:08 -0700 [thread overview]
Message-ID: <20220315050713.2000518-5-jacob.jun.pan@linux.intel.com> (raw)
In-Reply-To: <20220315050713.2000518-1-jacob.jun.pan@linux.intel.com>
With the availability of a generic device-PASID-domain attachment API,
there's no need to special case RID2PASID. Use the API to replace
duplicated code.
Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com>
---
drivers/iommu/intel/iommu.c | 18 ++----------------
1 file changed, 2 insertions(+), 16 deletions(-)
diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
index 9267194eaed3..f832b7599d21 100644
--- a/drivers/iommu/intel/iommu.c
+++ b/drivers/iommu/intel/iommu.c
@@ -1683,9 +1683,6 @@ static void domain_flush_piotlb(struct intel_iommu *iommu,
qi_flush_piotlb(iommu, did, domain->default_pasid,
addr, npages, ih);
- if (!list_empty(&domain->devices))
- qi_flush_piotlb(iommu, did, PASID_RID2PASID, addr, npages, ih);
-
if (list_empty(&domain->devices) || xa_empty(&domain->pasids))
return;
@@ -2826,17 +2823,7 @@ static struct dmar_domain *dmar_insert_one_dev_info(struct intel_iommu *iommu,
}
/* Setup the PASID entry for requests without PASID: */
- spin_lock_irqsave(&iommu->lock, flags);
- if (hw_pass_through && domain_type_is_si(domain))
- ret = intel_pasid_setup_pass_through(iommu, domain,
- dev, PASID_RID2PASID);
- else if (domain_use_first_level(domain))
- ret = domain_setup_first_level(iommu, domain, dev,
- PASID_RID2PASID);
- else
- ret = intel_pasid_setup_second_level(iommu, domain,
- dev, PASID_RID2PASID);
- spin_unlock_irqrestore(&iommu->lock, flags);
+ ret = intel_iommu_attach_dev_pasid(&domain->domain, dev, PASID_RID2PASID);
if (ret) {
dev_err(dev, "Setup RID2PASID failed\n");
dmar_remove_one_dev_info(dev);
@@ -4618,8 +4605,7 @@ static void __dmar_remove_one_dev_info(struct device_domain_info *info)
if (info->dev && !dev_is_real_dma_subdevice(info->dev)) {
if (dev_is_pci(info->dev) && sm_supported(iommu))
- intel_pasid_tear_down_entry(iommu, info->dev,
- PASID_RID2PASID, false);
+ intel_iommu_detach_dev_pasid(&domain->domain, info->dev, PASID_RID2PASID);
iommu_disable_dev_iotlb(info);
domain_context_clear(info);
--
2.25.1
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
next prev parent reply other threads:[~2022-03-15 5:04 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-15 5:07 [PATCH v2 0/8] Enable PASID for DMA API users Jacob Pan
2022-03-15 5:07 ` [PATCH v2 1/8] iommu: Assign per device max PASID Jacob Pan
2022-03-15 5:07 ` [PATCH v2 2/8] iommu: Add attach/detach_dev_pasid domain ops Jacob Pan
2022-03-15 10:24 ` Tian, Kevin
2022-03-15 11:26 ` Jean-Philippe Brucker
2022-03-15 11:49 ` Tian, Kevin
2022-03-15 16:11 ` Jacob Pan
2022-03-18 12:01 ` Lu Baolu
2022-03-18 13:50 ` Jason Gunthorpe via iommu
2022-03-18 11:52 ` Lu Baolu
2022-03-18 13:48 ` Jason Gunthorpe via iommu
2022-03-15 5:07 ` [PATCH v2 3/8] iommu/vt-d: Implement device_pasid domain attach ops Jacob Pan
2022-03-15 10:33 ` Tian, Kevin
2022-03-15 22:23 ` Jacob Pan
2022-03-15 14:33 ` Jason Gunthorpe via iommu
2022-03-15 22:36 ` Jacob Pan
2022-03-15 23:04 ` Jason Gunthorpe via iommu
2022-03-16 20:50 ` Jacob Pan
2022-03-16 22:15 ` Jason Gunthorpe via iommu
2022-03-16 22:23 ` Luck, Tony
2022-03-17 0:04 ` Jason Gunthorpe via iommu
2022-03-18 5:47 ` Tian, Kevin
2022-03-18 13:47 ` Jason Gunthorpe via iommu
2022-03-17 0:49 ` Jacob Pan
2022-03-17 13:23 ` Jason Gunthorpe via iommu
2022-03-17 18:23 ` Jacob Pan
2022-03-16 7:41 ` Tian, Kevin
2022-03-16 21:01 ` Jacob Pan
2022-03-18 5:33 ` Tian, Kevin
2022-03-28 21:41 ` Jacob Pan
2022-03-16 7:39 ` Tian, Kevin
2022-03-16 20:51 ` Jacob Pan
2022-03-15 5:07 ` Jacob Pan [this message]
2022-03-16 7:54 ` [PATCH v2 4/8] iommu/vt-d: Use device_pasid attach op for RID2PASID Tian, Kevin
2022-03-17 20:45 ` Jacob Pan
2022-03-15 5:07 ` [PATCH v2 5/8] iommu: Add PASID support for DMA mapping API users Jacob Pan
2022-03-15 11:16 ` Robin Murphy
2022-03-15 14:22 ` Jason Gunthorpe via iommu
2022-03-15 16:31 ` Jacob Pan
2022-03-15 17:05 ` Jason Gunthorpe via iommu
2022-03-15 21:24 ` Jacob Pan
2022-03-16 10:32 ` Tian, Kevin
2022-03-16 8:41 ` Tian, Kevin
2022-03-16 14:07 ` Jason Gunthorpe via iommu
2022-03-15 14:35 ` Jason Gunthorpe via iommu
2022-03-15 16:38 ` Jacob Pan
2022-03-15 23:05 ` Jason Gunthorpe via iommu
2022-03-18 12:43 ` Lu Baolu
2022-03-28 21:44 ` Jacob Pan
2022-03-15 5:07 ` [PATCH v2 6/8] dmaengine: idxd: Use DMA API for in-kernel DMA with PASID Jacob Pan
2022-03-18 6:10 ` Tian, Kevin
2022-03-29 17:39 ` Jacob Pan
2022-03-15 5:07 ` [PATCH v2 7/8] iommu/vt-d: Delete supervisor/kernel SVA Jacob Pan
2022-03-18 6:16 ` Tian, Kevin
2022-03-29 17:42 ` Jacob Pan
2022-03-15 5:07 ` [PATCH v2 8/8] iommu: Remove unused driver data in sva_bind_device Jacob Pan
2022-03-15 11:37 ` Jean-Philippe Brucker
2022-03-15 5:07 ` [PATCH v2 9/9] dmaengine: idxd: separate user and kernel pasid enabling Jacob Pan
2022-03-18 6:28 ` Tian, Kevin
2022-03-15 8:16 ` [PATCH v2 0/8] Enable PASID for DMA API users Tian, Kevin
2022-03-15 15:49 ` Jacob Pan
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=20220315050713.2000518-5-jacob.jun.pan@linux.intel.com \
--to=jacob.jun.pan@linux.intel.com \
--cc=ashok.raj@intel.com \
--cc=baolu.lu@linux.intel.com \
--cc=dan.j.williams@intel.com \
--cc=dave.jiang@intel.com \
--cc=hch@infradead.org \
--cc=iommu@lists.linux-foundation.org \
--cc=jacob.jun.pan@intel.com \
--cc=jean-philippe@linaro.com \
--cc=jgg@nvidia.com \
--cc=joro@8bytes.org \
--cc=kevin.tian@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=sanjay.k.kumar@intel.com \
--cc=tom.zanussi@intel.com \
--cc=tony.luck@intel.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: 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).