clocksource: Use pr_info() for "Checking clocksource synchronization" message
PATCH v4 1/2 clocksource: Use pr_info() for "Checking clocksource synchronization" message
The "Checking clocksource synchronization" message is normally printed when clocksource_verify_percpu() is called for a given clocksource if both the CLOCK_SOURCE_UNSTABLE and CLOCK_SOURCE_VERIFY_PERCPU flags are set. It is an informational message and so pr_info() should be used instead of pr_warn().
--- kernel/time/clocksource.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/time/clocksource.c +2 -1
@@ -382,7 +382,8 @@ void clocksource_verify_percpu(struct clocksource *cs)return ; } testcpu =smp_processor_id (); -pr_warn ("Checking clocksource %s synchronization from CPU %d to CPUs %*pbl.\n" , cs->name, testcpu,cpumask_pr_args (&cpus_chosen)); +pr_info ("Checking clocksource %s synchronization from CPU %d to CPUs %*pbl.\n" , + cs->name, testcpu,cpumask_pr_args (&cpus_chosen));for_each_cpu (cpu, &cpus_chosen) {if (cpu == testcpu)continue ;
Signature · 1 line
2.48.1
PATCH v4 2/2 clocksource: Use migrate_disable() to avoid calling get_random_u32() in atomic context
The following bug report happened with a PREEMPT_RT kernel.
[ 30.957705] BUG: sleeping function called from invalid context at kernel/locking/spinlock_rt.c:48 [ 30.957711] in_atomic(): 1, irqs_disabled(): 0, non_block: 0, pid: 2012, name: kwatchdog [ 30.962673] preempt_count: 1, expected: 0 [ 30.962676] RCU nest depth: 0, expected: 0
It is due to the fact that clocksource_verify_choose_cpus() is invoked with preemption disabled. This function invokes get_random_u32() to obtain random numbers for choosing CPUs. The batched_entropy_32 local lock and/or the base_crng.lock spinlock in driver/char/random.c will be acquired during the call. In PREEMPT_RT kernel, they are both sleeping locks and so cannot be acquired in atomic context.
Fix this problem by using migrate_disable() to allow smp_processor_id() to be reliably used without introducing atomic context. The preempt_disable() function is then called after clocksource_verify_choose_cpus() but before the clocksource measurement is being run to avoid introducing unexpected latency.
--- kernel/time/clocksource.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
kernel/time/clocksource.c +4 -2
@@ -373,10 +373,10 @@ void clocksource_verify_percpu(struct clocksource *cs)cpumask_clear (&cpus_ahead);cpumask_clear (&cpus_behind);cpus_read_lock (); -preempt_disable (); +migrate_disable ();clocksource_verify_choose_cpus ();if (cpumask_empty (&cpus_chosen)) { -preempt_enable (); +migrate_enable ();cpus_read_unlock ();pr_warn ("Not enough CPUs to check clocksource '%s'.\n" , cs->name);return ;
@@ -384,6 +384,7 @@ void clocksource_verify_percpu(struct clocksource *cs) testcpu =smp_processor_id ();pr_info ("Checking clocksource %s synchronization from CPU %d to CPUs %*pbl.\n" , cs->name, testcpu,cpumask_pr_args (&cpus_chosen)); +preempt_disable ();for_each_cpu (cpu, &cpus_chosen) {if (cpu == testcpu)continue ;
@@ -403,6 +404,7 @@ void clocksource_verify_percpu(struct clocksource *cs) cs_nsec_min = cs_nsec; }preempt_enable (); +migrate_enable ();cpus_read_unlock ();if (!cpumask_empty (&cpus_ahead)) pr_warn(" CPUs %*pbl ahead of CPU %d for clocksource %s.\n",
Signature · 1 line
2.48.1
Re: [PATCH v4 2/2] clocksource: Use migrate_disable() to avoid calling get_random_u32() in atomic context
Quoted 20 lines · Waiman Long
The following bug report happened with a
PREEMPT_RTkernel.[ 30.957705] BUG: sleeping function called from invalid context at kernel/locking/spinlock_rt.c:48 [ 30.957711] in_atomic(): 1, irqs_disabled(): 0, non_block: 0, pid: 2012, name: kwatchdog [ 30.962673] preempt_count: 1, expected: 0 [ 30.962676] RCU nest depth: 0, expected: 0It is due to the fact that
clocksource_verify_choose_cpus()is invoked with preemption disabled. This function invokesget_random_u32()to obtain random numbers for choosing CPUs. Thebatched_entropy_32local lock and/or the base_crng.lock spinlock indriver/char/random.cwill be acquired during the call. InPREEMPT_RTkernel, they are both sleeping locks and so cannot be acquired in atomic context.Fix this problem by using
migrate_disable()to allowsmp_processor_id()to be reliably used without introducing atomic context. Thepreempt_disable()function is then called afterclocksource_verify_choose_cpus()but before the clocksource measurement is being run to avoid introducing unexpected latency.
Quoted 3 lines
Fixes 7560c02bdffb ("clocksource: Check per-CPU clock synchronization when marked unstable")Suggested-by Sebastian Andrzej Siewior <[email protected]>Signed-off-by Waiman Long <[email protected]>
Quoted 40 lines
--- kernel/time/clocksource.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)kernel/time/clocksource.c +4
-2@@ -373,10 +373,10 @@ void clocksource_verify_percpu(struct clocksource *cs)cpumask_clear (&cpus_ahead);cpumask_clear (&cpus_behind);cpus_read_lock (); -preempt_disable (); +migrate_disable ();clocksource_verify_choose_cpus ();if (cpumask_empty (&cpus_chosen)) { -preempt_enable (); +migrate_enable ();cpus_read_unlock ();pr_warn ("Not enough CPUs to check clocksource '%s'.\n" , cs->name);return ;@@ -384,6 +384,7 @@ void clocksource_verify_percpu(struct clocksource *cs) testcpu =smp_processor_id ();pr_info ("Checking clocksource %s synchronization from CPU %d to CPUs %*pbl.\n" , cs->name, testcpu,cpumask_pr_args (&cpus_chosen)); +preempt_disable ();for_each_cpu (cpu, &cpus_chosen) {if (cpu == testcpu)continue ;@@ -403,6 +404,7 @@ void clocksource_verify_percpu(struct clocksource *cs) cs_nsec_min = cs_nsec; }preempt_enable (); +migrate_enable ();cpus_read_unlock ();if (!cpumask_empty (&cpus_ahead)) pr_warn(" CPUs %*pbl ahead of CPU %d for clocksource %s.\n",Signature · 1 line
2.48.1
Re: [PATCH v4 2/2] clocksource: Use migrate_disable() to avoid calling get_random_u32() in atomic context
In reply to Waiman LongQuoted 20 lines · Waiman Long
The following bug report happened with a
PREEMPT_RTkernel.[ 30.957705] BUG: sleeping function called from invalid context at kernel/locking/spinlock_rt.c:48 [ 30.957711] in_atomic(): 1, irqs_disabled(): 0, non_block: 0, pid: 2012, name: kwatchdog [ 30.962673] preempt_count: 1, expected: 0 [ 30.962676] RCU nest depth: 0, expected: 0It is due to the fact that
clocksource_verify_choose_cpus()is invoked with preemption disabled. This function invokesget_random_u32()to obtain random numbers for choosing CPUs. Thebatched_entropy_32local lock and/or the base_crng.lock spinlock indriver/char/random.cwill be acquired during the call. InPREEMPT_RTkernel, they are both sleeping locks and so cannot be acquired in atomic context.Fix this problem by using
migrate_disable()to allowsmp_processor_id()to be reliably used without introducing atomic context. Thepreempt_disable()function is then called afterclocksource_verify_choose_cpus()but before the clocksource measurement is being run to avoid introducing unexpected latency.
Quoted 3 lines
Fixes 7560c02bdffb ("clocksource: Check per-CPU clock synchronization when marked unstable")Suggested-by Sebastian Andrzej Siewior <[email protected]>Signed-off-by Waiman Long <[email protected]>
I would have moved the preempt-disable into the for_each_cpu() loop. But given that the clocksource is only updated on boot and by the watchdog this does not matter at runtime.
Sebastian
[tip: timers/urgent] clocksource: Use migrate_disable() to avoid calling get_random_u32() in atomic context
In reply to Waiman LongThe following commit has been merged into the timers/urgent branch of tip:
The following commit has been merged into the timers/urgent branch of tip:
Commit-ID: 6bb05a33337b2c842373857b63de5c9bf1ae2a09 Gitweb: https://git.kernel.org/tip/6bb05a33337b2c842373857b63de5c9bf1ae2a09 Author: Waiman Long <[email protected]> AuthorDate: Fri, 31 Jan 2025 12:33:23 -05:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Mon, 03 Feb 2025 16:18:56 +01:00
clocksource: Use migrate_disable() to avoid calling get_random_u32() in atomic context
The following bug report happened with a PREEMPT_RT kernel:
BUG: sleeping function called from invalid context at kernel/locking/spinlock_rt.c:48 in_atomic(): 1, irqs_disabled(): 0, non_block: 0, pid: 2012, name: kwatchdog preempt_count: 1, expected: 0 RCU nest depth: 0, expected: 0 get_random_u32+0x4f/0x110 clocksource_verify_choose_cpus+0xab/0x1a0 clocksource_verify_percpu.part.0+0x6b/0x330 clocksource_watchdog_kthread+0x193/0x1a0
It is due to the fact that clocksource_verify_choose_cpus() is invoked with preemption disabled. This function invokes get_random_u32() to obtain random numbers for choosing CPUs. The batched_entropy_32 local lock and/or the base_crng.lock spinlock in driver/char/random.c will be acquired during the call. In PREEMPT_RT kernel, they are both sleeping locks and so cannot be acquired in atomic context.
Fix this problem by using migrate_disable() to allow smp_processor_id() to be reliably used without introducing atomic context. preempt_disable() is then called after clocksource_verify_choose_cpus() but before the clocksource measurement is being run to avoid introducing unexpected latency.
--- kernel/time/clocksource.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
kernel/time/clocksource.c +4 -2
@@ -373,10 +373,10 @@ void clocksource_verify_percpu(struct clocksource *cs)cpumask_clear (&cpus_ahead);cpumask_clear (&cpus_behind);cpus_read_lock (); -preempt_disable (); +migrate_disable ();clocksource_verify_choose_cpus ();if (cpumask_empty (&cpus_chosen)) { -preempt_enable (); +migrate_enable ();cpus_read_unlock ();pr_warn ("Not enough CPUs to check clocksource '%s'.\n" , cs->name);return ;
@@ -384,6 +384,7 @@ void clocksource_verify_percpu(struct clocksource *cs) testcpu =smp_processor_id ();pr_info ("Checking clocksource %s synchronization from CPU %d to CPUs %*pbl.\n" , cs->name, testcpu,cpumask_pr_args (&cpus_chosen)); +preempt_disable ();for_each_cpu (cpu, &cpus_chosen) {if (cpu == testcpu)continue ;
@@ -403,6 +404,7 @@ void clocksource_verify_percpu(struct clocksource *cs) cs_nsec_min = cs_nsec; }preempt_enable (); +migrate_enable ();cpus_read_unlock ();if (!cpumask_empty (&cpus_ahead)) pr_warn(" CPUs %*pbl ahead of CPU %d for clocksource %s.\n",