Skip to contentSkip to conversation

sched: cpufreq_schedutil: maintain raw cache when next_f is not changed

PATCH In review Wei Wang 3 participants 8 messages Oct 16, 2020 – Oct 19, 2020

Subsystems (2)
lore
Share & tools
lore

Wei Wang

author
#0 lore raw

PATCH 1/1 sched: cpufreq_schedutil: maintain raw cache when next_f is not changed

Currently, raw cache will be reset when next_f is changed after get_next_freq for correctness. However, it may introduce more cycles. This patch changes it to maintain the cached value instead of dropping it.

This is adapted from https://android-review.googlesource.com/1352810/

---
 kernel/sched/cpufreq_schedutil.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
kernel/sched/cpufreq_schedutil.c +5 -2
index 5ae7b4e6e8d6..ae3ae7fcd027 100644
@@ -31,6 +31,7 @@ struct sugov_policy {
 	s64			freq_update_delay_ns;
 	unsigned int		next_freq;
 	unsigned int		cached_raw_freq;
+	unsigned int		prev_cached_raw_freq;
 
 	/* The next fields are only needed if fast switch cannot be used: */
 	struct			irq_work irq_work;
@@ -165,6 +166,7 @@ static unsigned int get_next_freq(struct sugov_policy *sg_policy,
 		return sg_policy->next_freq;
 
 	sg_policy->need_freq_update = false;
+	sg_policy->prev_cached_raw_freq = sg_policy->cached_raw_freq;
 	sg_policy->cached_raw_freq = freq;
 	return cpufreq_driver_resolve_freq(policy, freq);
 }
@@ -464,8 +466,8 @@ static void sugov_update_single(struct update_util_data *hook, u64 time,
 	if (busy && next_f < sg_policy->next_freq) {
 		next_f = sg_policy->next_freq;
 
-		/* Reset cached freq as next_freq has changed */
-		sg_policy->cached_raw_freq = 0;
+		/* Restore cached freq as next_freq has changed */
+		sg_policy->cached_raw_freq = sg_policy->prev_cached_raw_freq;
 	}
 
 	/*
@@ -828,6 +830,7 @@ static int sugov_start(struct cpufreq_policy *policy)
 	sg_policy->limits_changed		= false;
 	sg_policy->need_freq_update		= false;
 	sg_policy->cached_raw_freq		= 0;
+	sg_policy->prev_cached_raw_freq		= 0;
 
 	for_each_cpu(cpu, policy->cpus) {
 		struct sugov_cpu *sg_cpu = &per_cpu(sugov_cpu, cpu);
Signature · 1 line
2.29.0.rc1.297.gfa9743e501-goog
#1 lore raw
Quoted 5 lines · Wei Wang

Currently, raw cache will be reset when next_f is changed after get_next_freq for correctness. However, it may introduce more cycles. This patch changes it to maintain the cached value instead of dropping it.

IMV you need to be more specific about why this helps.

Quoted 49 lines

This is adapted from https://android-review.googlesource.com/1352810/

---
 kernel/sched/cpufreq_schedutil.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
kernel/sched/cpufreq_schedutil.c +5 -3
index 5ae7b4e6e8d6..ae3ae7fcd027 100644
@@ -31,6 +31,7 @@ struct sugov_policy {
        s64                     freq_update_delay_ns;
        unsigned int            next_freq;
        unsigned int            cached_raw_freq;
+       unsigned int            prev_cached_raw_freq;
 
        /* The next fields are only needed if fast switch cannot be used: */
        struct                  irq_work irq_work;
@@ -165,6 +166,7 @@ static unsigned int get_next_freq(struct sugov_policy *sg_policy,
                return sg_policy->next_freq;
 
        sg_policy->need_freq_update = false;
+       sg_policy->prev_cached_raw_freq = sg_policy->cached_raw_freq;
        sg_policy->cached_raw_freq = freq;
        return cpufreq_driver_resolve_freq(policy, freq);
 }
@@ -464,8 +466,8 @@ static void sugov_update_single(struct update_util_data *hook, u64 time,
        if (busy && next_f < sg_policy->next_freq) {
                next_f = sg_policy->next_freq;
 
-               /* Reset cached freq as next_freq has changed */
-               sg_policy->cached_raw_freq = 0;
+               /* Restore cached freq as next_freq has changed */
+               sg_policy->cached_raw_freq = sg_policy->prev_cached_raw_freq;
        }
 
        /*
@@ -828,6 +830,7 @@ static int sugov_start(struct cpufreq_policy *policy)
        sg_policy->limits_changed               = false;
        sg_policy->need_freq_update             = false;
        sg_policy->cached_raw_freq              = 0;
+       sg_policy->prev_cached_raw_freq         = 0;
 
        for_each_cpu(cpu, policy->cpus) {
                struct sugov_cpu *sg_cpu = &per_cpu(sugov_cpu, cpu);
--

2.29.0.rc1.297.gfa9743e501-goog

author
#2 lore raw
Quoted 10 lines · Rafael J. Wysocki
Quoted 5 lines · Wei Wang

Currently, raw cache will be reset when next_f is changed after get_next_freq for correctness. However, it may introduce more cycles. This patch changes it to maintain the cached value instead of dropping it.

IMV you need to be more specific about why this helps.

I think the idea of cached_raw_freq is to reduce the chance of calling cpufreq drivers (in some arch those may be costly) but sometimes the cache will be wiped for correctness. The purpose of this patch is to still keep the cached value instead of wiping them.

thx
wvw

Quoted 50 lines
Quoted 50 lines

This is adapted from https://android-review.googlesource.com/1352810/

---
 kernel/sched/cpufreq_schedutil.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
kernel/sched/cpufreq_schedutil.c +5 -3
index 5ae7b4e6e8d6..ae3ae7fcd027 100644
@@ -31,6 +31,7 @@ struct sugov_policy {
        s64                     freq_update_delay_ns;
        unsigned int            next_freq;
        unsigned int            cached_raw_freq;
+       unsigned int            prev_cached_raw_freq;
 
        /* The next fields are only needed if fast switch cannot be used: */
        struct                  irq_work irq_work;
@@ -165,6 +166,7 @@ static unsigned int get_next_freq(struct sugov_policy *sg_policy,
                return sg_policy->next_freq;
 
        sg_policy->need_freq_update = false;
+       sg_policy->prev_cached_raw_freq = sg_policy->cached_raw_freq;
        sg_policy->cached_raw_freq = freq;
        return cpufreq_driver_resolve_freq(policy, freq);
 }
@@ -464,8 +466,8 @@ static void sugov_update_single(struct update_util_data *hook, u64 time,
        if (busy && next_f < sg_policy->next_freq) {
                next_f = sg_policy->next_freq;
 
-               /* Reset cached freq as next_freq has changed */
-               sg_policy->cached_raw_freq = 0;
+               /* Restore cached freq as next_freq has changed */
+               sg_policy->cached_raw_freq = sg_policy->prev_cached_raw_freq;
        }
 
        /*
@@ -828,6 +830,7 @@ static int sugov_start(struct cpufreq_policy *policy)
        sg_policy->limits_changed               = false;
        sg_policy->need_freq_update             = false;
        sg_policy->cached_raw_freq              = 0;
+       sg_policy->prev_cached_raw_freq         = 0;
 
        for_each_cpu(cpu, policy->cpus) {
                struct sugov_cpu *sg_cpu = &per_cpu(sugov_cpu, cpu);
--

2.29.0.rc1.297.gfa9743e501-goog

#3 lore raw
Quoted 10 lines · Wei Wang
Quoted 8 lines · Rafael J. Wysocki
Quoted 5 lines · Wei Wang

Currently, raw cache will be reset when next_f is changed after get_next_freq for correctness. However, it may introduce more cycles. This patch changes it to maintain the cached value instead of dropping it.

Quoted 7 lines
Quoted 2 lines

IMV you need to be more specific about why this helps.

I think the idea of cached_raw_freq is to reduce the chance of calling cpufreq drivers (in some arch those may be costly) but sometimes the cache will be wiped for correctness. The purpose of this patch is to still keep the cached value instead of wiping them.

Well, I see what the problem is and how the patch is attempting to address it (which is not the best way to do that because of the extra struct member that doesn't need to be added if I'm not mistaken), but IMO the changelog is way too vague from the problem statement perspective.

author
#4 lore raw
Quoted 20 lines · Rafael J. Wysocki
Quoted 10 lines · Wei Wang
Quoted 8 lines · Rafael J. Wysocki
Quoted 5 lines · Wei Wang

Currently, raw cache will be reset when next_f is changed after get_next_freq for correctness. However, it may introduce more cycles. This patch changes it to maintain the cached value instead of dropping it.

Quoted 7 lines
Quoted 2 lines

IMV you need to be more specific about why this helps.

I think the idea of cached_raw_freq is to reduce the chance of calling cpufreq drivers (in some arch those may be costly) but sometimes the cache will be wiped for correctness. The purpose of this patch is to still keep the cached value instead of wiping them.

Quoted 5 lines

Well, I see what the problem is and how the patch is attempting to address it (which is not the best way to do that because of the extra struct member that doesn't need to be added if I'm not mistaken), but IMO the changelog is way too vague from the problem statement perspective.

Just want to bring this up in the mainline kernel. I think we can change the patch to use a variable insides sugov_update_single. This is adapted from Android common kernel where it has some off tree functions making a single variable not possible but also making the issue more obvious.

author
#5 lore raw

PATCH 1/1 sched: cpufreq_schedutil: restore cached freq when next_f is not changed

We have the raw cached freq to reduce the chance in calling cpufreq driver where it could be costly in some arch/SoC.

Currently, the raw cached freq will be reset when next_f is changed for correctness. This patch changes it to maintain the cached value instead of dropping it to honor the purpose of the cached value.

This is adapted from https://android-review.googlesource.com/1352810/

---
 kernel/sched/cpufreq_schedutil.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
kernel/sched/cpufreq_schedutil.c +3 -2
index 5ae7b4e6e8d6..e254745a82cb 100644
@@ -441,6 +441,7 @@ static void sugov_update_single(struct update_util_data *hook, u64 time,
 	unsigned long util, max;
 	unsigned int next_f;
 	bool busy;
+	unsigned int cached_freq = sg_policy->cached_raw_freq;
 
 	sugov_iowait_boost(sg_cpu, time, flags);
 	sg_cpu->last_update = time;
@@ -464,8 +465,8 @@ static void sugov_update_single(struct update_util_data *hook, u64 time,
 	if (busy && next_f < sg_policy->next_freq) {
 		next_f = sg_policy->next_freq;
 
-		/* Reset cached freq as next_freq has changed */
-		sg_policy->cached_raw_freq = 0;
+		/* Restore cached freq as next_freq has changed */
+		sg_policy->cached_raw_freq = cached_freq;
 	}
 
 	/*
Signature · 1 line
2.29.0.rc1.297.gfa9743e501-goog
maintainer Acked-by on v1 1/1
#6 lore raw

Re: [PATCH] sched: cpufreq_schedutil: restore cached freq when next_f is not changed

Quoted 27 lines · Wei Wang

We have the raw cached freq to reduce the chance in calling cpufreq driver where it could be costly in some arch/SoC.

Currently, the raw cached freq will be reset when next_f is changed for correctness. This patch changes it to maintain the cached value instead of dropping it to honor the purpose of the cached value.

This is adapted from https://android-review.googlesource.com/1352810/

---
 kernel/sched/cpufreq_schedutil.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
kernel/sched/cpufreq_schedutil.c +1 -0
index 5ae7b4e6e8d6..e254745a82cb 100644
@@ -441,6 +441,7 @@ static void sugov_update_single(struct update_util_data *hook, u64 time,
 	unsigned long util, max;
 	unsigned int next_f;
 	bool busy;
+	unsigned int cached_freq = sg_policy->cached_raw_freq;
 
 	sugov_iowait_boost(sg_cpu, time, flags);
 	sg_cpu->last_update = time;

kernel/sched/cpufreq_schedutil.c static void sugov_update_single(struct update_util_data *hook, u64 time, · line 472

Quoted 10 lines
kernel/sched/cpufreq_schedutil.c +2 -2
@@ -464,8 +465,8 @@ static void sugov_update_single(struct update_util_data *hook, u64 time,
 	if (busy && next_f < sg_policy->next_freq) {
 		next_f = sg_policy->next_freq;
 
-		/* Reset cached freq as next_freq has changed */
-		sg_policy->cached_raw_freq = 0;
+		/* Restore cached freq as next_freq has changed */
+		sg_policy->cached_raw_freq = cached_freq;
 	}
 
 	/*
Signature · 1 line
viresh
maintainer Applied
#7 lore raw

Re: [PATCH] sched: cpufreq_schedutil: restore cached freq when next_f is not changed

In reply to Wei Wang
Quoted 29 lines · Wei Wang

We have the raw cached freq to reduce the chance in calling cpufreq driver where it could be costly in some arch/SoC.

Currently, the raw cached freq will be reset when next_f is changed for correctness. This patch changes it to maintain the cached value instead of dropping it to honor the purpose of the cached value.

This is adapted from https://android-review.googlesource.com/1352810/

---
 kernel/sched/cpufreq_schedutil.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
kernel/sched/cpufreq_schedutil.c +1 -0
index 5ae7b4e6e8d6..e254745a82cb 100644
@@ -441,6 +441,7 @@ static void sugov_update_single(struct update_util_data *hook, u64 time,
        unsigned long util, max;
        unsigned int next_f;
        bool busy;
+       unsigned int cached_freq = sg_policy->cached_raw_freq;
 
        sugov_iowait_boost(sg_cpu, time, flags);
        sg_cpu->last_update = time;
@@ -464,8 +465,8 @@ static void sugov_update_single(struct update_util_data *hook, u64 time,
        if (busy && next_f < sg_policy->next_freq) {

kernel/sched/cpufreq_schedutil.c static void sugov_update_single(struct update_util_data *hook, u64 time,

Quoted 10 lines
kernel/sched/cpufreq_schedutil.c +2 -3
                next_f = sg_policy->next_freq;
 
-               /* Reset cached freq as next_freq has changed */
-               sg_policy->cached_raw_freq = 0;
+               /* Restore cached freq as next_freq has changed */
+               sg_policy->cached_raw_freq = cached_freq;
        }
 
        /*
--

Applied as 5.10-rc material with edited subject and rewritten changelog.

Thanks!