linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2] pm: Add runtime PM statistics
@ 2010-07-10 16:52 Arjan van de Ven
  2010-07-11 21:26 ` Rafael J. Wysocki
  0 siblings, 1 reply; 9+ messages in thread
From: Arjan van de Ven @ 2010-07-10 16:52 UTC (permalink / raw)
  To: Rafael J. Wysocki; +Cc: linux-pm, linux-kernel, Alan Stern, Ming Lei

From: Arjan van de Ven <arjan@linux.intel.com>
Subject: [PATCH v2] pm: Add runtime PM statistics

In order for PowerTOP to be able to report how well the new runtime PM is working
for the various drivers, the kernel needs to export some basic statistics in sysfs.

This patch adds two sysfs files in the runtime PM domain that expose the
total time a device has been active, and the time a device has been suspended.

With this PowerTOP can compute the activity percentage

Active %age = 100 * (delta active) / (delta active + delta suspended)

and present the information to the user.

I've written the PowerTOP code (slated for version 1.12) already, and the output looks
like this:

Runtime Device Power Management statistics
Active  Device name
 10.0%	06:00.0 Ethernet controller: Realtek Semiconductor Co., Ltd. RTL8101E/RTL8102E PCI Express Fast Ethernet controller 



[version 2: fix stat update bugs noticed by Alan Stern]

Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>

diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c
index b0ec0e9..b78c401 100644
--- a/drivers/base/power/runtime.c
+++ b/drivers/base/power/runtime.c
@@ -123,6 +123,45 @@ int pm_runtime_idle(struct device *dev)
 }
 EXPORT_SYMBOL_GPL(pm_runtime_idle);
 
+
+/**
+ * update_pm_runtime_accounting - Update the time accounting of power states
+ * @dev: Device to update the accounting for
+ *
+ * In order to be able to have time accounting of the various power states
+ * (as used by programs such as PowerTOP to show the effectiveness of runtime
+ * PM), we need to track the time spent in each state.
+ * update_pm_runtime_accounting must be called each time before the
+ * runtime_status field is updated, to account the time in the old state
+ * correctly.
+ */
+void update_pm_runtime_accounting(struct device *dev)
+{
+	unsigned long now = jiffies;
+	int delta;
+
+	delta = now - dev->power.accounting_timestamp;
+
+	if (delta < 0)
+		delta = 0;
+
+	dev->power.accounting_timestamp = now;
+
+	if (dev->power.disable_depth > 0)
+		return;
+
+	if (dev->power.runtime_status == RPM_SUSPENDED)
+		dev->power.suspended_jiffies += delta;
+	else
+		dev->power.active_jiffies += delta;
+}
+
+static void __update_runtime_status(struct device *dev, enum rpm_status status)
+{
+	update_pm_runtime_accounting(dev);
+	dev->power.runtime_status = status;
+}
+
 /**
  * __pm_runtime_suspend - Carry out run-time suspend of given device.
  * @dev: Device to suspend.
@@ -197,7 +236,7 @@ int __pm_runtime_suspend(struct device *dev, bool from_wq)
 		goto repeat;
 	}
 
-	dev->power.runtime_status = RPM_SUSPENDING;
+	__update_runtime_status(dev, RPM_SUSPENDING);
 	dev->power.deferred_resume = false;
 
 	if (dev->bus && dev->bus->pm && dev->bus->pm->runtime_suspend) {
@@ -228,7 +267,7 @@ int __pm_runtime_suspend(struct device *dev, bool from_wq)
 	}
 
 	if (retval) {
-		dev->power.runtime_status = RPM_ACTIVE;
+		__update_runtime_status(dev, RPM_ACTIVE);
 		if (retval == -EAGAIN || retval == -EBUSY) {
 			if (dev->power.timer_expires == 0)
 				notify = true;
@@ -237,7 +276,7 @@ int __pm_runtime_suspend(struct device *dev, bool from_wq)
 			pm_runtime_cancel_pending(dev);
 		}
 	} else {
-		dev->power.runtime_status = RPM_SUSPENDED;
+		__update_runtime_status(dev, RPM_SUSPENDED);
 		pm_runtime_deactivate_timer(dev);
 
 		if (dev->parent) {
@@ -381,7 +420,7 @@ int __pm_runtime_resume(struct device *dev, bool from_wq)
 		goto repeat;
 	}
 
-	dev->power.runtime_status = RPM_RESUMING;
+	__update_runtime_status(dev, RPM_RESUMING);
 
 	if (dev->bus && dev->bus->pm && dev->bus->pm->runtime_resume) {
 		spin_unlock_irq(&dev->power.lock);
@@ -411,10 +450,10 @@ int __pm_runtime_resume(struct device *dev, bool from_wq)
 	}
 
 	if (retval) {
-		dev->power.runtime_status = RPM_SUSPENDED;
+		__update_runtime_status(dev, RPM_SUSPENDED);
 		pm_runtime_cancel_pending(dev);
 	} else {
-		dev->power.runtime_status = RPM_ACTIVE;
+		__update_runtime_status(dev, RPM_ACTIVE);
 		if (parent)
 			atomic_inc(&parent->power.child_count);
 	}
@@ -848,7 +887,7 @@ int __pm_runtime_set_status(struct device *dev, unsigned int status)
 	}
 
  out_set:
-	dev->power.runtime_status = status;
+	__update_runtime_status(dev, status);
 	dev->power.runtime_error = 0;
  out:
 	spin_unlock_irqrestore(&dev->power.lock, flags);
@@ -1077,6 +1116,7 @@ void pm_runtime_init(struct device *dev)
 	dev->power.request_pending = false;
 	dev->power.request = RPM_REQ_NONE;
 	dev->power.deferred_resume = false;
+	dev->power.accounting_timestamp = jiffies;
 	INIT_WORK(&dev->power.work, pm_runtime_work);
 
 	dev->power.timer_expires = 0;
diff --git a/drivers/base/power/sysfs.c b/drivers/base/power/sysfs.c
index a4c33bc..f45c316 100644
--- a/drivers/base/power/sysfs.c
+++ b/drivers/base/power/sysfs.c
@@ -6,6 +6,7 @@
 #include <linux/string.h>
 #include <linux/pm_runtime.h>
 #include <asm/atomic.h>
+#include <linux/jiffies.h>
 #include "power.h"
 
 /*
@@ -190,9 +191,34 @@ static ssize_t rtpm_status_show(struct device *dev,
 	return -EIO;
 }
 
+static ssize_t rtpm_active_time_show(struct device *dev,
+				struct device_attribute *attr, char *buf)
+{
+	int ret;
+	spin_lock_irq(&dev->power.lock);
+	update_pm_runtime_accounting(dev);
+	ret = sprintf(buf, "%i\n", jiffies_to_msecs(dev->power.active_jiffies));
+	spin_unlock_irq(&dev->power.lock);
+	return ret;
+}
+
+static ssize_t rtpm_suspended_time_show(struct device *dev,
+				struct device_attribute *attr, char *buf)
+{
+	int ret;
+	spin_lock_irq(&dev->power.lock);
+	update_pm_runtime_accounting(dev);
+	ret = sprintf(buf, "%i\n",
+		jiffies_to_msecs(dev->power.suspended_jiffies));
+	spin_unlock_irq(&dev->power.lock);
+	return ret;
+}
+
 static DEVICE_ATTR(runtime_usage, 0444, rtpm_usagecount_show, NULL);
 static DEVICE_ATTR(runtime_active_kids, 0444, rtpm_children_show, NULL);
 static DEVICE_ATTR(runtime_status, 0444, rtpm_status_show, NULL);
+static DEVICE_ATTR(runtime_active_time, 0444, rtpm_active_time_show, NULL);
+static DEVICE_ATTR(runtime_suspended_time, 0444, rtpm_suspended_time_show, NULL);
 static DEVICE_ATTR(runtime_enabled, 0444, rtpm_enabled_show, NULL);
 
 #endif
@@ -234,6 +260,8 @@ static struct attribute * power_attrs[] = {
 	&dev_attr_async.attr,
 #ifdef CONFIG_PM_RUNTIME
 	&dev_attr_runtime_usage.attr,
+	&dev_attr_runtime_suspended_time.attr,
+	&dev_attr_runtime_active_time.attr,
 	&dev_attr_runtime_active_kids.attr,
 	&dev_attr_runtime_status.attr,
 	&dev_attr_runtime_enabled.attr,
diff --git a/include/linux/pm.h b/include/linux/pm.h
index 8e258c7..dca597f 100644
--- a/include/linux/pm.h
+++ b/include/linux/pm.h
@@ -476,9 +476,15 @@ struct dev_pm_info {
 	enum rpm_request	request;
 	enum rpm_status		runtime_status;
 	int			runtime_error;
+	unsigned long		active_jiffies;
+	unsigned long		suspended_jiffies;
+	unsigned long		accounting_timestamp;
 #endif
 };
 
+extern void update_pm_runtime_accounting(struct device *dev);
+
+
 /*
  * The PM_EVENT_ messages are also used by drivers implementing the legacy
  * suspend framework, based on the ->suspend() and ->resume() callbacks common


-- 
Arjan van de Ven 	Intel Open Source Technology Centre
For development, discussion and tips for power savings, 
visit http://www.lesswatts.org

^ permalink raw reply related	[flat|nested] 9+ messages in thread

* Re: [PATCH v2] pm: Add runtime PM statistics
  2010-07-10 16:52 [PATCH v2] pm: Add runtime PM statistics Arjan van de Ven
@ 2010-07-11 21:26 ` Rafael J. Wysocki
  2010-07-12  5:16   ` Arjan van de Ven
  0 siblings, 1 reply; 9+ messages in thread
From: Rafael J. Wysocki @ 2010-07-11 21:26 UTC (permalink / raw)
  To: Arjan van de Ven; +Cc: linux-pm, linux-kernel, Alan Stern, Ming Lei

On Saturday, July 10, 2010, Arjan van de Ven wrote:
> From: Arjan van de Ven <arjan@linux.intel.com>
> Subject: [PATCH v2] pm: Add runtime PM statistics
> 
> In order for PowerTOP to be able to report how well the new runtime PM is working
> for the various drivers, the kernel needs to export some basic statistics in sysfs.
> 
> This patch adds two sysfs files in the runtime PM domain that expose the
> total time a device has been active, and the time a device has been suspended.
> 
> With this PowerTOP can compute the activity percentage
> 
> Active %age = 100 * (delta active) / (delta active + delta suspended)
> 
> and present the information to the user.
> 
> I've written the PowerTOP code (slated for version 1.12) already, and the output looks
> like this:
> 
> Runtime Device Power Management statistics
> Active  Device name
>  10.0%	06:00.0 Ethernet controller: Realtek Semiconductor Co., Ltd. RTL8101E/RTL8102E PCI Express Fast Ethernet controller 
> 
> 
> 
> [version 2: fix stat update bugs noticed by Alan Stern]
> 
> Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
> 
> diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c
> index b0ec0e9..b78c401 100644
> --- a/drivers/base/power/runtime.c
> +++ b/drivers/base/power/runtime.c
...
>  
> +static ssize_t rtpm_active_time_show(struct device *dev,
> +				struct device_attribute *attr, char *buf)
> +{
> +	int ret;
> +	spin_lock_irq(&dev->power.lock);
> +	update_pm_runtime_accounting(dev);
> +	ret = sprintf(buf, "%i\n", jiffies_to_msecs(dev->power.active_jiffies));
> +	spin_unlock_irq(&dev->power.lock);
> +	return ret;
> +}
> +
> +static ssize_t rtpm_suspended_time_show(struct device *dev,
> +				struct device_attribute *attr, char *buf)
> +{
> +	int ret;
> +	spin_lock_irq(&dev->power.lock);
> +	update_pm_runtime_accounting(dev);
> +	ret = sprintf(buf, "%i\n",
> +		jiffies_to_msecs(dev->power.suspended_jiffies));
> +	spin_unlock_irq(&dev->power.lock);
> +	return ret;
> +}
> +
>  static DEVICE_ATTR(runtime_usage, 0444, rtpm_usagecount_show, NULL);
>  static DEVICE_ATTR(runtime_active_kids, 0444, rtpm_children_show, NULL);
>  static DEVICE_ATTR(runtime_status, 0444, rtpm_status_show, NULL);
> +static DEVICE_ATTR(runtime_active_time, 0444, rtpm_active_time_show, NULL);
> +static DEVICE_ATTR(runtime_suspended_time, 0444, rtpm_suspended_time_show, NULL);
>  static DEVICE_ATTR(runtime_enabled, 0444, rtpm_enabled_show, NULL);

On a second thought, "active_time" and "suspended_time" should be sufficient
(ie. the "runtime_" prefix is not really necessary).

Rafael

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH v2] pm: Add runtime PM statistics
  2010-07-11 21:26 ` Rafael J. Wysocki
@ 2010-07-12  5:16   ` Arjan van de Ven
  2010-07-13 21:28     ` Rafael J. Wysocki
  0 siblings, 1 reply; 9+ messages in thread
From: Arjan van de Ven @ 2010-07-12  5:16 UTC (permalink / raw)
  To: Rafael J. Wysocki; +Cc: linux-pm, linux-kernel, Alan Stern, Ming Lei

On Sun, 11 Jul 2010 23:26:07 +0200
"Rafael J. Wysocki" <rjw@sisk.pl> wrote:

> > +
> >  static DEVICE_ATTR(runtime_usage, 0444, rtpm_usagecount_show,
> > NULL); static DEVICE_ATTR(runtime_active_kids, 0444,
> > rtpm_children_show, NULL); static DEVICE_ATTR(runtime_status, 0444,
> > rtpm_status_show, NULL); +static DEVICE_ATTR(runtime_active_time,
> > 0444, rtpm_active_time_show, NULL); +static
> > DEVICE_ATTR(runtime_suspended_time, 0444, rtpm_suspended_time_show,
> > NULL); static DEVICE_ATTR(runtime_enabled, 0444, rtpm_enabled_show,
> > NULL);
> 
> On a second thought, "active_time" and "suspended_time" should be
> sufficient (ie. the "runtime_" prefix is not really necessary).

