Skip to contentSkip to conversation

powerpc/pseries: avoid harmless preempt warning

PATCH Applied Nicholas Piggin 3 participants 4 messages Mar 20, 2020 – Mar 26, 2020 PowerPC

lore
Share & tools
lore

Nicholas Piggin

author reviewer
#0 lore raw

PATCH 1/1 powerpc/pseries: avoid harmless preempt warning

---
 arch/powerpc/platforms/pseries/lpar.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
arch/powerpc/platforms/pseries/lpar.c +9 -1
index 3c3da25b445c..e4ed5317f117 100644
@@ -636,8 +636,16 @@ static const struct proc_ops vcpudispatch_stats_freq_proc_ops = {
 
 static int __init vcpudispatch_stats_procfs_init(void)
 {
-	if (!lppaca_shared_proc(get_lppaca()))
+	/*
+	 * Avoid smp_processor_id while preemptible. All CPUs should have
+	 * the same value for lppaca_shared_proc.
+	 */
+	preempt_disable();
+	if (!lppaca_shared_proc(get_lppaca())) {
+		preempt_enable();
 		return 0;
+	}
+	preempt_enable();
 
 	if (!proc_create("powerpc/vcpudispatch_stats", 0600, NULL,
 					&vcpudispatch_stats_proc_ops))
Signature · 1 line
2.23.0
#1 lore raw

Le 20/03/2020 à 16:24, Nicholas Piggin a écrit :

Quoted 14 lines
---
  arch/powerpc/platforms/pseries/lpar.c | 10 +++++++++-
  1 file changed, 9 insertions(+), 1 deletion(-)
arch/powerpc/platforms/pseries/lpar.c +0 -1
index 3c3da25b445c..e4ed5317f117 100644
@@ -636,8 +636,16 @@ static const struct proc_ops vcpudispatch_stats_freq_proc_ops = {
 
  static int __init vcpudispatch_stats_procfs_init(void)
  {
-	if (!lppaca_shared_proc(get_lppaca()))

arch/powerpc/platforms/pseries/lpar.c static const struct proc_ops vcpudispatch_stats_freq_proc_ops = { · line 648

Quoted 10 lines
arch/powerpc/platforms/pseries/lpar.c +9 -0
+	/*
+	 * Avoid smp_processor_id while preemptible. All CPUs should have
+	 * the same value for lppaca_shared_proc.
+	 */
+	preempt_disable();
+	if (!lppaca_shared_proc(get_lppaca())) {
+		preempt_enable();
  		return 0;
+	}
+	preempt_enable();

Can we avoid the double preempt_enable() with something like:

	preempt_disable();
	is_shared = lppaca_shared_proc(get_lppaca());
	preempt_enable();
	if (!is_shared)
		return 0;

arch/powerpc/platforms/pseries/lpar.c static const struct proc_ops vcpudispatch_stats_freq_proc_ops = {

Quoted 4 lines
arch/powerpc/platforms/pseries/lpar.c +0 -0
  	if (!proc_create("powerpc/vcpudispatch_stats", 0600, NULL,
  					&vcpudispatch_stats_proc_ops))
 

Christophe

author reviewer
#2 lore raw

Christophe Leroy's on March 21, 2020 1:33 am:

Quoted 30 lines

Le 20/03/2020 à 16:24, Nicholas Piggin a écrit :

Quoted 14 lines
---
  arch/powerpc/platforms/pseries/lpar.c | 10 +++++++++-
  1 file changed, 9 insertions(+), 1 deletion(-)
arch/powerpc/platforms/pseries/lpar.c +0 -1
index 3c3da25b445c..e4ed5317f117 100644
@@ -636,8 +636,16 @@ static const struct proc_ops vcpudispatch_stats_freq_proc_ops = {
 
  static int __init vcpudispatch_stats_procfs_init(void)
  {
-	if (!lppaca_shared_proc(get_lppaca()))

arch/powerpc/platforms/pseries/lpar.c static const struct proc_ops vcpudispatch_stats_freq_proc_ops = { · line 648

Quoted 10 lines
arch/powerpc/platforms/pseries/lpar.c +9 -0
+	/*
+	 * Avoid smp_processor_id while preemptible. All CPUs should have
+	 * the same value for lppaca_shared_proc.
+	 */
+	preempt_disable();
+	if (!lppaca_shared_proc(get_lppaca())) {
+		preempt_enable();
  		return 0;
+	}
+	preempt_enable();

Can we avoid the double preempt_enable() with something like:

Quoted 5 lines
	preempt_disable();
	is_shared = lppaca_shared_proc(get_lppaca());
	preempt_enable();
	if (!is_shared)
		return 0;

I don't mind too much. Same number of lines.

Thanks,
Nick