Re: [tip:x86/cpu] x86, cpu: AMD errata checking framework

[H. Peter Anvin]

Hi there,

This code has been excluded since it was added, because it doesn't
compile if CONFIG_CPU_SUP_AMD is not defined.  I took a quick look over
it to see if it could quickly be fixed (which it can -- just don't
exclude the macro definitions and define a dummy version of
cpu_has_amd_erratum() which simply returns false), however, on looking
closer at the code I have to say it really is pretty broken, and as such
I would rather you refreshed the patch.

First of all, you're passing a boolean flag which only is used to tell
if there is a single integer immediately following it.  This could just
as easily, and much more cleanly, be done by passing -1 in the case
there is no OSVW ID.  However, a *much* bigger issue is the fact that
this will manifest a potentially very large memory structure into code
at every calling point, but it is not at all obvious to the programmer
that that will happen.  As such, I'm going to insist that the individual
errata definitions move out of line into a memory structure -- using
more or less your existing macros you can simply make it an array of
type u32 -- and then have in your header file:


extern const u32 amd_erratum_400[];



... and at the point of call ...

cpu_has_amd_erratum(amd_erratum_400)


Note that I haven't included a pointer to the cpuinfo_x86 structure. The
reason why is that although you pass a pointer to an arbitrary
cpuinfo_x86 structure, you also do rdmsrl() on the local processor and
expect them to work.  This isn't really ideal; it's better, then, to
make it specific to the currently executing processor and just use
current_cpu_data.

I have flushed these two commits, and am looking forward to an updated
version.

	-hpa


