Skip to contentSkip to conversation

x86/cpufeatures: make bits in cpu_caps_cleared[] and cpu_cpus_set[] exclusive

PATCH In review Xiaoyao Li 2 participants 3 messages Mar 18, 2020 x86

lore
Share & tools
lore

Xiaoyao Li

author
#0 lore raw

PATCH 1/1 x86/cpufeatures: make bits in cpu_caps_cleared[] and cpu_cpus_set[] exclusive

In apply_forced_caps(), cpu_caps_set[] overrides cpu_caps_cleared[], so that setup_clear_cpu_cap() cannot clear one cap if setup_force_cpu_cap() sets the cap before it.

Explicitly clear the bit in cpu_caps_cleared[] when set it in cpu_caps_set[], and vice versa, can fix this.

---
 arch/x86/include/asm/cpufeature.h | 1 +
 arch/x86/kernel/cpu/cpuid-deps.c  | 1 +
 2 files changed, 2 insertions(+)
arch/x86/include/asm/cpufeature.h +1 -0
index 59bf91c57aa8..f6d976b05d2c 100644
@@ -144,6 +144,7 @@ extern void clear_cpu_cap(struct cpuinfo_x86 *c, unsigned int bit);
 #define setup_force_cpu_cap(bit) do { \
 	set_cpu_cap(&boot_cpu_data, bit);	\
 	set_bit(bit, (unsigned long *)cpu_caps_set);	\
+	clear_bit(bit, (unsigned long *)cpu_caps_cleared);	\
 } while (0)
 
 #define setup_force_cpu_bug(bit) setup_force_cpu_cap(bit)
arch/x86/kernel/cpu/cpuid-deps.c +1 -0
index 3cbe24ca80ab..e16c36094e6c 100644
@@ -82,6 +82,7 @@ static inline void clear_feature(struct cpuinfo_x86 *c, unsigned int feature)
 	if (!c) {
 		clear_cpu_cap(&boot_cpu_data, feature);
 		set_bit(feature, (unsigned long *)cpu_caps_cleared);
+		clear_bit(feature, (unsigned long *)cpu_caps_set);
 	} else {
 		clear_bit(feature, (unsigned long *)c->x86_capability);
 	}
Signature · 1 line
2.20.1
maintainer
#1 lore raw
Quoted 3 lines · Xiaoyao Li

In apply_forced_caps(), cpu_caps_set[] overrides cpu_caps_cleared[], so that setup_clear_cpu_cap() cannot clear one cap if setup_force_cpu_cap() sets the cap before it.

Context pls: what is the observation, what are you trying to do, reproducer, etc?

Thx.

Signature · 4 lines
Regards/Gruss,
    Boris.

https://people.kernel.org/tglx/notes-about-netiquette
author
#2 lore raw
Quoted 7 lines · Borislav Petkov
Quoted 3 lines · Xiaoyao Li

In apply_forced_caps(), cpu_caps_set[] overrides cpu_caps_cleared[], so that setup_clear_cpu_cap() cannot clear one cap if setup_force_cpu_cap() sets the cap before it.

Context pls: what is the observation, what are you trying to do, reproducer, etc?

Well. I use setup_force_cup_cap(XXX) to set one flag, XXX, during early boot. And use setup_clear_cpu_cap(XXX) to clear this flag when something wrong later. However, it turns out that the flag is still set when I use cpu_has(c, XXX) to check when init each AP. I have to clear the flag XXX explicitly using clear_cpu_cap(c, XXX). However, in /proc/cpuinfo, this XXX flag still presents on every CPU.

Quoted 2 lines

Thx.