it's not necessary but it's consistent with the others... so yes
I can change it but then it's no longer consistent naming.. are you sure
you want this changed?


-- 
Arjan van de Ven 	Intel Open Source Technology Centre
For development, discussion and tips for power savings, 
visit http://www.lesswatts.org

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH v2] pm: Add runtime PM statistics
  2010-07-12  5:16   ` Arjan van de Ven
@ 2010-07-13 21:28     ` Rafael J. Wysocki
  2010-07-15 15:44       ` Arjan van de Ven
  0 siblings, 1 reply; 9+ messages in thread
From: Rafael J. Wysocki @ 2010-07-13 21:28 UTC (permalink / raw)
  To: Arjan van de Ven; +Cc: linux-pm, linux-kernel, Alan Stern, Ming Lei

On Monday, July 12, 2010, Arjan van de Ven wrote:
> On Sun, 11 Jul 2010 23:26:07 +0200
> "Rafael J. Wysocki" <rjw@sisk.pl> wrote:
> 
> > > +
> > >  static DEVICE_ATTR(runtime_usage, 0444, rtpm_usagecount_show,
> > > NULL); static DEVICE_ATTR(runtime_active_kids, 0444,
> > > rtpm_children_show, NULL); static DEVICE_ATTR(runtime_status, 0444,
> > > rtpm_status_show, NULL); +static DEVICE_ATTR(runtime_active_time,
> > > 0444, rtpm_active_time_show, NULL); +static
> > > DEVICE_ATTR(runtime_suspended_time, 0444, rtpm_suspended_time_show,
> > > NULL); static DEVICE_ATTR(runtime_enabled, 0444, rtpm_enabled_show,
> > > NULL);
> > 
> > On a second thought, "active_time" and "suspended_time" should be
> > sufficient (ie. the "runtime_" prefix is not really necessary).
> 
> it's not necessary but it's consistent with the others... so yes
> I can change it but then it's no longer consistent naming.. are you sure
> you want this changed?

No, you're right, sorry.

But can you rebase your patch on top of linux-next, please, and move the
definitions of the new attributes next to 'control' and 'runtime_status' (so
that they don't depend on 'debug')?

Rafael

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: Re: [PATCH v2] pm: Add runtime PM statistics
  2010-07-13 21:28     ` Rafael J. Wysocki
