iommufd/selftest: Check the bus type during probe

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")
Link: https://lore.kernel.org/r/[email protected]
Reviewed-by: Kevin Tian <[email protected]>
Signed-off-by: Jason Gunthorpe <[email protected]>

diff --git a/drivers/iommu/iommufd/selftest.c b/drivers/iommu/iommufd/selftest.c
index db648c81507fa5c524329f94a3d5fcc0337eb94f..d9e9920c7eba413eaf25b7840eefdf36a3999a9e 100644 (file)
--- 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;
 }
 
@@ -576,19 +591,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);