From: Lu Baolu <baolu.lu@linux.intel.com>
To: Joerg Roedel <joro@8bytes.org>, Will Deacon <will@kernel.org>,
Robin Murphy <robin.murphy@arm.com>,
Jason Gunthorpe <jgg@ziepe.ca>, Kevin Tian <kevin.tian@intel.com>
Cc: Yi Liu <yi.l.liu@intel.com>, David Airlie <airlied@gmail.com>,
Daniel Vetter <daniel@ffwll.ch>, Kalle Valo <kvalo@kernel.org>,
Bjorn Andersson <andersson@kernel.org>,
Mathieu Poirier <mathieu.poirier@linaro.org>,
Alex Williamson <alex.williamson@redhat.com>,
mst@redhat.com, Jason Wang <jasowang@redhat.com>,
Thierry Reding <thierry.reding@gmail.com>,
Jonathan Hunter <jonathanh@nvidia.com>,
Mikko Perttunen <mperttunen@nvidia.com>,
iommu@lists.linux.dev, dri-devel@lists.freedesktop.org,
linux-kernel@vger.kernel.org, Lu Baolu <baolu.lu@linux.intel.com>
Subject: [PATCH v2 16/22] iommu/vt-d: Add helper to allocate paging domain
Date: Tue, 4 Jun 2024 09:51:28 +0800 [thread overview]
Message-ID: <20240604015134.164206-17-baolu.lu@linux.intel.com> (raw)
In-Reply-To: <20240604015134.164206-1-baolu.lu@linux.intel.com>
The domain_alloc_user operation is currently implemented by allocating a
paging domain using iommu_domain_alloc(). This is because it needs to fully
initialize the domain before return. Add a helper to do this to avoid using
iommu_domain_alloc().
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
---
drivers/iommu/intel/iommu.c | 87 +++++++++++++++++++++++++++++++++----
1 file changed, 78 insertions(+), 9 deletions(-)
diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
index 2e9811bf2a4e..ccde5f5972e4 100644
--- a/drivers/iommu/intel/iommu.c
+++ b/drivers/iommu/intel/iommu.c
@@ -3633,6 +3633,79 @@ static struct iommu_domain blocking_domain = {
}
};
+static int iommu_superpage_capability(struct intel_iommu *iommu, bool first_stage)
+{
+ if (!intel_iommu_superpage)
+ return 0;
+
+ if (first_stage)
+ return cap_fl1gp_support(iommu->cap) ? 2 : 1;
+
+ return fls(cap_super_page_val(iommu->cap));
+}
+
+static struct dmar_domain *paging_domain_alloc(struct device *dev, bool first_stage)
+{
+ struct device_domain_info *info = dev_iommu_priv_get(dev);
+ struct intel_iommu *iommu = info->iommu;
+ struct dmar_domain *domain;
+ int addr_width;
+
+ domain = kzalloc(sizeof(*domain), GFP_KERNEL);
+ if (!domain)
+ return ERR_PTR(-ENOMEM);
+
+ INIT_LIST_HEAD(&domain->devices);
+ INIT_LIST_HEAD(&domain->dev_pasids);
+ INIT_LIST_HEAD(&domain->cache_tags);
+ spin_lock_init(&domain->lock);
+ spin_lock_init(&domain->cache_lock);
+ xa_init(&domain->iommu_array);
+
+ domain->nid = dev_to_node(dev);
+ domain->has_iotlb_device = info->ats_enabled;
+ domain->use_first_level = first_stage;
+
+ /* calculate the address width */
+ addr_width = agaw_to_width(iommu->agaw);
+ if (addr_width > cap_mgaw(iommu->cap))
+ addr_width = cap_mgaw(iommu->cap);
+ domain->gaw = addr_width;
+ domain->agaw = iommu->agaw;
+ domain->max_addr = __DOMAIN_MAX_ADDR(addr_width);
+
+ /* iommu memory access coherency */
+ domain->iommu_coherency = iommu_paging_structure_coherency(iommu);
+
+ /* pagesize bitmap */
+ domain->domain.pgsize_bitmap = SZ_4K;
+ domain->iommu_superpage = iommu_superpage_capability(iommu, first_stage);
+ domain->domain.pgsize_bitmap |= domain_super_pgsize_bitmap(domain);
+
+ /*
+ * IOVA aperture: First-level translation restricts the input-address
+ * to a canonical address (i.e., address bits 63:N have the same value
+ * as address bit [N-1], where N is 48-bits with 4-level paging and
+ * 57-bits with 5-level paging). Hence, skip bit [N-1].
+ */
+ domain->domain.geometry.force_aperture = true;
+ domain->domain.geometry.aperture_start = 0;
+ if (first_stage)
+ domain->domain.geometry.aperture_end = __DOMAIN_MAX_ADDR(domain->gaw - 1);
+ else
+ domain->domain.geometry.aperture_end = __DOMAIN_MAX_ADDR(domain->gaw);
+
+ /* always allocate the top pgd */
+ domain->pgd = iommu_alloc_page_node(domain->nid, GFP_KERNEL);
+ if (!domain->pgd) {
+ kfree(domain);
+ return ERR_PTR(-ENOMEM);
+ }
+ domain_flush_cache(domain, domain->pgd, PAGE_SIZE);
+
+ return domain;
+}
+
static struct iommu_domain *intel_iommu_domain_alloc(unsigned type)
{
struct dmar_domain *dmar_domain;
@@ -3695,15 +3768,11 @@ intel_iommu_domain_alloc_user(struct device *dev, u32 flags,
if (user_data || (dirty_tracking && !ssads_supported(iommu)))
return ERR_PTR(-EOPNOTSUPP);
- /*
- * domain_alloc_user op needs to fully initialize a domain before
- * return, so uses iommu_domain_alloc() here for simple.
- */
- domain = iommu_domain_alloc(dev->bus);
- if (!domain)
- return ERR_PTR(-ENOMEM);
-
- dmar_domain = to_dmar_domain(domain);
+ /* Do not use first stage for user domain translation. */
+ dmar_domain = paging_domain_alloc(dev, false);
+ if (IS_ERR(dmar_domain))
+ return ERR_CAST(dmar_domain);
+ domain = &dmar_domain->domain;
if (nested_parent) {
dmar_domain->nested_parent = true;
--
2.34.1
next prev parent reply other threads:[~2024-06-04 1:55 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-04 1:51 [PATCH v2 00/22] iommu: Refactoring domain allocation interface Lu Baolu
2024-06-04 1:51 ` [PATCH v2 01/22] iommu: Add iommu_user_domain_alloc() interface Lu Baolu
2024-06-04 8:03 ` Yi Liu
2024-06-05 2:00 ` Baolu Lu
2024-06-05 6:23 ` Yi Liu
2024-06-06 2:04 ` Baolu Lu
2024-06-04 1:51 ` [PATCH v2 02/22] iommufd: Use iommu_user_domain_alloc() Lu Baolu
2024-06-04 16:51 ` Jason Gunthorpe
2024-06-05 2:17 ` Baolu Lu
2024-06-05 12:02 ` Jason Gunthorpe
2024-06-04 1:51 ` [PATCH v2 03/22] vfio/type1: " Lu Baolu
2024-06-04 1:51 ` [PATCH v2 04/22] vhost-vdpa: " Lu Baolu
2024-06-04 1:51 ` [PATCH v2 05/22] iommu: Add iommu_paging_domain_alloc() interface Lu Baolu
2024-06-04 1:51 ` [PATCH v2 06/22] drm/msm: Use iommu_paging_domain_alloc() Lu Baolu
2024-06-04 7:48 ` Dmitry Baryshkov
2024-06-04 1:51 ` [PATCH v2 07/22] drm/nouveau/tegra: " Lu Baolu
2024-06-04 1:51 ` [PATCH v2 08/22] gpu: host1x: " Lu Baolu
2024-06-04 1:51 ` [PATCH v2 09/22] media: nvidia: tegra: " Lu Baolu
2024-06-04 1:51 ` [PATCH v2 10/22] media: venus: firmware: " Lu Baolu
2024-06-04 1:51 ` [PATCH v2 11/22] ath10k: " Lu Baolu
2024-06-04 13:35 ` Jeff Johnson
2024-06-04 13:39 ` Jeff Johnson
2024-06-04 1:51 ` [PATCH v2 12/22] wifi: ath11k: " Lu Baolu
2024-06-04 8:19 ` Kalle Valo
2024-06-04 13:34 ` Jeff Johnson
2024-06-04 1:51 ` [PATCH v2 13/22] remoteproc: " Lu Baolu
2024-06-04 1:51 ` [PATCH v2 14/22] soc/fsl/qbman: " Lu Baolu
2024-06-04 1:51 ` [PATCH v2 15/22] RDMA/usnic: " Lu Baolu
2024-06-04 16:44 ` Jason Gunthorpe
2024-06-04 1:51 ` Lu Baolu [this message]
2024-06-04 1:51 ` [PATCH v2 17/22] ARM: dma-mapping: Pass device to arm_iommu_create_mapping() Lu Baolu
2024-06-04 1:51 ` [PATCH v2 18/22] ARM: dma-mapping: Use iommu_paging_domain_alloc() Lu Baolu
2024-06-04 1:51 ` [PATCH v2 19/22] drm/rockchip: " Lu Baolu
2024-06-04 1:51 ` [PATCH v2 20/22] drm/tegra: Remove call to iommu_domain_alloc() Lu Baolu
2024-06-04 1:51 ` [PATCH v2 21/22] iommu: Remove iommu_present() Lu Baolu
2024-06-04 1:51 ` [PATCH v2 22/22] iommu: Remove iommu_domain_alloc() Lu Baolu
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=20240604015134.164206-17-baolu.lu@linux.intel.com \
--to=baolu.lu@linux.intel.com \
--cc=airlied@gmail.com \
--cc=alex.williamson@redhat.com \
--cc=andersson@kernel.org \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=iommu@lists.linux.dev \
--cc=jasowang@redhat.com \
--cc=jgg@ziepe.ca \
--cc=jonathanh@nvidia.com \
--cc=joro@8bytes.org \
--cc=kevin.tian@intel.com \
--cc=kvalo@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mathieu.poirier@linaro.org \
--cc=mperttunen@nvidia.com \
--cc=mst@redhat.com \
--cc=robin.murphy@arm.com \
--cc=thierry.reding@gmail.com \
--cc=will@kernel.org \
--cc=yi.l.liu@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