1 files changed, 20 insertions, 1 deletions

diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
index 9b0c77a99346..1783f6b4c2e0 100644
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@ -2266,11 +2266,20 @@ static inline void cpufreq_update_util(struct rq *rq, unsigned int flags) {}
 #endif /* CONFIG_CPU_FREQ */
 
 #ifdef CONFIG_UCLAMP_TASK
-static inline unsigned int uclamp_util(struct rq *rq, unsigned int util)
+unsigned int uclamp_eff_value(struct task_struct *p, unsigned int clamp_id);
+
+static __always_inline
+unsigned int uclamp_util_with(struct rq *rq, unsigned int util,
+                              struct task_struct *p)
 {
         unsigned int min_util = READ_ONCE(rq->uclamp[UCLAMP_MIN].value);
         unsigned int max_util = READ_ONCE(rq->uclamp[UCLAMP_MAX].value);
 
+        if (p) {
+                min_util = max(min_util, uclamp_eff_value(p, UCLAMP_MIN));
+                max_util = max(max_util, uclamp_eff_value(p, UCLAMP_MAX));
+        }
+
         /*
          * Since CPU's {min,max}_util clamps are MAX aggregated considering
          * RUNNABLE tasks with _different_ clamps, we can end up with an
@@ -2281,7 +2290,17 @@ static inline unsigned int uclamp_util(struct rq *rq, unsigned int util)
 
         return clamp(util, min_util, max_util);
 }
+
+static inline unsigned int uclamp_util(struct rq *rq, unsigned int util)
+{
+        return uclamp_util_with(rq, util, NULL);
+}
 #else /* CONFIG_UCLAMP_TASK */
+static inline unsigned int uclamp_util_with(struct rq *rq, unsigned int util,
+                                            struct task_struct *p)
+{
+        return util;
+}
 static inline unsigned int uclamp_util(struct rq *rq, unsigned int util)
 {
         return util;