| Message ID | 20200220050440.45878-3-john.stultz@linaro.org (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
| Series | driver core: Try to improve and cleanup driver_deferred_probe_check_state() | expand |
On Thu, Feb 20, 2020 at 6:05 AM John Stultz <john.stultz@linaro.org> wrote: > > When using modules, its common for the modules not to be loaded > until quite late by userland. With the current code, > driver_deferred_probe_check_state() will stop returning > EPROBE_DEFER after late_initcall, which can cause module > dependency resolution to fail after that. > > So allow a longer window of 30 seconds (picked somewhat > arbitrarily, but influenced by the similar regulator core > timeout value) in the case where modules are enabled. > > Cc: Rob Herring <robh@kernel.org> > Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net> > Cc: Kevin Hilman <khilman@kernel.org> > Cc: Ulf Hansson <ulf.hansson@linaro.org> > Cc: Pavel Machek <pavel@ucw.cz> > Cc: Len Brown <len.brown@intel.com> > Cc: Todd Kjos <tkjos@google.com> > Cc: Bjorn Andersson <bjorn.andersson@linaro.org> > Cc: Liam Girdwood <lgirdwood@gmail.com> > Cc: Mark Brown <broonie@kernel.org> > Cc: Thierry Reding <treding@nvidia.com> > Cc: Linus Walleij <linus.walleij@linaro.org> > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > Cc: linux-pm@vger.kernel.org > Signed-off-by: John Stultz <john.stultz@linaro.org> > Change-Id: I9c5a02a54915ff53f9f14d49c601f41d7105e05e > --- > v4: > * Split out into its own patch as suggested by Mark > * Made change conditional on CONFIG_MODULES > --- > drivers/base/dd.c | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/drivers/base/dd.c b/drivers/base/dd.c > index bb383dca39c1..fa138f24e2d3 100644 > --- a/drivers/base/dd.c > +++ b/drivers/base/dd.c > @@ -224,7 +224,16 @@ static int deferred_devs_show(struct seq_file *s, void *data) > } > DEFINE_SHOW_ATTRIBUTE(deferred_devs); > > +#ifdef CONFIG_MODULES > +/* > + * In the case of modules, set the default probe timeout to > + * 30 seconds to give userland some time to load needed modules > + */ > +static int deferred_probe_timeout = 30; > +#else > +/* In the case of !modules, no probe timeout needed */ > static int deferred_probe_timeout = -1; > +#endif Looks reasonable to me. Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > static int __init deferred_probe_timeout_setup(char *str) > { > int timeout; > --
On Wed 19 Feb 21:04 PST 2020, John Stultz wrote: > When using modules, its common for the modules not to be loaded > until quite late by userland. With the current code, > driver_deferred_probe_check_state() will stop returning > EPROBE_DEFER after late_initcall, which can cause module > dependency resolution to fail after that. > > So allow a longer window of 30 seconds (picked somewhat > arbitrarily, but influenced by the similar regulator core > timeout value) in the case where modules are enabled. > > Cc: Rob Herring <robh@kernel.org> > Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net> > Cc: Kevin Hilman <khilman@kernel.org> > Cc: Ulf Hansson <ulf.hansson@linaro.org> > Cc: Pavel Machek <pavel@ucw.cz> > Cc: Len Brown <len.brown@intel.com> > Cc: Todd Kjos <tkjos@google.com> > Cc: Bjorn Andersson <bjorn.andersson@linaro.org> > Cc: Liam Girdwood <lgirdwood@gmail.com> > Cc: Mark Brown <broonie@kernel.org> > Cc: Thierry Reding <treding@nvidia.com> > Cc: Linus Walleij <linus.walleij@linaro.org> > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > Cc: linux-pm@vger.kernel.org > Signed-off-by: John Stultz <john.stultz@linaro.org> > Change-Id: I9c5a02a54915ff53f9f14d49c601f41d7105e05e Change-Id... Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org> Regards, Bjorn > --- > v4: > * Split out into its own patch as suggested by Mark > * Made change conditional on CONFIG_MODULES > --- > drivers/base/dd.c | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/drivers/base/dd.c b/drivers/base/dd.c > index bb383dca39c1..fa138f24e2d3 100644 > --- a/drivers/base/dd.c > +++ b/drivers/base/dd.c > @@ -224,7 +224,16 @@ static int deferred_devs_show(struct seq_file *s, void *data) > } > DEFINE_SHOW_ATTRIBUTE(deferred_devs); > > +#ifdef CONFIG_MODULES > +/* > + * In the case of modules, set the default probe timeout to > + * 30 seconds to give userland some time to load needed modules > + */ > +static int deferred_probe_timeout = 30; > +#else > +/* In the case of !modules, no probe timeout needed */ > static int deferred_probe_timeout = -1; > +#endif > static int __init deferred_probe_timeout_setup(char *str) > { > int timeout; > -- > 2.17.1 >
diff --git a/drivers/base/dd.c b/drivers/base/dd.c index bb383dca39c1..fa138f24e2d3 100644 --- a/drivers/base/dd.c +++ b/drivers/base/dd.c @@ -224,7 +224,16 @@ static int deferred_devs_show(struct seq_file *s, void *data) } DEFINE_SHOW_ATTRIBUTE(deferred_devs); +#ifdef CONFIG_MODULES +/* + * In the case of modules, set the default probe timeout to + * 30 seconds to give userland some time to load needed modules + */ +static int deferred_probe_timeout = 30; +#else +/* In the case of !modules, no probe timeout needed */ static int deferred_probe_timeout = -1; +#endif static int __init deferred_probe_timeout_setup(char *str) { int timeout;
When using modules, its common for the modules not to be loaded until quite late by userland. With the current code, driver_deferred_probe_check_state() will stop returning EPROBE_DEFER after late_initcall, which can cause module dependency resolution to fail after that. So allow a longer window of 30 seconds (picked somewhat arbitrarily, but influenced by the similar regulator core timeout value) in the case where modules are enabled. Cc: Rob Herring <robh@kernel.org> Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net> Cc: Kevin Hilman <khilman@kernel.org> Cc: Ulf Hansson <ulf.hansson@linaro.org> Cc: Pavel Machek <pavel@ucw.cz> Cc: Len Brown <len.brown@intel.com> Cc: Todd Kjos <tkjos@google.com> Cc: Bjorn Andersson <bjorn.andersson@linaro.org> Cc: Liam Girdwood <lgirdwood@gmail.com> Cc: Mark Brown <broonie@kernel.org> Cc: Thierry Reding <treding@nvidia.com> Cc: Linus Walleij <linus.walleij@linaro.org> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: linux-pm@vger.kernel.org Signed-off-by: John Stultz <john.stultz@linaro.org> Change-Id: I9c5a02a54915ff53f9f14d49c601f41d7105e05e --- v4: * Split out into its own patch as suggested by Mark * Made change conditional on CONFIG_MODULES --- drivers/base/dd.c | 9 +++++++++ 1 file changed, 9 insertions(+)