@ 2010-07-15 15:44       ` Arjan van de Ven
  2010-08-05 23:20         ` Kevin Hilman
  0 siblings, 1 reply; 9+ messages in thread
From: Arjan van de Ven @ 2010-07-15 15:44 UTC (permalink / raw)
  To: Rafael J. Wysocki
  Cc: Arjan van de Ven, linux-pm, linux-kernel, Alan Stern, Ming Lei

On 11:59 AM, Rafael J. Wysocki wrote:
> On Monday, July 12, 2010, Arjan van de Ven wrote:
>    
>> On Sun, 11 Jul 2010 23:26:07 +0200
>> "Rafael J. Wysocki"<rjw@sisk.pl>  wrote:
>>
>>      
>>>> +
>>>>   static DEVICE_ATTR(runtime_usage, 0444, rtpm_usagecount_show,
>>>> NULL); static DEVICE_ATTR(runtime_active_kids, 0444,
>>>> rtpm_children_show, NULL); static DEVICE_ATTR(runtime_status, 0444,
>>>> rtpm_status_show, NULL); +static DEVICE_ATTR(runtime_active_time,
>>>> 0444, rtpm_active_time_show, NULL); +static
>>>> DEVICE_ATTR(runtime_suspended_time, 0444, rtpm_suspended_time_show,
>>>> NULL); static DEVICE_ATTR(runtime_enabled, 0444, rtpm_enabled_show,
>>>> NULL);
>>>>          
>>> On a second thought, "active_time" and "suspended_time" should be
>>> sufficient (ie. the "runtime_" prefix is not really necessary).
>>>        
>> it's not necessary but it's consistent with the others... so yes
>> I can change it but then it's no longer consistent naming.. are you sure
>> you want this changed?
>>      
> No, you're right, sorry.
>
> But can you rebase your patch on top of linux-next, please, and move the
> definitions of the new attributes next to 'control' and 'runtime_status' (so
> that they don't depend on 'debug')?
>
> Rafael
>    
From: Arjan van de Ven <arjan@linux.intel.com>
Subject: [PATCH v3] pm: Add runtime PM statistics

In order for PowerTOP to be able to report how well the new runtime PM is
working for the various drivers, the kernel needs to export some basic
statistics in sysfs.

This patch adds two sysfs files in the runtime PM domain that expose the
total time a device has been active, and the time a device has been
suspended.

With this PowerTOP can compute the activity percentage

Active %age = 100 * (delta active) / (delta active + delta suspended)

and present the information to the user.

I've written the PowerTOP code (slated for version 1.12) already, and the
output looks like this:

Runtime Device Power Management statistics
Active  Device name
  10.0%    06:00.0 Ethernet controller: Realtek Semiconductor Co., Ltd. 
RTL8101E/RTL8102E PCI Express Fast Ethernet controller


[version 2: fix stat update bugs noticed by Alan Stern]
[version 3: rebase to -next and move the sysfs declaration]

Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>

diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c
index b0ec0e9..b78c401 100644
--- a/drivers/base/power/runtime.c
+++ b/drivers/base/power/runtime.c
@@ -123,6 +123,45 @@ int pm_runtime_idle(struct device *dev)
  }
  EXPORT_SYMBOL_GPL(pm_runtime_idle);

