Re: [PATCH] acpi: handle the acpi hotplug schedule error

From: joeyli
Date: Wed Jun 07 2017 - 06:18:56 EST


Hi Andy,

Thanks for your help to review my patch.

On Wed, Jun 07, 2017 at 11:36:55AM +0300, Andy Shevchenko wrote:
> On Wed, Jun 7, 2017 at 9:05 AM, Lee, Chun-Yi <joeyli.kernel@xxxxxxxxx> wrote:
> > Kernel should decrements the reference count of acpi device
> > when scheduling acpi hotplug work is failed, and also evaluates
> > _OST to notify BIOS the failure.
>
> > - if (hotplug_event && ACPI_SUCCESS(acpi_hotplug_schedule(adev, type)))
> > - return;

A note here...
When the acpi hotplug job is scheduled success, the adev device can not
be put because acpi_device_hotplug() will put it until hotplug routine
finished.

drivers/acpi/bus.c acpi_bus_notify()
acpi_bus_get_acpi_device(handle) //get here
drivers/acpi/osl.c acpi_hotplug_schedule()
drivers/acpi/osl.c acpi_hotplug_work_fn()
drivers/acpi/scan.c acpi_device_hotplug()
acpi_bus_put_acpi_device(adev) //put here

> > + if (hotplug_event) {
> > + if (ACPI_FAILURE(acpi_hotplug_schedule(adev, type))) {
> > + acpi_bus_put_acpi_device(adev);
> > + goto err;
> > + } else {
> > + return;
> > + }
> > + }
>
> Wouldn't be simpler to
>
> - return;
> + goto err_put_device;
>
> + err_put_device:
> + acpi_bus_put_acpi_device(adev);
> err:
>

So, do you mean like this?

- if (hotplug_event && ACPI_SUCCESS(acpi_hotplug_schedule(adev, type)))
- return;
+ if (hotplug_event) {
+ if (ACPI_SUCCESS(acpi_hotplug_schedule(adev, type)))
+ return;
+ else
+ goto err_put_device;
+ }

acpi_bus_put_acpi_device(adev);
return;

+err_put_device:
+ acpi_bus_put_acpi_device(adev);
err:
acpi_evaluate_ost(handle, type, ost_code, NULL);
}

Thanks for your suggestion, it looks simpler.

Joey Lee