* Re: [PATCH] x86/bugs: Replace RFDS model checks with VFM ones
2026-10-30 19:52 [PATCH] x86/bugs: Replace RFDS model checks with VFM ones Sohil Mehta
@ 2026-10-30 21:50 ` Pawan Gupta
2026-10-31 4:20 ` Borislav Petkov
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Pawan Gupta @ 2026-10-30 21:50 UTC (permalink / raw)
To: Sohil Mehta
Cc: Dave Hansen, Borislav Petkov, x86, Thomas Gleixner, Ingo Molnar,
H . Peter Anvin, Dave Hansen, Tony Luck, linux-kernel
On Fri, Oct 30, 2026 at 12:52:14PM -0700, Sohil Mehta wrote:
> The RFDS vulnerability check uses raw model numbers to identify Alder
> Lake and Raptor Lake. Most Intel-specific code has already moved away
> from x86_model checks, but this one got added recently.
>
> Replace the x86_model checks with VFM ones to make them more readable.
>
> Signed-off-by: Sohil Mehta <sohil.mehta@intel.com>
> ---
> arch/x86/kernel/cpu/common.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
> index c7352827f491..8d7bd8bb7b18 100644
> --- a/arch/x86/kernel/cpu/common.c
> +++ b/arch/x86/kernel/cpu/common.c
> @@ -1392,8 +1392,8 @@ static bool __init vulnerable_to_rfds(u64 x86_arch_cap_msr)
> * both Core and Atom CPUs. Mark unaffected when Atom CPUs are not
> * present.
> */
> - if ((boot_cpu_data.x86_model == 0x97 ||
> - boot_cpu_data.x86_model == 0xB7) &&
> + if ((boot_cpu_data.x86_vfm == INTEL_ALDERLAKE ||
> + boot_cpu_data.x86_vfm == INTEL_RAPTORLAKE) &&
I missed that when adding the patch. Thanks for fixing.
Reviewed-by: Pawan Gupta <pawan.kumar.gupta@linux.intel.com>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] x86/bugs: Replace RFDS model checks with VFM ones
2026-10-30 19:52 [PATCH] x86/bugs: Replace RFDS model checks with VFM ones Sohil Mehta
2026-10-30 21:50 ` Pawan Gupta
@ 2026-10-31 4:20 ` Borislav Petkov
2026-11-02 3:56 ` [tip: x86/urgent] " tip-bot2 for Sohil Mehta
2026-11-02 4:31 ` [tip: x86/cleanups] " tip-bot2 for Sohil Mehta
3 siblings, 0 replies; 5+ messages in thread
From: Borislav Petkov @ 2026-10-31 4:20 UTC (permalink / raw)
To: Sohil Mehta
Cc: Dave Hansen, x86, Thomas Gleixner, Ingo Molnar, H . Peter Anvin,
Pawan Gupta, Dave Hansen, Tony Luck, linux-kernel
On Fri, Oct 30, 2026 at 12:52:14PM -0700, Sohil Mehta wrote:
> The RFDS vulnerability check uses raw model numbers to identify Alder
> Lake and Raptor Lake. Most Intel-specific code has already moved away
> from x86_model checks, but this one got added recently.
>
> Replace the x86_model checks with VFM ones to make them more readable.
>
> Signed-off-by: Sohil Mehta <sohil.mehta@intel.com>
> ---
> arch/x86/kernel/cpu/common.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
> index c7352827f491..8d7bd8bb7b18 100644
> --- a/arch/x86/kernel/cpu/common.c
> +++ b/arch/x86/kernel/cpu/common.c
> @@ -1392,8 +1392,8 @@ static bool __init vulnerable_to_rfds(u64 x86_arch_cap_msr)
> * both Core and Atom CPUs. Mark unaffected when Atom CPUs are not
> * present.
> */
> - if ((boot_cpu_data.x86_model == 0x97 ||
> - boot_cpu_data.x86_model == 0xB7) &&
> + if ((boot_cpu_data.x86_vfm == INTEL_ALDERLAKE ||
> + boot_cpu_data.x86_vfm == INTEL_RAPTORLAKE) &&
> boot_cpu_data.topo.intel_type != INTEL_CPU_TYPE_ATOM &&
> !boot_cpu_has(X86_FEATURE_HYBRID_CPU))
> return false;
> --
Queued, thx.
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette
^ permalink raw reply [flat|nested] 5+ messages in thread* [tip: x86/urgent] x86/bugs: Replace RFDS model checks with VFM ones
2026-10-30 19:52 [PATCH] x86/bugs: Replace RFDS model checks with VFM ones Sohil Mehta
2026-10-30 21:50 ` Pawan Gupta
2026-10-31 4:20 ` Borislav Petkov
@ 2026-11-02 3:56 ` tip-bot2 for Sohil Mehta
2026-11-02 4:31 ` [tip: x86/cleanups] " tip-bot2 for Sohil Mehta
3 siblings, 0 replies; 5+ messages in thread
From: tip-bot2 for Sohil Mehta @ 2026-11-02 3:56 UTC (permalink / raw)
To: linux-tip-commits
Cc: Sohil Mehta, Borislav Petkov (AMD), Pawan Gupta, x86, linux-kernel
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: b828d777c292c963aa110c33159a59f81d372ce7
Gitweb: https://git.kernel.org/tip/b828d777c292c963aa110c33159a59f81d372ce7
Author: Sohil Mehta <sohil.mehta@intel.com>
AuthorDate: Fri, 30 Oct 2026 12:52:14 -07:00
Committer: Borislav Petkov (AMD) <bp@alien8.de>
CommitterDate: Sun, 01 Nov 2026 17:42:22 -08:00
x86/bugs: Replace RFDS model checks with VFM ones
The RFDS vulnerability check uses raw model numbers to identify Alder
Lake and Raptor Lake. Most Intel-specific code has already moved away
from x86_model checks, but this one got added recently.
Replace the x86_model checks with VFM ones to make them more readable.
Signed-off-by: Sohil Mehta <sohil.mehta@intel.com>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Reviewed-by: Pawan Gupta <pawan.kumar.gupta@linux.intel.com>
Link: https://patch.msgid.link/20261030195214.1284995-1-sohil.mehta@intel.com
---
arch/x86/kernel/cpu/common.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index 9bd50c6..aba7e99 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -1391,8 +1391,8 @@ static bool __init vulnerable_to_rfds(u64 x86_arch_cap_msr)
* both Core and Atom CPUs. Mark unaffected when Atom CPUs are not
* present.
*/
- if ((boot_cpu_data.x86_model == 0x97 ||
- boot_cpu_data.x86_model == 0xB7) &&
+ if ((boot_cpu_data.x86_vfm == INTEL_ALDERLAKE ||
+ boot_cpu_data.x86_vfm == INTEL_RAPTORLAKE) &&
boot_cpu_data.topo.intel_type != INTEL_CPU_TYPE_ATOM &&
!boot_cpu_has(X86_FEATURE_HYBRID_CPU))
return false;
^ permalink raw reply [flat|nested] 5+ messages in thread
* [tip: x86/cleanups] x86/bugs: Replace RFDS model checks with VFM ones
2026-10-30 19:52 [PATCH] x86/bugs: Replace RFDS model checks with VFM ones Sohil Mehta
` (2 preceding siblings ...)
2026-11-02 3:56 ` [tip: x86/urgent] " tip-bot2 for Sohil Mehta
@ 2026-11-02 4:31 ` tip-bot2 for Sohil Mehta
3 siblings, 0 replies; 5+ messages in thread
From: tip-bot2 for Sohil Mehta @ 2026-11-02 4:31 UTC (permalink / raw)
To: linux-tip-commits
Cc: Sohil Mehta, Borislav Petkov (AMD), Pawan Gupta, x86, linux-kernel
The following commit has been merged into the x86/cleanups branch of tip:
Commit-ID: 07479e8845c8a3a17d49a707a7178e9fd8360ab1
Gitweb: https://git.kernel.org/tip/07479e8845c8a3a17d49a707a7178e9fd8360ab1
Author: Sohil Mehta <sohil.mehta@intel.com>
AuthorDate: Fri, 30 Oct 2026 12:52:14 -07:00
Committer: Borislav Petkov (AMD) <bp@alien8.de>
CommitterDate: Sun, 01 Nov 2026 20:28:55 -08:00
x86/bugs: Replace RFDS model checks with VFM ones
The RFDS vulnerability check uses raw model numbers to identify Alder
Lake and Raptor Lake. Most Intel-specific code has already moved away
from x86_model checks, but this one got added recently.
Replace the x86_model checks with VFM ones to make them more readable.
Signed-off-by: Sohil Mehta <sohil.mehta@intel.com>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Reviewed-by: Pawan Gupta <pawan.kumar.gupta@linux.intel.com>
Link: https://patch.msgid.link/20261030195214.1284995-1-sohil.mehta@intel.com
---
arch/x86/kernel/cpu/common.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index 9bd50c6..aba7e99 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -1391,8 +1391,8 @@ static bool __init vulnerable_to_rfds(u64 x86_arch_cap_msr)
* both Core and Atom CPUs. Mark unaffected when Atom CPUs are not
* present.
*/
- if ((boot_cpu_data.x86_model == 0x97 ||
- boot_cpu_data.x86_model == 0xB7) &&
+ if ((boot_cpu_data.x86_vfm == INTEL_ALDERLAKE ||
+ boot_cpu_data.x86_vfm == INTEL_RAPTORLAKE) &&
boot_cpu_data.topo.intel_type != INTEL_CPU_TYPE_ATOM &&
!boot_cpu_has(X86_FEATURE_HYBRID_CPU))
return false;
^ permalink raw reply [flat|nested] 5+ messages in thread