+
+/**
+ * update_pm_runtime_accounting - Update the time accounting of power 
states
+ * @dev: Device to update the accounting for
+ *
+ * In order to be able to have time accounting of the various power states
+ * (as used by programs such as PowerTOP to show the effectiveness of 
runtime
+ * PM), we need to track the time spent in each state.
+ * update_pm_runtime_accounting must be called each time before the
+ * runtime_status field is updated, to account the time in the old state
+ * correctly.
+ */
+void update_pm_runtime_accounting(struct device *dev)
+{
+    unsigned long now = jiffies;
+    int delta;
+
+    delta = now - dev->power.accounting_timestamp;
+
+    if (delta < 0)
+        delta = 0;
+
+    dev->power.accounting_timestamp = now;
+
+    if (dev->power.disable_depth > 0)
+        return;
+
+    if (dev->power.runtime_status == RPM_SUSPENDED)
+        dev->power.suspended_jiffies += delta;
+    else
+        dev->power.active_jiffies += delta;
+}
+
+static void __update_runtime_status(struct device *dev, enum rpm_status 
status)
+{
+    update_pm_runtime_accounting(dev);
+    dev->power.runtime_status = status;
+}
+
  /**
   * __pm_runtime_suspend - Carry out run-time suspend of given device.
   * @dev: Device to suspend.
@@ -197,7 +236,7 @@ int __pm_runtime_suspend(struct device *dev, bool 
from_wq)
          goto repeat;
      }

-    dev->power.runtime_status = RPM_SUSPENDING;
+    __update_runtime_status(dev, RPM_SUSPENDING);
      dev->power.deferred_resume = false;

      if (dev->bus && dev->bus->pm && dev->bus->pm->runtime_suspend) {
@@ -228,7 +267,7 @@ int __pm_runtime_suspend(struct device *dev, bool 
from_wq)
      }

      if (retval) {
-        dev->power.runtime_status = RPM_ACTIVE;
+        __update_runtime_status(dev, RPM_ACTIVE);
          if (retval == -EAGAIN || retval == -EBUSY) {
              if (dev->power.timer_expires == 0)
                  notify = true;
@@ -237,7 +276,7 @@ int __pm_runtime_suspend(struct device *dev, bool 
from_wq)
              pm_runtime_cancel_pending(dev);
          }
      } else {
-        dev->power.runtime_status = RPM_SUSPENDED;
+        __update_runtime_status(dev, RPM_SUSPENDED);
          pm_runtime_deactivate_timer(dev);

          if (dev->parent) {
@@ -381,7 +420,7 @@ int __pm_runtime_resume(struct device *dev, bool 
from_wq)
          goto repeat;
      }

-    dev->power.runtime_status = RPM_RESUMING;
+    __update_runtime_status(dev, RPM_RESUMING);

      if (dev->bus && dev->bus->pm && dev->bus->pm->runtime_resume) {
          spin_unlock_irq(&dev->power.lock);
@@ -411,10 +450,10 @@ int __pm_runtime_resume(struct device *dev, bool 
from_wq)
      }

      if (retval) {
-        dev->power.runtime_status = RPM_SUSPENDED;
+        __update_runtime_status(dev, RPM_SUSPENDED);
          pm_runtime_cancel_pending(dev);
      } else {
-        dev->power.runtime_status = RPM_ACTIVE;
+        __update_runtime_status(dev, RPM_ACTIVE);
          if (parent)
              atomic_inc(&parent->power.child_count);
      }
@@ -848,7 +887,7 @@ int __pm_runtime_set_status(struct device *dev, 
unsigned int status)
      }

   out_set:
-    dev->power.runtime_status = status;
+    __update_runtime_status(dev, status);
      dev->power.runtime_error = 0;
   out:
      spin_unlock_irqrestore(&dev->power.lock, flags);
@@ -1077,6 +1116,7 @@ void pm_runtime_init(struct device *dev)
      dev->power.request_pending = false;
      dev->power.request = RPM_REQ_NONE;
      dev->power.deferred_resume = false;
+    dev->power.accounting_timestamp = jiffies;
      INIT_WORK(&dev->power.work, pm_runtime_work);

      dev->power.timer_expires = 0;
diff --git a/drivers/base/power/sysfs.c b/drivers/base/power/sysfs.c
index 1eca50c..e56b438 100644
--- a/drivers/base/power/sysfs.c
+++ b/drivers/base/power/sysfs.c
@@ -6,6 +6,7 @@
  #include <linux/string.h>
  #include <linux/pm_runtime.h>
  #include <asm/atomic.h>
+#include <linux/jiffies.h>
  #include "power.h"

  /*
@@ -111,6 +112,33 @@ static ssize_t control_store(struct device * dev, 
struct device_attribute *attr,

  static DEVICE_ATTR(control, 0644, control_show, control_store);

+static ssize_t rtpm_active_time_show(struct device *dev,
+                struct device_attribute *attr, char *buf)
+{
+    int ret;
+    spin_lock_irq(&dev->power.lock);
+    update_pm_runtime_accounting(dev);
+    ret = sprintf(buf, "%i\n", 
jiffies_to_msecs(dev->power.active_jiffies));
+    spin_unlock_irq(&dev->power.lock);
+    return ret;
+}
+
+static DEVICE_ATTR(runtime_active_time, 0444, rtpm_active_time_show, NULL);
+
+static ssize_t rtpm_suspended_time_show(struct device *dev,
+                struct device_attribute *attr, char *buf)
+{
+    int ret;
+    spin_lock_irq(&dev->power.lock);
+    update_pm_runtime_accounting(dev);
+    ret = sprintf(buf, "%i\n",
+        jiffies_to_msecs(dev->power.suspended_jiffies));
+    spin_unlock_irq(&dev->power.lock);
+    return ret;
+}
+
+static DEVICE_ATTR(runtime_suspended_time, 0444, 
rtpm_suspended_time_show, NULL);
+
  static ssize_t rtpm_status_show(struct device *dev,
                  struct device_attribute *attr, char *buf)
  {
@@ -254,6 +282,8 @@ static struct attribute * power_attrs[] = {
  #ifdef CONFIG_PM_RUNTIME
&dev_attr_control.attr,
&dev_attr_runtime_status.attr,
+ &dev_attr_runtime_suspended_time.attr,
+ &dev_attr_runtime_active_time.attr,
  #endif
&dev_attr_wakeup.attr,
  #ifdef CONFIG_PM_SLEEP
diff --git a/include/linux/pm.h b/include/linux/pm.h
index b417fc4..52e8c55 100644
--- a/include/linux/pm.h
+++ b/include/linux/pm.h
@@ -477,9 +477,15 @@ struct dev_pm_info {
      enum rpm_request    request;
      enum rpm_status        runtime_status;
      int            runtime_error;
+    unsigned long        active_jiffies;
+    unsigned long        suspended_jiffies;
+    unsigned long        accounting_timestamp;
  #endif
  };

+extern void update_pm_runtime_accounting(struct device *dev);
+
+
  /*
   * The PM_EVENT_ messages are also used by drivers implementing the legacy
   * suspend framework, based on the ->suspend() and ->resume() 
callbacks common


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* Re: [PATCH v2] pm: Add runtime PM statistics
  2010-07-15 15:44       ` Arjan van de Ven
@ 2010-08-05 23:20         ` Kevin Hilman
  2010-08-05 23:45           ` Rafael J. Wysocki
  2010-08-05 23:59           ` Arjan van de Ven
  0 siblings, 2 replies; 9+ messages in thread
From: Kevin Hilman @ 2010-08-05 23:20 UTC (permalink / raw)
  To: Arjan van de Ven
  Cc: Rafael J. Wysocki, Arjan van de Ven, linux-pm, linux-kernel,
	Alan Stern, Ming Lei

Arjan van de Ven <arjan@linux.intel.com> writes:

> +
> +/**
> + * update_pm_runtime_accounting - Update the time accounting of power
> states
> + * @dev: Device to update the accounting for
> + *
> + * In order to be able to have time accounting of the various power states
> + * (as used by programs such as PowerTOP to show the effectiveness of
> runtime
> + * PM), we need to track the time spent in each state.
> + * update_pm_runtime_accounting must be called each time before the
> + * runtime_status field is updated, to account the time in the old state
> + * correctly.
> + */
> +void update_pm_runtime_accounting(struct device *dev)
> +{
> +    unsigned long now = jiffies;
> +    int delta;
> +
> +    delta = now - dev->power.accounting_timestamp;
> +
> +    if (delta < 0)
> +        delta = 0;
> +
> +    dev->power.accounting_timestamp = now;
> +
> +    if (dev->power.disable_depth > 0)
> +        return;
> +
> +    if (dev->power.runtime_status == RPM_SUSPENDED)
> +        dev->power.suspended_jiffies += delta;
> +    else
> +        dev->power.active_jiffies += delta;
> +}

