From patchwork Thu Jan 14 01:56:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rafael J. Wysocki" X-Patchwork-Id: 8029131 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 07391BEEE5 for ; Thu, 14 Jan 2016 01:57:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E3E21204A2 for ; Thu, 14 Jan 2016 01:57:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 99C8720499 for ; Thu, 14 Jan 2016 01:57:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755746AbcANB4r (ORCPT ); Wed, 13 Jan 2016 20:56:47 -0500 Received: from v094114.home.net.pl ([79.96.170.134]:64923 "HELO v094114.home.net.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1753195AbcANB4p (ORCPT ); Wed, 13 Jan 2016 20:56:45 -0500 Received: from abxw243.neoplus.adsl.tpnet.pl (83.9.16.243) (HELO vostro.rjw.lan) by serwer1319399.home.pl (79.96.170.134) with SMTP (IdeaSmtpServer v0.80) id 3af8dbaaa54377d8; Thu, 14 Jan 2016 02:56:44 +0100 From: "Rafael J. Wysocki" To: Linux PM list Cc: Greg Kroah-Hartman , Linux Kernel Mailing List , Alan Stern , Grant Likely , Mark Brown , Rob Herring , Tomeu Vizoso , Thierry Reding , Dmitry Torokhov , Geert Uytterhoeven , Michael Turquette Subject: [RFC][PATCH 4/5] PM core: Make runtime PM of devices use device links Date: Thu, 14 Jan 2016 02:56:13 +0100 Message-ID: <2791894.Yv1jHnXEPi@vostro.rjw.lan> User-Agent: KMail/4.11.5 (Linux/4.4.0; KDE/4.11.5; x86_64; ; ) In-Reply-To: <2576341.476ZsjkPgF@vostro.rjw.lan> References: <1623682.7KVblAB3KQ@vostro.rjw.lan> <2576341.476ZsjkPgF@vostro.rjw.lan> MIME-Version: 1.0 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Rafael J. Wysocki Modify the runtime PM framework to use device links to ensure that supplier devices will not be suspended if any of their consumer devices are active. The idea is to reference count suppliers on the consumer's resume and drop references to them on its suspend. The information on whether or not the supplier has been reference counted by the consumer's (runtime) resume is stored in a new field (rpm_active) in the link object for each link. It may be necessary to clean up those references when the supplier is unbinding and that's why the links whose status is DEVICE_LINK_SUPPLIER_UNBIND are skipped by the runtime suspend and resume code. The above means that if the consumer device is probed in the runtime-active state, the supplier has to be resumed and reference counted by device_link_add() so the code works as expected on its (runtime) suspend. There is a new flag, DEVICE_LINK_RPM_ACTIVE, to tell device_link_add() about that (in which case the caller is responsible for making sure that the consumer really will be runtime-active when runtime PM is enabled for it). The other new link flag, DEVICE_LINK_PM_RUNTIME, tells the core whether or not the link should be used for runtime PM at all. Signed-off-by: Rafael J. Wysocki --- drivers/base/core.c | 15 ++++++ drivers/base/dd.c | 1 drivers/base/power/runtime.c | 93 ++++++++++++++++++++++++++++++++++++++++--- include/linux/device.h | 5 ++ include/linux/pm_runtime.h | 2 5 files changed, 111 insertions(+), 5 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: linux-pm/drivers/base/power/runtime.c =================================================================== --- linux-pm.orig/drivers/base/power/runtime.c +++ linux-pm/drivers/base/power/runtime.c @@ -12,6 +12,8 @@ #include #include #include + +#include "../base.h" #include "power.h" typedef int (*pm_callback_t)(struct device *); @@ -266,19 +268,69 @@ static int rpm_check_suspend_allowed(str static int __rpm_callback(int (*cb)(struct device *), struct device *dev) __releases(&dev->power.lock) __acquires(&dev->power.lock) { - int retval; + struct devlink *link; + int retval, idx; - if (dev->power.irq_safe) + if (dev->power.irq_safe) { spin_unlock(&dev->power.lock); - else + } else { spin_unlock_irq(&dev->power.lock); + /* + * Resume suppliers if necessary. + * + * The device's runtime PM status cannot change until this + * routine returns, so it is safe to read the status outside of + * the lock. + */ + if (dev->power.runtime_status == RPM_RESUMING) { + idx = device_links_read_lock(); + + list_for_each_entry_rcu(link, &dev->consumer_links, c_node) + if ((link->flags & DEVICE_LINK_PM_RUNTIME) + && link->status != DEVICE_LINK_SUPPLIER_UNBIND + && !link->rpm_active) { + retval = pm_runtime_get_sync(link->supplier); + if (retval < 0) { + pm_runtime_put_noidle(link->supplier); + goto fail; + } + link->rpm_active = true; + } + + device_links_read_unlock(idx); + } + } + retval = cb(dev); - if (dev->power.irq_safe) + if (dev->power.irq_safe) { spin_lock(&dev->power.lock); - else + } else { + /* + * If the device is suspending and the callback has returned + * success, drop the usage counters of the suppliers that have + * been reference counted on its resume. + * + * Do that if resume fails too. + */ + if ((dev->power.runtime_status == RPM_SUSPENDING && !retval) + || (dev->power.runtime_status == RPM_RESUMING && retval)) { + idx = device_links_read_lock(); + + fail: + list_for_each_entry_rcu(link, &dev->consumer_links, c_node) + if (link->status != DEVICE_LINK_SUPPLIER_UNBIND + && link->rpm_active) { + pm_runtime_put(link->supplier); + link->rpm_active = false; + } + + device_links_read_unlock(idx); + } + spin_lock_irq(&dev->power.lock); + } return retval; } @@ -1443,6 +1495,37 @@ void pm_runtime_remove(struct device *de } /** + * pm_runtime_clean_up_links - Prepare links to consumers for driver removal. + * @dev: Device whose driver is going to be removed. + * + * Check links from this device to any consumers and if any of them have active + * runtime PM references to the device, drop the usage counter of the device + * (once per link). + * + * Since the device is guaranteed to be runtime-active at the point this is + * called, nothing else needs to be done here. + * + * Moreover, this is called after device_links_busy() has returned 'false', so + * the status of each link is guaranteed to be DEVICE_LINK_SUPPLIER_UNBIND and + * therefore rpm_active can't be manipulated concurrently. + */ +void pm_runtime_clean_up_links(struct device *dev) +{ + struct devlink *link; + int idx; + + idx = device_links_read_lock(); + + list_for_each_entry_rcu(link, &dev->supplier_links, s_node) + if (link->rpm_active) { + pm_runtime_put_noidle(dev); + link->rpm_active = false; + } + + device_links_read_unlock(idx); +} + +/** * pm_runtime_force_suspend - Force a device into suspend state if needed. * @dev: Device to suspend. * Index: linux-pm/include/linux/device.h =================================================================== --- linux-pm.orig/include/linux/device.h +++ linux-pm/include/linux/device.h @@ -704,9 +704,13 @@ enum devlink_status { * * PERSISTENT: Do not delete the link on consumer device driver unbind. * PROBE_TIME: Assume supplier device functional when creating the link. + * PM_RUNTIME: If set, the runtime PM framework will use this link. + * RPM_ACTIVE: Run pm_runtime_get_sync() on the supplier during link creation. */ #define DEVICE_LINK_PERSISTENT (1 << 0) #define DEVICE_LINK_PROBE_TIME (1 << 1) +#define DEVICE_LINK_PM_RUNTIME (1 << 2) +#define DEVICE_LINK_RPM_ACTIVE (1 << 3) struct devlink { struct device *supplier; @@ -715,6 +719,7 @@ struct devlink { struct list_head c_node; enum devlink_status status; u32 flags; + bool rpm_active; spinlock_t lock; struct rcu_head rcu_head; }; Index: linux-pm/drivers/base/core.c =================================================================== --- linux-pm.orig/drivers/base/core.c +++ linux-pm/drivers/base/core.c @@ -88,6 +88,11 @@ struct devlink *device_link_add(struct d if (!consumer || !supplier || !flags) return NULL; +#define RPM_ACTIVE_FLAGS (DEVICE_LINK_PM_RUNTIME | DEVICE_LINK_PROBE_TIME) + if ((flags & DEVICE_LINK_RPM_ACTIVE) + && (flags & RPM_ACTIVE_FLAGS) != RPM_ACTIVE_FLAGS) + return NULL; + mutex_lock(&device_links_lock); list_for_each_entry(link, &supplier->supplier_links, s_node) @@ -98,6 +103,16 @@ struct devlink *device_link_add(struct d if (!link) goto out; + if (flags & DEVICE_LINK_RPM_ACTIVE) { + if (pm_runtime_get_sync(supplier) < 0) { + pm_runtime_put_noidle(supplier); + kfree(link); + goto out; + } + link->rpm_active = true; + } else { + link->rpm_active = false; + } get_device(supplier); link->supplier = supplier; INIT_LIST_HEAD(&link->s_node); Index: linux-pm/drivers/base/dd.c =================================================================== --- linux-pm.orig/drivers/base/dd.c +++ linux-pm/drivers/base/dd.c @@ -771,6 +771,7 @@ static void __device_release_driver(stru } pm_runtime_get_sync(dev); + pm_runtime_clean_up_links(dev); driver_sysfs_remove(dev); Index: linux-pm/include/linux/pm_runtime.h =================================================================== --- linux-pm.orig/include/linux/pm_runtime.h +++ linux-pm/include/linux/pm_runtime.h @@ -55,6 +55,7 @@ extern unsigned long pm_runtime_autosusp extern void pm_runtime_update_max_time_suspended(struct device *dev, s64 delta_ns); extern void pm_runtime_set_memalloc_noio(struct device *dev, bool enable); +extern void pm_runtime_clean_up_links(struct device *dev); static inline bool pm_children_suspended(struct device *dev) { @@ -180,6 +181,7 @@ static inline unsigned long pm_runtime_a struct device *dev) { return 0; } static inline void pm_runtime_set_memalloc_noio(struct device *dev, bool enable){} +static inline void pm_runtime_clean_up_links(struct device *dev) {} #endif /* !CONFIG_PM */