From: Yi Liu <yi.l.liu@intel.com>
To: joro@8bytes.org, jgg@nvidia.com, kevin.tian@intel.com,
baolu.lu@linux.intel.com
Cc: alex.williamson@redhat.com, robin.murphy@arm.com,
eric.auger@redhat.com, nicolinc@nvidia.com, kvm@vger.kernel.org,
chao.p.peng@linux.intel.com, yi.l.liu@intel.com,
iommu@lists.linux.dev, zhenzhong.duan@intel.com,
jacob.jun.pan@intel.com
Subject: [PATCH v2 05/12] iommu: Allow iommu driver to populate the max_pasids
Date: Fri, 12 Apr 2024 01:15:09 -0700 [thread overview]
Message-ID: <20240412081516.31168-6-yi.l.liu@intel.com> (raw)
In-Reply-To: <20240412081516.31168-1-yi.l.liu@intel.com>
Today, the iommu layer gets the max_pasids by pci_max_pasids() or reading
the "pasid-num-bits" property. This requires the non-PCI devices to have a
"pasid-num-bits" property. Like the mock device used in iommufd selftest,
otherwise the max_pasids check would fail in iommu layer.
While there is an alternative, the iommu layer can allow the iommu driver
to set the max_pasids in its probe_device() callback and populate it. This
is simpler and has no impact on the existing cases.
Suggested-by: Jason Gunthorpe <jgg@nvidia.com>
Signed-off-by: Yi Liu <yi.l.liu@intel.com>
---
drivers/iommu/iommu.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 343683e646e0..dc85c251237f 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -368,9 +368,9 @@ static bool dev_has_iommu(struct device *dev)
return dev->iommu && dev->iommu->iommu_dev;
}
-static u32 dev_iommu_get_max_pasids(struct device *dev)
+static void dev_iommu_set_max_pasids(struct device *dev)
{
- u32 max_pasids = 0, bits = 0;
+ u32 max_pasids = dev->iommu->max_pasids, bits = 0;
int ret;
if (dev_is_pci(dev)) {
@@ -383,7 +383,8 @@ static u32 dev_iommu_get_max_pasids(struct device *dev)
max_pasids = 1UL << bits;
}
- return min_t(u32, max_pasids, dev->iommu->iommu_dev->max_pasids);
+ dev->iommu->max_pasids = min_t(u32, max_pasids,
+ dev->iommu->iommu_dev->max_pasids);
}
void dev_iommu_priv_set(struct device *dev, void *priv)
@@ -433,7 +434,7 @@ static int iommu_init_device(struct device *dev, const struct iommu_ops *ops)
}
dev->iommu_group = group;
- dev->iommu->max_pasids = dev_iommu_get_max_pasids(dev);
+ dev_iommu_set_max_pasids(dev);
if (ops->is_attach_deferred)
dev->iommu->attach_deferred = ops->is_attach_deferred(dev);
return 0;
--
2.34.1
next prev parent reply other threads:[~2024-04-12 8:15 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-12 8:15 [PATCH v2 00/12] iommufd support pasid attach/replace Yi Liu
2024-04-12 8:15 ` [PATCH v2 01/12] iommu: Pass old domain to set_dev_pasid op Yi Liu
2024-04-15 5:32 ` Baolu Lu
2024-04-15 11:54 ` Jason Gunthorpe
2024-04-16 2:07 ` Baolu Lu
2024-04-16 17:47 ` Jason Gunthorpe
2024-04-12 8:15 ` [PATCH v2 02/12] iommu: Introduce a replace API for device pasid Yi Liu
2024-04-16 3:01 ` Duan, Zhenzhong
2024-04-16 9:18 ` Yi Liu
2024-04-17 8:44 ` Tian, Kevin
2024-04-17 12:17 ` Jason Gunthorpe
2024-04-18 0:08 ` Tian, Kevin
2024-04-29 13:55 ` Jason Gunthorpe
2024-04-30 5:00 ` Yi Liu
2024-04-30 12:26 ` Jason Gunthorpe
2024-04-12 8:15 ` [PATCH v2 03/12] iommufd: replace attach_fn with a structure Yi Liu
2024-04-12 8:15 ` [PATCH v2 04/12] iommufd: Support attach/replace hwpt per pasid Yi Liu
2024-04-29 13:56 ` Jason Gunthorpe
2024-04-12 8:15 ` Yi Liu [this message]
2024-04-15 5:41 ` [PATCH v2 05/12] iommu: Allow iommu driver to populate the max_pasids Baolu Lu
2024-04-17 8:49 ` Tian, Kevin
2024-04-20 5:45 ` Yi Liu
2024-04-22 11:52 ` Jason Gunthorpe
2024-04-12 8:15 ` [PATCH v2 06/12] iommufd/selftest: Add set_dev_pasid and remove_dev_pasid in mock iommu Yi Liu
2024-04-12 8:15 ` [PATCH v2 07/12] iommufd/selftest: Add a helper to get test device Yi Liu
2024-04-12 8:15 ` [PATCH v2 08/12] iommufd/selftest: Add test ops to test pasid attach/detach Yi Liu
2024-04-12 8:15 ` [PATCH v2 09/12] iommufd/selftest: Add coverage for iommufd " Yi Liu
2024-04-12 8:15 ` [PATCH v2 10/12] iommu/vt-d: Return if no dev_pasid is found in domain Yi Liu
2024-04-15 6:04 ` Baolu Lu
2024-04-16 9:21 ` Yi Liu
2024-04-17 2:30 ` Baolu Lu
2024-04-17 3:48 ` Yi Liu
2024-04-17 9:03 ` Tian, Kevin
2024-04-17 9:36 ` Yi Liu
2024-04-12 8:15 ` [PATCH v2 11/12] iommu/vt-d: Make intel_iommu_set_dev_pasid() to handle domain replacement Yi Liu
2024-04-17 9:19 ` Tian, Kevin
2024-04-17 9:35 ` Yi Liu
2024-04-17 12:19 ` Jason Gunthorpe
2024-04-12 8:15 ` [PATCH v2 12/12] iommu/vt-d: Add set_dev_pasid callback for nested domain Yi Liu
2024-04-17 9:25 ` Tian, Kevin
2024-04-30 9:19 ` Yi Liu
2024-05-06 7:42 ` Baolu Lu
2024-05-06 13:36 ` Jason Gunthorpe
2024-05-07 2:28 ` Yi Liu
2024-05-07 15:18 ` Jason Gunthorpe
2024-05-08 6:10 ` Yi Liu
2024-05-08 12:25 ` Jason Gunthorpe
2024-05-08 13:26 ` Yi Liu
2024-05-08 14:11 ` Jason Gunthorpe
2024-05-09 14:22 ` Liu, Yi L
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=20240412081516.31168-6-yi.l.liu@intel.com \
--to=yi.l.liu@intel.com \
--cc=alex.williamson@redhat.com \
--cc=baolu.lu@linux.intel.com \
--cc=chao.p.peng@linux.intel.com \
--cc=eric.auger@redhat.com \
--cc=iommu@lists.linux.dev \
--cc=jacob.jun.pan@intel.com \
--cc=jgg@nvidia.com \
--cc=joro@8bytes.org \
--cc=kevin.tian@intel.com \
--cc=kvm@vger.kernel.org \
--cc=nicolinc@nvidia.com \
--cc=robin.murphy@arm.com \
--cc=zhenzhong.duan@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 read-only IMAP folder(s) and NNTP newsgroup(s).