Revert "sched/fair: Consider capacity inversion in util_fits_cpu()"

This reverts commit 09129798a6.

It breaks the Android kernel abi, so revert it.  If it needs to come
back later, it can do so in an abi-safe way.

Bug: 161946584
Cc: Qais Yousef <qyousef@google.com>
Change-Id: Ied83e33a14ff0e09f5f9f288d4e779d8175a8f0f
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2023-06-20 11:17:22 +00:00
parent 652a7f2c7e
commit ce3ecd63bf

View File

@@ -4128,16 +4128,12 @@ static inline int util_fits_cpu(unsigned long util,
* For uclamp_max, we can tolerate a drop in performance level as the * For uclamp_max, we can tolerate a drop in performance level as the
* goal is to cap the task. So it's okay if it's getting less. * goal is to cap the task. So it's okay if it's getting less.
* *
* In case of capacity inversion we should honour the inverted capacity * In case of capacity inversion, which is not handled yet, we should
* for both uclamp_min and uclamp_max all the time. * honour the inverted capacity for both uclamp_min and uclamp_max all
* the time.
*/ */
capacity_orig = cpu_in_capacity_inversion(cpu); capacity_orig = capacity_orig_of(cpu);
if (capacity_orig) { capacity_orig_thermal = capacity_orig - arch_scale_thermal_pressure(cpu);
capacity_orig_thermal = capacity_orig;
} else {
capacity_orig = capacity_orig_of(cpu);
capacity_orig_thermal = capacity_orig - arch_scale_thermal_pressure(cpu);
}
/* /*
* We want to force a task to fit a cpu as implied by uclamp_max. * We want to force a task to fit a cpu as implied by uclamp_max.