By using jiffies, I think we might miss events in drivers that are doing
runtime PM transitions in short bursts.  On embedded systems with slow
HZ, there could potentially be lots of transitions between ticks.

It would be nicer to use clocksource-based time so transitions between
jiffies could still be factored into the accounting.

Kevin



^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH v2] pm: Add runtime PM statistics
  2010-08-05 23:20         ` Kevin Hilman
@ 2010-08-05 23:45           ` Rafael J. Wysocki
  2010-08-05 23:59           ` Arjan van de Ven
  1 sibling, 0 replies; 9+ messages in thread
From: Rafael J. Wysocki @ 2010-08-05 23:45 UTC (permalink / raw)
  To: Kevin Hilman
  Cc: Arjan van de Ven, Arjan van de Ven, linux-pm, linux-kernel,
	Alan Stern, Ming Lei

On Friday, August 06, 2010, Kevin Hilman wrote:
> Arjan van de Ven <arjan@linux.intel.com> writes:
> 
> > +
> > +/**
> > + * update_pm_runtime_accounting - Update the time accounting of power
> > states
> > + * @dev: Device to update the accounting for
> > + *
> > + * In order to be able to have time accounting of the various power states
> > + * (as used by programs such as PowerTOP to show the effectiveness of
> > runtime
> > + * PM), we need to track the time spent in each state.
> > + * update_pm_runtime_accounting must be called each time before the
> > + * runtime_status field is updated, to account the time in the old state
> > + * correctly.
> > + */
> > +void update_pm_runtime_accounting(struct device *dev)
> > +{
> > +    unsigned long now = jiffies;
> > +    int delta;
> > +
> > +    delta = now - dev->power.accounting_timestamp;
> > +
> > +    if (delta < 0)
> > +        delta = 0;
> > +
> > +    dev->power.accounting_timestamp = now;
> > +
> > +    if (dev->power.disable_depth > 0)
> > +        return;
> > +
> > +    if (dev->power.runtime_status == RPM_SUSPENDED)
> > +        dev->power.suspended_jiffies += delta;
> > +    else
> > +        dev->power.active_jiffies += delta;
> > +}
> 
> By using jiffies, I think we might miss events in drivers that are doing
> runtime PM transitions in short bursts.  On embedded systems with slow
> HZ, there could potentially be lots of transitions between ticks.
> 
> It would be nicer to use clocksource-based time so transitions between
> jiffies could still be factored into the accounting.

Patch please?

Rafael

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH v2] pm: Add runtime PM statistics
  2010-08-05 23:20         ` Kevin Hilman
  2010-08-05 23:45           ` Rafael J. Wysocki
@ 2010-08-05 23:59           ` Arjan van de Ven
  2010-08-06 23:37             ` Kevin Hilman
  1 sibling, 1 reply; 9+ messages in thread
From: Arjan van de Ven @ 2010-08-05 23:59 UTC (permalink / raw)
  To: Kevin Hilman
  Cc: Rafael J. Wysocki, Arjan van de Ven, linux-pm, linux-kernel,
	Alan Stern, Ming Lei

On 8/5/2010 4:20 PM, Kevin Hilman wrote:
> Arjan van de Ven<arjan@linux.intel.com>  writes:
>
>    
>> +
>> +/**
>> + * update_pm_runtime_accounting - Update the time accounting of power
>> states
>> + * @dev: Device to update the accounting for
>> + *
>> + * In order to be able to have time accounting of the various power states
>> + * (as used by programs such as PowerTOP to show the effectiveness of
>> runtime
>> + * PM), we need to track the time spent in each state.
>> + * update_pm_runtime_accounting must be called each time before the
>> + * runtime_status field is updated, to account the time in the old state
>> + * correctly.
>> + */
>> +void update_pm_runtime_accounting(struct device *dev)
>> +{
>> +    unsigned long now = jiffies;
>> +    int delta;
>> +
>> +    delta = now - dev->power.accounting_timestamp;
>> +
>> +    if (delta<  0)
>> +        delta = 0;
>> +
>> +    dev->power.accounting_timestamp = now;
>> +
>> +    if (dev->power.disable_depth>  0)
>> +        return;
>> +
>> +    if (dev->power.runtime_status == RPM_SUSPENDED)
>> +        dev->power.suspended_jiffies += delta;
>> +    else
>> +        dev->power.active_jiffies += delta;
>> +}
>>      
> By using jiffies, I think we might miss events in drivers that are doing
> runtime PM transitions in short bursts.  On embedded systems with slow
> HZ, there could potentially be lots of transitions between ticks.
>
> It would be nicer to use clocksource-based time so transitions between
> jiffies could still be factored into the accounting.
>    

you're absolutely right that the current mechanism is more "sampling 
accuracy" (similar to most /proc info that shows up with top and such).

on the "slow HZ".. there is no more valid reason to not set HZ to 
1000... so we'll get 1 msec sampling rate basically.

the problem with a more accurate clocksource is that it's expensive. And 
more... the path to such clocksource itself might be subject to power 
management ;-)


^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH v2] pm: Add runtime PM statistics
  2010-08-05 23:59           ` Arjan van de Ven
