x86: Fix AMD K6 indirect call check v2
PATCH 1/1 x86: Fix AMD K6 indirect call check v2
From: Andi Kleen <[email protected]>
The AMD K6 errata check relies on timing a indirect call. But the way it was written it could be optimized to a direct call. Force gcc to actually do a indirect call and not just constant resolve the target address.
Found during code review, no runtime testing due to lack of hardware.
v2: More description
arch/x86/kernel/cpu/amd.c +1 -1
@@ -115,7 +115,7 @@ static void __cpuinit init_amd_k6(struct cpuinfo_x86 *c)*/ n =K6_BUG_LOOP ; - f_vide = vide; + asm("" :"=g" (f_vide) :"0" (vide));rdtscl (d);while (n--)f_vide ();
H. Peter Anvin
reviewerQuoted 9 lines · Andi Kleen
From: Andi Kleen <[email protected]>
The AMD K6 errata check relies on timing a indirect call. But the way it was written it could be optimized to a direct call. Force gcc to actually do a indirect call and not just constant resolve the target address.
Found during code review, no runtime testing due to lack of hardware.
Maybe it would be even better to just code the indirect call instruction in assembly?
Something like:
asm volatile("call *%0"
: : "r" (vide)
: "eax", "ecx", "edx");Gotta love the metal mask(?) fix without bumping the stepping number...
-hpa
Quoted 2 lines
Maybe it would be even better to just code the indirect call instruction in assembly?
I only have the simple low risk fix to offer. If you want something gold plated you have to do/test it yourself.
-Andi
Borislav Petkov
maintainerQuoted 14 lines · H. Peter Anvin
Quoted 9 lines · Andi Kleen
From: Andi Kleen <[email protected]>
The AMD K6 errata check relies on timing a indirect call. But the way it was written it could be optimized to a direct call. Force gcc to actually do a indirect call and not just constant resolve the target address.
Found during code review, no runtime testing due to lack of hardware.
Maybe it would be even better to just code the indirect call instruction in assembly?
Quoted 7 lines
Something like:
asm volatile("call *%0" : : "r" (vide) : "eax", "ecx", "edx");Gotta love the metal mask(?) fix without bumping the stepping number...
They fixed it in the next revision:
"Resolution Status. This erratum is corrected in the C stepping of the AMD-K6 processor."
On page 12 here http://www.datasheetcatalog.org/datasheet/AdvancedMicroDevices/mXwsxv.pdf
But it looks some revBs got fixed too reportedly: "... before B 9730xxxx...". Who knows.
Btw, I can't help but cringe everytime I see the wording "... instruction is speculatively executed... " in an erratum :-).
So the poor K6 had some issues with SMC, that's sad.
But I have hard time understanding what that test with the 10^6 loop iterations is supposed to achieve. And what makes sure that the RDTSCs don't get reordered? Or maybe K6 wasn't reordering that aggressively...
Erratum says "unpredictable system behavior" but it seems it wasn't that unpredictable after all - otherwise the fix would've been "HLT" right then and there. :)
Oh well.
Signature · 5 lines
Regards/Gruss,
Boris.
Sent from a fat crate under my desk. Formatting is fine.
--H. Peter Anvin
reviewerQuoted 9 lines · Borislav Petkov
But I have hard time understanding what that test with the 10^6 loop iterations is supposed to achieve. And what makes sure that the RDTSCs don't get reordered? Or maybe K6 wasn't reordering that aggressively...
Erratum says "unpredictable system behavior" but it seems it wasn't that unpredictable after all - otherwise the fix would've been "HLT" right then and there. :)
Looks like it is just trying to sense the bug... but then it doesn't actually do anything about it. At least it should taint the kernel.
-hpa
Borislav Petkov
maintainerQuoted 2 lines · H. Peter Anvin
Looks like it is just trying to sense the bug... but then it doesn't actually do anything about it. At least it should taint the kernel.
Yeah, I was thinking of asking my old contacts about it but it is simply not worth it. Those CPUs are on their way to the museum if they're not there already.
Signature · 5 lines
Regards/Gruss,
Boris.
Sent from a fat crate under my desk. Formatting is fine.
--Hi,
Quoted 3 lines
Yeah, I was thinking of asking my old contacts about it but it is simply not worth it. Those CPUs are on their way to the museum if they're not there already.
I have a perfectly running K6 system (the legendary K6-III I believe), though I am about to have it taken to recycling.
If you want anything tested, I can still do it this week.
Regards,
Wolfram.
Quoted 9 lines · Wolfram Gloger
Hi,
Quoted 3 lines
Yeah, I was thinking of asking my old contacts about it but it is simply not worth it. Those CPUs are on their way to the museum if they're not there already.
I have a perfectly running K6 system (the legendary K6-III I believe), though I am about to have it taken to recycling.
If you want anything tested, I can still do it this week.
This bug was present on the original K6 only, not K6-2 or K6-3. I think that I have a K6 somewhere but I doubt that it's one of the early buggy ones.
Here are the details: http://membres.multimania.fr/poulot/k6bug_faq.html
Signature · 1 line
Ondrej Zary