Skip to contentSkip to conversation

powerpc/64s: support nospectre_v2 cmdline option

PATCH Superseded Christopher M. Riedl 3 participants 4 messages May 7, 2019 PowerPC

v2 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 powerpc/64s: support nospectre_v2 cmdline option

Add support for disabling the kernel implemented spectre v2 mitigation (count cache flush on context switch) via the nospectre_v2 cmdline option.

---
v1->v2:
add call to toggle_count_cache_flush(false)

 arch/powerpc/kernel/security.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)
arch/powerpc/kernel/security.c +14 -2
index b33bafb8fcea..d775da9b9227 100644
@@ -28,7 +28,7 @@ static enum count_cache_flush_type count_cache_flush_type = COUNT_CACHE_FLUSH_NO
 bool barrier_nospec_enabled;
 static bool no_nospec;
 static bool btb_flush_enabled;
-#ifdef CONFIG_PPC_FSL_BOOK3E
+#if defined(CONFIG_PPC_FSL_BOOK3E) || defined(CONFIG_PPC_BOOK3S_64)
 static bool no_spectrev2;
 #endif
 
@@ -106,7 +106,7 @@ static __init int barrier_nospec_debugfs_init(void)
 device_initcall(barrier_nospec_debugfs_init);
 #endif /* CONFIG_DEBUG_FS */
 
-#ifdef CONFIG_PPC_FSL_BOOK3E
+#if defined(CONFIG_PPC_FSL_BOOK3E) || defined(CONFIG_PPC_BOOK3S_64)
 static int __init handle_nospectre_v2(char *p)
 {
 	no_spectrev2 = true;
@@ -114,6 +114,9 @@ static int __init handle_nospectre_v2(char *p)
 	return 0;
 }
 early_param("nospectre_v2", handle_nospectre_v2);
