From: "Rafael J. Wysocki" <rjw@rjwysocki.net>
To: Linux PM list <linux-pm@vger.kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Alan Stern <stern@rowland.harvard.edu>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Tomeu Vizoso <tomeu.vizoso@collabora.com>,
Mark Brown <broonie@kernel.org>,
Marek Szyprowski <m.szyprowski@samsung.com>,
Lukas Wunner <lukas@wunner.de>, Kevin Hilman <khilman@kernel.org>,
Ulf Hansson <ulf.hansson@linaro.org>,
"Luis R. Rodriguez" <mcgrof@suse.com>
Subject: [Resend][PATCH v6 5/5] PM / runtime: Optimize the use of device links
Date: Sun, 30 Oct 2016 17:32:43 +0100 [thread overview]
Message-ID: <4532235.M9ZOiUL2WF@vostro.rjw.lan> (raw)
In-Reply-To: <11468990.WB1J8sxXpS@vostro.rjw.lan>
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Subject:
If the device has no links to suppliers that should be used for
runtime PM (links with DEVICE_LINK_PM_RUNTIME set), there is no
reason to walk the list of suppliers for that device during
runtime suspend and resume.
Add a simple mechanism to detect that case and possibly avoid the
extra unnecessary overhead.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
drivers/base/core.c | 20 +++++++++++++-------
drivers/base/power/runtime.c | 23 ++++++++++++++++++++---
include/linux/pm.h | 1 +
include/linux/pm_runtime.h | 4 ++++
4 files changed, 38 insertions(+), 10 deletions(-)
Index: linux-pm/drivers/base/core.c
===================================================================
--- linux-pm.orig/drivers/base/core.c
+++ linux-pm/drivers/base/core.c
@@ -205,14 +205,17 @@ struct device_link *device_link_add(stru
if (!link)
goto out;
- if ((flags & DL_FLAG_PM_RUNTIME) && (flags & DL_FLAG_RPM_ACTIVE)) {
- if (pm_runtime_get_sync(supplier) < 0) {
- pm_runtime_put_noidle(supplier);
- kfree(link);
- link = NULL;
- goto out;
+ if (flags & DL_FLAG_PM_RUNTIME) {
+ if (flags & DL_FLAG_RPM_ACTIVE) {
+ if (pm_runtime_get_sync(supplier) < 0) {
+ pm_runtime_put_noidle(supplier);
+ kfree(link);
+ link = NULL;
+ goto out;
+ }
+ link->rpm_active = true;
}
- link->rpm_active = true;
+ pm_runtime_new_link(consumer);
}
get_device(supplier);
link->supplier = supplier;
@@ -296,6 +299,9 @@ static void __device_link_del(struct dev
dev_info(link->consumer, "Dropping the link to %s\n",
dev_name(link->supplier));
+ if (link->flags & DL_FLAG_PM_RUNTIME)
+ pm_runtime_drop_link(link->consumer);
+
list_del_rcu(&link->s_node);
list_del_rcu(&link->c_node);
call_srcu(&device_links_srcu, &link->rcu_head, __device_link_free_srcu);
Index: linux-pm/drivers/base/power/runtime.c
===================================================================
--- linux-pm.orig/drivers/base/power/runtime.c
+++ linux-pm/drivers/base/power/runtime.c
@@ -305,6 +305,7 @@ static int __rpm_callback(int (*cb)(stru
__releases(&dev->power.lock) __acquires(&dev->power.lock)
{
int retval, idx;
+ bool use_links = dev->power.links_count > 0;
if (dev->power.irq_safe) {
spin_unlock(&dev->power.lock);
@@ -318,7 +319,7 @@ static int __rpm_callback(int (*cb)(stru
* routine returns, so it is safe to read the status outside of
* the lock.
*/
- if (dev->power.runtime_status == RPM_RESUMING) {
+ if (use_links && dev->power.runtime_status == RPM_RESUMING) {
idx = device_links_read_lock();
retval = rpm_get_suppliers(dev);
@@ -341,8 +342,9 @@ static int __rpm_callback(int (*cb)(stru
*
* Do that if resume fails too.
*/
- if ((dev->power.runtime_status == RPM_SUSPENDING && !retval)
- || (dev->power.runtime_status == RPM_RESUMING && retval)) {
+ if (use_links
+ && ((dev->power.runtime_status == RPM_SUSPENDING && !retval)
+ || (dev->power.runtime_status == RPM_RESUMING && retval))) {
idx = device_links_read_lock();
fail:
@@ -1593,6 +1595,21 @@ void pm_runtime_put_suppliers(struct dev
device_links_read_unlock(idx);
}
+void pm_runtime_new_link(struct device *dev)
+{
+ spin_lock_irq(&dev->power.lock);
+ dev->power.links_count++;
+ spin_unlock_irq(&dev->power.lock);
+}
+
+void pm_runtime_drop_link(struct device *dev)
+{
+ spin_lock_irq(&dev->power.lock);
+ WARN_ON(dev->power.links_count == 0);
+ dev->power.links_count--;
+ spin_unlock_irq(&dev->power.lock);
+}
+
/**
* pm_runtime_force_suspend - Force a device into suspend state if needed.
* @dev: Device to suspend.
Index: linux-pm/include/linux/pm.h
===================================================================
--- linux-pm.orig/include/linux/pm.h
+++ linux-pm/include/linux/pm.h
@@ -597,6 +597,7 @@ struct dev_pm_info {
unsigned int use_autosuspend:1;
unsigned int timer_autosuspends:1;
unsigned int memalloc_noio:1;
+ unsigned int links_count;
enum rpm_request request;
enum rpm_status runtime_status;
int runtime_error;
Index: linux-pm/include/linux/pm_runtime.h
===================================================================
--- linux-pm.orig/include/linux/pm_runtime.h
+++ linux-pm/include/linux/pm_runtime.h
@@ -58,6 +58,8 @@ extern void pm_runtime_set_memalloc_noio
extern void pm_runtime_clean_up_links(struct device *dev);
extern void pm_runtime_get_suppliers(struct device *dev);
extern void pm_runtime_put_suppliers(struct device *dev);
+extern void pm_runtime_new_link(struct device *dev);
+extern void pm_runtime_drop_link(struct device *dev);
static inline void pm_suspend_ignore_children(struct device *dev, bool enable)
{
@@ -192,6 +194,8 @@ static inline void pm_runtime_set_memall
static inline void pm_runtime_clean_up_links(struct device *dev) {}
static inline void pm_runtime_get_suppliers(struct device *dev) {}
static inline void pm_runtime_put_suppliers(struct device *dev) {}
+static inline void pm_runtime_new_link(struct device *dev) {}
+static inline void pm_runtime_drop_link(struct device *dev) {}
#endif /* !CONFIG_PM */
next prev parent reply other threads:[~2016-10-30 16:25 UTC|newest]
Thread overview: 138+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-08 21:25 [RFC/RFT][PATCH v2 0/7] Functional dependencies between devices Rafael J. Wysocki
2016-09-08 21:26 ` [RFC/RFT][PATCH v2 1/7] driver core: Add a wrapper around __device_release_driver() Rafael J. Wysocki
2016-09-08 21:27 ` [RFC/RFT][PATCH v2 2/7] driver core: Functional dependencies tracking support Rafael J. Wysocki
2016-09-09 8:25 ` Ulf Hansson
2016-09-09 12:06 ` Mark Brown
2016-09-09 14:13 ` Ulf Hansson
2016-09-15 1:11 ` Rafael J. Wysocki
2016-09-11 13:40 ` Lukas Wunner
2016-09-11 20:43 ` Lukas Wunner
2016-09-14 1:21 ` Rafael J. Wysocki
2016-09-14 8:28 ` Lukas Wunner
2016-09-14 13:17 ` Rafael J. Wysocki
2016-09-08 21:28 ` [RFC/RFT][PATCH v2 3/7] PM / sleep: Make async suspend/resume of devices use device links Rafael J. Wysocki
2016-09-10 13:31 ` Lukas Wunner
2016-09-10 22:12 ` Rafael J. Wysocki
2016-09-08 21:29 ` [RFC/RFT][PATCH v2 4/7] PM / runtime: Pass flags argument to __pm_runtime_disable() Rafael J. Wysocki
2016-09-08 21:29 ` [RFC/RFT][PATCH v2 5/7] PM / runtime: Flag to indicate PM sleep transitions in progress Rafael J. Wysocki
2016-09-12 14:07 ` Lukas Wunner
2016-09-12 21:25 ` Rafael J. Wysocki
2016-09-12 22:52 ` Lukas Wunner
2016-09-13 7:21 ` Marek Szyprowski
2016-09-13 23:59 ` Rafael J. Wysocki
2016-09-08 21:30 ` [RFC/RFT][PATCH v2 6/7] PM / runtime: Use device links Rafael J. Wysocki
2016-09-12 9:47 ` Lukas Wunner
2016-09-12 13:57 ` Rafael J. Wysocki
2016-09-14 1:19 ` Rafael J. Wysocki
2016-09-08 21:31 ` [RFC/RFT][PATCH v2 7/7] PM / runtime: Optimize the use of " Rafael J. Wysocki
2016-09-08 21:35 ` [RFC/RFT][PATCH v2 0/7] Functional dependencies between devices Rafael J. Wysocki
2016-09-10 11:39 ` Lukas Wunner
2016-09-10 22:04 ` Rafael J. Wysocki
2016-09-13 17:57 ` Lukas Wunner
2016-09-13 23:18 ` Rafael J. Wysocki
2016-09-18 12:39 ` Lukas Wunner
[not found] ` <CGME20160913095858eucas1p267ec2397c9e4577f94557e4a38498164@eucas1p2.samsung.com>
2016-09-13 9:58 ` Marek Szyprowski
2016-09-13 22:41 ` Rafael J. Wysocki
2016-09-18 11:23 ` Lukas Wunner
2016-09-15 22:03 ` [RFC/RFT][PATCH v3 0/5] " Rafael J. Wysocki
2016-09-15 22:04 ` [Resend][RFC/RFT][PATCH v3 1/5] driver core: Add a wrapper around __device_release_driver() Rafael J. Wysocki
2016-09-15 22:06 ` [RFC/RFT][PATCH v3 2/5] driver core: Functional dependencies tracking support Rafael J. Wysocki
2016-09-16 7:53 ` Marek Szyprowski
2016-09-16 12:06 ` Rafael J. Wysocki
2016-09-16 12:33 ` [Update][RFC/RFT][PATCH " Rafael J. Wysocki
2016-09-19 22:46 ` Lukas Wunner
2016-09-23 13:03 ` Lukas Wunner
2016-09-23 13:42 ` Rafael J. Wysocki
2016-09-26 16:51 ` Lukas Wunner
2016-09-27 12:16 ` Rafael J. Wysocki
2016-09-27 8:54 ` Lukas Wunner
2016-09-27 11:52 ` Rafael J. Wysocki
2016-09-28 10:43 ` Lukas Wunner
2016-09-28 11:31 ` Rafael J. Wysocki
2016-09-29 10:36 ` Lukas Wunner
2016-09-15 22:06 ` [RFC/RFT][PATCH v3 3/5] PM / sleep: Make async suspend/resume of devices use device links Rafael J. Wysocki
2016-09-15 22:07 ` [RFC/RFT][PATCH v3 4/5] PM / runtime: Use " Rafael J. Wysocki
2016-09-15 22:07 ` [RFC/RFT][PATCH v3 5/5] PM / runtime: Optimize the use of " Rafael J. Wysocki
2016-09-16 7:25 ` [RFC/RFT][PATCH v3 0/5] Functional dependencies between devices Marek Szyprowski
2016-09-16 7:57 ` Marek Szyprowski
2016-09-16 12:04 ` Rafael J. Wysocki
2016-09-27 12:34 ` Lukas Wunner
2016-09-28 0:33 ` Rafael J. Wysocki
2016-09-28 11:42 ` Lukas Wunner
2016-09-29 0:51 ` Rafael J. Wysocki
2016-11-15 18:50 ` Lukas Wunner
2016-09-29 0:24 ` [PATCH v4 " Rafael J. Wysocki
2016-09-29 0:25 ` [Resend][PATCH v4 1/5] driver core: Add a wrapper around __device_release_driver() Rafael J. Wysocki
2016-09-29 0:38 ` [PATCH v4 2/5] driver core: Functional dependencies tracking support Rafael J. Wysocki
2016-10-01 7:43 ` Lukas Wunner
2016-10-01 23:32 ` Rafael J. Wysocki
2016-09-29 0:38 ` [Resend][PATCH v4 3/5] PM / sleep: Make async suspend/resume of devices use device links Rafael J. Wysocki
2016-09-29 0:40 ` [PATCH v4 4/5] PM / runtime: Use " Rafael J. Wysocki
2016-09-29 0:41 ` [Rebase][PATCH v4 5/5] PM / runtime: Optimize the use of " Rafael J. Wysocki
2016-09-29 6:58 ` [PATCH v4 0/5] Functional dependencies between devices Marek Szyprowski
2016-09-29 12:27 ` Rafael J. Wysocki
2016-10-02 23:13 ` Lukas Wunner
2016-10-10 12:36 ` [PATCH v5 " Rafael J. Wysocki
2016-10-10 12:37 ` [Resend][PATCH v5 1/5] driver core: Add a wrapper around __device_release_driver() Rafael J. Wysocki
2016-10-10 12:51 ` [PATCH v5 2/5] driver core: Functional dependencies tracking support Rafael J. Wysocki
2016-10-26 11:19 ` Lukas Wunner
2016-10-27 15:25 ` Greg Kroah-Hartman
2016-10-28 9:57 ` Lukas Wunner
2016-11-07 21:22 ` Luis R. Rodriguez
2016-11-08 6:45 ` Greg Kroah-Hartman
2016-11-08 19:21 ` Luis R. Rodriguez
2016-11-08 19:43 ` Greg Kroah-Hartman
2016-11-08 20:58 ` Luis R. Rodriguez
2016-11-09 6:45 ` Greg Kroah-Hartman
2016-11-09 9:36 ` Andrzej Hajda
2016-11-09 9:41 ` Greg Kroah-Hartman
2016-11-13 16:58 ` Lukas Wunner
2016-11-10 0:43 ` Rafael J. Wysocki
2016-11-10 0:59 ` Luis R. Rodriguez
2016-11-10 7:14 ` Laurent Pinchart
2016-11-10 22:04 ` Luis R. Rodriguez
2016-11-10 22:40 ` Greg Kroah-Hartman
2016-11-11 0:08 ` Laurent Pinchart
2016-11-13 10:59 ` Greg Kroah-Hartman
2016-11-14 14:50 ` Luis R. Rodriguez
2016-11-14 8:15 ` Geert Uytterhoeven
2016-11-10 8:46 ` Geert Uytterhoeven
2016-11-10 22:12 ` Luis R. Rodriguez
2016-10-27 15:32 ` Greg Kroah-Hartman
2016-11-07 21:39 ` Luis R. Rodriguez
2016-11-10 1:07 ` Rafael J. Wysocki
2016-11-10 7:05 ` Laurent Pinchart
2016-11-10 23:09 ` Luis R. Rodriguez
2016-11-13 17:34 ` Lukas Wunner
2016-11-14 13:48 ` Luis R. Rodriguez
2016-11-14 15:48 ` Lukas Wunner
2016-11-14 16:00 ` Luis R. Rodriguez
2016-10-10 12:54 ` [PATCH v5 3/5] PM / sleep: Make async suspend/resume of devices use device links Rafael J. Wysocki
2016-10-10 12:56 ` [PATCH v5 4/5] PM / runtime: Use " Rafael J. Wysocki
2016-10-20 13:17 ` [Update][PATCH " Rafael J. Wysocki
2016-10-10 12:57 ` [Rebase][PATCH v5 5/5] PM / runtime: Optimize the use of " Rafael J. Wysocki
2016-10-18 10:46 ` [PATCH v5 0/5] Functional dependencies between devices Marek Szyprowski
2016-10-19 11:57 ` Rafael J. Wysocki
2016-10-20 10:21 ` Marek Szyprowski
2016-10-20 12:54 ` Rafael J. Wysocki
2016-10-27 15:32 ` Greg Kroah-Hartman
[not found] ` <5811F0CF.5000204@huawei.com>
2016-10-28 9:39 ` Lukas Wunner
2016-11-02 20:55 ` Hanjun Guo
2016-10-30 16:22 ` [PATCH v6 " Rafael J. Wysocki
2016-10-30 16:28 ` [Resend][PATCH v6 3/5] PM / sleep: Make async suspend/resume of devices use device links Rafael J. Wysocki
2016-10-30 16:29 ` [Resend][PATCH v6 1/5] driver core: Add a wrapper around __device_release_driver() Rafael J. Wysocki
2016-10-30 16:32 ` [PATCH v6 2/5] driver core: Functional dependencies tracking support Rafael J. Wysocki
2016-10-30 16:32 ` [PATCH v6 4/5] PM / runtime: Use device links Rafael J. Wysocki
2016-12-18 14:01 ` Lukas Wunner
2016-12-18 15:53 ` Rafael J. Wysocki
2016-12-18 16:37 ` Lukas Wunner
2016-12-19 12:38 ` Rafael J. Wysocki
2016-10-30 16:32 ` Rafael J. Wysocki [this message]
2016-10-30 16:40 ` [PATCH v6 0/5] Functional dependencies between devices Rafael J. Wysocki
2016-10-31 17:47 ` Greg Kroah-Hartman
2016-11-01 3:50 ` Rafael J. Wysocki
2016-11-02 7:58 ` Marek Szyprowski
2016-11-05 12:10 ` Greg Kroah-Hartman
2016-11-07 21:15 ` Luis R. Rodriguez
2016-11-08 6:36 ` Marek Szyprowski
2016-11-08 20:14 ` Luis R. Rodriguez
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=4532235.M9ZOiUL2WF@vostro.rjw.lan \
--to=rjw@rjwysocki.net \
--cc=broonie@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=khilman@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=lukas@wunner.de \
--cc=m.szyprowski@samsung.com \
--cc=mcgrof@suse.com \
--cc=stern@rowland.harvard.edu \
--cc=tomeu.vizoso@collabora.com \
--cc=ulf.hansson@linaro.org \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).