Commit 47bdf337 authored by He Chen's avatar He Chen Committed by Thomas Gleixner
Browse files

x86/cpuid: Provide get_scattered_cpuid_leaf() 



Sparse populated CPUID leafs are collected in a software provided leaf to
avoid bloat of the x86_capability array, but there is no way to rebuild the
real leafs (e.g. for KVM CPUID enumeration) other than rereading the CPUID
leaf from the CPU. While this is possible it is problematic as it does not
take software disabled features into account. If a feature is disabled on
the host it should not be exposed to a guest either.

Add get_scattered_cpuid_leaf() which rebuilds the leaf from the scattered
cpuid table information and the active CPU features.

[ tglx: Rewrote changelog ]

Signed-off-by: default avatarHe Chen <he.chen@linux.intel.com>
Reviewed-by: default avatarBorislav Petkov <bp@suse.de>
Cc: Luwei Kang <luwei.kang@intel.com>
Cc: kvm@vger.kernel.org
Cc: Radim Krčmář <rkrcmar@redhat.com>
Cc: Piotr Luc <Piotr.Luc@intel.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Link: http://lkml.kernel.org/r/1478856336-9388-3-git-send-email-he.chen@linux.intel.com


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 47f10a36

arch/x86/include/asm/processor.h

+3 −0
Original line number Diff line number Diff line
@@ -189,6 +189,9 @@ extern void identify_secondary_cpu(struct cpuinfo_x86 *); 
extern void print_cpu_info(struct cpuinfo_x86 *);

void print_cpu_msr(struct cpuinfo_x86 *);

extern void init_scattered_cpuid_features(struct cpuinfo_x86 *c);

extern u32 get_scattered_cpuid_leaf(unsigned int level,

				    unsigned int sub_leaf,

				    enum cpuid_regs_idx reg);

extern unsigned int init_intel_cacheinfo(struct cpuinfo_x86 *c);

extern void init_amd_cacheinfo(struct cpuinfo_x86 *c);

arch/x86/kernel/cpu/scattered.c

+37 −12
Original line number Diff line number Diff line
@@ -17,24 +17,25 @@ struct cpuid_bit { 
	u32 sub_leaf;

};



void init_scattered_cpuid_features(struct cpuinfo_x86 *c)

{

	u32 max_level;

	u32 regs[4];

	const struct cpuid_bit *cb;



/* Please keep the leaf sorted by cpuid_bit.level for faster search. */

static const struct cpuid_bit cpuid_bits[] = {

	{ X86_FEATURE_APERFMPERF,       CPUID_ECX,  0, 0x00000006, 0 },

	{ X86_FEATURE_EPB,              CPUID_ECX,  3, 0x00000006, 0 },

	{ X86_FEATURE_INTEL_PT,         CPUID_EBX, 25, 0x00000007, 0 },

	{ X86_FEATURE_AVX512_4VNNIW,    CPUID_EDX,  2, 0x00000007, 0 },

	{ X86_FEATURE_AVX512_4FMAPS,    CPUID_EDX,  3, 0x00000007, 0 },

		{ X86_FEATURE_APERFMPERF,	CPUID_ECX,  0, 0x00000006, 0 },

		{ X86_FEATURE_EPB,		CPUID_ECX,  3, 0x00000006, 0 },

	{ X86_FEATURE_HW_PSTATE,        CPUID_EDX,  7, 0x80000007, 0 },

	{ X86_FEATURE_CPB,              CPUID_EDX,  9, 0x80000007, 0 },

	{ X86_FEATURE_PROC_FEEDBACK,    CPUID_EDX, 11, 0x80000007, 0 },

	{ 0, 0, 0, 0, 0 }

};



void init_scattered_cpuid_features(struct cpuinfo_x86 *c)

{

	u32 max_level;

	u32 regs[4];

	const struct cpuid_bit *cb;



	for (cb = cpuid_bits; cb->feature; cb++) {



		/* Verify that the level is valid */
@@ -51,3 +52,27 @@ void init_scattered_cpuid_features(struct cpuinfo_x86 *c) 
			set_cpu_cap(c, cb->feature);

	}

}



u32 get_scattered_cpuid_leaf(unsigned int level, unsigned int sub_leaf,

			     enum cpuid_regs_idx reg)

{

	const struct cpuid_bit *cb;

	u32 cpuid_val = 0;



	for (cb = cpuid_bits; cb->feature; cb++) {



		if (level > cb->level)

			continue;



		if (level < cb->level)

			break;



		if (reg == cb->reg && sub_leaf == cb->sub_leaf) {

			if (cpu_has(&boot_cpu_data, cb->feature))

				cpuid_val |= BIT(cb->bit);

		}

	}



	return cpuid_val;

}

EXPORT_SYMBOL_GPL(get_scattered_cpuid_leaf);

CRA Git | Maintained and supported by SUSTech CRA and CCSE