mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-30 08:02:30 +00:00
x86: tsc: Fix calibration refinement conditionals to avoid divide by zero
Konrad Wilk reported that the new delayed calibration crashes with a divide by zero on Xen. The reason is that Xen sets the pmtimer address, but reading from it returns 0xffffff. That results in the ref_start and ref_stop value being the same, so the delta is zero which causes the divide by zero later in the calculation. The conditional (!hpet && !ref_start && !ref_stop) which sanity checks the calibration reference values doesn't really make sense. If the refs are null, but hpet is on, we still want to break out. The div by zero would be possible to trigger by chance if both reads from the hardware provided the exact same value (due to hardware wrapping). So checking if both the ref values are the same should handle if we don't have hardware (both null) or if they are the same value (either by invalid hardware, or by chance), avoiding the div by zero issue. [ tglx: Applied the same fix to native_calibrate_tsc() where this check was copied from ] Reported-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Tested-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Signed-off-by: John Stultz <johnstul@us.ibm.com> LKML-Reference: <1295024788-15619-1-git-send-email-johnstul@us.ibm.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
parent
9378b63ccb
commit
62627bec8a
1 changed files with 2 additions and 2 deletions
|
@ -464,7 +464,7 @@ unsigned long native_calibrate_tsc(void)
|
|||
tsc_pit_min = min(tsc_pit_min, tsc_pit_khz);
|
||||
|
||||
/* hpet or pmtimer available ? */
|
||||
if (!hpet && !ref1 && !ref2)
|
||||
if (ref1 == ref2)
|
||||
continue;
|
||||
|
||||
/* Check, whether the sampling was disturbed by an SMI */
|
||||
|
@ -935,7 +935,7 @@ static void tsc_refine_calibration_work(struct work_struct *work)
|
|||
tsc_stop = tsc_read_refs(&ref_stop, hpet);
|
||||
|
||||
/* hpet or pmtimer available ? */
|
||||
if (!hpet && !ref_start && !ref_stop)
|
||||
if (ref_start == ref_stop)
|
||||
goto out;
|
||||
|
||||
/* Check, whether the sampling was disturbed by an SMI */
|
||||
|
|
Loading…
Reference in a new issue