[PATCH] x86: Black list more Intel CPUs for TSX [BZ #27398]
Noah Goldstein
goldstein.w.n@gmail.com
Tue Jan 18 19:55:30 GMT 2022
On Tue, Jan 18, 2022 at 10:43 AM H.J. Lu via Libc-alpha
<libc-alpha@sourceware.org> wrote:
>
> Disable TSX and enable RTM_ALWAYS_ABORT for Intel CPUs listed in:
>
> https://www.intel.com/content/www/us/en/support/articles/000059422/processors.html
>
> This fixes BZ #27398.
> ---
> sysdeps/x86/cpu-features.c | 35 ++++++++++++++++++++++++++++++++---
> 1 file changed, 32 insertions(+), 3 deletions(-)
>
> diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c
> index 772ccf8e91..034d9feff7 100644
> --- a/sysdeps/x86/cpu-features.c
> +++ b/sysdeps/x86/cpu-features.c
> @@ -507,11 +507,40 @@ init_cpu_features (struct cpu_features *cpu_features)
> break;
> }
>
> - /* Disable TSX on some Haswell processors to avoid TSX on kernels that
> - weren't updated with the latest microcode package (which disables
> - broken feature by default). */
> + /* Disable TSX on some processors to avoid TSX on kernels that
> + weren't updated with the latest microcode package (which
> + disables broken feature by default). */
> switch (model)
> {
> + case 0x55:
> + if (stepping <= 5)
> + goto disable_tsx;
> + break;
> + case 0x8e:
> + /* NB: The errata says that only 0xb stepping or lower are
> + impacted. But 0xc stepping also exhibits the similar
> + behavior. */
Do you have any link for this or is this just from internal testing?
> + if (stepping <= 0xc)
> + goto disable_tsx;
If you want you could make `case 0x8e` fall through into `case 0x9e`
given that both
disable for `stepping <= 0xc`. This isn't a critical path and clarity
might be more
important, especially since the `case 0x8e` goes against documentation.
> + break;
> + case 0x9e:
> + if (stepping > 0xc)
> + break;
> + /* Fall through. */
> + case 0x4e:
> + case 0x5e:
> + {
> + /* Disable Intel TSX and enable RTM_ALWAYS_ABORT for
> + processors listed in:
> +
> +https://www.intel.com/content/www/us/en/support/articles/000059422/processors.html
> + */
> +disable_tsx:
> + CPU_FEATURE_UNSET (cpu_features, HLE);
> + CPU_FEATURE_UNSET (cpu_features, RTM);
> + CPU_FEATURE_SET (cpu_features, RTM_ALWAYS_ABORT);
> + }
> + break;
> case 0x3f:
> /* Xeon E7 v3 with stepping >= 4 has working TSX. */
> if (stepping >= 4)
> --
> 2.34.1
>
LGTM although have a few comments.
More information about the Libc-alpha
mailing list