Skip to contentSkip to conversation

rcu: Align stall warning 'idle=' output with documentation

PATCH Superseded Donglin Peng 4 participants 5 messages Jan 4 – Jan 5 RCU

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 rcu: Align stall warning 'idle=' output with documentation

From: Donglin Peng <[email protected]>

The RCU stall warning message includes an "idle=" field to indicate the dyntick-idle state of a CPU. According to Documentation/RCU/stallwarn.rst, the hexadecimal number before the first '/' represents the low-order 16 bits of the dynticks counter. An even value denotes that the CPU is in dyntick-idle mode, while an odd value indicates otherwise.

This was accurate until commit 171476775d32 ("context_tracking: Convert state to atomic_t"), which merged the context tracking state and the dynticks counter into a single atomic value. Consequently, the value printed in the stall warning
no longer directly corresponds to the documented dynticks counter bits.

To restore consistency between the code's output and the documentation, right-shift the merged atomic state value to extract and display the correct low-order bits of the dynticks counter.

Fixes 171476775d32 ("context_tracking: Convert state to atomic_t")
---
 kernel/rcu/tree_stall.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/rcu/tree_stall.h +1 -1
index b67532cb8770..d25cc826d77a 100644
@@ -555,7 +555,7 @@ static void print_cpu_stall_info(int cpu)
 			rdp->rcu_iw_pending ? (int)min(delta, 9UL) + '0' :
 				"!."[!delta],
 	       ticks_value, ticks_title,
-	       ct_rcu_watching_cpu(cpu) & 0xffff,
+	       (ct_rcu_watching_cpu(cpu) >> ilog2(CT_RCU_WATCHING)) & 0xffff,
 	       ct_nesting_cpu(cpu), ct_nmi_nesting_cpu(cpu),
 	       rdp->softirq_snap, kstat_softirqs_cpu(RCU_SOFTIRQ, cpu),
 	       data_race(rcu_state.n_force_qs) - rcu_state.n_force_qs_gpstart,
Signature · 1 line
2.34.1
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 13 lines · Donglin Peng

From: Donglin Peng <[email protected]>

The RCU stall warning message includes an "idle=" field to indicate the dyntick-idle state of a CPU. According to Documentation/RCU/stallwarn.rst, the hexadecimal number before the first '/' represents the low-order 16 bits of the dynticks counter. An even value denotes that the CPU is in dyntick-idle mode, while an odd value indicates otherwise.

This was accurate until commit 171476775d32 ("context_tracking: Convert state to atomic_t"), which merged the context tracking state and the dynticks counter into a single atomic value. Consequently, the value printed in the stall warning
no longer directly corresponds to the documented dynticks counter bits.

Quoted 6 lines

To restore consistency between the code's output and the documentation, right-shift the merged atomic state value to extract and display the correct low-order bits of the dynticks counter.

Fixes 171476775d32 ("context_tracking: Convert state to atomic_t")

Looks good to me! Also nice use of ilog2() which resolves to a single shift right instruction per my testing (shift right of 2).

thanks,

- Joel

Quoted 20 lines
---
 kernel/rcu/tree_stall.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/rcu/tree_stall.h +1 -1
index b67532cb8770..d25cc826d77a 100644
@@ -555,7 +555,7 @@ static void print_cpu_stall_info(int cpu)
 			rdp->rcu_iw_pending ? (int)min(delta, 9UL) + '0' :
 				"!."[!delta],
 	       ticks_value, ticks_title,
-	       ct_rcu_watching_cpu(cpu) & 0xffff,
+	       (ct_rcu_watching_cpu(cpu) >> ilog2(CT_RCU_WATCHING)) & 0xffff,
 	       ct_nesting_cpu(cpu), ct_nmi_nesting_cpu(cpu),
 	       rdp->softirq_snap, kstat_softirqs_cpu(RCU_SOFTIRQ, cpu),
 	       data_race(rcu_state.n_force_qs) - rcu_state.n_force_qs_gpstart,
Signature · 1 line
2.34.1
reviewer
#2 lore raw
Quoted 24 lines · Donglin Peng
Quoted 15 lines

From: Donglin Peng <[email protected]>

The RCU stall warning message includes an "idle=" field to indicate the dyntick-idle state of a CPU. According to Documentation/RCU/stallwarn.rst, the hexadecimal number before the first '/' represents the low-order 16 bits of the dynticks counter. An even value denotes that the CPU is in dyntick-idle mode, while an odd value indicates otherwise.

This was accurate until commit 171476775d32 ("context_tracking: Convert state to atomic_t"), which merged the context tracking state and the dynticks counter into a single atomic value. Consequently, the value printed in the stall warning
no longer directly corresponds to the documented dynticks counter bits.

Quoted 7 lines

To restore consistency between the code's output and the documentation, right-shift the merged atomic state value to extract and display the correct low-order bits of the dynticks counter.

Fixes 171476775d32 ("context_tracking: Convert state to atomic_t")
Quoted 24 lines

