Utilize cpu-type for CPU matching
Subsystems (3)
Pawan Gupta
reviewerv8 cover Utilize cpu-type for CPU matching
v8:
- Zap the unused macro X86_MATCH_VENDOR_FAM_MODEL_FEATURE() (Borislav).
- s/cpu_type/type/ in struct x86_cpu_id (Borislav).
- s/boot_cpu_has/cpu_feature_enabled/ in x86_match_vendor_cpu_type() (Borislav).
- Added patch to fix X86_MATCH_VFM_STEPS() documentation.
- Rebased to tip/x86/cpu.
v7: https://lore.kernel.org/r/[email protected]
- Moved the CPU table cleanup patch out of the series, it does not relate to cpu-type detection. Will send it separately.
v6: https://lore.kernel.org/r/[email protected]
- Use the recently added macro VULNBL_INTEL_STEPS() in the affected CPU list cleanup patch.
- Rebased to tip/x86/cpu.
This series is now the remaining last 4 patches from the original series. Other parts are:
Part-1: 45239ba39a52 ("x86/cpu: Add CPU type to struct cpuinfo_topology")
is merged upstream.
Part-2: Is below list of patches that are in tip tree branch x86/cpu:
x86/cpu: Prepend 0x to the hex values in cpu_debug_show()
cpufreq: intel_pstate: Avoid SMP calls to get cpu-type perf/x86/intel: Use cache cpu-type for hybrid PMU selection x86/cpu: Remove get_this_hybrid_cpu_*()
v5: https://lore.kernel.org/r/[email protected]
- Replace usages of get_this_hybrid_cpu_native_id() with its cached value in CPU topology structure.
- s/x86_match_cpu_type/x86_match_vendor_cpu_type and add vendor checks in the function.
- Some cleanups in intel_pstate.c.
- Collected tags.
- Rebased to v6.13-rc1.
v4: https://lore.kernel.org/r/[email protected]
- Series doesn't apply to upstream cleanly anymore, rebased to v6.12-rc1, resolved the merge conflict in files:
arch/x86/include/asm/cpu_device_id.h arch/x86/kernel/cpu/common.c
- Remove redundant "hw_" in intel_hw_native_model_id().
v3: https://lore.kernel.org/r/[email protected]
- Add a patch to prepend "0x" to hex values in cpu_debug_show() (Borislav).
- Add support to to also get Intel Native Model ID (Dapeng).
- Keep similar models together in the affected processor list (Josh).
- Add a comparison of .init.data in commit message for cpu_vuln_blacklist before and after decluttering patch for affected processor list (Josh).
- Drop the debugfs file reference in the commit message (Borislav).
- s/cpu_type/hw_cpu_type/ (Borislav).
- Add a union for hw_cpu_type for easy retrieval of intel_core_type and intel_native_model_id.
- Updated commit messages, collected tags.
- Rebased to v6.11-rc3.
Note, I will be off work till Tuesday, will reply to any comments then.
v2: https://lore.kernel.org/r/[email protected]
- Move CPU-type to the end of the CPU topology structure (Andrew).
- Use c->cpuid_level instead of cpuid_eax(0) (Andrew).
- Move CPU-type enum out of ifdef CONFIG_NUMA (kernel test robot).
- Rename cpu_type to hw_cpu_type (Borislav).
- Explain replacing get_this_hybrid_cpu_type() with topology_hw_cpu_type() in the commit message (Dave).
- Fix the alignment in cpu_vuln_whitelist (Andrew).
- Add the obj compare note in the commit message (Dave/Tony).
- s/X86_CPU_TYPE_INTEL_ATOM/ATOM/ in cpu_vuln_whitelist (Dave).
v1: https://lore.kernel.org/r/[email protected]
Hi,
This series adds support for CPU-type (CPUID.1A.EAX[31-24] on Intel) to differentiate between hybrid variants P+E, P-only, E-only that share the same Family/Model/Stepping. One of the use case for CPU-type is the affected CPU table for CPU vulnerabilities, which can now use the CPU-type to filter the unaffected variants.
* Patch 1 fixes a minor formatting issue in cpu_debug_show().
* Patch 2 adds hardware cpu-type to CPU topology structure and introduces topology_hw_cpu_type().
* Patch 3-5 replaces usages of get_this_hybrid_cpu_type() with topology_hw_cpu_type().
* Patch 6-8 Updates CPU-matching infrastructure to use CPU-type.
* Patch 9 cleans up the affected CPU list.
* Patch 10 uses the CPU-type to exclude P-only parts from the RFDS affected list.
---
Pawan Gupta (5):
x86/cpu: Fix the description of X86_MATCH_VFM_STEPS() x86/cpu: Name CPU matching macro more generically (and shorten) x86/cpu: Add cpu_type to struct x86_cpu_id
x86/cpu: Update x86_match_cpu() to also use cpu-type x86/rfds: Exclude P-only parts from the RFDS affected list
.../admin-guide/hw-vuln/reg-file-data-sampling.rst | 8 -- arch/x86/include/asm/cpu_device_id.h | 130 +++++++-------------- arch/x86/kernel/cpu/common.c | 7 +- arch/x86/kernel/cpu/match.c | 30 +++++ include/linux/mod_devicetable.h | 2 + 5 files changed, 81 insertions(+), 96 deletions(-)
---
base-commit: 55d9f0b05e1ca53c0884545445b7e29466679a33
change-id: 20240617-add-cpu-type-4d5e47efc117
Best regards,
Signature · 1 line
Pawan
Pawan Gupta
reviewerPATCH v8 1/5 x86/cpu: Fix the description of X86_MATCH_VFM_STEPS()
The comments needs to reflect an implementation change.
No functional change.
--- arch/x86/include/asm/cpu_device_id.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
arch/x86/include/asm/cpu_device_id.h +4 -2
@@ -209,9 +209,11 @@#define __X86_STEPPINGS (mins, maxs) GENMASK(maxs, mins)/** -* X86_MATCH_VFM_STEPPINGS - Match encoded vendor/family/model/stepping +* X86_MATCH_VFM_STEPS - Match encoded vendor/family/model and steppings +* range. * @vfm: Encoded 8-bits each for vendor, family, model -* @steppings: Bitmask of steppings to match +* @min_step: Lowest stepping number to match +* @max_step: Highest stepping number to match * @data: Driver specific data or NULL. The internal storage * format is unsigned long. The supplied value, pointer * etc. is cast to unsigned long internally.
Signature · 1 line
2.34.1
[tip: x86/cpu] x86/cpu: Fix the description of X86_MATCH_VFM_STEPS()
The following commit has been merged into the x86/cpu branch of tip:
The following commit has been merged into the x86/cpu branch of tip:
Commit-ID: 0a4e4ed87f42e250e4dc126dab38365e0ff1f2fb Gitweb: https://git.kernel.org/tip/0a4e4ed87f42e250e4dc126dab38365e0ff1f2fb Author: Pawan Gupta <[email protected]> AuthorDate: Tue, 11 Mar 2025 08:02:05 -07:00 Committer: Borislav Petkov (AMD) <[email protected]> CommitterDate: Tue, 11 Mar 2025 20:53:29 +01:00
x86/cpu: Fix the description of X86_MATCH_VFM_STEPS()
The comments needs to reflect an implementation change.
No functional change.
--- arch/x86/include/asm/cpu_device_id.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
arch/x86/include/asm/cpu_device_id.h +4 -2
@@ -209,9 +209,11 @@#define __X86_STEPPINGS (mins, maxs) GENMASK(maxs, mins)/** -* X86_MATCH_VFM_STEPPINGS - Match encoded vendor/family/model/stepping +* X86_MATCH_VFM_STEPS - Match encoded vendor/family/model and steppings +* range. * @vfm: Encoded 8-bits each for vendor, family, model -* @steppings: Bitmask of steppings to match +* @min_step: Lowest stepping number to match +* @max_step: Highest stepping number to match * @data: Driver specific data or NULL. The internal storage * format is unsigned long. The supplied value, pointer * etc. is cast to unsigned long internally.
[tip: x86/core] x86/cpu: Fix the description of X86_MATCH_VFM_STEPS()
In reply to Pawan GuptaThe following commit has been merged into the x86/core branch of tip:
The following commit has been merged into the x86/core branch of tip:
Commit-ID: 7b9b54e23a677efdc76220903afa4262069a5dc7 Gitweb: https://git.kernel.org/tip/7b9b54e23a677efdc76220903afa4262069a5dc7 Author: Pawan Gupta <[email protected]> AuthorDate: Tue, 11 Mar 2025 08:02:05 -07:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Wed, 19 Mar 2025 11:16:33 +01:00
x86/cpu: Fix the description of X86_MATCH_VFM_STEPS()
The comments needs to reflect an implementation change.
No functional change.
--- arch/x86/include/asm/cpu_device_id.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
arch/x86/include/asm/cpu_device_id.h +4 -2
@@ -209,9 +209,11 @@#define __X86_STEPPINGS (mins, maxs) GENMASK(maxs, mins)/** -* X86_MATCH_VFM_STEPPINGS - Match encoded vendor/family/model/stepping +* X86_MATCH_VFM_STEPS - Match encoded vendor/family/model and steppings +* range. * @vfm: Encoded 8-bits each for vendor, family, model -* @steppings: Bitmask of steppings to match +* @min_step: Lowest stepping number to match +* @max_step: Highest stepping number to match * @data: Driver specific data or NULL. The internal storage * format is unsigned long. The supplied value, pointer * etc. is cast to unsigned long internally.
Pawan Gupta
reviewerPATCH v8 2/5 x86/cpu: Name CPU matching macro more generically (and shorten)
In reply to Pawan GuptaTo add cpu-type to the existing CPU matching infrastructure, the base macro X86_MATCH_VENDOR_FAM_MODEL_STEPPINGS_FEATURE need to append _CPU_TYPE. This makes an already long name longer, and somewhat incomprehensible.
To avoid this, rename the base macro to X86_MATCH_CPU. The macro name doesn't need to explicitly tell everything that it matches. The arguments to the macro already hints that.
For consistency, use this base macro to define X86_MATCH_VFM and friends.
--- arch/x86/include/asm/cpu_device_id.h | 110 +++++++++-------------------------- 1 file changed, 26 insertions(+), 84 deletions(-)
arch/x86/include/asm/cpu_device_id.h +26 -84
@@ -57,7 +57,7 @@#define X86_CPU_ID_FLAG_ENTRY_VALID BIT(0)/** -* X86_MATCH_VENDOR_FAM_MODEL_STEPPINGS_FEATURE - Base macro for CPU matching +* X86_MATCH_CPU - Base macro for CPU matching * @_vendor: The vendor name, e.g. INTEL, AMD, HYGON, ..., ANY * The name is expanded to X86_VENDOR_@_vendor * @_family: The family number or X86_FAMILY_ANY
@@ -74,19 +74,7 @@* into another macro at the usage site for good reasons, then please * start this local macro with X86_MATCH to allow easy grepping. */ -#define X86_MATCH_VENDOR_FAM_MODEL_STEPPINGS_FEATURE (_vendor, _family, _model, \ - _steppings, _feature, _data) { \ - .vendor = X86_VENDOR_##_vendor, \ - .family = _family, \ - .model = _model, \ - .steppings = _steppings, \ - .feature = _feature, \ - .flags = X86_CPU_ID_FLAG_ENTRY_VALID, \ - .driver_data = (unsigned long) _data \ -} - -#define X86_MATCH_VENDORID_FAM_MODEL_STEPPINGS_FEATURE (_vendor, _family, _model, \ - _steppings, _feature, _data) { \ +#define X86_MATCH_CPU (_vendor, _family, _model, _steppings, _feature, _data) { \ .vendor = _vendor, \ .family = _family, \ .model = _model, \
@@ -96,24 +84,6 @@ .driver_data = (unsigned long) _data \ } -/** -* X86_MATCH_VENDOR_FAM_MODEL_FEATURE - Macro for CPU matching -* @_vendor: The vendor name, e.g. INTEL, AMD, HYGON, ..., ANY -* The name is expanded to X86_VENDOR_@_vendor -* @_family: The family number or X86_FAMILY_ANY -* @_model: The model number, model constant or X86_MODEL_ANY -* @_feature: A X86_FEATURE bit or X86_FEATURE_ANY -* @_data: Driver specific data or NULL. The internal storage -* format is unsigned long. The supplied value, pointer -* etc. is casted to unsigned long internally. -* -* The steppings arguments of X86_MATCH_VENDOR_FAM_MODEL_STEPPINGS_FEATURE() is -* set to wildcards. -*/ -#define X86_MATCH_VENDOR_FAM_MODEL_FEATURE (vendor, family, model, feature, data) \ - X86_MATCH_VENDOR_FAM_MODEL_STEPPINGS_FEATURE(vendor, family, model, \ - X86_STEPPING_ANY, feature, data) -/** * X86_MATCH_VENDOR_FAM_FEATURE - Macro for matching vendor, family and CPU feature * @vendor: The vendor name, e.g. INTEL, AMD, HYGON, ..., ANY
@@ -123,13 +93,10 @@* @data: Driver specific data or NULL. The internal storage * format is unsigned long. The supplied value, pointer * etc. is casted to unsigned long internally. -* -* All other missing arguments of X86_MATCH_VENDOR_FAM_MODEL_FEATURE() are -* set to wildcards. */ -#define X86_MATCH_VENDOR_FAM_FEATURE (vendor, family, feature, data) \ - X86_MATCH_VENDOR_FAM_MODEL_FEATURE(vendor, family, \ - X86_MODEL_ANY, feature, data) +#define X86_MATCH_VENDOR_FAM_FEATURE (vendor, family, feature, data) \ + X86_MATCH_CPU(X86_VENDOR_##vendor, family, X86_MODEL_ANY, \ + X86_STEPPING_ANY, feature, data)/** * X86_MATCH_VENDOR_FEATURE - Macro for matching vendor and CPU feature
@@ -139,12 +106,10 @@* @data: Driver specific data or NULL. The internal storage * format is unsigned long. The supplied value, pointer * etc. is casted to unsigned long internally. -* -* All other missing arguments of X86_MATCH_VENDOR_FAM_MODEL_FEATURE() are -* set to wildcards. */ -#define X86_MATCH_VENDOR_FEATURE (vendor, feature, data) \ - X86_MATCH_VENDOR_FAM_FEATURE(vendor, X86_FAMILY_ANY, feature, data) +#define X86_MATCH_VENDOR_FEATURE (vendor, feature, data) \ + X86_MATCH_CPU(X86_VENDOR_##vendor, X86_FAMILY_ANY, X86_MODEL_ANY, \ + X86_STEPPING_ANY, feature, data)/** * X86_MATCH_FEATURE - Macro for matching a CPU feature
@@ -152,12 +117,10 @@* @data: Driver specific data or NULL. The internal storage * format is unsigned long. The supplied value, pointer * etc. is casted to unsigned long internally. -* -* All other missing arguments of X86_MATCH_VENDOR_FAM_MODEL_FEATURE() are -* set to wildcards. */ -#define X86_MATCH_FEATURE (feature, data) \ - X86_MATCH_VENDOR_FEATURE(ANY, feature, data) +#define X86_MATCH_FEATURE (feature, data) \ + X86_MATCH_CPU(X86_VENDOR_ANY, X86_FAMILY_ANY, X86_MODEL_ANY, \ + X86_STEPPING_ANY, feature, data)/** * X86_MATCH_VENDOR_FAM_MODEL - Match vendor, family and model
@@ -168,13 +131,10 @@* @data: Driver specific data or NULL. The internal storage * format is unsigned long. The supplied value, pointer * etc. is casted to unsigned long internally. -* -* All other missing arguments of X86_MATCH_VENDOR_FAM_MODEL_FEATURE() are -* set to wildcards. */ -#define X86_MATCH_VENDOR_FAM_MODEL (vendor, family, model, data) \ - X86_MATCH_VENDOR_FAM_MODEL_FEATURE(vendor, family, model, \ - X86_FEATURE_ANY, data) +#define X86_MATCH_VENDOR_FAM_MODEL (vendor, family, model, data) \ + X86_MATCH_CPU(X86_VENDOR_##vendor, family, model, X86_STEPPING_ANY, \ + X86_FEATURE_ANY, data)/** * X86_MATCH_VENDOR_FAM - Match vendor and family
@@ -184,12 +144,10 @@* @data: Driver specific data or NULL. The internal storage * format is unsigned long. The supplied value, pointer * etc. is casted to unsigned long internally. -* -* All other missing arguments to X86_MATCH_VENDOR_FAM_MODEL_FEATURE() are -* set of wildcards. */ -#define X86_MATCH_VENDOR_FAM (vendor, family, data) \ - X86_MATCH_VENDOR_FAM_MODEL(vendor, family, X86_MODEL_ANY, data) +#define X86_MATCH_VENDOR_FAM (vendor, family, data) \ + X86_MATCH_CPU(X86_VENDOR_##vendor, family, X86_MODEL_ANY, \ + X86_STEPPING_ANY, X86_FEATURE_ANY, data)/** * X86_MATCH_VFM - Match encoded vendor/family/model
@@ -197,15 +155,10 @@* @data: Driver specific data or NULL. The internal storage * format is unsigned long. The supplied value, pointer * etc. is cast to unsigned long internally. -* -* Stepping and feature are set to wildcards */ -#define X86_MATCH_VFM (vfm, data) \ - X86_MATCH_VENDORID_FAM_MODEL_STEPPINGS_FEATURE( \ - VFM_VENDOR(vfm), \ - VFM_FAMILY(vfm), \ - VFM_MODEL(vfm), \ - X86_STEPPING_ANY, X86_FEATURE_ANY, data) +#define X86_MATCH_VFM (vfm, data) \ + X86_MATCH_CPU(VFM_VENDOR(vfm), VFM_FAMILY(vfm), VFM_MODEL(vfm), \ + X86_STEPPING_ANY, X86_FEATURE_ANY, data)#define __X86_STEPPINGS (mins, maxs) GENMASK(maxs, mins)/**
@@ -217,16 +170,10 @@* @data: Driver specific data or NULL. The internal storage * format is unsigned long. The supplied value, pointer * etc. is cast to unsigned long internally. -* -* feature is set to wildcard */ -#define X86_MATCH_VFM_STEPS (vfm, min_step, max_step, data) \ - X86_MATCH_VENDORID_FAM_MODEL_STEPPINGS_FEATURE( \ - VFM_VENDOR(vfm), \ - VFM_FAMILY(vfm), \ - VFM_MODEL(vfm), \ - __X86_STEPPINGS(min_step, max_step), \ - X86_FEATURE_ANY, data) +#define X86_MATCH_VFM_STEPS (vfm, min_step, max_step, data) \ + X86_MATCH_CPU(VFM_VENDOR(vfm), VFM_FAMILY(vfm), VFM_MODEL(vfm), \ + __X86_STEPPINGS(min_step, max_step), X86_FEATURE_ANY, data)/** * X86_MATCH_VFM_FEATURE - Match encoded vendor/family/model/feature
@@ -235,15 +182,10 @@* @data: Driver specific data or NULL. The internal storage * format is unsigned long. The supplied value, pointer * etc. is cast to unsigned long internally. -* -* Steppings is set to wildcard */ -#define X86_MATCH_VFM_FEATURE (vfm, feature, data) \ - X86_MATCH_VENDORID_FAM_MODEL_STEPPINGS_FEATURE( \ - VFM_VENDOR(vfm), \ - VFM_FAMILY(vfm), \ - VFM_MODEL(vfm), \ - X86_STEPPING_ANY, feature, data) +#define X86_MATCH_VFM_FEATURE (vfm, feature, data) \ + X86_MATCH_CPU(VFM_VENDOR(vfm), VFM_FAMILY(vfm), VFM_MODEL(vfm), \ + X86_STEPPING_ANY, feature, data)extern const struct x86_cpu_id *x86_match_cpu (const struct x86_cpu_id *match);extern bool x86_match_min_microcode_rev (const struct x86_cpu_id *table);
Signature · 1 line
2.34.1
[tip: x86/cpu] x86/cpu: Shorten CPU matching macro
The following commit has been merged into the x86/cpu branch of tip:
The following commit has been merged into the x86/cpu branch of tip:
Commit-ID: 6f91e60c38443f80c7d41aab3f535390f758d35f Gitweb: https://git.kernel.org/tip/6f91e60c38443f80c7d41aab3f535390f758d35f Author: Pawan Gupta <[email protected]> AuthorDate: Tue, 11 Mar 2025 08:02:20 -07:00 Committer: Borislav Petkov (AMD) <[email protected]> CommitterDate: Tue, 11 Mar 2025 20:53:30 +01:00
x86/cpu: Shorten CPU matching macro
To add cpu-type to the existing CPU matching infrastructure, the base macro X86_MATCH_VENDOR_FAM_MODEL_STEPPINGS_FEATURE need to append _CPU_TYPE. This makes an already long name longer, and somewhat incomprehensible.
To avoid this, rename the base macro to X86_MATCH_CPU. The macro name doesn't need to explicitly tell everything that it matches. The arguments to the macro already hint at that.
For consistency, use this base macro to define X86_MATCH_VFM and friends.
Remove unused X86_MATCH_VENDOR_FAM_MODEL_FEATURE while at it.
[ bp: Massage commit message. ]
--- arch/x86/include/asm/cpu_device_id.h | 110 ++++++-------------------- 1 file changed, 26 insertions(+), 84 deletions(-)
arch/x86/include/asm/cpu_device_id.h +26 -84
@@ -57,7 +57,7 @@#define X86_CPU_ID_FLAG_ENTRY_VALID BIT(0)/** -* X86_MATCH_VENDOR_FAM_MODEL_STEPPINGS_FEATURE - Base macro for CPU matching +* X86_MATCH_CPU - Base macro for CPU matching * @_vendor: The vendor name, e.g. INTEL, AMD, HYGON, ..., ANY * The name is expanded to X86_VENDOR_@_vendor * @_family: The family number or X86_FAMILY_ANY
@@ -74,19 +74,7 @@* into another macro at the usage site for good reasons, then please * start this local macro with X86_MATCH to allow easy grepping. */ -#define X86_MATCH_VENDOR_FAM_MODEL_STEPPINGS_FEATURE (_vendor, _family, _model, \ - _steppings, _feature, _data) { \ - .vendor = X86_VENDOR_##_vendor, \ - .family = _family, \ - .model = _model, \ - .steppings = _steppings, \ - .feature = _feature, \ - .flags = X86_CPU_ID_FLAG_ENTRY_VALID, \ - .driver_data = (unsigned long) _data \ -} - -#define X86_MATCH_VENDORID_FAM_MODEL_STEPPINGS_FEATURE (_vendor, _family, _model, \ - _steppings, _feature, _data) { \ +#define X86_MATCH_CPU (_vendor, _family, _model, _steppings, _feature, _data) { \ .vendor = _vendor, \ .family = _family, \ .model = _model, \
@@ -97,24 +85,6 @@ }/** -* X86_MATCH_VENDOR_FAM_MODEL_FEATURE - Macro for CPU matching -* @_vendor: The vendor name, e.g. INTEL, AMD, HYGON, ..., ANY -* The name is expanded to X86_VENDOR_@_vendor -* @_family: The family number or X86_FAMILY_ANY -* @_model: The model number, model constant or X86_MODEL_ANY -* @_feature: A X86_FEATURE bit or X86_FEATURE_ANY -* @_data: Driver specific data or NULL. The internal storage -* format is unsigned long. The supplied value, pointer -* etc. is casted to unsigned long internally. -* -* The steppings arguments of X86_MATCH_VENDOR_FAM_MODEL_STEPPINGS_FEATURE() is -* set to wildcards. -*/ -#define X86_MATCH_VENDOR_FAM_MODEL_FEATURE (vendor, family, model, feature, data) \ - X86_MATCH_VENDOR_FAM_MODEL_STEPPINGS_FEATURE(vendor, family, model, \ - X86_STEPPING_ANY, feature, data) - -/** * X86_MATCH_VENDOR_FAM_FEATURE - Macro for matching vendor, family and CPU feature * @vendor: The vendor name, e.g. INTEL, AMD, HYGON, ..., ANY * The name is expanded to X86_VENDOR_@vendor
@@ -123,13 +93,10 @@* @data: Driver specific data or NULL. The internal storage * format is unsigned long. The supplied value, pointer * etc. is casted to unsigned long internally. -* -* All other missing arguments of X86_MATCH_VENDOR_FAM_MODEL_FEATURE() are -* set to wildcards. */ -#define X86_MATCH_VENDOR_FAM_FEATURE (vendor, family, feature, data) \ - X86_MATCH_VENDOR_FAM_MODEL_FEATURE(vendor, family, \ - X86_MODEL_ANY, feature, data) +#define X86_MATCH_VENDOR_FAM_FEATURE (vendor, family, feature, data) \ + X86_MATCH_CPU(X86_VENDOR_##vendor, family, X86_MODEL_ANY, \ + X86_STEPPING_ANY, feature, data)/** * X86_MATCH_VENDOR_FEATURE - Macro for matching vendor and CPU feature
@@ -139,12 +106,10 @@* @data: Driver specific data or NULL. The internal storage * format is unsigned long. The supplied value, pointer * etc. is casted to unsigned long internally. -* -* All other missing arguments of X86_MATCH_VENDOR_FAM_MODEL_FEATURE() are -* set to wildcards. */ -#define X86_MATCH_VENDOR_FEATURE (vendor, feature, data) \ - X86_MATCH_VENDOR_FAM_FEATURE(vendor, X86_FAMILY_ANY, feature, data) +#define X86_MATCH_VENDOR_FEATURE (vendor, feature, data) \ + X86_MATCH_CPU(X86_VENDOR_##vendor, X86_FAMILY_ANY, X86_MODEL_ANY, \ + X86_STEPPING_ANY, feature, data)/** * X86_MATCH_FEATURE - Macro for matching a CPU feature
@@ -152,12 +117,10 @@* @data: Driver specific data or NULL. The internal storage * format is unsigned long. The supplied value, pointer * etc. is casted to unsigned long internally. -* -* All other missing arguments of X86_MATCH_VENDOR_FAM_MODEL_FEATURE() are -* set to wildcards. */ -#define X86_MATCH_FEATURE (feature, data) \ - X86_MATCH_VENDOR_FEATURE(ANY, feature, data) +#define X86_MATCH_FEATURE (feature, data) \ + X86_MATCH_CPU(X86_VENDOR_ANY, X86_FAMILY_ANY, X86_MODEL_ANY, \ + X86_STEPPING_ANY, feature, data)/** * X86_MATCH_VENDOR_FAM_MODEL - Match vendor, family and model
@@ -168,13 +131,10 @@* @data: Driver specific data or NULL. The internal storage * format is unsigned long. The supplied value, pointer * etc. is casted to unsigned long internally. -* -* All other missing arguments of X86_MATCH_VENDOR_FAM_MODEL_FEATURE() are -* set to wildcards. */ -#define X86_MATCH_VENDOR_FAM_MODEL (vendor, family, model, data) \ - X86_MATCH_VENDOR_FAM_MODEL_FEATURE(vendor, family, model, \ - X86_FEATURE_ANY, data) +#define X86_MATCH_VENDOR_FAM_MODEL (vendor, family, model, data) \ + X86_MATCH_CPU(X86_VENDOR_##vendor, family, model, X86_STEPPING_ANY, \ + X86_FEATURE_ANY, data)/** * X86_MATCH_VENDOR_FAM - Match vendor and family
@@ -184,12 +144,10 @@* @data: Driver specific data or NULL. The internal storage * format is unsigned long. The supplied value, pointer * etc. is casted to unsigned long internally. -* -* All other missing arguments to X86_MATCH_VENDOR_FAM_MODEL_FEATURE() are -* set of wildcards. */ -#define X86_MATCH_VENDOR_FAM (vendor, family, data) \ - X86_MATCH_VENDOR_FAM_MODEL(vendor, family, X86_MODEL_ANY, data) +#define X86_MATCH_VENDOR_FAM (vendor, family, data) \ + X86_MATCH_CPU(X86_VENDOR_##vendor, family, X86_MODEL_ANY, \ + X86_STEPPING_ANY, X86_FEATURE_ANY, data)/** * X86_MATCH_VFM - Match encoded vendor/family/model
@@ -197,15 +155,10 @@* @data: Driver specific data or NULL. The internal storage * format is unsigned long. The supplied value, pointer * etc. is cast to unsigned long internally. -* -* Stepping and feature are set to wildcards */ -#define X86_MATCH_VFM (vfm, data) \ - X86_MATCH_VENDORID_FAM_MODEL_STEPPINGS_FEATURE( \ - VFM_VENDOR(vfm), \ - VFM_FAMILY(vfm), \ - VFM_MODEL(vfm), \ - X86_STEPPING_ANY, X86_FEATURE_ANY, data) +#define X86_MATCH_VFM (vfm, data) \ + X86_MATCH_CPU(VFM_VENDOR(vfm), VFM_FAMILY(vfm), VFM_MODEL(vfm), \ + X86_STEPPING_ANY, X86_FEATURE_ANY, data)#define __X86_STEPPINGS (mins, maxs) GENMASK(maxs, mins)/**
@@ -217,16 +170,10 @@* @data: Driver specific data or NULL. The internal storage * format is unsigned long. The supplied value, pointer * etc. is cast to unsigned long internally. -* -* feature is set to wildcard */ -#define X86_MATCH_VFM_STEPS (vfm, min_step, max_step, data) \ - X86_MATCH_VENDORID_FAM_MODEL_STEPPINGS_FEATURE( \ - VFM_VENDOR(vfm), \ - VFM_FAMILY(vfm), \ - VFM_MODEL(vfm), \ - __X86_STEPPINGS(min_step, max_step), \ - X86_FEATURE_ANY, data) +#define X86_MATCH_VFM_STEPS (vfm, min_step, max_step, data) \ + X86_MATCH_CPU(VFM_VENDOR(vfm), VFM_FAMILY(vfm), VFM_MODEL(vfm), \ + __X86_STEPPINGS(min_step, max_step), X86_FEATURE_ANY, data)/** * X86_MATCH_VFM_FEATURE - Match encoded vendor/family/model/feature
@@ -235,15 +182,10 @@* @data: Driver specific data or NULL. The internal storage * format is unsigned long. The supplied value, pointer * etc. is cast to unsigned long internally. -* -* Steppings is set to wildcard */ -#define X86_MATCH_VFM_FEATURE (vfm, feature, data) \ - X86_MATCH_VENDORID_FAM_MODEL_STEPPINGS_FEATURE( \ - VFM_VENDOR(vfm), \ - VFM_FAMILY(vfm), \ - VFM_MODEL(vfm), \ - X86_STEPPING_ANY, feature, data) +#define X86_MATCH_VFM_FEATURE (vfm, feature, data) \ + X86_MATCH_CPU(VFM_VENDOR(vfm), VFM_FAMILY(vfm), VFM_MODEL(vfm), \ + X86_STEPPING_ANY, feature, data)extern const struct x86_cpu_id *x86_match_cpu (const struct x86_cpu_id *match);extern bool x86_match_min_microcode_rev (const struct x86_cpu_id *table);
[tip: x86/core] x86/cpu: Shorten CPU matching macro
In reply to Pawan GuptaThe following commit has been merged into the x86/core branch of tip:
The following commit has been merged into the x86/core branch of tip:
Commit-ID: c3390406adc62dd2d42eb522e1ce124fa43c5dec Gitweb: https://git.kernel.org/tip/c3390406adc62dd2d42eb522e1ce124fa43c5dec Author: Pawan Gupta <[email protected]> AuthorDate: Tue, 11 Mar 2025 08:02:20 -07:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Wed, 19 Mar 2025 11:16:46 +01:00
x86/cpu: Shorten CPU matching macro
To add cpu-type to the existing CPU matching infrastructure, the base macro X86_MATCH_VENDOR_FAM_MODEL_STEPPINGS_FEATURE need to append _CPU_TYPE. This makes an already long name longer, and somewhat incomprehensible.
To avoid this, rename the base macro to X86_MATCH_CPU. The macro name doesn't need to explicitly tell everything that it matches. The arguments to the macro already hint at that.
For consistency, use this base macro to define X86_MATCH_VFM and friends.
Remove unused X86_MATCH_VENDOR_FAM_MODEL_FEATURE while at it.
[ bp: Massage commit message. ]
--- arch/x86/include/asm/cpu_device_id.h | 110 ++++++-------------------- 1 file changed, 26 insertions(+), 84 deletions(-)
arch/x86/include/asm/cpu_device_id.h +26 -84
@@ -57,7 +57,7 @@#define X86_CPU_ID_FLAG_ENTRY_VALID BIT(0)/** -* X86_MATCH_VENDOR_FAM_MODEL_STEPPINGS_FEATURE - Base macro for CPU matching +* X86_MATCH_CPU - Base macro for CPU matching * @_vendor: The vendor name, e.g. INTEL, AMD, HYGON, ..., ANY * The name is expanded to X86_VENDOR_@_vendor * @_family: The family number or X86_FAMILY_ANY
@@ -74,19 +74,7 @@* into another macro at the usage site for good reasons, then please * start this local macro with X86_MATCH to allow easy grepping. */ -#define X86_MATCH_VENDOR_FAM_MODEL_STEPPINGS_FEATURE (_vendor, _family, _model, \ - _steppings, _feature, _data) { \ - .vendor = X86_VENDOR_##_vendor, \ - .family = _family, \ - .model = _model, \ - .steppings = _steppings, \ - .feature = _feature, \ - .flags = X86_CPU_ID_FLAG_ENTRY_VALID, \ - .driver_data = (unsigned long) _data \ -} - -#define X86_MATCH_VENDORID_FAM_MODEL_STEPPINGS_FEATURE (_vendor, _family, _model, \ - _steppings, _feature, _data) { \ +#define X86_MATCH_CPU (_vendor, _family, _model, _steppings, _feature, _data) { \ .vendor = _vendor, \ .family = _family, \ .model = _model, \
@@ -97,24 +85,6 @@ }/** -* X86_MATCH_VENDOR_FAM_MODEL_FEATURE - Macro for CPU matching -* @_vendor: The vendor name, e.g. INTEL, AMD, HYGON, ..., ANY -* The name is expanded to X86_VENDOR_@_vendor -* @_family: The family number or X86_FAMILY_ANY -* @_model: The model number, model constant or X86_MODEL_ANY -* @_feature: A X86_FEATURE bit or X86_FEATURE_ANY -* @_data: Driver specific data or NULL. The internal storage -* format is unsigned long. The supplied value, pointer -* etc. is casted to unsigned long internally. -* -* The steppings arguments of X86_MATCH_VENDOR_FAM_MODEL_STEPPINGS_FEATURE() is -* set to wildcards. -*/ -#define X86_MATCH_VENDOR_FAM_MODEL_FEATURE (vendor, family, model, feature, data) \ - X86_MATCH_VENDOR_FAM_MODEL_STEPPINGS_FEATURE(vendor, family, model, \ - X86_STEPPING_ANY, feature, data) - -/** * X86_MATCH_VENDOR_FAM_FEATURE - Macro for matching vendor, family and CPU feature * @vendor: The vendor name, e.g. INTEL, AMD, HYGON, ..., ANY * The name is expanded to X86_VENDOR_@vendor
@@ -123,13 +93,10 @@* @data: Driver specific data or NULL. The internal storage * format is unsigned long. The supplied value, pointer * etc. is casted to unsigned long internally. -* -* All other missing arguments of X86_MATCH_VENDOR_FAM_MODEL_FEATURE() are -* set to wildcards. */ -#define X86_MATCH_VENDOR_FAM_FEATURE (vendor, family, feature, data) \ - X86_MATCH_VENDOR_FAM_MODEL_FEATURE(vendor, family, \ - X86_MODEL_ANY, feature, data) +#define X86_MATCH_VENDOR_FAM_FEATURE (vendor, family, feature, data) \ + X86_MATCH_CPU(X86_VENDOR_##vendor, family, X86_MODEL_ANY, \ + X86_STEPPING_ANY, feature, data)/** * X86_MATCH_VENDOR_FEATURE - Macro for matching vendor and CPU feature
@@ -139,12 +106,10 @@* @data: Driver specific data or NULL. The internal storage * format is unsigned long. The supplied value, pointer * etc. is casted to unsigned long internally. -* -* All other missing arguments of X86_MATCH_VENDOR_FAM_MODEL_FEATURE() are -* set to wildcards. */ -#define X86_MATCH_VENDOR_FEATURE (vendor, feature, data) \ - X86_MATCH_VENDOR_FAM_FEATURE(vendor, X86_FAMILY_ANY, feature, data) +#define X86_MATCH_VENDOR_FEATURE (vendor, feature, data) \ + X86_MATCH_CPU(X86_VENDOR_##vendor, X86_FAMILY_ANY, X86_MODEL_ANY, \ + X86_STEPPING_ANY, feature, data)/** * X86_MATCH_FEATURE - Macro for matching a CPU feature
@@ -152,12 +117,10 @@* @data: Driver specific data or NULL. The internal storage * format is unsigned long. The supplied value, pointer * etc. is casted to unsigned long internally. -* -* All other missing arguments of X86_MATCH_VENDOR_FAM_MODEL_FEATURE() are -* set to wildcards. */ -#define X86_MATCH_FEATURE (feature, data) \ - X86_MATCH_VENDOR_FEATURE(ANY, feature, data) +#define X86_MATCH_FEATURE (feature, data) \ + X86_MATCH_CPU(X86_VENDOR_ANY, X86_FAMILY_ANY, X86_MODEL_ANY, \ + X86_STEPPING_ANY, feature, data)/** * X86_MATCH_VENDOR_FAM_MODEL - Match vendor, family and model
@@ -168,13 +131,10 @@* @data: Driver specific data or NULL. The internal storage * format is unsigned long. The supplied value, pointer * etc. is casted to unsigned long internally. -* -* All other missing arguments of X86_MATCH_VENDOR_FAM_MODEL_FEATURE() are -* set to wildcards. */ -#define X86_MATCH_VENDOR_FAM_MODEL (vendor, family, model, data) \ - X86_MATCH_VENDOR_FAM_MODEL_FEATURE(vendor, family, model, \ - X86_FEATURE_ANY, data) +#define X86_MATCH_VENDOR_FAM_MODEL (vendor, family, model, data) \ + X86_MATCH_CPU(X86_VENDOR_##vendor, family, model, X86_STEPPING_ANY, \ + X86_FEATURE_ANY, data)/** * X86_MATCH_VENDOR_FAM - Match vendor and family
@@ -184,12 +144,10 @@* @data: Driver specific data or NULL. The internal storage * format is unsigned long. The supplied value, pointer * etc. is casted to unsigned long internally. -* -* All other missing arguments to X86_MATCH_VENDOR_FAM_MODEL_FEATURE() are -* set of wildcards. */ -#define X86_MATCH_VENDOR_FAM (vendor, family, data) \ - X86_MATCH_VENDOR_FAM_MODEL(vendor, family, X86_MODEL_ANY, data) +#define X86_MATCH_VENDOR_FAM (vendor, family, data) \ + X86_MATCH_CPU(X86_VENDOR_##vendor, family, X86_MODEL_ANY, \ + X86_STEPPING_ANY, X86_FEATURE_ANY, data)/** * X86_MATCH_VFM - Match encoded vendor/family/model
@@ -197,15 +155,10 @@* @data: Driver specific data or NULL. The internal storage * format is unsigned long. The supplied value, pointer * etc. is cast to unsigned long internally. -* -* Stepping and feature are set to wildcards */ -#define X86_MATCH_VFM (vfm, data) \ - X86_MATCH_VENDORID_FAM_MODEL_STEPPINGS_FEATURE( \ - VFM_VENDOR(vfm), \ - VFM_FAMILY(vfm), \ - VFM_MODEL(vfm), \ - X86_STEPPING_ANY, X86_FEATURE_ANY, data) +#define X86_MATCH_VFM (vfm, data) \ + X86_MATCH_CPU(VFM_VENDOR(vfm), VFM_FAMILY(vfm), VFM_MODEL(vfm), \ + X86_STEPPING_ANY, X86_FEATURE_ANY, data)#define __X86_STEPPINGS (mins, maxs) GENMASK(maxs, mins)/**
@@ -217,16 +170,10 @@* @data: Driver specific data or NULL. The internal storage * format is unsigned long. The supplied value, pointer * etc. is cast to unsigned long internally. -* -* feature is set to wildcard */ -#define X86_MATCH_VFM_STEPS (vfm, min_step, max_step, data) \ - X86_MATCH_VENDORID_FAM_MODEL_STEPPINGS_FEATURE( \ - VFM_VENDOR(vfm), \ - VFM_FAMILY(vfm), \ - VFM_MODEL(vfm), \ - __X86_STEPPINGS(min_step, max_step), \ - X86_FEATURE_ANY, data) +#define X86_MATCH_VFM_STEPS (vfm, min_step, max_step, data) \ + X86_MATCH_CPU(VFM_VENDOR(vfm), VFM_FAMILY(vfm), VFM_MODEL(vfm), \ + __X86_STEPPINGS(min_step, max_step), X86_FEATURE_ANY, data)/** * X86_MATCH_VFM_FEATURE - Match encoded vendor/family/model/feature
@@ -235,15 +182,10 @@* @data: Driver specific data or NULL. The internal storage * format is unsigned long. The supplied value, pointer * etc. is cast to unsigned long internally. -* -* Steppings is set to wildcard */ -#define X86_MATCH_VFM_FEATURE (vfm, feature, data) \ - X86_MATCH_VENDORID_FAM_MODEL_STEPPINGS_FEATURE( \ - VFM_VENDOR(vfm), \ - VFM_FAMILY(vfm), \ - VFM_MODEL(vfm), \ - X86_STEPPING_ANY, feature, data) +#define X86_MATCH_VFM_FEATURE (vfm, feature, data) \ + X86_MATCH_CPU(VFM_VENDOR(vfm), VFM_FAMILY(vfm), VFM_MODEL(vfm), \ + X86_STEPPING_ANY, feature, data)extern const struct x86_cpu_id *x86_match_cpu (const struct x86_cpu_id *match);extern bool x86_match_min_microcode_rev (const struct x86_cpu_id *table);
Pawan Gupta
reviewerPATCH v8 3/5 x86/cpu: Add cpu_type to struct x86_cpu_id
In reply to Pawan GuptaIn addition to matching vendor/family/model/feature, for hybrid variants it is required to also match cpu-type also. For example some CPU vulnerabilities like RFDS only affects a specific cpu-type.
To be able to also match CPUs based on their type, add a new field cpu_type to struct x86_cpu_id which is used by the CPU-matching tables. Introduce X86_CPU_TYPE_ANY for the cases that don't care about the cpu-type.
--- arch/x86/include/asm/cpu_device_id.h | 32 +++++++++++++++++++++++--------- include/linux/mod_devicetable.h | 2 ++ 2 files changed, 25 insertions(+), 9 deletions(-)
arch/x86/include/asm/cpu_device_id.h +23 -9
@@ -74,13 +74,14 @@* into another macro at the usage site for good reasons, then please * start this local macro with X86_MATCH to allow easy grepping. */ -#define X86_MATCH_CPU (_vendor, _family, _model, _steppings, _feature, _data) { \ +#define X86_MATCH_CPU (_vendor, _family, _model, _steppings, _feature, _type, _data) { \ .vendor = _vendor, \ .family = _family, \ .model = _model, \ .steppings = _steppings, \ .feature = _feature, \ .flags = X86_CPU_ID_FLAG_ENTRY_VALID, \ + .type = _type, \ .driver_data = (unsigned long) _data \ }
@@ -96,7 +97,7 @@*/ #define X86_MATCH_VENDOR_FAM_FEATURE (vendor, family, feature, data) \ X86_MATCH_CPU(X86_VENDOR_##vendor, family, X86_MODEL_ANY, \ - X86_STEPPING_ANY, feature, data) + X86_STEPPING_ANY, feature, X86_CPU_TYPE_ANY, data)/** * X86_MATCH_VENDOR_FEATURE - Macro for matching vendor and CPU feature
@@ -109,7 +110,7 @@*/ #define X86_MATCH_VENDOR_FEATURE (vendor, feature, data) \ X86_MATCH_CPU(X86_VENDOR_##vendor, X86_FAMILY_ANY, X86_MODEL_ANY, \ - X86_STEPPING_ANY, feature, data) + X86_STEPPING_ANY, feature, X86_CPU_TYPE_ANY, data)/** * X86_MATCH_FEATURE - Macro for matching a CPU feature
@@ -120,7 +121,7 @@*/ #define X86_MATCH_FEATURE (feature, data) \ X86_MATCH_CPU(X86_VENDOR_ANY, X86_FAMILY_ANY, X86_MODEL_ANY, \ - X86_STEPPING_ANY, feature, data) + X86_STEPPING_ANY, feature, X86_CPU_TYPE_ANY, data)/** * X86_MATCH_VENDOR_FAM_MODEL - Match vendor, family and model
@@ -134,7 +135,7 @@*/ #define X86_MATCH_VENDOR_FAM_MODEL (vendor, family, model, data) \ X86_MATCH_CPU(X86_VENDOR_##vendor, family, model, X86_STEPPING_ANY, \ - X86_FEATURE_ANY, data) + X86_FEATURE_ANY, X86_CPU_TYPE_ANY, data)/** * X86_MATCH_VENDOR_FAM - Match vendor and family
@@ -147,7 +148,7 @@*/ #define X86_MATCH_VENDOR_FAM (vendor, family, data) \ X86_MATCH_CPU(X86_VENDOR_##vendor, family, X86_MODEL_ANY, \ - X86_STEPPING_ANY, X86_FEATURE_ANY, data) + X86_STEPPING_ANY, X86_FEATURE_ANY, X86_CPU_TYPE_ANY, data)/** * X86_MATCH_VFM - Match encoded vendor/family/model
@@ -158,7 +159,7 @@*/ #define X86_MATCH_VFM (vfm, data) \ X86_MATCH_CPU(VFM_VENDOR(vfm), VFM_FAMILY(vfm), VFM_MODEL(vfm), \ - X86_STEPPING_ANY, X86_FEATURE_ANY, data) + X86_STEPPING_ANY, X86_FEATURE_ANY, X86_CPU_TYPE_ANY, data)#define __X86_STEPPINGS (mins, maxs) GENMASK(maxs, mins)/**
@@ -173,7 +174,8 @@*/ #define X86_MATCH_VFM_STEPS (vfm, min_step, max_step, data) \ X86_MATCH_CPU(VFM_VENDOR(vfm), VFM_FAMILY(vfm), VFM_MODEL(vfm), \ - __X86_STEPPINGS(min_step, max_step), X86_FEATURE_ANY, data) + __X86_STEPPINGS(min_step, max_step), X86_FEATURE_ANY, \ + X86_CPU_TYPE_ANY, data)/** * X86_MATCH_VFM_FEATURE - Match encoded vendor/family/model/feature
@@ -185,7 +187,19 @@*/ #define X86_MATCH_VFM_FEATURE (vfm, feature, data) \ X86_MATCH_CPU(VFM_VENDOR(vfm), VFM_FAMILY(vfm), VFM_MODEL(vfm), \ - X86_STEPPING_ANY, feature, data) + X86_STEPPING_ANY, feature, X86_CPU_TYPE_ANY, data) + +/** +* X86_MATCH_VFM_CPU_TYPE - Match encoded vendor/family/model/type +* @vfm: Encoded 8-bits each for vendor, family, model +* @type: CPU type e.g. P-core, E-core +* @data: Driver specific data or NULL. The internal storage +* format is unsigned long. The supplied value, pointer +* etc. is cast to unsigned long internally. +*/ +#define X86_MATCH_VFM_CPU_TYPE (vfm, type, data) \ + X86_MATCH_CPU(VFM_VENDOR(vfm), VFM_FAMILY(vfm), VFM_MODEL(vfm), \ + X86_STEPPING_ANY, X86_FEATURE_ANY, type, data)extern const struct x86_cpu_id *x86_match_cpu (const struct x86_cpu_id *match);extern bool x86_match_min_microcode_rev (const struct x86_cpu_id *table);
include/linux/mod_devicetable.h +2 -0
@@ -692,6 +692,7 @@ struct x86_cpu_id {__u16 feature;/* bit index */ /* Solely for kernel-internal use: DO NOT EXPORT to userspace! */ __u16 flags; +__u8 type;kernel_ulong_t driver_data; };
@@ -703,6 +704,7 @@ struct x86_cpu_id {#define X86_STEP_MIN 0#define X86_STEP_MAX 0xf#define X86_FEATURE_ANY 0/* Same as FPU, you can't test for that */ +#define X86_CPU_TYPE_ANY 0/* * Generic table type for matching CPU features.
Signature · 1 line
2.34.1
[tip: x86/cpu] x86/cpu: Add cpu_type to struct x86_cpu_id
The following commit has been merged into the x86/cpu branch of tip:
The following commit has been merged into the x86/cpu branch of tip:
Commit-ID: 72e6cc4356393b7d8ceef7e9a74acce3f24cd04a Gitweb: https://git.kernel.org/tip/72e6cc4356393b7d8ceef7e9a74acce3f24cd04a Author: Pawan Gupta <[email protected]> AuthorDate: Tue, 11 Mar 2025 08:02:36 -07:00 Committer: Borislav Petkov (AMD) <[email protected]> CommitterDate: Tue, 11 Mar 2025 20:53:30 +01:00
x86/cpu: Add cpu_type to struct x86_cpu_id
In addition to matching vendor/family/model/feature, for hybrid variants it is required to also match cpu-type. For example, some CPU vulnerabilities like RFDS only affect a specific cpu-type.
To be able to also match CPUs based on their type, add a new field "type" to struct x86_cpu_id which is used by the CPU-matching tables. Introduce X86_CPU_TYPE_ANY for the cases that don't care about the cpu-type.
[ bp: Massage commit message. ]
--- arch/x86/include/asm/cpu_device_id.h | 32 +++++++++++++++++++-------- include/linux/mod_devicetable.h | 2 ++- 2 files changed, 25 insertions(+), 9 deletions(-)
arch/x86/include/asm/cpu_device_id.h +23 -9
@@ -74,13 +74,14 @@* into another macro at the usage site for good reasons, then please * start this local macro with X86_MATCH to allow easy grepping. */ -#define X86_MATCH_CPU (_vendor, _family, _model, _steppings, _feature, _data) { \ +#define X86_MATCH_CPU (_vendor, _family, _model, _steppings, _feature, _type, _data) { \ .vendor = _vendor, \ .family = _family, \ .model = _model, \ .steppings = _steppings, \ .feature = _feature, \ .flags = X86_CPU_ID_FLAG_ENTRY_VALID, \ + .type = _type, \ .driver_data = (unsigned long) _data \ }
@@ -96,7 +97,7 @@*/ #define X86_MATCH_VENDOR_FAM_FEATURE (vendor, family, feature, data) \ X86_MATCH_CPU(X86_VENDOR_##vendor, family, X86_MODEL_ANY, \ - X86_STEPPING_ANY, feature, data) + X86_STEPPING_ANY, feature, X86_CPU_TYPE_ANY, data)/** * X86_MATCH_VENDOR_FEATURE - Macro for matching vendor and CPU feature
@@ -109,7 +110,7 @@*/ #define X86_MATCH_VENDOR_FEATURE (vendor, feature, data) \ X86_MATCH_CPU(X86_VENDOR_##vendor, X86_FAMILY_ANY, X86_MODEL_ANY, \ - X86_STEPPING_ANY, feature, data) + X86_STEPPING_ANY, feature, X86_CPU_TYPE_ANY, data)/** * X86_MATCH_FEATURE - Macro for matching a CPU feature
@@ -120,7 +121,7 @@*/ #define X86_MATCH_FEATURE (feature, data) \ X86_MATCH_CPU(X86_VENDOR_ANY, X86_FAMILY_ANY, X86_MODEL_ANY, \ - X86_STEPPING_ANY, feature, data) + X86_STEPPING_ANY, feature, X86_CPU_TYPE_ANY, data)/** * X86_MATCH_VENDOR_FAM_MODEL - Match vendor, family and model
@@ -134,7 +135,7 @@*/ #define X86_MATCH_VENDOR_FAM_MODEL (vendor, family, model, data) \ X86_MATCH_CPU(X86_VENDOR_##vendor, family, model, X86_STEPPING_ANY, \ - X86_FEATURE_ANY, data) + X86_FEATURE_ANY, X86_CPU_TYPE_ANY, data)/** * X86_MATCH_VENDOR_FAM - Match vendor and family
@@ -147,7 +148,7 @@*/ #define X86_MATCH_VENDOR_FAM (vendor, family, data) \ X86_MATCH_CPU(X86_VENDOR_##vendor, family, X86_MODEL_ANY, \ - X86_STEPPING_ANY, X86_FEATURE_ANY, data) + X86_STEPPING_ANY, X86_FEATURE_ANY, X86_CPU_TYPE_ANY, data)/** * X86_MATCH_VFM - Match encoded vendor/family/model
@@ -158,7 +159,7 @@*/ #define X86_MATCH_VFM (vfm, data) \ X86_MATCH_CPU(VFM_VENDOR(vfm), VFM_FAMILY(vfm), VFM_MODEL(vfm), \ - X86_STEPPING_ANY, X86_FEATURE_ANY, data) + X86_STEPPING_ANY, X86_FEATURE_ANY, X86_CPU_TYPE_ANY, data)#define __X86_STEPPINGS (mins, maxs) GENMASK(maxs, mins)/**
@@ -173,7 +174,8 @@*/ #define X86_MATCH_VFM_STEPS (vfm, min_step, max_step, data) \ X86_MATCH_CPU(VFM_VENDOR(vfm), VFM_FAMILY(vfm), VFM_MODEL(vfm), \ - __X86_STEPPINGS(min_step, max_step), X86_FEATURE_ANY, data) + __X86_STEPPINGS(min_step, max_step), X86_FEATURE_ANY, \ + X86_CPU_TYPE_ANY, data)/** * X86_MATCH_VFM_FEATURE - Match encoded vendor/family/model/feature
@@ -185,7 +187,19 @@*/ #define X86_MATCH_VFM_FEATURE (vfm, feature, data) \ X86_MATCH_CPU(VFM_VENDOR(vfm), VFM_FAMILY(vfm), VFM_MODEL(vfm), \ - X86_STEPPING_ANY, feature, data) + X86_STEPPING_ANY, feature, X86_CPU_TYPE_ANY, data) + +/** +* X86_MATCH_VFM_CPU_TYPE - Match encoded vendor/family/model/type +* @vfm: Encoded 8-bits each for vendor, family, model +* @type: CPU type e.g. P-core, E-core +* @data: Driver specific data or NULL. The internal storage +* format is unsigned long. The supplied value, pointer +* etc. is cast to unsigned long internally. +*/ +#define X86_MATCH_VFM_CPU_TYPE (vfm, type, data) \ + X86_MATCH_CPU(VFM_VENDOR(vfm), VFM_FAMILY(vfm), VFM_MODEL(vfm), \ + X86_STEPPING_ANY, X86_FEATURE_ANY, type, data)extern const struct x86_cpu_id *x86_match_cpu (const struct x86_cpu_id *match);extern bool x86_match_min_microcode_rev (const struct x86_cpu_id *table);
include/linux/mod_devicetable.h +2 -0
@@ -692,6 +692,7 @@ struct x86_cpu_id {__u16 feature;/* bit index */ /* Solely for kernel-internal use: DO NOT EXPORT to userspace! */ __u16 flags; +__u8 type;kernel_ulong_t driver_data; };
@@ -703,6 +704,7 @@ struct x86_cpu_id {#define X86_STEP_MIN 0#define X86_STEP_MAX 0xf#define X86_FEATURE_ANY 0/* Same as FPU, you can't test for that */ +#define X86_CPU_TYPE_ANY 0/* * Generic table type for matching CPU features.
[tip: x86/core] x86/cpu: Add cpu_type to struct x86_cpu_id
In reply to Pawan GuptaThe following commit has been merged into the x86/core branch of tip:
The following commit has been merged into the x86/core branch of tip:
Commit-ID: 00d7fc04b703eb3e9d61dd3eac02a34c466e9f12 Gitweb: https://git.kernel.org/tip/00d7fc04b703eb3e9d61dd3eac02a34c466e9f12 Author: Pawan Gupta <[email protected]> AuthorDate: Tue, 11 Mar 2025 08:02:36 -07:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Wed, 19 Mar 2025 11:17:03 +01:00
x86/cpu: Add cpu_type to struct x86_cpu_id
In addition to matching vendor/family/model/feature, for hybrid variants it is required to also match cpu-type. For example, some CPU vulnerabilities like RFDS only affect a specific cpu-type.
To be able to also match CPUs based on their type, add a new field "type" to struct x86_cpu_id which is used by the CPU-matching tables. Introduce X86_CPU_TYPE_ANY for the cases that don't care about the cpu-type.
[ bp: Massage commit message. ]
--- arch/x86/include/asm/cpu_device_id.h | 32 +++++++++++++++++++-------- include/linux/mod_devicetable.h | 2 ++- 2 files changed, 25 insertions(+), 9 deletions(-)
arch/x86/include/asm/cpu_device_id.h +23 -9
@@ -74,13 +74,14 @@* into another macro at the usage site for good reasons, then please * start this local macro with X86_MATCH to allow easy grepping. */ -#define X86_MATCH_CPU (_vendor, _family, _model, _steppings, _feature, _data) { \ +#define X86_MATCH_CPU (_vendor, _family, _model, _steppings, _feature, _type, _data) { \ .vendor = _vendor, \ .family = _family, \ .model = _model, \ .steppings = _steppings, \ .feature = _feature, \ .flags = X86_CPU_ID_FLAG_ENTRY_VALID, \ + .type = _type, \ .driver_data = (unsigned long) _data \ }
@@ -96,7 +97,7 @@*/ #define X86_MATCH_VENDOR_FAM_FEATURE (vendor, family, feature, data) \ X86_MATCH_CPU(X86_VENDOR_##vendor, family, X86_MODEL_ANY, \ - X86_STEPPING_ANY, feature, data) + X86_STEPPING_ANY, feature, X86_CPU_TYPE_ANY, data)/** * X86_MATCH_VENDOR_FEATURE - Macro for matching vendor and CPU feature
@@ -109,7 +110,7 @@*/ #define X86_MATCH_VENDOR_FEATURE (vendor, feature, data) \ X86_MATCH_CPU(X86_VENDOR_##vendor, X86_FAMILY_ANY, X86_MODEL_ANY, \ - X86_STEPPING_ANY, feature, data) + X86_STEPPING_ANY, feature, X86_CPU_TYPE_ANY, data)/** * X86_MATCH_FEATURE - Macro for matching a CPU feature
@@ -120,7 +121,7 @@*/ #define X86_MATCH_FEATURE (feature, data) \ X86_MATCH_CPU(X86_VENDOR_ANY, X86_FAMILY_ANY, X86_MODEL_ANY, \ - X86_STEPPING_ANY, feature, data) + X86_STEPPING_ANY, feature, X86_CPU_TYPE_ANY, data)/** * X86_MATCH_VENDOR_FAM_MODEL - Match vendor, family and model
@@ -134,7 +135,7 @@*/ #define X86_MATCH_VENDOR_FAM_MODEL (vendor, family, model, data) \ X86_MATCH_CPU(X86_VENDOR_##vendor, family, model, X86_STEPPING_ANY, \ - X86_FEATURE_ANY, data) + X86_FEATURE_ANY, X86_CPU_TYPE_ANY, data)/** * X86_MATCH_VENDOR_FAM - Match vendor and family
@@ -147,7 +148,7 @@*/ #define X86_MATCH_VENDOR_FAM (vendor, family, data) \ X86_MATCH_CPU(X86_VENDOR_##vendor, family, X86_MODEL_ANY, \ - X86_STEPPING_ANY, X86_FEATURE_ANY, data) + X86_STEPPING_ANY, X86_FEATURE_ANY, X86_CPU_TYPE_ANY, data)/** * X86_MATCH_VFM - Match encoded vendor/family/model
@@ -158,7 +159,7 @@*/ #define X86_MATCH_VFM (vfm, data) \ X86_MATCH_CPU(VFM_VENDOR(vfm), VFM_FAMILY(vfm), VFM_MODEL(vfm), \ - X86_STEPPING_ANY, X86_FEATURE_ANY, data) + X86_STEPPING_ANY, X86_FEATURE_ANY, X86_CPU_TYPE_ANY, data)#define __X86_STEPPINGS (mins, maxs) GENMASK(maxs, mins)/**
@@ -173,7 +174,8 @@*/ #define X86_MATCH_VFM_STEPS (vfm, min_step, max_step, data) \ X86_MATCH_CPU(VFM_VENDOR(vfm), VFM_FAMILY(vfm), VFM_MODEL(vfm), \ - __X86_STEPPINGS(min_step, max_step), X86_FEATURE_ANY, data) + __X86_STEPPINGS(min_step, max_step), X86_FEATURE_ANY, \ + X86_CPU_TYPE_ANY, data)/** * X86_MATCH_VFM_FEATURE - Match encoded vendor/family/model/feature
@@ -185,7 +187,19 @@*/ #define X86_MATCH_VFM_FEATURE (vfm, feature, data) \ X86_MATCH_CPU(VFM_VENDOR(vfm), VFM_FAMILY(vfm), VFM_MODEL(vfm), \ - X86_STEPPING_ANY, feature, data) + X86_STEPPING_ANY, feature, X86_CPU_TYPE_ANY, data) + +/** +* X86_MATCH_VFM_CPU_TYPE - Match encoded vendor/family/model/type +* @vfm: Encoded 8-bits each for vendor, family, model +* @type: CPU type e.g. P-core, E-core +* @data: Driver specific data or NULL. The internal storage +* format is unsigned long. The supplied value, pointer +* etc. is cast to unsigned long internally. +*/ +#define X86_MATCH_VFM_CPU_TYPE (vfm, type, data) \ + X86_MATCH_CPU(VFM_VENDOR(vfm), VFM_FAMILY(vfm), VFM_MODEL(vfm), \ + X86_STEPPING_ANY, X86_FEATURE_ANY, type, data)extern const struct x86_cpu_id *x86_match_cpu (const struct x86_cpu_id *match);extern bool x86_match_min_microcode_rev (const struct x86_cpu_id *table);
include/linux/mod_devicetable.h +2 -0
@@ -692,6 +692,7 @@ struct x86_cpu_id {__u16 feature;/* bit index */ /* Solely for kernel-internal use: DO NOT EXPORT to userspace! */ __u16 flags; +__u8 type;kernel_ulong_t driver_data; };
@@ -703,6 +704,7 @@ struct x86_cpu_id {#define X86_STEP_MIN 0#define X86_STEP_MAX 0xf#define X86_FEATURE_ANY 0/* Same as FPU, you can't test for that */ +#define X86_CPU_TYPE_ANY 0/* * Generic table type for matching CPU features.
Pawan Gupta
reviewerPATCH v8 4/5 x86/cpu: Update x86_match_cpu() to also use cpu-type
In reply to Pawan GuptaNon-hybrid CPU variants that share the same Family/Model could be differentiated by their cpu-type. x86_match_cpu() currently does not use cpu-type for CPU matching.
Dave Hansen suggested to use below conditions to match CPU-type:
1. If CPU_TYPE_ANY (the wildcard), then matched
2. If hybrid, then matched
3. If !hybrid, look at the boot CPU and compare the cpu-type to determine if it is a match.
This special case for hybrid systems allows more compact vulnerability list. Imagine that "Haswell" CPUs might or might not be hybrid and that only Atom cores are vulnerable to Meltdown. That means there are three possibilities:
1. P-core only
2. Atom only
3. Atom + P-core (aka. hybrid)
One might be tempted to code up the vulnerability list like this:
MATCH( HASWELL, X86_FEATURE_HYBRID, MELTDOWN)
MATCH_TYPE(HASWELL, ATOM, MELTDOWN)
Logically, this matches #2 and #3. But that's a little silly. You would only ask for the "ATOM" match in cases where there *WERE* hybrid cores in play. You shouldn't have to _also_ ask for hybrid cores explicitly.
In short, assume that processors that enumerate Hybrid==1 have a vulnerable core type.
Update x86_match_cpu() to also match cpu-type. Also treat hybrid systems as special, and match them to any cpu-type.
--- arch/x86/kernel/cpu/match.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+)
arch/x86/kernel/cpu/match.c +30 -0
@@ -5,6 +5,34 @@#include <linux/export.h> #include <linux/slab.h> +/** +* x86_match_vendor_cpu_type - helper function to match the hardware defined +* cpu-type for a single entry in the x86_cpu_id +* table. Note, this function does not match the +* generic cpu-types TOPO_CPU_TYPE_EFFICIENCY and +* TOPO_CPU_TYPE_PERFORMANCE. +* @c: Pointer to the cpuinfo_x86 structure of the CPU to match. +* @m: Pointer to the x86_cpu_id entry to match against. +* +* Return: true if the cpu-type matches, false otherwise. +*/ +static bool x86_match_vendor_cpu_type (struct cpuinfo_x86 *c,const struct x86_cpu_id *m) +{ +if (m->type ==X86_CPU_TYPE_ANY ) +return true; + +/* Hybrid CPUs are special, they are assumed to match all cpu-types */ +if (cpu_feature_enabled (X86_FEATURE_HYBRID_CPU )) +return true; + +if (c->x86_vendor ==X86_VENDOR_INTEL ) +return m->type == c->topo.intel_type; +if (c->x86_vendor ==X86_VENDOR_AMD ) +return m->type == c->topo.amd_type; + +return false; +} +/** * x86_match_cpu - match current CPU against an array of x86_cpu_ids * @match: Pointer to array of x86_cpu_ids. Last entry terminated with
@@ -50,6 +78,8 @@ const struct x86_cpu_id *x86_match_cpu(const struct x86_cpu_id *match)continue ;if (m->feature !=X86_FEATURE_ANY && !cpu_has (c, m->feature))continue ; +if (!x86_match_vendor_cpu_type (c, m)) +continue ;return m; }return NULL ;
Signature · 1 line
2.34.1
[tip: x86/cpu] x86/cpu: Update x86_match_cpu() to also use cpu-type
The following commit has been merged into the x86/cpu branch of tip:
The following commit has been merged into the x86/cpu branch of tip:
Commit-ID: 3fc9260bff702ea9d12cabce04c6e3620f7e1335 Gitweb: https://git.kernel.org/tip/3fc9260bff702ea9d12cabce04c6e3620f7e1335 Author: Pawan Gupta <[email protected]> AuthorDate: Tue, 11 Mar 2025 08:02:52 -07:00 Committer: Borislav Petkov (AMD) <[email protected]> CommitterDate: Tue, 11 Mar 2025 20:53:30 +01:00
x86/cpu: Update x86_match_cpu() to also use cpu-type
Non-hybrid CPU variants that share the same Family/Model could be differentiated by their cpu-type. x86_match_cpu() currently does not use cpu-type for CPU matching.
Dave Hansen suggested to use below conditions to match CPU-type:
1. If CPU_TYPE_ANY (the wildcard), then matched
2. If hybrid, then matched
3. If !hybrid, look at the boot CPU and compare the cpu-type to determine if it is a match.
This special case for hybrid systems allows more compact vulnerability list. Imagine that "Haswell" CPUs might or might not be hybrid and that only Atom cores are vulnerable to Meltdown. That means there are three possibilities:
1. P-core only
2. Atom only
3. Atom + P-core (aka. hybrid)
One might be tempted to code up the vulnerability list like this:
MATCH( HASWELL, X86_FEATURE_HYBRID, MELTDOWN)
MATCH_TYPE(HASWELL, ATOM, MELTDOWN)
Logically, this matches #2 and #3. But that's a little silly. You would only ask for the "ATOM" match in cases where there *WERE* hybrid cores in play. You shouldn't have to _also_ ask for hybrid cores explicitly.
In short, assume that processors that enumerate Hybrid==1 have a vulnerable core type.
Update x86_match_cpu() to also match cpu-type. Also treat hybrid systems as special, and match them to any cpu-type.
--- arch/x86/kernel/cpu/match.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+)
arch/x86/kernel/cpu/match.c +30 -0
@@ -6,6 +6,34 @@#include <linux/slab.h> /** +* x86_match_vendor_cpu_type - helper function to match the hardware defined +* cpu-type for a single entry in the x86_cpu_id +* table. Note, this function does not match the +* generic cpu-types TOPO_CPU_TYPE_EFFICIENCY and +* TOPO_CPU_TYPE_PERFORMANCE. +* @c: Pointer to the cpuinfo_x86 structure of the CPU to match. +* @m: Pointer to the x86_cpu_id entry to match against. +* +* Return: true if the cpu-type matches, false otherwise. +*/ +static bool x86_match_vendor_cpu_type (struct cpuinfo_x86 *c,const struct x86_cpu_id *m) +{ +if (m->type ==X86_CPU_TYPE_ANY ) +return true; + +/* Hybrid CPUs are special, they are assumed to match all cpu-types */ +if (cpu_feature_enabled (X86_FEATURE_HYBRID_CPU )) +return true; + +if (c->x86_vendor ==X86_VENDOR_INTEL ) +return m->type == c->topo.intel_type; +if (c->x86_vendor ==X86_VENDOR_AMD ) +return m->type == c->topo.amd_type; + +return false; +} + +/** * x86_match_cpu - match current CPU against an array of x86_cpu_ids * @match: Pointer to array of x86_cpu_ids. Last entry terminated with * {}.
@@ -50,6 +78,8 @@ const struct x86_cpu_id *x86_match_cpu(const struct x86_cpu_id *match)continue ;if (m->feature !=X86_FEATURE_ANY && !cpu_has (c, m->feature))continue ; +if (!x86_match_vendor_cpu_type (c, m)) +continue ;return m; }return NULL ;
[tip: x86/core] x86/cpu: Update x86_match_cpu() to also use cpu-type
In reply to Pawan GuptaThe following commit has been merged into the x86/core branch of tip:
The following commit has been merged into the x86/core branch of tip:
Commit-ID: adf2de5e8d85aad3fa0319e1a524fa97d2aa8f90 Gitweb: https://git.kernel.org/tip/adf2de5e8d85aad3fa0319e1a524fa97d2aa8f90 Author: Pawan Gupta <[email protected]> AuthorDate: Tue, 11 Mar 2025 08:02:52 -07:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Wed, 19 Mar 2025 11:17:11 +01:00
x86/cpu: Update x86_match_cpu() to also use cpu-type
Non-hybrid CPU variants that share the same Family/Model could be differentiated by their cpu-type. x86_match_cpu() currently does not use cpu-type for CPU matching.
Dave Hansen suggested to use below conditions to match CPU-type:
1. If CPU_TYPE_ANY (the wildcard), then matched
2. If hybrid, then matched
3. If !hybrid, look at the boot CPU and compare the cpu-type to determine if it is a match.
This special case for hybrid systems allows more compact vulnerability list. Imagine that "Haswell" CPUs might or might not be hybrid and that only Atom cores are vulnerable to Meltdown. That means there are three possibilities:
1. P-core only
2. Atom only
3. Atom + P-core (aka. hybrid)
One might be tempted to code up the vulnerability list like this:
MATCH( HASWELL, X86_FEATURE_HYBRID, MELTDOWN)
MATCH_TYPE(HASWELL, ATOM, MELTDOWN)
Logically, this matches #2 and #3. But that's a little silly. You would only ask for the "ATOM" match in cases where there *WERE* hybrid cores in play. You shouldn't have to _also_ ask for hybrid cores explicitly.
In short, assume that processors that enumerate Hybrid==1 have a vulnerable core type.
Update x86_match_cpu() to also match cpu-type. Also treat hybrid systems as special, and match them to any cpu-type.
--- arch/x86/kernel/cpu/match.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+)
arch/x86/kernel/cpu/match.c +30 -0
@@ -6,6 +6,34 @@#include <linux/slab.h> /** +* x86_match_vendor_cpu_type - helper function to match the hardware defined +* cpu-type for a single entry in the x86_cpu_id +* table. Note, this function does not match the +* generic cpu-types TOPO_CPU_TYPE_EFFICIENCY and +* TOPO_CPU_TYPE_PERFORMANCE. +* @c: Pointer to the cpuinfo_x86 structure of the CPU to match. +* @m: Pointer to the x86_cpu_id entry to match against. +* +* Return: true if the cpu-type matches, false otherwise. +*/ +static bool x86_match_vendor_cpu_type (struct cpuinfo_x86 *c,const struct x86_cpu_id *m) +{ +if (m->type ==X86_CPU_TYPE_ANY ) +return true; + +/* Hybrid CPUs are special, they are assumed to match all cpu-types */ +if (cpu_feature_enabled (X86_FEATURE_HYBRID_CPU )) +return true; + +if (c->x86_vendor ==X86_VENDOR_INTEL ) +return m->type == c->topo.intel_type; +if (c->x86_vendor ==X86_VENDOR_AMD ) +return m->type == c->topo.amd_type; + +return false; +} + +/** * x86_match_cpu - match current CPU against an array of x86_cpu_ids * @match: Pointer to array of x86_cpu_ids. Last entry terminated with * {}.
@@ -50,6 +78,8 @@ const struct x86_cpu_id *x86_match_cpu(const struct x86_cpu_id *match)continue ;if (m->feature !=X86_FEATURE_ANY && !cpu_has (c, m->feature))continue ; +if (!x86_match_vendor_cpu_type (c, m)) +continue ;return m; }return NULL ;
Pawan Gupta
reviewerPATCH v8 5/5 x86/rfds: Exclude P-only parts from the RFDS affected list
In reply to Pawan GuptaThe affected CPU table (cpu_vuln_blacklist) marks Alderlake and Raptorlake P-only parts affected by RFDS. This is not true because only E-cores are affected by RFDS. With the current family/model matching it is not possible to differentiate the unaffected parts, as the affected and unaffected hybrid variants have the same model number.
Add a cpu-type match as well for such parts so as to exclude P-only parts being marked as affected.
Note, family/model and cpu-type enumeration could be inaccurate in virtualized environments. In a guest affected status is decided by RFDS_NO and RFDS_CLEAR bits exposed by VMMs.
--- Documentation/admin-guide/hw-vuln/reg-file-data-sampling.rst | 8 -------- arch/x86/kernel/cpu/common.c | 7 +++++-- 2 files changed, 5 insertions(+), 10 deletions(-)
Documentation/admin-guide/hw-vuln/reg-file-data-sampling.rst +0 -8
@@ -29,14 +29,6 @@ Below is the list of affected Intel processors [#f1]_: RAPTORLAKE_S 06_BFH =================== ============ -As an exception to this table, Intel Xeon E family parts ALDERLAKE(06_97H) and -RAPTORLAKE(06_B7H) codenamed Catlow are not affected. They are reported as -vulnerable in Linux because they share the same family/model with an affected -part. Unlike their affected counterparts, they do not enumerate RFDS_CLEAR or -CPUID.HYBRID. This information could be used to distinguish between the -affected and unaffected parts, but it is deemed not worth adding complexity as -the reporting is fixed automatically when these parts enumerate RFDS_NO. - Mitigation ========== Intel released a microcode update that enables software to clear sensitive
arch/x86/kernel/cpu/common.c +5 -2
@@ -1203,6 +1203,9 @@ static const __initconst struct x86_cpu_id cpu_vuln_whitelist[] = {#define VULNBL_INTEL_STEPS (vfm, max_stepping, issues) \ X86_MATCH_VFM_STEPS(vfm, X86_STEP_MIN, max_stepping, issues) +#define VULNBL_INTEL_TYPE (vfm, cpu_type, issues) \ + X86_MATCH_VFM_CPU_TYPE(vfm, INTEL_CPU_TYPE_##cpu_type, issues) +#define VULNBL_AMD (family, blacklist) \ VULNBL(AMD, family, X86_MODEL_ANY, blacklist)
@@ -1251,9 +1254,9 @@ static const struct x86_cpu_id cpu_vuln_blacklist[] __initconst = {VULNBL_INTEL_STEPS (INTEL_TIGERLAKE ,X86_STEP_MAX ,GDS ),VULNBL_INTEL_STEPS (INTEL_LAKEFIELD ,X86_STEP_MAX ,MMIO |MMIO_SBDS |RETBLEED ),VULNBL_INTEL_STEPS (INTEL_ROCKETLAKE ,X86_STEP_MAX ,MMIO |RETBLEED |GDS ), -VULNBL_INTEL_STEPS (INTEL_ALDERLAKE ,X86_STEP_MAX ,RFDS ), +VULNBL_INTEL_TYPE (INTEL_ALDERLAKE ,ATOM ,RFDS ),VULNBL_INTEL_STEPS (INTEL_ALDERLAKE_L ,X86_STEP_MAX ,RFDS ), -VULNBL_INTEL_STEPS (INTEL_RAPTORLAKE ,X86_STEP_MAX ,RFDS ), +VULNBL_INTEL_TYPE (INTEL_RAPTORLAKE ,ATOM ,RFDS ),VULNBL_INTEL_STEPS (INTEL_RAPTORLAKE_P ,X86_STEP_MAX ,RFDS ),VULNBL_INTEL_STEPS (INTEL_RAPTORLAKE_S ,X86_STEP_MAX ,RFDS ), VULNBL_INTEL_STEPS(INTEL_ATOM_GRACEMONT, X86_STEP_MAX, RFDS),
Signature · 1 line
2.34.1
[tip: x86/cpu] x86/rfds: Exclude P-only parts from the RFDS affected list
The following commit has been merged into the x86/cpu branch of tip:
The following commit has been merged into the x86/cpu branch of tip:
Commit-ID: 8c7768105a84c16b9d71af2fa2d2c50ff3c80f4e Gitweb: https://git.kernel.org/tip/8c7768105a84c16b9d71af2fa2d2c50ff3c80f4e Author: Pawan Gupta <[email protected]> AuthorDate: Tue, 11 Mar 2025 08:03:08 -07:00 Committer: Borislav Petkov (AMD) <[email protected]> CommitterDate: Tue, 11 Mar 2025 20:53:30 +01:00
x86/rfds: Exclude P-only parts from the RFDS affected list
The affected CPU table (cpu_vuln_blacklist) marks Alderlake and Raptorlake P-only parts affected by RFDS. This is not true because only E-cores are affected by RFDS. With the current family/model matching it is not possible to differentiate the unaffected parts, as the affected and unaffected hybrid variants have the same model number.
Add a cpu-type match as well for such parts so as to exclude P-only parts being marked as affected.
Note, family/model and cpu-type enumeration could be inaccurate in virtualized environments. In a guest affected status is decided by RFDS_NO and RFDS_CLEAR bits exposed by VMMs.
--- Documentation/admin-guide/hw-vuln/reg-file-data-sampling.rst | 8 +------- arch/x86/kernel/cpu/common.c | 7 ++++-- 2 files changed, 5 insertions(+), 10 deletions(-)
Documentation/admin-guide/hw-vuln/reg-file-data-sampling.rst +0 -8
@@ -29,14 +29,6 @@ Below is the list of affected Intel processors [#f1]_: RAPTORLAKE_S 06_BFH =================== ============ -As an exception to this table, Intel Xeon E family parts ALDERLAKE(06_97H) and -RAPTORLAKE(06_B7H) codenamed Catlow are not affected. They are reported as -vulnerable in Linux because they share the same family/model with an affected -part. Unlike their affected counterparts, they do not enumerate RFDS_CLEAR or -CPUID.HYBRID. This information could be used to distinguish between the -affected and unaffected parts, but it is deemed not worth adding complexity as -the reporting is fixed automatically when these parts enumerate RFDS_NO. - Mitigation ========== Intel released a microcode update that enables software to clear sensitive
arch/x86/kernel/cpu/common.c +5 -2
@@ -1203,6 +1203,9 @@ static const __initconst struct x86_cpu_id cpu_vuln_whitelist[] = {#define VULNBL_INTEL_STEPS (vfm, max_stepping, issues) \ X86_MATCH_VFM_STEPS(vfm, X86_STEP_MIN, max_stepping, issues) +#define VULNBL_INTEL_TYPE (vfm, cpu_type, issues) \ + X86_MATCH_VFM_CPU_TYPE(vfm, INTEL_CPU_TYPE_##cpu_type, issues) +#define VULNBL_AMD (family, blacklist) \ VULNBL(AMD, family, X86_MODEL_ANY, blacklist)
@@ -1251,9 +1254,9 @@ static const struct x86_cpu_id cpu_vuln_blacklist[] __initconst = {VULNBL_INTEL_STEPS (INTEL_TIGERLAKE ,X86_STEP_MAX ,GDS ),VULNBL_INTEL_STEPS (INTEL_LAKEFIELD ,X86_STEP_MAX ,MMIO |MMIO_SBDS |RETBLEED ),VULNBL_INTEL_STEPS (INTEL_ROCKETLAKE ,X86_STEP_MAX ,MMIO |RETBLEED |GDS ), -VULNBL_INTEL_STEPS (INTEL_ALDERLAKE ,X86_STEP_MAX ,RFDS ), +VULNBL_INTEL_TYPE (INTEL_ALDERLAKE ,ATOM ,RFDS ),VULNBL_INTEL_STEPS (INTEL_ALDERLAKE_L ,X86_STEP_MAX ,RFDS ), -VULNBL_INTEL_STEPS (INTEL_RAPTORLAKE ,X86_STEP_MAX ,RFDS ), +VULNBL_INTEL_TYPE (INTEL_RAPTORLAKE ,ATOM ,RFDS ),VULNBL_INTEL_STEPS (INTEL_RAPTORLAKE_P ,X86_STEP_MAX ,RFDS ),VULNBL_INTEL_STEPS (INTEL_RAPTORLAKE_S ,X86_STEP_MAX ,RFDS ), VULNBL_INTEL_STEPS(INTEL_ATOM_GRACEMONT, X86_STEP_MAX, RFDS),
[tip: x86/core] x86/rfds: Exclude P-only parts from the RFDS affected list
In reply to Pawan GuptaThe following commit has been merged into the x86/core branch of tip:
The following commit has been merged into the x86/core branch of tip:
Commit-ID: 722fa0dba74f206999244facb177a8bfe3d513e6 Gitweb: https://git.kernel.org/tip/722fa0dba74f206999244facb177a8bfe3d513e6 Author: Pawan Gupta <[email protected]> AuthorDate: Tue, 11 Mar 2025 08:03:08 -07:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Wed, 19 Mar 2025 11:17:23 +01:00
x86/rfds: Exclude P-only parts from the RFDS affected list
The affected CPU table (cpu_vuln_blacklist) marks Alderlake and Raptorlake P-only parts affected by RFDS. This is not true because only E-cores are affected by RFDS. With the current family/model matching it is not possible to differentiate the unaffected parts, as the affected and unaffected hybrid variants have the same model number.
Add a cpu-type match as well for such parts so as to exclude P-only parts being marked as affected.
Note, family/model and cpu-type enumeration could be inaccurate in virtualized environments. In a guest affected status is decided by RFDS_NO and RFDS_CLEAR bits exposed by VMMs.
--- Documentation/admin-guide/hw-vuln/reg-file-data-sampling.rst | 8 +------- arch/x86/kernel/cpu/common.c | 7 ++++-- 2 files changed, 5 insertions(+), 10 deletions(-)
Documentation/admin-guide/hw-vuln/reg-file-data-sampling.rst +0 -8
@@ -29,14 +29,6 @@ Below is the list of affected Intel processors [#f1]_: RAPTORLAKE_S 06_BFH =================== ============ -As an exception to this table, Intel Xeon E family parts ALDERLAKE(06_97H) and -RAPTORLAKE(06_B7H) codenamed Catlow are not affected. They are reported as -vulnerable in Linux because they share the same family/model with an affected -part. Unlike their affected counterparts, they do not enumerate RFDS_CLEAR or -CPUID.HYBRID. This information could be used to distinguish between the -affected and unaffected parts, but it is deemed not worth adding complexity as -the reporting is fixed automatically when these parts enumerate RFDS_NO. - Mitigation ========== Intel released a microcode update that enables software to clear sensitive
arch/x86/kernel/cpu/common.c +5 -2
@@ -1203,6 +1203,9 @@ static const __initconst struct x86_cpu_id cpu_vuln_whitelist[] = {#define VULNBL_INTEL_STEPS (vfm, max_stepping, issues) \ X86_MATCH_VFM_STEPS(vfm, X86_STEP_MIN, max_stepping, issues) +#define VULNBL_INTEL_TYPE (vfm, cpu_type, issues) \ + X86_MATCH_VFM_CPU_TYPE(vfm, INTEL_CPU_TYPE_##cpu_type, issues) +#define VULNBL_AMD (family, blacklist) \ VULNBL(AMD, family, X86_MODEL_ANY, blacklist)
@@ -1251,9 +1254,9 @@ static const struct x86_cpu_id cpu_vuln_blacklist[] __initconst = {VULNBL_INTEL_STEPS (INTEL_TIGERLAKE ,X86_STEP_MAX ,GDS ),VULNBL_INTEL_STEPS (INTEL_LAKEFIELD ,X86_STEP_MAX ,MMIO |MMIO_SBDS |RETBLEED ),VULNBL_INTEL_STEPS (INTEL_ROCKETLAKE ,X86_STEP_MAX ,MMIO |RETBLEED |GDS ), -VULNBL_INTEL_STEPS (INTEL_ALDERLAKE ,X86_STEP_MAX ,RFDS ), +VULNBL_INTEL_TYPE (INTEL_ALDERLAKE ,ATOM ,RFDS ),VULNBL_INTEL_STEPS (INTEL_ALDERLAKE_L ,X86_STEP_MAX ,RFDS ), -VULNBL_INTEL_STEPS (INTEL_RAPTORLAKE ,X86_STEP_MAX ,RFDS ), +VULNBL_INTEL_TYPE (INTEL_RAPTORLAKE ,ATOM ,RFDS ),VULNBL_INTEL_STEPS (INTEL_RAPTORLAKE_P ,X86_STEP_MAX ,RFDS ),VULNBL_INTEL_STEPS (INTEL_RAPTORLAKE_S ,X86_STEP_MAX ,RFDS ), VULNBL_INTEL_STEPS(INTEL_ATOM_GRACEMONT, X86_STEP_MAX, RFDS),