ACPI: video: Rework checking for duplicate video bus devices

The current way of checking for duplicate video bus devices in
acpi_video_bus_probe() is based on walking the ACPI namespace which is
not necessary after recent driver conversions.  It is also susceptible
to race conditions (for example, if two video bus devices are probed at
the same time) and ordering issues.

Instead of doing it the old way, inspect the children of the parent of
the device being probed, excluding the latter and the children that are
not auxiliary devices.  For each of the remaining children, check if any
of the entries in the video_bus_head list is equal to its driver data
which can only happen if the given child has been processed by
acpi_video_bus_probe() successfully and so it is a duplicate of the
one being probed.

Moreover, to prevent acpi_video_bus_probe() from processing two devices
concurrently, which might defeat the above check, use a new internal
mutex in it.

Also, print the FW_BUG message only if allow_duplicates is unset which
allows the entire duplicates check to be skipped in that case (doing
it just to print the message about the case that is going to be
ignored anyway is kind of pointless).

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Danilo Krummrich <dakr@kernel.org>
Link: https://patch.msgid.link/3058492.e9J7NaK4W3@rafael.j.wysocki

diff --git a/drivers/acpi/acpi_video.c b/drivers/acpi/acpi_video.c
index adbaf0226c905905927c42e352f6e5403e0781b3..037582807453c8d43e3d7d0ddaa0d6eecce3bd50 100644 (file)
--- a/drivers/acpi/acpi_video.c
+++ b/drivers/acpi/acpi_video.c
@@ -1681,26 +1681,6 @@ static int acpi_video_resume(struct notifier_block *nb,
        return NOTIFY_DONE;
 }
 
-static acpi_status
-acpi_video_bus_match(acpi_handle handle, u32 level, void *context,
-                       void **return_value)
-{
-       struct acpi_device *device = context;
-       struct acpi_device *sibling;
-
-       if (handle == device->handle)
-               return AE_CTRL_TERMINATE;
-
-       sibling = acpi_fetch_acpi_dev(handle);
-       if (!sibling)
-               return AE_OK;
-
-       if (!strcmp(acpi_device_name(sibling), ACPI_VIDEO_BUS_NAME))
-                       return AE_ALREADY_EXISTS;
-
-       return AE_OK;
-}
-
 static void acpi_video_dev_register_backlight(struct acpi_video_device *device)
 {
        struct backlight_properties props;
@@ -1976,29 +1956,49 @@ static int acpi_video_bus_put_devices(struct acpi_video_bus *video)
        return 0;
 }
 
+static int duplicate_dev_check(struct device *sibling, void *data)
+{
+       struct acpi_video_bus *video;
+
+       if (sibling == data || !dev_is_auxiliary(sibling))
+               return 0;
+
+       guard(mutex)(&video_list_lock);
+
+       list_for_each_entry(video, &video_bus_head, entry) {
+               if (video == dev_get_drvdata(sibling))
+                       return -EEXIST;
+       }
+
+       return 0;
+}
+
+static bool acpi_video_bus_dev_is_duplicate(struct device *dev)
+{
+       return device_for_each_child(dev->parent, dev, duplicate_dev_check);
+}
+
 static int instance;
 
 static int acpi_video_bus_probe(struct auxiliary_device *aux_dev,
                                const struct auxiliary_device_id *id_unused)
 {
        struct acpi_device *device = ACPI_COMPANION(&aux_dev->dev);
+       static DEFINE_MUTEX(probe_lock);
        struct acpi_video_bus *video;
        bool auto_detect;
        int error;
-       acpi_status status;
 
-       status = acpi_walk_namespace(ACPI_TYPE_DEVICE,
-                               acpi_dev_parent(device)->handle, 1,
-                               acpi_video_bus_match, NULL,
-                               device, NULL);
-       if (status == AE_ALREADY_EXISTS) {
+       /* Probe one video bus device at a time in case there are duplicates. */
+       guard(mutex)(&probe_lock);
+
+       if (!allow_duplicates && acpi_video_bus_dev_is_duplicate(&aux_dev->dev)) {
                pr_info(FW_BUG
                        "Duplicate ACPI video bus devices for the"
                        " same VGA controller, please try module "
                        "parameter \"video.allow_duplicates=1\""
                        "if the current driver doesn't work.\n");
-               if (!allow_duplicates)
-                       return -ENODEV;
+               return -ENODEV;
        }
 
        video = kzalloc_obj(struct acpi_video_bus);