Re: [PATCH 05/10] MCE: Mask out address mask bits below address granuality

Borislav Petkov
2011-06-10T09:43:00Z

On Thu, Jun 09, 2011 at 05:33:42PM -0400, Luck, Tony wrote:
> From: Andi Kleen <andi@firstfloor.org>
>
> SER enabled systems report the address granuality for each
> reported address in a machine check. But the bits below
> the granuality are undefined. Mask them out before
> logging the machine check.
>
> Signed-off-by: Andi Kleen <ak@linux.intel.com>
> Signed-off-by: Tony Luck <tony.luck@intel.com>
> ---
> arch/x86/kernel/cpu/mcheck/mce.c | 12 +++++++++++-
> 1 files changed, 11 insertions(+), 1 deletions(-)
>
> diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
> index 0349e87..ffc8d11 100644
> --- a/arch/x86/kernel/cpu/mcheck/mce.c
> +++ b/arch/x86/kernel/cpu/mcheck/mce.c
> @@ -539,8 +539,18 @@ static void mce_read_aux(struct mce *m, int i)
> {
> if (m->status & MCI_STATUS_MISCV)
> m->misc = mce_rdmsrl(MSR_IA32_MCx_MISC(i));
> - if (m->status & MCI_STATUS_ADDRV)
> + if (m->status & MCI_STATUS_ADDRV) {
> m->addr = mce_rdmsrl(MSR_IA32_MCx_ADDR(i));
> +
> + /*
> + * Mask the reported address by the reported granuality.
> + */
> + if (mce_ser && (m->status & MCI_STATUS_MISCV)) {
> + u8 shift = m->misc & 0x1f;
> + m->addr >>= shift;
> + m->addr <<= shift;
> + }
> + }
> }
>
> DEFINE_PER_CPU(unsigned, mce_poll_count);

s/granuality/granularity/g;

I would very much like to know how you guys got 'granularity' wrong
_three_ times in one small patch?!!

:-)

--
Regards/Gruss,
Boris.

Advanced Micro Devices GmbH
Einsteinring 24, 85609 Dornach
General Managers: Alberto Bozzo, Andrew Bowd
Registration: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632