@ 2010-08-06 23:37             ` Kevin Hilman
  0 siblings, 0 replies; 9+ messages in thread
From: Kevin Hilman @ 2010-08-06 23:37 UTC (permalink / raw)
  To: Arjan van de Ven
  Cc: Rafael J. Wysocki, Arjan van de Ven, linux-pm, linux-kernel,
	Alan Stern, Ming Lei

Arjan van de Ven <arjan@linux.intel.com> writes:

> On 8/5/2010 4:20 PM, Kevin Hilman wrote:
>> Arjan van de Ven<arjan@linux.intel.com>  writes:
>>
>>    
>>> +
>>> +/**
>>> + * update_pm_runtime_accounting - Update the time accounting of power
>>> states
>>> + * @dev: Device to update the accounting for
>>> + *
>>> + * In order to be able to have time accounting of the various power states
>>> + * (as used by programs such as PowerTOP to show the effectiveness of
>>> runtime
>>> + * PM), we need to track the time spent in each state.
>>> + * update_pm_runtime_accounting must be called each time before the
>>> + * runtime_status field is updated, to account the time in the old state
>>> + * correctly.
>>> + */
>>> +void update_pm_runtime_accounting(struct device *dev)
>>> +{
>>> +    unsigned long now = jiffies;
>>> +    int delta;
>>> +
>>> +    delta = now - dev->power.accounting_timestamp;
>>> +
>>> +    if (delta<  0)
>>> +        delta = 0;
>>> +
>>> +    dev->power.accounting_timestamp = now;
>>> +
>>> +    if (dev->power.disable_depth>  0)
>>> +        return;
>>> +
>>> +    if (dev->power.runtime_status == RPM_SUSPENDED)
>>> +        dev->power.suspended_jiffies += delta;
>>> +    else
>>> +        dev->power.active_jiffies += delta;
>>> +}
>>>      
>> By using jiffies, I think we might miss events in drivers that are doing
>> runtime PM transitions in short bursts.  On embedded systems with slow
>> HZ, there could potentially be lots of transitions between ticks.
>>
>> It would be nicer to use clocksource-based time so transitions between
>> jiffies could still be factored into the accounting.
>>    
>
> you're absolutely right that the current mechanism is more "sampling
> accuracy" (similar to most /proc info that shows up with top and
> such).
>
> on the "slow HZ".. there is no more valid reason to not set HZ to
> 1000... 

Probably, especially with tickless idle, but not so sure there is total
agreement on this in the embedded world though...

> so we'll get 1 msec sampling rate basically.
>
> the problem with a more accurate clocksource is that it's
> expensive. And more... the path to such clocksource itself might be
> subject to power management ;-)

What about using read_persistent_clock() then?  Then the arch/platform
definition of this will determine the max sampling rate.

Kevin




^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2010-08-06 23:38 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-07-10 16:52 [PATCH v2] pm: Add runtime PM statistics Arjan van de Ven
2010-07-11 21:26 ` Rafael J. Wysocki
2010-07-12  5:16   ` Arjan van de Ven
2010-07-13 21:28     ` Rafael J. Wysocki
2010-07-15 15:44       ` Arjan van de Ven
2010-08-05 23:20         ` Kevin Hilman
2010-08-05 23:45           ` Rafael J. Wysocki
2010-08-05 23:59           ` Arjan van de Ven
2010-08-06 23:37             ` Kevin Hilman

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).