| Message ID | 20190402104153.25404-4-patrick.bellasi@arm.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
| Series | Add utilization clamping support | expand |
Hi Patrick, On Tue, Apr 2, 2019 at 3:42 AM Patrick Bellasi <patrick.bellasi@arm.com> wrote: > > When a task sleeps it removes its max utilization clamp from its CPU. > However, the blocked utilization on that CPU can be higher than the max > clamp value enforced while the task was running. This allows undesired > CPU frequency increases while a CPU is idle, for example, when another > CPU on the same frequency domain triggers a frequency update, since > schedutil can now see the full not clamped blocked utilization of the > idle CPU. > > Fix this by using > uclamp_rq_dec_id(p, rq, UCLAMP_MAX) > uclamp_rq_max_value(rq, UCLAMP_MAX, clamp_value) > to detect when a CPU has no more RUNNABLE clamped tasks and to flag this > condition. > If I understand the intent correctly, you are trying to exclude idle CPUs from affecting calculations of rq UCLAMP_MAX value. If that is true I think description can be simplified a bit :) In particular it took me some time to understand what "blocked utilization" means, however if it's a widely accepted term then feel free to ignore my input. > Don't track any minimum utilization clamps since an idle CPU never > requires a minimum frequency. The decay of the blocked utilization is > good enough to reduce the CPU frequency. > > Signed-off-by: Patrick Bellasi <patrick.bellasi@arm.com> > Cc: Ingo Molnar <mingo@redhat.com> > Cc: Peter Zijlstra <peterz@infradead.org> > > -- > Changes in v8: > Message-ID: <20190314170619.rt6yhelj3y6dzypu@e110439-lin> > - moved flag reset into uclamp_rq_inc() > --- > kernel/sched/core.c | 45 ++++++++++++++++++++++++++++++++++++++++---- > kernel/sched/sched.h | 2 ++ > 2 files changed, 43 insertions(+), 4 deletions(-) > > diff --git a/kernel/sched/core.c b/kernel/sched/core.c > index 6e1beae5f348..046f61d33f00 100644 > --- a/kernel/sched/core.c > +++ b/kernel/sched/core.c > @@ -754,8 +754,35 @@ static inline unsigned int uclamp_none(int clamp_id) > return SCHED_CAPACITY_SCALE; > } > > +static inline unsigned int > +uclamp_idle_value(struct rq *rq, unsigned int clamp_id, unsigned int clamp_value) > +{ > + /* > + * Avoid blocked utilization pushing up the frequency when we go > + * idle (which drops the max-clamp) by retaining the last known > + * max-clamp. > + */ > + if (clamp_id == UCLAMP_MAX) { > + rq->uclamp_flags |= UCLAMP_FLAG_IDLE; > + return clamp_value; > + } > + > + return uclamp_none(UCLAMP_MIN); > +} > + > +static inline void uclamp_idle_reset(struct rq *rq, unsigned int clamp_id, > + unsigned int clamp_value) > +{ > + /* Reset max-clamp retention only on idle exit */ > + if (!(rq->uclamp_flags & UCLAMP_FLAG_IDLE)) > + return; > + > + WRITE_ONCE(rq->uclamp[clamp_id].value, clamp_value); > +} > + > static inline > -unsigned int uclamp_rq_max_value(struct rq *rq, unsigned int clamp_id) > +unsigned int uclamp_rq_max_value(struct rq *rq, unsigned int clamp_id, > + unsigned int clamp_value) IMHO the name of uclamp_rq_max_value() is a bit misleading because: 1. It does not imply that it has to be called only when there are no more runnable tasks on a CPU. This is currently the case because it's called only from uclamp_rq_dec_id() and only when bucket->tasks==0 but nothing in the name of this function indicates that it can't be called from other places. 2. It does not imply that it marks rq UCLAMP_FLAG_IDLE. > { > struct uclamp_bucket *bucket = rq->uclamp[clamp_id].bucket; > int bucket_id = UCLAMP_BUCKETS - 1; > @@ -771,7 +798,7 @@ unsigned int uclamp_rq_max_value(struct rq *rq, unsigned int clamp_id) > } > > /* No tasks -- default clamp values */ > - return uclamp_none(clamp_id); > + return uclamp_idle_value(rq, clamp_id, clamp_value); > } > > /* > @@ -794,6 +821,8 @@ static inline void uclamp_rq_inc_id(struct task_struct *p, struct rq *rq, > bucket = &uc_rq->bucket[uc_se->bucket_id]; > bucket->tasks++; > > + uclamp_idle_reset(rq, clamp_id, uc_se->value); > + > /* > * Local max aggregation: rq buckets always track the max > * "requested" clamp value of its RUNNABLE tasks. > @@ -820,6 +849,7 @@ static inline void uclamp_rq_dec_id(struct task_struct *p, struct rq *rq, > struct uclamp_rq *uc_rq = &rq->uclamp[clamp_id]; > struct uclamp_se *uc_se = &p->uclamp[clamp_id]; > struct uclamp_bucket *bucket; > + unsigned int bkt_clamp; > unsigned int rq_clamp; > > bucket = &uc_rq->bucket[uc_se->bucket_id]; > @@ -848,7 +878,8 @@ static inline void uclamp_rq_dec_id(struct task_struct *p, struct rq *rq, > * there are anymore RUNNABLE tasks refcounting it. > */ > bucket->value = uclamp_bucket_base_value(bucket->value); > - WRITE_ONCE(uc_rq->value, uclamp_rq_max_value(rq, clamp_id)); > + bkt_clamp = uclamp_rq_max_value(rq, clamp_id, uc_se->value); > + WRITE_ONCE(uc_rq->value, bkt_clamp); > } > } > > @@ -861,6 +892,10 @@ static inline void uclamp_rq_inc(struct rq *rq, struct task_struct *p) > > for (clamp_id = 0; clamp_id < UCLAMP_CNT; ++clamp_id) > uclamp_rq_inc_id(p, rq, clamp_id); > + > + /* Reset clamp idle holding when there is one RUNNABLE task */ > + if (rq->uclamp_flags & UCLAMP_FLAG_IDLE) > + rq->uclamp_flags &= ~UCLAMP_FLAG_IDLE; > } > > static inline void uclamp_rq_dec(struct rq *rq, struct task_struct *p) > @@ -879,8 +914,10 @@ static void __init init_uclamp(void) > unsigned int clamp_id; > int cpu; > > - for_each_possible_cpu(cpu) > + for_each_possible_cpu(cpu) { > memset(&cpu_rq(cpu)->uclamp, 0, sizeof(struct uclamp_rq)); > + cpu_rq(cpu)->uclamp_flags = 0; > + } > > for (clamp_id = 0; clamp_id < UCLAMP_CNT; ++clamp_id) { > struct uclamp_se *uc_se = &init_task.uclamp[clamp_id]; > diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h > index c3d1ae1e7eec..d8b182f1782c 100644 > --- a/kernel/sched/sched.h > +++ b/kernel/sched/sched.h > @@ -880,6 +880,8 @@ struct rq { > #ifdef CONFIG_UCLAMP_TASK > /* Utilization clamp values based on CPU's RUNNABLE tasks */ > struct uclamp_rq uclamp[UCLAMP_CNT] ____cacheline_aligned; > + unsigned int uclamp_flags; > +#define UCLAMP_FLAG_IDLE 0x01 > #endif > > struct cfs_rq cfs; > -- > 2.20.1 >
On 17-Apr 13:36, Suren Baghdasaryan wrote: > Hi Patrick, > > On Tue, Apr 2, 2019 at 3:42 AM Patrick Bellasi <patrick.bellasi@arm.com> wrote: > > > > When a task sleeps it removes its max utilization clamp from its CPU. > > However, the blocked utilization on that CPU can be higher than the max > > clamp value enforced while the task was running. This allows undesired > > CPU frequency increases while a CPU is idle, for example, when another > > CPU on the same frequency domain triggers a frequency update, since > > schedutil can now see the full not clamped blocked utilization of the > > idle CPU. > > > > Fix this by using > > uclamp_rq_dec_id(p, rq, UCLAMP_MAX) > > uclamp_rq_max_value(rq, UCLAMP_MAX, clamp_value) > > to detect when a CPU has no more RUNNABLE clamped tasks and to flag this > > condition. > > > > If I understand the intent correctly, you are trying to exclude idle > CPUs from affecting calculations of rq UCLAMP_MAX value. If that is > true I think description can be simplified a bit :) That's not entirely correct. What I want to avoid is an OPP increase because of an idle CPU. Maybe an example can explain it better, consider this sequence: 1. A task is running unconstrained on a CPUx and it generates a 100% utilization 2. The task is now constrained by setting util_max=20 3. We now select an OPP which provides 20% capacity on CPUx In this scenario the task is still running flat out on that CPUx which will keep it's util_avg to 1024. Note that after Vincet's PELT rewrite we don't converge down to the current capacity. 4. The task sleep, it's removed from CPUx but the "blocked utilization" is still 1024 After this point: the CPU is idle, its "blocked utilization" starts to "slowly" decay but we _already_ removed the 20% util_max constraint on that CPU since there are no RUNNABLE tasks (i.e no active buckets). At this point in time, if there is a schedutil update requested from another CPU of the same frequency domain, by looking at CPUx we will see its full "blocked utilization" signal, which can be above 20%. > In particular it took me some time to understand what "blocked > utilization" means, however if it's a widely accepted term then feel > free to ignore my input. Yes, "blocked utilization" is a commonly used term to refer to the utilization generated by tasks executed on a CPU. [...] > > +static inline unsigned int > > +uclamp_idle_value(struct rq *rq, unsigned int clamp_id, unsigned int clamp_value) > > +{ > > + /* > > + * Avoid blocked utilization pushing up the frequency when we go > > + * idle (which drops the max-clamp) by retaining the last known > > + * max-clamp. > > + */ > > + if (clamp_id == UCLAMP_MAX) { > > + rq->uclamp_flags |= UCLAMP_FLAG_IDLE; > > + return clamp_value; > > + } > > + > > + return uclamp_none(UCLAMP_MIN); > > +} > > + > > +static inline void uclamp_idle_reset(struct rq *rq, unsigned int clamp_id, > > + unsigned int clamp_value) > > +{ > > + /* Reset max-clamp retention only on idle exit */ > > + if (!(rq->uclamp_flags & UCLAMP_FLAG_IDLE)) > > + return; > > + > > + WRITE_ONCE(rq->uclamp[clamp_id].value, clamp_value); > > +} > > + > > static inline > > -unsigned int uclamp_rq_max_value(struct rq *rq, unsigned int clamp_id) > > +unsigned int uclamp_rq_max_value(struct rq *rq, unsigned int clamp_id, > > + unsigned int clamp_value) > > IMHO the name of uclamp_rq_max_value() is a bit misleading because: That's very similar to what you proposed in: https://lore.kernel.org/lkml/20190314122256.7wb3ydswpkfmntvf@e110439-lin/ > 1. It does not imply that it has to be called only when there are no > more runnable tasks on a CPU. This is currently the case because it's > called only from uclamp_rq_dec_id() and only when bucket->tasks==0 but > nothing in the name of this function indicates that it can't be called > from other places. > 2. It does not imply that it marks rq UCLAMP_FLAG_IDLE. Even if you call it from other places, which is not required, it does not arm. That function still return the current max clamp for a CPU given its current state. If the CPU is idle we set the flag one more time but that's not a problem too. However, do you have any other proposal for a better name ? > > { > > struct uclamp_bucket *bucket = rq->uclamp[clamp_id].bucket; > > int bucket_id = UCLAMP_BUCKETS - 1; > > @@ -771,7 +798,7 @@ unsigned int uclamp_rq_max_value(struct rq *rq, unsigned int clamp_id) > > } > > > > /* No tasks -- default clamp values */ > > - return uclamp_none(clamp_id); > > + return uclamp_idle_value(rq, clamp_id, clamp_value); > > } [...]
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 6e1beae5f348..046f61d33f00 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -754,8 +754,35 @@ static inline unsigned int uclamp_none(int clamp_id) return SCHED_CAPACITY_SCALE; } +static inline unsigned int +uclamp_idle_value(struct rq *rq, unsigned int clamp_id, unsigned int clamp_value) +{ + /* + * Avoid blocked utilization pushing up the frequency when we go + * idle (which drops the max-clamp) by retaining the last known + * max-clamp. + */ + if (clamp_id == UCLAMP_MAX) { + rq->uclamp_flags |= UCLAMP_FLAG_IDLE; + return clamp_value; + } + + return uclamp_none(UCLAMP_MIN); +} + +static inline void uclamp_idle_reset(struct rq *rq, unsigned int clamp_id, + unsigned int clamp_value) +{ + /* Reset max-clamp retention only on idle exit */ + if (!(rq->uclamp_flags & UCLAMP_FLAG_IDLE)) + return; + + WRITE_ONCE(rq->uclamp[clamp_id].value, clamp_value); +} + static inline -unsigned int uclamp_rq_max_value(struct rq *rq, unsigned int clamp_id) +unsigned int uclamp_rq_max_value(struct rq *rq, unsigned int clamp_id, + unsigned int clamp_value) { struct uclamp_bucket *bucket = rq->uclamp[clamp_id].bucket; int bucket_id = UCLAMP_BUCKETS - 1; @@ -771,7 +798,7 @@ unsigned int uclamp_rq_max_value(struct rq *rq, unsigned int clamp_id) } /* No tasks -- default clamp values */ - return uclamp_none(clamp_id); + return uclamp_idle_value(rq, clamp_id, clamp_value); } /* @@ -794,6 +821,8 @@ static inline void uclamp_rq_inc_id(struct task_struct *p, struct rq *rq, bucket = &uc_rq->bucket[uc_se->bucket_id]; bucket->tasks++; + uclamp_idle_reset(rq, clamp_id, uc_se->value); + /* * Local max aggregation: rq buckets always track the max * "requested" clamp value of its RUNNABLE tasks. @@ -820,6 +849,7 @@ static inline void uclamp_rq_dec_id(struct task_struct *p, struct rq *rq, struct uclamp_rq *uc_rq = &rq->uclamp[clamp_id]; struct uclamp_se *uc_se = &p->uclamp[clamp_id]; struct uclamp_bucket *bucket; + unsigned int bkt_clamp; unsigned int rq_clamp; bucket = &uc_rq->bucket[uc_se->bucket_id]; @@ -848,7 +878,8 @@ static inline void uclamp_rq_dec_id(struct task_struct *p, struct rq *rq, * there are anymore RUNNABLE tasks refcounting it. */ bucket->value = uclamp_bucket_base_value(bucket->value); - WRITE_ONCE(uc_rq->value, uclamp_rq_max_value(rq, clamp_id)); + bkt_clamp = uclamp_rq_max_value(rq, clamp_id, uc_se->value); + WRITE_ONCE(uc_rq->value, bkt_clamp); } } @@ -861,6 +892,10 @@ static inline void uclamp_rq_inc(struct rq *rq, struct task_struct *p) for (clamp_id = 0; clamp_id < UCLAMP_CNT; ++clamp_id) uclamp_rq_inc_id(p, rq, clamp_id); + + /* Reset clamp idle holding when there is one RUNNABLE task */ + if (rq->uclamp_flags & UCLAMP_FLAG_IDLE) + rq->uclamp_flags &= ~UCLAMP_FLAG_IDLE; } static inline void uclamp_rq_dec(struct rq *rq, struct task_struct *p) @@ -879,8 +914,10 @@ static void __init init_uclamp(void) unsigned int clamp_id; int cpu; - for_each_possible_cpu(cpu) + for_each_possible_cpu(cpu) { memset(&cpu_rq(cpu)->uclamp, 0, sizeof(struct uclamp_rq)); + cpu_rq(cpu)->uclamp_flags = 0; + } for (clamp_id = 0; clamp_id < UCLAMP_CNT; ++clamp_id) { struct uclamp_se *uc_se = &init_task.uclamp[clamp_id]; diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index c3d1ae1e7eec..d8b182f1782c 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -880,6 +880,8 @@ struct rq { #ifdef CONFIG_UCLAMP_TASK /* Utilization clamp values based on CPU's RUNNABLE tasks */ struct uclamp_rq uclamp[UCLAMP_CNT] ____cacheline_aligned; + unsigned int uclamp_flags; +#define UCLAMP_FLAG_IDLE 0x01 #endif struct cfs_rq cfs;
When a task sleeps it removes its max utilization clamp from its CPU. However, the blocked utilization on that CPU can be higher than the max clamp value enforced while the task was running. This allows undesired CPU frequency increases while a CPU is idle, for example, when another CPU on the same frequency domain triggers a frequency update, since schedutil can now see the full not clamped blocked utilization of the idle CPU. Fix this by using uclamp_rq_dec_id(p, rq, UCLAMP_MAX) uclamp_rq_max_value(rq, UCLAMP_MAX, clamp_value) to detect when a CPU has no more RUNNABLE clamped tasks and to flag this condition. Don't track any minimum utilization clamps since an idle CPU never requires a minimum frequency. The decay of the blocked utilization is good enough to reduce the CPU frequency. Signed-off-by: Patrick Bellasi <patrick.bellasi@arm.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: Peter Zijlstra <peterz@infradead.org> -- Changes in v8: Message-ID: <20190314170619.rt6yhelj3y6dzypu@e110439-lin> - moved flag reset into uclamp_rq_inc() --- kernel/sched/core.c | 45 ++++++++++++++++++++++++++++++++++++++++---- kernel/sched/sched.h | 2 ++ 2 files changed, 43 insertions(+), 4 deletions(-)