Commit 8b78cf60 authored by Yi Yang's avatar Yi Yang Committed by Len Brown

cpuidle: fix cpuidle time and usage overflow

cpuidle C-state sysfs node time and usage are very easy to overflow because
they are all of unsigned int type, time will overflow within about two hours,
usage will take longer time to overflow, but they are increasing for ever.

This patch will convert them to unsigned long long.
Signed-off-by: default avatarYi Yang <yi.y.yang@intel.com>
Acked-by: default avatarVenkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 996520c1
...@@ -67,7 +67,7 @@ static void cpuidle_idle_call(void) ...@@ -67,7 +67,7 @@ static void cpuidle_idle_call(void)
/* enter the state and update stats */ /* enter the state and update stats */
dev->last_residency = target_state->enter(dev, target_state); dev->last_residency = target_state->enter(dev, target_state);
dev->last_state = target_state; dev->last_state = target_state;
target_state->time += dev->last_residency; target_state->time += (unsigned long long)dev->last_residency;
target_state->usage++; target_state->usage++;
/* give the governor an opportunity to reflect on the outcome */ /* give the governor an opportunity to reflect on the outcome */
......
...@@ -218,6 +218,12 @@ static ssize_t show_state_##_name(struct cpuidle_state *state, char *buf) \ ...@@ -218,6 +218,12 @@ static ssize_t show_state_##_name(struct cpuidle_state *state, char *buf) \
return sprintf(buf, "%u\n", state->_name);\ return sprintf(buf, "%u\n", state->_name);\
} }
#define define_show_state_ull_function(_name) \
static ssize_t show_state_##_name(struct cpuidle_state *state, char *buf) \
{ \
return sprintf(buf, "%llu\n", state->_name);\
}
#define define_show_state_str_function(_name) \ #define define_show_state_str_function(_name) \
static ssize_t show_state_##_name(struct cpuidle_state *state, char *buf) \ static ssize_t show_state_##_name(struct cpuidle_state *state, char *buf) \
{ \ { \
...@@ -228,8 +234,8 @@ static ssize_t show_state_##_name(struct cpuidle_state *state, char *buf) \ ...@@ -228,8 +234,8 @@ static ssize_t show_state_##_name(struct cpuidle_state *state, char *buf) \
define_show_state_function(exit_latency) define_show_state_function(exit_latency)
define_show_state_function(power_usage) define_show_state_function(power_usage)
define_show_state_function(usage) define_show_state_ull_function(usage)
define_show_state_function(time) define_show_state_ull_function(time)
define_show_state_str_function(name) define_show_state_str_function(name)
define_show_state_str_function(desc) define_show_state_str_function(desc)
......
...@@ -38,8 +38,8 @@ struct cpuidle_state { ...@@ -38,8 +38,8 @@ struct cpuidle_state {
unsigned int power_usage; /* in mW */ unsigned int power_usage; /* in mW */
unsigned int target_residency; /* in US */ unsigned int target_residency; /* in US */
unsigned int usage; unsigned long long usage;
unsigned int time; /* in US */ unsigned long long time; /* in US */
int (*enter) (struct cpuidle_device *dev, int (*enter) (struct cpuidle_device *dev,
struct cpuidle_state *state); struct cpuidle_state *state);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment