]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
x86/cpu: Fix LFENCE serialization check in init_amd()
authorRhythm Mahajan <rhythm.m.mahajan@oracle.com>
Wed, 15 Mar 2023 10:40:15 +0000 (03:40 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 17 Mar 2023 07:30:38 +0000 (08:30 +0100)
commit9e1f4df32ee8738b6781464a706c16f57ce0d68f
tree308fb0f89e9d841f04abf539a3ac57ce35d4a726
parent7f973ce9835454b99481c9547e010ecc80228b41
x86/cpu: Fix LFENCE serialization check in init_amd()

The commit: 3f235279828c ("x86/cpu: Restore AMD's DE_CFG MSR after resume")
which was backported from the upstream commit: 2632daebafd0 renamed the
MSR_F10H_DECFG_LFENCE_SERIALIZE macro to MSR_AMD64_DE_CFG_LFENCE_SERIALIZE.
The fix for 4.14 and 4.9 changed MSR_F10H_DECFG_LFENCE_SERIALIZE to
MSR_AMD64_DE_CFG_LFENCE_SERIALIZE_BIT in the init_amd() function, but should
have used MSR_AMD64_DE_CFG_LFENCE_SERIALIZE.  This causes a discrepency in the
LFENCE serialization check in the init_amd() function.

This causes a ~16% sysbench memory regression, when running:
    sysbench --test=memory run

Fixes: 3f235279828c ("x86/cpu: Restore AMD's DE_CFG MSR after resume")
Signed-off-by: Rhythm Mahajan <rhythm.m.mahajan@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/x86/kernel/cpu/amd.c