Looks good to me! Also nice use of ilog2() which resolves to a single shift right instruction per my testing (shift right of 2).

thanks,

- Joel

Quoted 15 lines
---
 kernel/rcu/tree_stall.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/rcu/tree_stall.h b/kernel/rcu/tree_stall.h index b67532cb8770..d25cc826d77a 100644
--- a/kernel/rcu/tree_stall.h
+++ b/kernel/rcu/tree_stall.h
@@ -555,7 +555,7 @@ static void print_cpu_stall_info(int cpu) rdp->rcu_iw_pending ? (int)min(delta, 9UL) + '0' :
"!."[!delta],
ticks_value, ticks_title,
- ct_rcu_watching_cpu(cpu) & 0xffff,
+ (ct_rcu_watching_cpu(cpu) >> ilog2(CT_RCU_WATCHING)) & 0xffff,

May be also use CT_RCU_WATCHING_START to
replace ilog2(CT_RCU_WATCHING) operations? (I didn't actually test it)

Thanks
Zqiang

Quoted 7 lines
Quoted 6 lines

ct_nesting_cpu(cpu), ct_nmi_nesting_cpu(cpu), rdp->softirq_snap, kstat_softirqs_cpu(RCU_SOFTIRQ, cpu), data_race(rcu_state.n_force_qs) - rcu_state.n_force_qs_gpstart, --
2.34.1

#3 lore raw
Quoted 12 lines · Zqiang
Quoted 12 lines · Donglin Peng
Quoted 9 lines

From: Donglin Peng <[email protected]>

The RCU stall warning message includes an "idle=" field to indicate the dyntick-idle state of a CPU. According to Documentation/RCU/stallwarn.rst, the hexadecimal number before the first '/' represents the low-order 16 bits of the dynticks counter. An even value denotes that the CPU is in dyntick-idle mode, while an odd value indicates otherwise.

[...]

Quoted 16 lines
Quoted 13 lines
Quoted 13 lines
 kernel/rcu/tree_stall.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/rcu/tree_stall.h b/kernel/rcu/tree_stall.h index b67532cb8770..d25cc826d77a 100644
--- a/kernel/rcu/tree_stall.h
+++ b/kernel/rcu/tree_stall.h
@@ -555,7 +555,7 @@ static void print_cpu_stall_info(int cpu) rdp->rcu_iw_pending ? (int)min(delta, 9UL) + '0' :
"!."[!delta],
ticks_value, ticks_title,
- ct_rcu_watching_cpu(cpu) & 0xffff,
+ (ct_rcu_watching_cpu(cpu) >> ilog2(CT_RCU_WATCHING)) & 0xffff,

Quoted 2 lines

May be also use CT_RCU_WATCHING_START to
replace ilog2(CT_RCU_WATCHING) operations? (I didn't actually test it)

It should compile down to the same thing, but either is fine with me.

thanks,

- Joel

#4 lore raw
Quoted 31 lines · Joel Fernandes
Quoted 12 lines · Zqiang
Quoted 12 lines · Donglin Peng
Quoted 9 lines

From: Donglin Peng <[email protected]>

The RCU stall warning message includes an "idle=" field to indicate the dyntick-idle state of a CPU. According to Documentation/RCU/stallwarn.rst, the hexadecimal number before the first '/' represents the low-order 16 bits of the dynticks counter. An even value denotes that the CPU is in dyntick-idle mode, while an odd value indicates otherwise.

[...]

Quoted 16 lines
Quoted 13 lines
Quoted 13 lines
 kernel/rcu/tree_stall.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/rcu/tree_stall.h b/kernel/rcu/tree_stall.h index b67532cb8770..d25cc826d77a 100644
--- a/kernel/rcu/tree_stall.h
+++ b/kernel/rcu/tree_stall.h
@@ -555,7 +555,7 @@ static void print_cpu_stall_info(int cpu) rdp->rcu_iw_pending ? (int)min(delta, 9UL) + '0' :
"!."[!delta],
ticks_value, ticks_title,
- ct_rcu_watching_cpu(cpu) & 0xffff,
+ (ct_rcu_watching_cpu(cpu) >> ilog2(CT_RCU_WATCHING)) & 0xffff,

Quoted 2 lines
Quoted 2 lines

May be also use CT_RCU_WATCHING_START to
replace ilog2(CT_RCU_WATCHING) operations? (I didn't actually test it)

Thank you for the suggestion. I agree that using the CT_RCU_WATCHING_START macro is cleaner. I will fix it in the next version.

I noted that the CT_RCU_WATCHING_START macro was introduced in kernel version 6.19-rc1 by commit d1e6d2773898 ("rcu: Add a small-width RCU watching counter debug option").
Therefore, if this patch needs to be backported to older kernel versions that lack this macro, using ilog2(CT_RCU_WATCHING) would be the simpler, more compatible approach.

Quoted 6 lines

It should compile down to the same thing, but either is fine with me.

thanks,

- Joel