Re: [PATCH PATCH v2 9/9] x86/rfds: Exclude P-only parts from the RFDS affected list

public inbox for linux-pm@vger.kernel.org
 help / color / mirror / Atom feed

From: Pawan Gupta <pawan.kumar.gupta@linux.intel.com>
To: Josh Poimboeuf <jpoimboe@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>,
	Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
	Dave Hansen <dave.hansen@linux.intel.com>,
	x86@kernel.org, daniel.sneddon@linux.intel.com,
	tony.luck@intel.com, linux-kernel@vger.kernel.org,
	linux-pm@vger.kernel.org, linux-perf-users@vger.kernel.org,
	Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>,
	"Rafael J. Wysocki" <rafael@kernel.org>,
	Ricardo Neri <ricardo.neri-calderon@linux.intel.com>,
	"Liang, Kan" <kan.liang@linux.intel.com>,
	Andrew Cooper <andrew.cooper3@citrix.com>,
	Brice Goglin <brice.goglin@gmail.com>,
	Mario Limonciello <mario.limonciello@amd.com>,
	Perry Yuan <Perry.Yuan@amd.com>,
	Dapeng Mi <dapeng1.mi@linux.intel.com>
Subject: Re: [PATCH PATCH v2 9/9] x86/rfds: Exclude P-only parts from the RFDS affected list
Date: Wed, 3 Jul 2024 11:26:13 -0700	[thread overview]
Message-ID: <20240703182613.4vfaoxl344mdanxn@desk> (raw)
In-Reply-To: <20240703010433.2ymzh5g7osth5ch5@treble>

