x86, msr: Add an AMD wrmsr with exception handling
Subsystems (2)
PATCH RESEND 1/2 x86, msr: Add an AMD wrmsr with exception handling
Add native_write_msr_amd_safe() - we need this for a workaround.
( While at it, convert native_read_msr_amd_safe to using
more robust named inline asm parameters as the rest of the functions. )
Signed-off-by Borislav Petkov <[email protected]>
--- arch/x86/include/asm/msr.h | 32 ++++++++++++++++++++++++++++---- arch/x86/include/asm/paravirt.h | 11 +++++++++-- arch/x86/kernel/paravirt.c | 1 + 3 files changed, 38 insertions(+), 6 deletions(-)
arch/x86/include/asm/msr.h +28 -4
@@ -76,14 +76,14 @@ static inline unsigned long long native_read_msr_amd_safe(unsigned int msr, {DECLARE_ARGS (val, low, high); - asm volatile("2: rdmsr ; xor %0,%0\n" + asmvolatile ("2: rdmsr ; xor %[err],%[err]\n" "1:\n\t" ".section .fixup,\"ax\"\n\t" - "3: mov %3,%0 ; jmp 1b\n\t" +"3: mov %[fault],%[err] ; jmp 1b\n\t" ".previous\n\t" _ASM_EXTABLE(2b, 3b) - : "=r" (*err), EAX_EDX_RET(val, low, high) - : "c" (msr), "D" (0x9c5a203a), "i" (-EFAULT)); + : [err] "=r" (*err), EAX_EDX_RET(val, low, high) + : "c" (msr), "D" (0x9c5a203a), [fault] "i" (-EFAULT)); returnEAX_EDX_VAL (val, low, high); }
@@ -111,6 +111,25 @@ notrace static inline int native_write_msr_safe(unsigned int msr,return err; } +static inline unsigned long long native_write_msr_amd_safe (unsigned int msr, +unsigned low, +unsigned high) +{ +int err; + asmvolatile ("2: wrmsr ; xor %[err],%[err]\n" +"1:\n\t" +".section .fixup,\"ax\"\n\t" +"3: mov %[fault],%[err] ; jmp 1b\n\t" +".previous\n\t" + _ASM_EXTABLE(2b, 3b) + : [err] "=a" (err) + : "c" (msr), "0" (low), "d" (high), [fault] "i" (-EFAULT), +" D " (0x9c5a203a) + : "memory"); + return err; + +} +extern unsigned long long native_read_tsc (void );static __always_inline unsigned long long __native_read_tsc (void )
@@ -164,6 +183,11 @@ static inline int wrmsr_safe(unsigned msr, unsigned low, unsigned high)return native_write_msr_safe (msr, low, high); } +static inline int wrmsr_amd_safe (unsigned msr,unsigned low,unsigned high) +{ +return native_write_msr_amd_safe (msr, low, high); +} +/* rdmsr with exception handling */ #define rdmsr_safe (msr, p1, p2) \ ({ \
arch/x86/include/asm/paravirt.h +9 -2
@@ -169,6 +169,7 @@ struct pv_cpu_ops {u64 (*read_msr_amd)(unsigned int msr,int *err);u64 (*read_msr)(unsigned int msr,int *err);int (*write_msr)(unsigned int msr,unsigned low,unsigned high); +u64 (*write_msr_amd)(unsigned int msr,unsigned low,unsigned high);u64 (*read_tsc)(void);u64 (*read_pmc)(int counter);
@@ -829,6 +830,11 @@ static inline int paravirt_write_msr(unsigned msr, unsigned low, unsigned high)return PVOP_CALL3 (int, pv_cpu_ops.write_msr, msr, low, high); } +static inline int paravirt_write_msr_amd (unsigned msr,unsigned low,unsigned high) +{ +return PVOP_CALL3 (u64, pv_cpu_ops.write_msr_amd, msr, low, high); +} +/* These should all do BUG_ON(_err), but our headers are too tangled. */ #define rdmsr (msr, val1, val2) \ do { \
@@ -849,8 +855,9 @@ do { \ val =paravirt_read_msr (msr, &_err); \ } while (0) -#define wrmsrl (msr, val) wrmsr(msr, (u32)((u64)(val)), ((u64)(val))>>32) -#define wrmsr_safe (msr, a, b) paravirt_write_msr(msr, a, b) +#define wrmsrl (msr, val) wrmsr(msr, (u32)((u64)(val)), ((u64)(val))>>32) +#define wrmsr_safe (msr, a, b) paravirt_write_msr(msr, a, b) +#define wrmsr_amd_safe (msr, a, b) paravirt_write_msr_amd(msr, a, b)/* rdmsr with exception handling */ #define rdmsr_safe (msr, a, b) \
arch/x86/kernel/paravirt.c +1 -0
@@ -364,6 +364,7 @@ struct pv_cpu_ops pv_cpu_ops = { .read_msr = native_read_msr_safe, .read_msr_amd = native_read_msr_amd_safe, .write_msr = native_write_msr_safe, + .write_msr_amd = native_write_msr_amd_safe, .read_tsc = native_read_tsc, .read_pmc = native_read_pmc, .read_tscp = native_read_tscp,
Signature · 1 line
1.6.3.3
PATCH RESEND 2/2 x86, AMD: Disable wrongly set X86_FEATURE_LAHF_LM CPUID bit
fbd8b1819e80ac5a176d085fdddc3a34d1499318 turns off the bit for /proc/cpuinfo. However, a proper/full fix would be to additionally turn off the bit in the CPUID output so that future callers get correct CPU features info.
Do that by basically reversing what the BIOS wrongfully does at boot.
Tested-by Kevin Winchester <[email protected]>
Signed-off-by Borislav Petkov <[email protected]>
--- arch/x86/kernel/cpu/amd.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-)
arch/x86/kernel/cpu/amd.c +11 -1
@@ -404,9 +404,19 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c)/* * Some BIOSes incorrectly force this feature, but only K8 * revision D (model = 0x14) and later actually support it. +* (AMD Erratum #110, docId: 25759). */ -if (c->x86_model <0x14 ) +if (c->x86_model <0x14 &&cpu_has (c,X86_FEATURE_LAHF_LM )) { +u64 val; +clear_cpu_cap (c,X86_FEATURE_LAHF_LM ); +if (!rdmsrl_amd_safe (0xc001100d , &val)) { + val &= ~(1ULL <<32 ); +wrmsr_amd_safe (0xc001100d , (u32 ) val, + (u32)(val >>32 )); + } + } + }if (c->x86 ==0x10 || c->x86 ==0x11 )set_cpu_cap (c,X86_FEATURE_REP_GOOD );
Signature · 1 line
1.6.3.3