On 06/17/2010 10:06 AM, tip-bot for Hans Rosenfeld wrote:
> Commit-ID:  48327dd572aaf9924c3dc4f8ad3189d506b11390
> Gitweb:     http://git.kernel.org/tip/48327dd572aaf9924c3dc4f8ad3189d506b11390
> Author:     Hans Rosenfeld <hans.rosenfeld@xxxxxxx>
> AuthorDate: Wed, 16 Jun 2010 11:48:52 +0200
> Committer:  H. Peter Anvin <hpa@xxxxxxxxx>
> CommitDate: Wed, 16 Jun 2010 17:28:04 -0700
> 
> x86, cpu: AMD errata checking framework
> 
> Errata are defined using the AMD_LEGACY_ERRATUM() or AMD_OSVW_ERRATUM()
> macros. The latter is intended for newer errata that have an OSVW id
> assigned, which it takes as first argument. Both take a variable number
> of family-specific model-stepping ranges created by AMD_MODEL_RANGE().
> 
> Iff an erratum has an OSVW id, OSVW is available on the CPU, and the
> OSVW id is known to the hardware, it is used to determine whether an
> erratum is present. Otherwise, the model-stepping ranges are matched
> against the boot CPU to find out whether the erratum applies.
> 
> For certain special errata, the code using this framework might have to
> conduct further checks to make sure an erratum is really (not) present.
> 
> Signed-off-by: Hans Rosenfeld <hans.rosenfeld@xxxxxxx>
> LKML-Reference: <1276681733-10872-1-git-send-email-hans.rosenfeld@xxxxxxx>
> Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxx>
> ---
>  arch/x86/include/asm/processor.h |   30 ++++++++++++++++++++++
>  arch/x86/kernel/cpu/amd.c        |   51 ++++++++++++++++++++++++++++++++++++++
>  2 files changed, 81 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
> index 7e5c6a6..09fb3a1 100644
> --- a/arch/x86/include/asm/processor.h
> +++ b/arch/x86/include/asm/processor.h
> @@ -1025,4 +1025,34 @@ unsigned long calc_aperfmperf_ratio(struct aperfmperf *old,
>  	return ratio;
>  }
>  
> +/*
> + * AMD errata checking
> + */
> +#ifdef CONFIG_CPU_SUP_AMD
> +extern bool cpu_has_amd_erratum(const struct cpuinfo_x86 *, bool, ...);
> +
> +/*
> + * Errata are defined using the AMD_LEGACY_ERRATUM() or AMD_OSVW_ERRATUM()
> + * macros. The latter is intended for newer errata that have an OSVW id
> + * assigned, which it takes as first argument. Both take a variable number
> + * of family-specific model-stepping ranges created by AMD_MODEL_RANGE().
> + *
> + * Example:
> + *
> + * #define AMD_ERRATUM_319						\
> + *	AMD_LEGACY_ERRATUM(AMD_MODEL_RANGE(0x10, 0x2, 0x1, 0x4, 0x2),	\
> + *			   AMD_MODEL_RANGE(0x10, 0x8, 0x0, 0x8, 0x0),	\
> + *			   AMD_MODEL_RANGE(0x10, 0x9, 0x0, 0x9, 0x0))
> + */
> +
> +#define AMD_LEGACY_ERRATUM(...)		false, __VA_ARGS__, 0
> +#define AMD_OSVW_ERRATUM(osvw_id, ...)	true, osvw_id, __VA_ARGS__, 0
> +#define AMD_MODEL_RANGE(f, m_start, s_start, m_end, s_end) \
> +	((f << 24) | (m_start << 16) | (s_start << 12) | (m_end << 4) | (s_end))
> +#define AMD_MODEL_RANGE_FAMILY(range)	(((range) >> 24) & 0xff)
> +#define AMD_MODEL_RANGE_START(range)	(((range) >> 12) & 0xfff)
> +#define AMD_MODEL_RANGE_END(range)	((range) & 0xfff)
> +
> +#endif /* CONFIG_CPU_SUP_AMD */
> +
>  #endif /* _ASM_X86_PROCESSOR_H */
> diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
> index 12b9cff..07bdfe9 100644
> --- a/arch/x86/kernel/cpu/amd.c
> +++ b/arch/x86/kernel/cpu/amd.c
> @@ -14,6 +14,8 @@
>  # include <asm/cacheflush.h>
>  #endif
>  
> +#include <stdarg.h>
> +
>  #include "cpu.h"
>  
>  #ifdef CONFIG_X86_32
> @@ -609,3 +611,52 @@ static const struct cpu_dev __cpuinitconst amd_cpu_dev = {
>  };
>  
>  cpu_dev_register(amd_cpu_dev);
> +
> +
> +/*
> + * Check for the presence of an AMD erratum.
> + * Arguments are defined in processor.h for each known erratum.
> + */
> +bool cpu_has_amd_erratum(const struct cpuinfo_x86 *cpu, bool osvw, ...)
> +{
> +	va_list ap;
> +	u32 range;
> +	u32 ms;
> +
> +	if (cpu->x86_vendor != X86_VENDOR_AMD)
> +		return false;
> +
> +	va_start(ap, osvw);
> +
> +	if (osvw) {
> +		u16 osvw_id = va_arg(ap, int);
> +
> +		if (cpu_has(cpu, X86_FEATURE_OSVW)) {
> +			u64 osvw_len;
> +			rdmsrl(MSR_AMD64_OSVW_ID_LENGTH, osvw_len);
> +
> +			if (osvw_id < osvw_len) {
> +				u64 osvw_bits;
> +				rdmsrl(MSR_AMD64_OSVW_STATUS + (osvw_id >> 6),
> +				       osvw_bits);
> +
> +				va_end(ap);
> +				return osvw_bits & (1ULL << (osvw_id & 0x3f));
> +			}
> +		}
> +	}
> +
> +	/* OSVW unavailable or ID unknown, match family-model-stepping range */
> +	ms = (cpu->x86_model << 8) | cpu->x86_mask;
> +	while ((range = va_arg(ap, int))) {
> +		if ((cpu->x86 == AMD_MODEL_RANGE_FAMILY(range)) &&
> +		    (ms >= AMD_MODEL_RANGE_START(range)) &&
> +		    (ms <= AMD_MODEL_RANGE_END(range))) {
> +			va_end(ap);
> +			return true;
> +		}
> +	}
> +
> +	va_end(ap);
> +	return false;
> +}


-- 
H. Peter Anvin, Intel Open Source Technology Center
I work for Intel.  I don't speak on their behalf.

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/