The patch titled
arch/x86/kernel/tsc.c: SMI workaround for pit_expect_msb()
has been added to the -mm tree. Its filename is
arch-x86-kernel-tscc-smi-workaround-for-pit_expect_msb.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: arch/x86/kernel/tsc.c: SMI workaround for pit_expect_msb()
From: Wei Chong Tan <wei.chong.tan@xxxxxxxxx>
pit_expect_msb() seems to be vulnerable to SMI disturbance corner case in
some platforms which causes /proc/cpuinfo to show wrong CPU MHz value when
quick_pit_calibrate() jump to success section.
This patch tries to minimize such cases by rejecting them so that other
calibration method is utilized.
Initial trial shows that out of 300 reboot cycles, 18 uses
quick_pit_calibrate() successfully and /proc/cpuinfo shows reasonable CPU
MHz. Without the patch, 1 out of roughly 20 reboot cycles may show wrong
MHz value.
Signed-off-by: Wei Chong Tan <wei.chong.tan@xxxxxxxxx>
Cc: "Li, Shaohua" <shaohua.li@xxxxxxxxx>
Cc: Arjan van de Ven <arjan@xxxxxxxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: john stultz <johnstul@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/x86/kernel/tsc.c | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff -puN arch/x86/kernel/tsc.c~arch-x86-kernel-tscc-smi-workaround-for-pit_expect_msb arch/x86/kernel/tsc.c
--- a/arch/x86/kernel/tsc.c~arch-x86-kernel-tscc-smi-workaround-for-pit_expect_msb
+++ a/arch/x86/kernel/tsc.c
@@ -285,10 +285,29 @@ static inline int pit_expect_msb(unsigne
inb(0x42);
if (inb(0x42) != val)
break;
+ /* What if an SMI kicks in here when
+ * count is just slightly over 5 and SMI run long enough
+ * so that PIT MSB value is way bigger then val?
+ * Then tscp will have an unreasonably large value,
+ * since the code has no notion of
+ * how much inb(0x42) MSB is bigger then val when it return from SMI.
+ * In addition, since the 2 get_cycles() are near,
+ * deltap may get a sane value.
+ * If this happen on the final few readings
+ * just before (d1+d2 < delta >> 11),
+ * this may skew the average delta variable of quick_pit_calibrate().
+ */
tsc = get_cycles();
}
*deltap = get_cycles() - tsc;
*tscp = tsc;
+ /* inb(0x42) will need to be separately repeated here as
+ * the SMI may take so long that the old reading
+ * is no longer reliable. inb(0x42) after all get_cycles is the safest.
+ */
+ inb(0x42);
+ if (inb(0x42) < (val - 1))
+ return 0;
/*
* We require _some_ success, but the quality control
_
Patches currently in -mm which might be from wei.chong.tan@xxxxxxxxx are
arch-x86-kernel-tscc-smi-workaround-for-pit_expect_msb.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
