From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758298AbbJHUVa (ORCPT ); Thu, 8 Oct 2015 16:21:30 -0400 Received: from v094114.home.net.pl ([79.96.170.134]:45408 "HELO v094114.home.net.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1751589AbbJHUV3 (ORCPT ); Thu, 8 Oct 2015 16:21:29 -0400 From: "Rafael J. Wysocki" To: Grygorii Strashko Cc: Greg Kroah-Hartman , Alan Stern , Pavel Machek , Len Brown , linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, Thierry Reding Subject: Re: [PATCH 1/2] PM / sleep: ensure deferred probe workqueue is finished in wait_for_device_probe Date: Thu, 08 Oct 2015 22:50:02 +0200 Message-ID: <2181899.pIHuaJgxyC@vostro.rjw.lan> User-Agent: KMail/4.11.5 (Linux/4.1.0-rc5+; KDE/4.11.5; x86_64; ; ) In-Reply-To: <1444323427-6822-2-git-send-email-grygorii.strashko@ti.com> References: <1444323427-6822-1-git-send-email-grygorii.strashko@ti.com> <1444323427-6822-2-git-send-email-grygorii.strashko@ti.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="utf-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thursday, October 08, 2015 11:57:06 AM Grygorii Strashko wrote: > Now wait_for_device_probe() waits for currently executing probes to finish, > but it doesn't take into account deferred probing mechanism. As result, > nothing prevents deferred probe workqueue to continue probing devices right > after wait_for_device_probe() is finished. > > Hence, lest ensure deferred probe workqueue is finished in s/lest/let's/ > wait_for_device_probe() before proceeding. > > Cc: Alan Stern > Cc: Rafael J. Wysocki > Cc: Thierry Reding > Signed-off-by: Grygorii Strashko > --- > drivers/base/dd.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/drivers/base/dd.c b/drivers/base/dd.c > index be0eb46..98de1a5 100644 > --- a/drivers/base/dd.c > +++ b/drivers/base/dd.c > @@ -391,6 +391,10 @@ int driver_probe_done(void) > */ > void wait_for_device_probe(void) > { > + /* wait for the deferred probe workqueue to finish */ > + if (driver_deferred_probe_enable) > + flush_workqueue(deferred_wq); > + > /* wait for the known devices to complete their probing */ > wait_event(probe_waitqueue, atomic_read(&probe_count) == 0); > async_synchronize_full(); I'm not sure if this is sufficient. Something may be added to the workqueue right after you've flushed it and then be reporobed after the wait_event() in theory. Or am I missing anything? Thanks, Rafael