LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: "Rafael J. Wysocki" <rjw@sisk.pl>
To: Alan Stern <stern@rowland.harvard.edu>
Cc: pm list <linux-pm@lists.linux-foundation.org>,
	Alexey Starikovskiy <astarikovskiy@suse.de>,
	Pavel Machek <pavel@ucw.cz>, LKML <linux-kernel@vger.kernel.org>
Subject: Re: [RFC][PATCH] PM: Make PM core handle device registrations concurrent with suspend/hibernation
Date: Thu, 6 Mar 2008 00:24:28 +0100	[thread overview]
Message-ID: <200803060024.28850.rjw@sisk.pl> (raw)
In-Reply-To: <Pine.LNX.4.44L0.0803051658290.4318-100000@iolanthe.rowland.org>

On Wednesday, 5 of March 2008, Alan Stern wrote:
> On Wed, 5 Mar 2008, Rafael J. Wysocki wrote:
> 
> > On Wednesday, 5 of March 2008, Alan Stern wrote:
> > > On Wed, 5 Mar 2008, Rafael J. Wysocki wrote:
> > > 
> > > > -void device_pm_add(struct device *dev)
> > > > +int device_pm_add(struct device *dev)
> > > >  {
> > > > +	int error = 0;
> > > > +
> > > >  	pr_debug("PM: Adding info for %s:%s\n",
> > > >  		 dev->bus ? dev->bus->name : "No Bus",
> > > >  		 kobject_name(&dev->kobj));
> > > >  	mutex_lock(&dpm_list_mtx);
> > > > -	list_add_tail(&dev->power.entry, &dpm_active);
> > > > +	if (dev->parent && dev->parent->power.sleeping) {
> > > > +		WARN_ON(true);
> > > 
> > > I would prefer to put a dev_warn() line here, so that people reading
> > > the kernel log can easily tell which device caused the problem and what
> > > sort of problem it is.  Something like this:
> > > 
> > > 		dev_warn(dev, "device added while parent %s is asleep\n",
> > > 				dev->parent->bus_id);
> > > 		WARN_ON(true);
> > 
> > Added.
> > 
> > > > @@ -426,6 +406,12 @@ static int dpm_suspend(pm_message_t stat
> > > >  		struct list_head *entry = dpm_active.prev;
> > > >  		struct device *dev = to_device(entry);
> > > >  
> > > > +		if (dev->parent && dev->parent->power.sleeping) {
> > > > +			WARN_ON(true);
> > > > +			error = -EAGAIN;
> > > > +			break;
> > > 
> > > Again, a dev_warn() would be appropriate.
> > 
> > I chose just "WARN_ON(dev->parent && dev->parent->power.sleeping)",
> > which is shorter. :-)
> > 
> > I don't really expect it to appear and if it's reported, it'll be easy to
> > figure out everything from the stack trace.
> 
> Okay.
> 
> > Revised patch below.
> 
> It looks good.  Let's hope it doesn't mess up ACPI too badly...  :-)
> 
> Acked-by: Alan Stern <stern@rowland.harvard.edu>

Thanks!

Okay, I also have the appended patch on top of this one. :-)

Rafael

---
From: Rafael J. Wysocki <rjw@sisk.pl>

Include dpm_sysfs_add() into device_pm_add(), in analogy with
device_pm_remove(), and modify device_add() to call the latter after
bus_add_device(), to avoid situations in which the PM core may
attempt to suspend a device the registration of which has not been
successful.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
 drivers/base/core.c       |   15 +++++----------
 drivers/base/power/main.c |    4 +++-
 2 files changed, 8 insertions(+), 11 deletions(-)

Index: linux-2.6/drivers/base/core.c
===================================================================
--- linux-2.6.orig/drivers/base/core.c
+++ linux-2.6/drivers/base/core.c
@@ -812,17 +812,12 @@ int device_add(struct device *dev)
 	error = device_add_attrs(dev);
 	if (error)
 		goto AttrsError;
-	error = dpm_sysfs_add(dev);
-	if (error)
-		goto PMError;
-	error = device_pm_add(dev);
-	if (error) {
-		dpm_sysfs_remove(dev);
-		goto PMError;
-	}
 	error = bus_add_device(dev);
 	if (error)
 		goto BusError;
+	error = device_pm_add(dev);
+	if (error)
+		goto PMError;
 	kobject_uevent(&dev->kobj, KOBJ_ADD);
 	bus_attach_device(dev);
 	if (parent)
@@ -842,9 +837,9 @@ int device_add(struct device *dev)
  Done:
 	put_device(dev);
 	return error;
- BusError:
-	device_pm_remove(dev);
  PMError:
+	bus_remove_device(dev);
+ BusError:
 	if (dev->bus)
 		blocking_notifier_call_chain(&dev->bus->p->bus_notifier,
 					     BUS_NOTIFY_DEL_DEVICE, dev);
Index: linux-2.6/drivers/base/power/main.c
===================================================================
--- linux-2.6.orig/drivers/base/power/main.c
+++ linux-2.6/drivers/base/power/main.c
@@ -75,7 +75,9 @@ int device_pm_add(struct device *dev)
 		WARN_ON(true);
 		error = -EBUSY;
 	} else {
-		list_add_tail(&dev->power.entry, &dpm_active);
+		error = dpm_sysfs_add(dev);
+		if (!error)
+			list_add_tail(&dev->power.entry, &dpm_active);
 	}
 	mutex_unlock(&dpm_list_mtx);
 	return error;

  reply	other threads:[~2008-03-05 23:25 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-03-03 23:10 Rafael J. Wysocki
2008-03-04 16:01 ` Alan Stern
2008-03-04 21:52   ` Rafael J. Wysocki
2008-03-05 16:03     ` Alan Stern
2008-03-05 16:16       ` Cornelia Huck
2008-03-05  1:15   ` Rafael J. Wysocki
2008-03-05 16:27     ` Alan Stern
2008-03-05 21:49       ` Rafael J. Wysocki
2008-03-05 22:00         ` Alan Stern
2008-03-05 23:24           ` Rafael J. Wysocki [this message]
2008-03-06 15:26             ` Alan Stern
2008-03-06 16:26               ` Rafael J. Wysocki
2008-03-06 17:40                 ` Alan Stern
2008-03-06 20:18                   ` Rafael J. Wysocki
2008-03-06 20:28                     ` Alan Stern
2008-03-06 21:28                       ` Rafael J. Wysocki
2008-03-06 21:58                         ` Alan Stern
2008-03-06 22:30                           ` Rafael J. Wysocki

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=200803060024.28850.rjw@sisk.pl \
    --to=rjw@sisk.pl \
    --cc=astarikovskiy@suse.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@lists.linux-foundation.org \
    --cc=pavel@ucw.cz \
    --cc=stern@rowland.harvard.edu \
    --subject='Re: [RFC][PATCH] PM: Make PM core handle device registrations concurrent with suspend/hibernation' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).