x86, sched: Bail out of frequency invariance if turbo_freq/base_freq gives 0
authorGiovanni Gherdovich <ggherdovich@suse.cz>
Sun, 31 May 2020 18:24:53 +0000 (20:24 +0200)
committerPeter Zijlstra <peterz@infradead.org>
Mon, 15 Jun 2020 12:10:02 +0000 (14:10 +0200)
Be defensive against the case where the processor reports a base_freq
larger than turbo_freq (the ratio would be zero).

Fixes: 1567c3e3467c ("x86, sched: Add support for frequency invariance")
Signed-off-by: Giovanni Gherdovich <ggherdovich@suse.cz>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://lkml.kernel.org/r/20200531182453.15254-4-ggherdovich@suse.cz
arch/x86/kernel/smpboot.c

index 20e1cea262e4b5634e32f0a50abe83015067dca5..518ac6bf752e0da9dd016633ddb36f6c0a15a293 100644 (file)
@@ -1977,6 +1977,7 @@ static bool core_set_max_freq_ratio(u64 *base_freq, u64 *turbo_freq)
 static bool intel_set_max_freq_ratio(void)
 {
        u64 base_freq, turbo_freq;
+       u64 turbo_ratio;
 
        if (slv_set_max_freq_ratio(&base_freq, &turbo_freq))
                goto out;
@@ -2010,9 +2011,15 @@ out:
                return false;
        }
 
-       arch_turbo_freq_ratio = div_u64(turbo_freq * SCHED_CAPACITY_SCALE,
-                                       base_freq);
+       turbo_ratio = div_u64(turbo_freq * SCHED_CAPACITY_SCALE, base_freq);
+       if (!turbo_ratio) {
+               pr_debug("Non-zero turbo and base frequencies led to a 0 ratio.\n");
+               return false;
+       }
+
+       arch_turbo_freq_ratio = turbo_ratio;
        arch_set_max_freq_ratio(turbo_disabled());
+
        return true;
 }