[PATCH] iommufd/selftest: Check the bus type during probe

[PATCH] iommufd/selftest: Check the bus type during probe

[Jason Gunthorpe]

This relied on the probe function only being invoked by the bus type mock
was registered on. The removal of the bus ops broke this assumption and
the probe could be called on non-mock bus types like PCI.

Check the bus type directly in probe.

Fixes: 17de3f5fdd35 ("iommu: Retire bus ops")
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
---
 drivers/iommu/iommufd/selftest.c | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

I'll pick this up for the merge window, it solves some of the issues. I'll
send a patch to iterate all the global binding drivers for rc1.

diff --git a/drivers/iommu/iommufd/selftest.c b/drivers/iommu/iommufd/selftest.c
index 9528528cab2743..cf3e9fed039ee7 100644
--- a/drivers/iommu/iommufd/selftest.c
+++ b/drivers/iommu/iommufd/selftest.c
@@ -25,6 +25,19 @@ static struct iommu_domain_ops domain_nested_ops;
 
 size_t iommufd_test_memory_limit = 65536;
 
+struct mock_bus_type {
+	struct bus_type bus;
+	struct notifier_block nb;
+};
+
+static struct mock_bus_type iommufd_mock_bus_type = {
+	.bus = {
+		.name = "iommufd_mock",
+	},
+};
+
+static atomic_t mock_dev_num;
+
 enum {
 	MOCK_DIRTY_TRACK = 1,
 	MOCK_IO_PAGE_SIZE = PAGE_SIZE / 2,
@@ -437,6 +450,8 @@ static struct iommu_device mock_iommu_device = {
 
 static struct iommu_device *mock_probe_device(struct device *dev)
 {
+	if (dev->bus != &iommufd_mock_bus_type.bus)
+		return ERR_PTR(-ENODEV);
 	return &mock_iommu_device;
 }
 
@@ -586,19 +601,6 @@ get_md_pagetable_nested(struct iommufd_ucmd *ucmd, u32 mockpt_id,
 	return hwpt;
 }
 
-struct mock_bus_type {
-	struct bus_type bus;
-	struct notifier_block nb;
-};
-
-static struct mock_bus_type iommufd_mock_bus_type = {
-	.bus = {
-		.name = "iommufd_mock",
-	},
-};
-
-static atomic_t mock_dev_num;
-
 static void mock_dev_release(struct device *dev)
 {
 	struct mock_dev *mdev = container_of(dev, struct mock_dev, dev);

base-commit: ca4a310350b8795802e392ce005fb17075345fac
-- 
2.43.0

RE: [PATCH] iommufd/selftest: Check the bus type during probe

[Tian, Kevin]

> From: Jason Gunthorpe <jgg@nvidia.com>
> Sent: Wednesday, January 3, 2024 11:27 PM
> 
> This relied on the probe function only being invoked by the bus type mock
> was registered on. The removal of the bus ops broke this assumption and
> the probe could be called on non-mock bus types like PCI.
> 
> Check the bus type directly in probe.
> 
> Fixes: 17de3f5fdd35 ("iommu: Retire bus ops")
> Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>

Reviewed-by: Kevin Tian <kevin.tian@intel.com>

Re: [PATCH] iommufd/selftest: Check the bus type during probe

[Jason Gunthorpe]

On Fri, Jan 05, 2024 at 12:38:49AM +0000, Tian, Kevin wrote:
> > From: Jason Gunthorpe <jgg@nvidia.com>
> > Sent: Wednesday, January 3, 2024 11:27 PM
> > 
> > This relied on the probe function only being invoked by the bus type mock
> > was registered on. The removal of the bus ops broke this assumption and
> > the probe could be called on non-mock bus types like PCI.
> > 
> > Check the bus type directly in probe.
> > 
> > Fixes: 17de3f5fdd35 ("iommu: Retire bus ops")
> > Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
> 
> Reviewed-by: Kevin Tian <kevin.tian@intel.com>

Applied to iommufd for-next

Thanks,
Jason