+#endif /* CONFIG_PPC_FSL_BOOK3E || CONFIG_PPC_BOOK3S_64 */
+
+#ifdef CONFIG_PPC_FSL_BOOK3E
 void setup_spectre_v2(void)
 {
 	if (no_spectrev2)
@@ -391,6 +394,15 @@ static void toggle_count_cache_flush(bool enable)
 
 void setup_count_cache_flush(void)
 {
+	if (no_spectrev2) {
+		if (security_ftr_enabled(SEC_FTR_BCCTRL_SERIALISED)
+		    || security_ftr_enabled(SEC_FTR_COUNT_CACHE_DISABLED))
+			pr_warn("Spectre v2 mitigations not under software control, can't disable\n");
+
+		toggle_count_cache_flush(false);
+		return;
+	}
+
 	toggle_count_cache_flush(true);
 }
 
Signature · 1 line
2.21.0
Reviewed-by on v2 1/1
#1 lore raw
Quoted 6 lines · Christopher M. Riedl

Add support for disabling the kernel implemented spectre v2 mitigation (count cache flush on context switch) via the nospectre_v2 cmdline option.

Quoted 56 lines

---
v1->v2:
add call to toggle_count_cache_flush(false)

  arch/powerpc/kernel/security.c | 16 ++++++++++++++--
  1 file changed, 14 insertions(+), 2 deletions(-)
arch/powerpc/kernel/security.c +14 -2
index b33bafb8fcea..d775da9b9227 100644
@@ -28,7 +28,7 @@ static enum count_cache_flush_type count_cache_flush_type = COUNT_CACHE_FLUSH_NO
  bool barrier_nospec_enabled;
  static bool no_nospec;
  static bool btb_flush_enabled;
-#ifdef CONFIG_PPC_FSL_BOOK3E
+#if defined(CONFIG_PPC_FSL_BOOK3E) || defined(CONFIG_PPC_BOOK3S_64)
  static bool no_spectrev2;
  #endif
 
@@ -106,7 +106,7 @@ static __init int barrier_nospec_debugfs_init(void)
  device_initcall(barrier_nospec_debugfs_init);
  #endif /* CONFIG_DEBUG_FS */
 
-#ifdef CONFIG_PPC_FSL_BOOK3E
+#if defined(CONFIG_PPC_FSL_BOOK3E) || defined(CONFIG_PPC_BOOK3S_64)
  static int __init handle_nospectre_v2(char *p)
  {
  	no_spectrev2 = true;
@@ -114,6 +114,9 @@ static int __init handle_nospectre_v2(char *p)
  	return 0;
  }
  early_param("nospectre_v2", handle_nospectre_v2);
+#endif /* CONFIG_PPC_FSL_BOOK3E || CONFIG_PPC_BOOK3S_64 */
+
+#ifdef CONFIG_PPC_FSL_BOOK3E
  void setup_spectre_v2(void)
  {
  	if (no_spectrev2)
@@ -391,6 +394,15 @@ static void toggle_count_cache_flush(bool enable)
 
  void setup_count_cache_flush(void)
  {
+	if (no_spectrev2) {
+		if (security_ftr_enabled(SEC_FTR_BCCTRL_SERIALISED)
+		    || security_ftr_enabled(SEC_FTR_COUNT_CACHE_DISABLED))
+			pr_warn("Spectre v2 mitigations not under software control, can't disable\n");
+
+		toggle_count_cache_flush(false);
+		return;
+	}
+
  	toggle_count_cache_flush(true);
  }
 
Signature · 2 lines
Andrew Donnellan              OzLabs, ADL Canberra
[email protected]             IBM Australia Limited
#2 lore raw
In reply to Christopher M. Riedl
Quoted 9 lines · Christopher M. Riedl
arch/powerpc/kernel/security.c +1 -0
index b33bafb8fcea..d775da9b9227 100644
@@ -391,6 +394,15 @@ static void toggle_count_cache_flush(bool enable)
 
 void setup_count_cache_flush(void)
 {
+	if (no_spectrev2) {

arch/powerpc/kernel/security.c static void toggle_count_cache_flush(bool enable) · line 407

Quoted 10 lines
arch/powerpc/kernel/security.c +8 -0
+		if (security_ftr_enabled(SEC_FTR_BCCTRL_SERIALISED)
+		    || security_ftr_enabled(SEC_FTR_COUNT_CACHE_DISABLED))
+			pr_warn("Spectre v2 mitigations not under software control, can't disable\n");
+
+		toggle_count_cache_flush(false);
+		return;
+	}
+
 	toggle_count_cache_flush(true);
 }

I'm nit-picking, but would it be better as:

void setup_count_cache_flush(void)

{
	bool enable = true;

	if (no_spectrev2) {
		if (security_ftr_enabled(SEC_FTR_BCCTRL_SERIALISED)
		    || security_ftr_enabled(SEC_FTR_COUNT_CACHE_DISABLED))
			pr_warn("Spectre v2 mitigations not under software control, can't disable\n");

		enable = false;
	}

	toggle_count_cache_flush(enable);
}

???

cheers

#3 lore raw
Quoted 11 lines · Michael Ellerman
Quoted 6 lines · Christopher M. Riedl
arch/powerpc/kernel/security.c +0 -0
index b33bafb8fcea..d775da9b9227 100644
@@ -391,6 +394,15 @@ static void toggle_count_cache_flush(bool enable)
 
Quoted 16 lines

arch/powerpc/kernel/security.c static void toggle_count_cache_flush(bool enable) · line 407

Quoted 13 lines
arch/powerpc/kernel/security.c +9 -0
 void setup_count_cache_flush(void)
 {
+	if (no_spectrev2) {
+		if (security_ftr_enabled(SEC_FTR_BCCTRL_SERIALISED)
+		    || security_ftr_enabled(SEC_FTR_COUNT_CACHE_DISABLED))
+			pr_warn("Spectre v2 mitigations not under software control, can't disable\n");
+
+		toggle_count_cache_flush(false);
+		return;
+	}
+
 	toggle_count_cache_flush(true);
 }

I'm nit-picking, but would it be better as:

Agreed, v3 is on the way :)

Quoted 19 lines

void setup_count_cache_flush(void)

{
	bool enable = true;

	if (no_spectrev2) {
		if (security_ftr_enabled(SEC_FTR_BCCTRL_SERIALISED)
		    || security_ftr_enabled(SEC_FTR_COUNT_CACHE_DISABLED))
			pr_warn("Spectre v2 mitigations not under software control, can't disable\n");

		enable = false;
	}

	toggle_count_cache_flush(enable);
}

???

cheers