rcu/nocb: Fix dump_tree hierarchy print always active
PATCH 1/1 rcu/nocb: Fix dump_tree hierarchy print always active
Commit 18cd8c93e69e ("rcu/nocb: Print gp/cb kthread hierarchy if dump_tree") added print statements to rcu_organize_nocb_kthreads for debugging, but incorrectly guarded them, causing the function to always spew out its message.
This patch fixes it by guarding both pr_alert statements with dump_tree, while also changing the second pr_alert to a pr_cont, to print the hierarchy in a single line (assuming that's how it was supposed to work).
---
First time contributing to the kernel, hope I'm doing this right :)
kernel/rcu/tree_plugin.h | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
kernel/rcu/tree_plugin.h +9 -5
@@ -2346,15 +2346,19 @@ static void __init rcu_organize_nocb_kthreads(void) nl =DIV_ROUND_UP (rdp->cpu +1 , ls) * ls; rdp->nocb_gp_rdp = rdp; rdp_gp = rdp; -if (!firsttime && dump_tree) -pr_cont ("\n" ); - firsttime = false; -pr_alert ("%s: No-CB GP kthread CPU %d:" , __func__, cpu); +if (dump_tree) { +if (!firsttime) +pr_cont ("\n" ); + firsttime = false; +pr_alert ("%s: No-CB GP kthread CPU %d:" , + __func__, cpu); + } }else {/* Another CB kthread, link to previous GP kthread. */ rdp->nocb_gp_rdp = rdp_gp; rdp_prev->nocb_next_cb_rdp = rdp; -pr_alert (" %d" , cpu); +if (dump_tree) +pr_cont (" %d" , cpu); } rdp_prev = rdp; }
Signature · 1 line
2.23.0
Paul E. McKenney
maintainerQuoted 5 lines · Stefan Reiter
Commit
18cd8c93e69e("rcu/nocb: Print gp/cb kthread hierarchy ifdump_tree") added print statements torcu_organize_nocb_kthreadsfor debugging, but incorrectly guarded them, causing the function to always spew out its message.
Quoted 7 lines
This patch fixes it by guarding both
pr_alertstatements withdump_tree, while also changing the secondpr_alertto apr_cont, to print the hierarchy in a single line (assuming that's how it was supposed to work).Fixes 18cd8c93e69e ("rcu/nocb: Print gp/cb kthread hierarchy if dump_tree")Signed-off-by Stefan Reiter <[email protected]>
Queued for testing and review, thank you!
Quoted 3 lines
---
First time contributing to the kernel, hope I'm doing this right :)
Looks good so far. Then again, I just kicked off the tests. ;-)
Thanx, Paul
Quoted 36 lines
kernel/rcu/tree_plugin.h | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)kernel/rcu/tree_plugin.h +9
-5@@ -2346,15 +2346,19 @@ static void __init rcu_organize_nocb_kthreads(void) nl =DIV_ROUND_UP (rdp->cpu +1 , ls) * ls; rdp->nocb_gp_rdp = rdp; rdp_gp = rdp; -if (!firsttime && dump_tree) -pr_cont ("\n" ); - firsttime = false; -pr_alert ("%s: No-CB GP kthread CPU %d:" , __func__, cpu); +if (dump_tree) { +if (!firsttime) +pr_cont ("\n" ); + firsttime = false; +pr_alert ("%s: No-CB GP kthread CPU %d:" , + __func__, cpu); + } }else {/* Another CB kthread, link to previous GP kthread. */ rdp->nocb_gp_rdp = rdp_gp; rdp_prev->nocb_next_cb_rdp = rdp; -pr_alert (" %d" , cpu); +if (dump_tree) +pr_cont (" %d" , cpu); } rdp_prev = rdp; }Signature · 1 line
2.23.0
Paul E. McKenney
maintainerQuoted 11 lines · Paul E. McKenney
Quoted 10 lines · Stefan Reiter
Commit
18cd8c93e69e("rcu/nocb: Print gp/cb kthread hierarchy ifdump_tree") added print statements torcu_organize_nocb_kthreadsfor debugging, but incorrectly guarded them, causing the function to always spew out its message.This patch fixes it by guarding both
pr_alertstatements withdump_tree, while also changing the secondpr_alertto apr_cont, to print the hierarchy in a single line (assuming that's how it was supposed to work).
Quoted 4 lines
Quoted 2 lines
Fixes 18cd8c93e69e ("rcu/nocb: Print gp/cb kthread hierarchy if dump_tree")Signed-off-by Stefan Reiter <[email protected]>Queued for testing and review, thank you!
And here is an updated version to make the special case of a nocb GP kthread having no other nocb CB kthreads look less strange. Does this work for you?
Thanx, Paul
------------------------------------------------------------------------
commit e6223b0705369750990c32ddc80251942e61be30
Author: Stefan Reiter <[email protected]> Date: Fri Oct 4 19:49:10 2019 +0000
rcu/nocb: Fix dump_tree hierarchy print always active
Commit 18cd8c93e69e ("rcu/nocb: Print gp/cb kthread hierarchy if dump_tree") added print statements to rcu_organize_nocb_kthreads for debugging, but incorrectly guarded them, causing the function to always spew out its message.
This patch fixes it by guarding both pr_alert statements with dump_tree, while also changing the second pr_alert to a pr_cont, to print the hierarchy in a single line (assuming that's how it was supposed to work).
kernel/rcu/tree_plugin.h +17 -5
@@ -2295,6 +2295,8 @@ static void __init rcu_organize_nocb_kthreads(void) {int cpu;bool firsttime = true; +bool gotnocbs = false; +bool gotnocbscbs = true;int ls = rcu_nocb_gp_stride;int nl =0 ;/* Next GP kthread. */ struct rcu_data *rdp;
@@ -2317,21 +2319,31 @@ static void __init rcu_organize_nocb_kthreads(void) rdp =per_cpu_ptr (&rcu_data, cpu);if (rdp->cpu >= nl) {/* New GP kthread, set up for CBs & next GP. */ + gotnocbs = true; nl =DIV_ROUND_UP (rdp->cpu +1 , ls) * ls; rdp->nocb_gp_rdp = rdp; rdp_gp = rdp; -if (!firsttime && dump_tree) -pr_cont ("\n" ); - firsttime = false; -pr_alert ("%s: No-CB GP kthread CPU %d:" , __func__, cpu); +if (dump_tree) { +if (!firsttime) +pr_cont ("%s\n" , gotnocbscbs + ?"" :" (self only)" ); + gotnocbscbs = false; + firsttime = false; +pr_alert ("%s: No-CB GP kthread CPU %d:" , + __func__, cpu); + } }else {/* Another CB kthread, link to previous GP kthread. */ + gotnocbscbs = true; rdp->nocb_gp_rdp = rdp_gp; rdp_prev->nocb_next_cb_rdp = rdp; -pr_alert (" %d" , cpu); +if (dump_tree) +pr_cont (" %d" , cpu); } rdp_prev = rdp; } +if (gotnocbs && dump_tree) +pr_cont ("%s\n" , gotnocbscbs ?"" :" (self only)" ); }/*
Quoted 13 lines · Paul E. McKenney
Quoted 11 lines · Paul E. McKenney
Quoted 10 lines · Stefan Reiter
Commit
18cd8c93e69e("rcu/nocb: Print gp/cb kthread hierarchy ifdump_tree") added print statements torcu_organize_nocb_kthreadsfor debugging, but incorrectly guarded them, causing the function to always spew out its message.This patch fixes it by guarding both
pr_alertstatements withdump_tree, while also changing the secondpr_alertto apr_cont, to print the hierarchy in a single line (assuming that's how it was supposed to work).
Quoted 8 lines
Quoted 4 lines
Quoted 2 lines
Fixes 18cd8c93e69e ("rcu/nocb: Print gp/cb kthread hierarchy if dump_tree")Signed-off-by Stefan Reiter <[email protected]>Queued for testing and review, thank you!
And here is an updated version to make the special case of a nocb GP kthread having no other nocb CB kthreads look less strange. Does this work for you?
Tested just now, works for me. Thanks for the additional fix!
Quoted 77 lines
Thanx, Paul
------------------------------------------------------------------------
commit
e6223b0705369750990c32ddc80251942e61be30Author: Stefan Reiter <[email protected]> Date: Fri Oct 4 19:49:10 2019 +0000rcu/nocb: Fix
dump_treehierarchy print always activeCommit
18cd8c93e69e("rcu/nocb: Print gp/cb kthread hierarchy ifdump_tree") added print statements torcu_organize_nocb_kthreadsfor debugging, but incorrectly guarded them, causing the function to always spew out its message.This patch fixes it by guarding both
pr_alertstatements withdump_tree, while also changing the secondpr_alertto apr_cont, to print the hierarchy in a single line (assuming that's how it was supposed to work).Fixes 18cd8c93e69e ("rcu/nocb: Print gp/cb kthread hierarchy if dump_tree")Signed-off-by Stefan Reiter <[email protected]>[ paulmck: Make single-nocbs-CPU GP kthreads look less erroneous. ]Signed-off-by Paul E. McKenney <[email protected]>kernel/rcu/tree_plugin.h +17
-5@@ -2295,6 +2295,8 @@ static void __init rcu_organize_nocb_kthreads(void) {int cpu;bool firsttime = true; +bool gotnocbs = false; +bool gotnocbscbs = true;int ls = rcu_nocb_gp_stride;int nl =0 ;/* Next GP kthread. */ struct rcu_data *rdp;@@ -2317,21 +2319,31 @@ static void __init rcu_organize_nocb_kthreads(void) rdp =per_cpu_ptr (&rcu_data, cpu);if (rdp->cpu >= nl) {/* New GP kthread, set up for CBs & next GP. */ + gotnocbs = true; nl =DIV_ROUND_UP (rdp->cpu +1 , ls) * ls; rdp->nocb_gp_rdp = rdp; rdp_gp = rdp; -if (!firsttime && dump_tree) -pr_cont ("\n" ); - firsttime = false; -pr_alert ("%s: No-CB GP kthread CPU %d:" , __func__, cpu); +if (dump_tree) { +if (!firsttime) +pr_cont ("%s\n" , gotnocbscbs + ?"" :" (self only)" ); + gotnocbscbs = false; + firsttime = false; +pr_alert ("%s: No-CB GP kthread CPU %d:" , + __func__, cpu); + } }else {/* Another CB kthread, link to previous GP kthread. */ + gotnocbscbs = true; rdp->nocb_gp_rdp = rdp_gp; rdp_prev->nocb_next_cb_rdp = rdp; -pr_alert (" %d" , cpu); +if (dump_tree) +pr_cont (" %d" , cpu); } rdp_prev = rdp; } +if (gotnocbs && dump_tree) +pr_cont ("%s\n" , gotnocbscbs ?"" :" (self only)" ); }/*