2021-03-19 11:07:15

by Ahmad Fatoum

[permalink] [raw]
Subject: [PATCH v2 1/2] driver core: clear deferred probe reason on probe retry

When retrying a deferred probe, any old defer reason string should be
discarded. Otherwise, if the probe is deferred again at a different spot,
but without setting a message, the now incorrect probe reason will remain.

This was observed with the i.MX I2C driver, which ultimately failed
to probe due to lack of the GPIO driver. The probe defer for GPIO
doesn't record a message, but a previous probe defer to clock_get did.
This had the effect that /sys/kernel/debug/devices_deferred listed
a misleading probe deferral reason.

Cc: [email protected]
Fixes: d090b70ede02 ("driver core: add deferring probe reason to devices_deferred property")
Reviewed-by: Andy Shevchenko <[email protected]>
Signed-off-by: Ahmad Fatoum <[email protected]>
---
v1 -> v2:
- reworded commit message (Andy)
- collected Andy's Reviewed-by
---
drivers/base/dd.c | 3 +++
1 file changed, 3 insertions(+)

diff --git a/drivers/base/dd.c b/drivers/base/dd.c
index 9179825ff646..e2cf3b29123e 100644
--- a/drivers/base/dd.c
+++ b/drivers/base/dd.c
@@ -97,6 +97,9 @@ static void deferred_probe_work_func(struct work_struct *work)

get_device(dev);

+ kfree(dev->p->deferred_probe_reason);
+ dev->p->deferred_probe_reason = NULL;
+
/*
* Drop the mutex while probing each device; the probe path may
* manipulate the deferred list
--
2.29.2


2021-03-22 08:21:48

by Andrzej Hajda

[permalink] [raw]
Subject: Re: [PATCH v2 1/2] driver core: clear deferred probe reason on probe retry

Hi Ahmad,

W dniu 19.03.2021 o 12:04, Ahmad Fatoum pisze:
> When retrying a deferred probe, any old defer reason string should be
> discarded. Otherwise, if the probe is deferred again at a different spot,
> but without setting a message, the now incorrect probe reason will remain.
>
> This was observed with the i.MX I2C driver, which ultimately failed
> to probe due to lack of the GPIO driver. The probe defer for GPIO
> doesn't record a message, but a previous probe defer to clock_get did.
> This had the effect that /sys/kernel/debug/devices_deferred listed
> a misleading probe deferral reason.
>
> Cc: [email protected]
> Fixes: d090b70ede02 ("driver core: add deferring probe reason to devices_deferred property")
> Reviewed-by: Andy Shevchenko <[email protected]>
> Signed-off-by: Ahmad Fatoum <[email protected]>


Reviewed-by: Andrzej Hajda <[email protected]>


Regards

Andrzej


> ---
> v1 -> v2:
> - reworded commit message (Andy)
> - collected Andy's Reviewed-by
> ---
> drivers/base/dd.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/base/dd.c b/drivers/base/dd.c
> index 9179825ff646..e2cf3b29123e 100644
> --- a/drivers/base/dd.c
> +++ b/drivers/base/dd.c
> @@ -97,6 +97,9 @@ static void deferred_probe_work_func(struct work_struct *work)
>
> get_device(dev);
>
> + kfree(dev->p->deferred_probe_reason);
> + dev->p->deferred_probe_reason = NULL;
> +
> /*
> * Drop the mutex while probing each device; the probe path may
> * manipulate the deferred list