On Tue, Jul 02, 2024 at 06:04:33PM -0700, Josh Poimboeuf wrote:
> On Thu, Jun 27, 2024 at 01:44:55PM -0700, Pawan Gupta wrote:
> > @@ -1255,9 +1260,7 @@ static const struct x86_cpu_id cpu_vuln_blacklist[] __initconst = {
> >  	VULNBL_INTEL(TIGERLAKE,			GDS),
> >  	VULNBL_INTEL(LAKEFIELD,			MMIO | MMIO_SBDS | RETBLEED),
> >  	VULNBL_INTEL(ROCKETLAKE,		MMIO | RETBLEED | GDS),
> > -	VULNBL_INTEL(ALDERLAKE,			RFDS),
> >  	VULNBL_INTEL(ALDERLAKE_L,		RFDS),
> > -	VULNBL_INTEL(RAPTORLAKE,		RFDS),
> >  	VULNBL_INTEL(RAPTORLAKE_P,		RFDS),
> >  	VULNBL_INTEL(RAPTORLAKE_S,		RFDS),
> >  	VULNBL_INTEL(ATOM_GRACEMONT,		RFDS),
> > @@ -1271,6 +1274,8 @@ static const struct x86_cpu_id cpu_vuln_blacklist[] __initconst = {
> >  	/* Match more than Vendor/Family/Model */
> >  	VULNBL_INTEL_STEPPINGS(COMETLAKE_L,	X86_STEPPINGS(0x0, 0x0),	MMIO | RETBLEED),
> >  	VULNBL_INTEL	      (COMETLAKE_L,					MMIO | MMIO_SBDS | RETBLEED | GDS),
> > +	VULNBL_INTEL_TYPE     (ALDERLAKE,	ATOM,				RFDS),
> > +	VULNBL_INTEL_TYPE     (RAPTORLAKE,	ATOM,				RFDS),
> 
> Same comment here, these should be inline with the main list.  Maybe
> there's some way to structure the indentations so they align better
> vertically with the STEPPINGS/TYPE variants.

This is how it is turning out to be:

---
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index 151c2377df21..75bbdf0cf8ae 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -1237,45 +1237,43 @@ static const __initconst struct x86_cpu_id cpu_vuln_whitelist[] = {
 #define RFDS		BIT(7)
 
 static const struct x86_cpu_id cpu_vuln_blacklist[] __initconst = {
-	VULNBL_INTEL(IVYBRIDGE,			SRBDS),
-	VULNBL_INTEL(HASWELL,			SRBDS),
-	VULNBL_INTEL(HASWELL_L,			SRBDS),
-	VULNBL_INTEL(HASWELL_G,			SRBDS),
-	VULNBL_INTEL(HASWELL_X,			MMIO),
-	VULNBL_INTEL(BROADWELL_D,		MMIO),
-	VULNBL_INTEL(BROADWELL_G,		SRBDS),
-	VULNBL_INTEL(BROADWELL_X,		MMIO),
-	VULNBL_INTEL(BROADWELL,			SRBDS),
-	VULNBL_INTEL(SKYLAKE_X,			MMIO | RETBLEED | GDS),
-	VULNBL_INTEL(SKYLAKE_L,			MMIO | RETBLEED | GDS | SRBDS),
-	VULNBL_INTEL(SKYLAKE,			MMIO | RETBLEED | GDS | SRBDS),
-	VULNBL_INTEL(KABYLAKE_L,		MMIO | RETBLEED | GDS | SRBDS),
-	VULNBL_INTEL(KABYLAKE,			MMIO | RETBLEED | GDS | SRBDS),
-	VULNBL_INTEL(CANNONLAKE_L,		RETBLEED),
-	VULNBL_INTEL(ICELAKE_L,			MMIO | MMIO_SBDS | RETBLEED | GDS),
-	VULNBL_INTEL(ICELAKE_D,			MMIO | GDS),
-	VULNBL_INTEL(ICELAKE_X,			MMIO | GDS),
-	VULNBL_INTEL(COMETLAKE,			MMIO | MMIO_SBDS | RETBLEED | GDS),
-	VULNBL_INTEL(TIGERLAKE_L,		GDS),
-	VULNBL_INTEL(TIGERLAKE,			GDS),
-	VULNBL_INTEL(LAKEFIELD,			MMIO | MMIO_SBDS | RETBLEED),
-	VULNBL_INTEL(ROCKETLAKE,		MMIO | RETBLEED | GDS),
-	VULNBL_INTEL(ALDERLAKE_L,		RFDS),
-	VULNBL_INTEL(RAPTORLAKE_P,		RFDS),
-	VULNBL_INTEL(RAPTORLAKE_S,		RFDS),
-	VULNBL_INTEL(ATOM_GRACEMONT,		RFDS),
-	VULNBL_INTEL(ATOM_TREMONT,		MMIO | MMIO_SBDS | RFDS),
-	VULNBL_INTEL(ATOM_TREMONT_D,		MMIO | RFDS),
-	VULNBL_INTEL(ATOM_TREMONT_L,		MMIO | MMIO_SBDS | RFDS),
-	VULNBL_INTEL(ATOM_GOLDMONT,		RFDS),
-	VULNBL_INTEL(ATOM_GOLDMONT_D,		RFDS),
-	VULNBL_INTEL(ATOM_GOLDMONT_PLUS,	RFDS),
-
-	/* Match more than Vendor/Family/Model */
-	VULNBL_INTEL_STEPPINGS(COMETLAKE_L,	X86_STEPPINGS(0x0, 0x0),	MMIO | RETBLEED),
-	VULNBL_INTEL	      (COMETLAKE_L,					MMIO | MMIO_SBDS | RETBLEED | GDS),
-	VULNBL_INTEL_TYPE     (ALDERLAKE,	ATOM,				RFDS),
-	VULNBL_INTEL_TYPE     (RAPTORLAKE,	ATOM,				RFDS),
+	VULNBL_INTEL(		IVYBRIDGE,		SRBDS),
+	VULNBL_INTEL(		HASWELL,		SRBDS),
+	VULNBL_INTEL(		HASWELL_L,		SRBDS),
+	VULNBL_INTEL(		HASWELL_G,		SRBDS),
+	VULNBL_INTEL(		HASWELL_X,		MMIO),
+	VULNBL_INTEL(		BROADWELL_D,		MMIO),
+	VULNBL_INTEL(		BROADWELL_G,		SRBDS),
+	VULNBL_INTEL(		BROADWELL_X,		MMIO),
+	VULNBL_INTEL(		BROADWELL,		SRBDS),
+	VULNBL_INTEL(		SKYLAKE_X,		MMIO | RETBLEED | GDS),
+	VULNBL_INTEL(		SKYLAKE_L,		MMIO | RETBLEED | GDS | SRBDS),
+	VULNBL_INTEL(		SKYLAKE,		MMIO | RETBLEED | GDS | SRBDS),
+	VULNBL_INTEL(		KABYLAKE_L,		MMIO | RETBLEED | GDS | SRBDS),
+	VULNBL_INTEL(		KABYLAKE,		MMIO | RETBLEED | GDS | SRBDS),
+	VULNBL_INTEL(		CANNONLAKE_L,		RETBLEED),
+	VULNBL_INTEL(		ICELAKE_L,		MMIO | MMIO_SBDS | RETBLEED | GDS),
+	VULNBL_INTEL(		ICELAKE_D,		MMIO | GDS),
+	VULNBL_INTEL(		ICELAKE_X,		MMIO | GDS),
+	VULNBL_INTEL(		COMETLAKE,		MMIO | MMIO_SBDS | RETBLEED | GDS),
+	VULNBL_INTEL_STEPPINGS(	COMETLAKE_L,	X86_STEPPINGS(0x0, 0x0),	MMIO | RETBLEED),
+	VULNBL_INTEL(		COMETLAKE_L,		MMIO | MMIO_SBDS | RETBLEED | GDS),
+	VULNBL_INTEL(		TIGERLAKE_L,		GDS),
+	VULNBL_INTEL(		TIGERLAKE,		GDS),
+	VULNBL_INTEL(		LAKEFIELD,		MMIO | MMIO_SBDS | RETBLEED),
+	VULNBL_INTEL(		ROCKETLAKE,		MMIO | RETBLEED | GDS),
+	VULNBL_INTEL_TYPE(	ALDERLAKE,	ATOM,	RFDS),
+	VULNBL_INTEL(		ALDERLAKE_L,		RFDS),
+	VULNBL_INTEL_TYPE(	RAPTORLAKE,	ATOM,	RFDS),
+	VULNBL_INTEL(		RAPTORLAKE_P,		RFDS),
+	VULNBL_INTEL(		RAPTORLAKE_S,		RFDS),
+	VULNBL_INTEL(		ATOM_GRACEMONT,		RFDS),
+	VULNBL_INTEL(		ATOM_TREMONT,		MMIO | MMIO_SBDS | RFDS),
+	VULNBL_INTEL(		ATOM_TREMONT_D,		MMIO | RFDS),
+	VULNBL_INTEL(		ATOM_TREMONT_L,		MMIO | MMIO_SBDS | RFDS),
+	VULNBL_INTEL(		ATOM_GOLDMONT,		RFDS),
+	VULNBL_INTEL(		ATOM_GOLDMONT_D,	RFDS),
+	VULNBL_INTEL(		ATOM_GOLDMONT_PLUS,	RFDS),
 
 	VULNBL_AMD(0x15, RETBLEED),
 	VULNBL_AMD(0x16, RETBLEED),

next prev parent reply	other threads:[~2024-07-03 18:26 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-06-27 20:44 [PATCH v2 0/9] Add CPU-type to topology Pawan Gupta
2024-06-27 20:44 ` [PATCH PATCH v2 1/9] x86/cpu/topology: Add CPU type to struct cpuinfo_topology Pawan Gupta
2024-06-28  8:03   ` Borislav Petkov
2024-06-28 17:32     ` [PATCH " Pawan Gupta
2024-07-03 23:07       ` Borislav Petkov
2024-07-09  1:24         ` Pawan Gupta
2024-07-09 12:45           ` Borislav Petkov
2024-06-27 20:44 ` [PATCH PATCH v2 2/9] cpufreq: intel_pstate: Use topology_cpu_type() Pawan Gupta
2024-07-01 17:08   ` Rafael J. Wysocki
2024-07-01 17:14     ` Pawan Gupta
2024-06-27 20:44 ` [PATCH PATCH v2 3/9] perf/x86/intel: Use topology_hw_cpu_type() Pawan Gupta
2024-06-28  8:59   ` Mi, Dapeng
2024-06-28 18:51     ` [PATCH " Pawan Gupta
2024-07-01  3:37       ` Mi, Dapeng
2024-07-01 17:32         ` Pawan Gupta
2024-06-27 20:44 ` [PATCH PATCH v2 4/9] x86/cpu: Remove get_this_hybrid_cpu_type() Pawan Gupta
2024-06-27 20:44 ` [PATCH PATCH v2 5/9] x86/cpu: Name CPU matching macro more generically (and shorten) Pawan Gupta
2024-06-27 20:44 ` [PATCH PATCH v2 6/9] x86/cpu: Add cpu_type to struct x86_cpu_id Pawan Gupta
2024-06-27 20:44 ` [PATCH PATCH v2 7/9] x86/cpu: Update x86_match_cpu() to also use cpu-type Pawan Gupta
2024-06-27 20:44 ` [PATCH PATCH v2 8/9] x86/bugs: Declutter vulnerable CPU list Pawan Gupta
2024-07-03  1:00   ` Josh Poimboeuf
2024-07-03 18:09     ` Pawan Gupta
2024-06-27 20:44 ` [PATCH PATCH v2 9/9] x86/rfds: Exclude P-only parts from the RFDS affected list Pawan Gupta
2024-07-03  1:04   ` Josh Poimboeuf
2024-07-03 18:26     ` Pawan Gupta [this message]
2024-07-03 22:04       ` Josh Poimboeuf

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:151c2377df2 dfblob:75bbdf0cf8a )
 OR (
bs:"Re: [PATCH PATCH v2 9/9] x86/rfds: Exclude P-only parts from the RFDS affected list" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240703182613.4vfaoxl344mdanxn@desk \
    --to=pawan.kumar.gupta@linux.intel.com \
    --cc=Perry.Yuan@amd.com \
    --cc=andrew.cooper3@citrix.com \
    --cc=bp@alien8.de \
    --cc=brice.goglin@gmail.com \
    --cc=daniel.sneddon@linux.intel.com \
    --cc=dapeng1.mi@linux.intel.com \
    --cc=dave.hansen@linux.intel.com \
    --cc=jpoimboe@kernel.org \
    --cc=kan.liang@linux.intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-perf-users@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=mario.limonciello@amd.com \
    --cc=mingo@redhat.com \
    --cc=rafael@kernel.org \
    --cc=ricardo.neri-calderon@linux.intel.com \
    --cc=srinivas.pandruvada@linux.intel.com \
    --cc=tglx@linutronix.de \
    --cc=tony.luck@intel.com \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox