Convert timekeeping core to use printk_deferred (v3)
Subsystems (3)
cover Convert timekeeping core to use printk_deferred (v3)
Recently, Jiri pointed out a potential deadlock when calling printk while holding the timekeeping seqlock.
Annoyingly, the seqlock lockdep enablement doesn't catch this, as printk disables lockdep.
When looking for possible solutions, one idea was to use a local buffer and defer the printk to later. Ends up there is already similar functionality in printk_sched() to avoid similar style deadlocks w/ the scheduler.
Thus this patchset (based on next/akpm) renames printk_sched to printk_deferred and then moves the affected timekeeping printks to make use of it.
There were some points in the discussion between Jan and Peter that made it seem that there may still be problems lurking in the console layer, and I'm not sure I fully understand their point, so this solution may be incomplete.
Additionally, the same issue likely affects any WARN_ONs as well, but I wanted to get some thoughts on this approach before trying to remove or convert affected WARN_ONS.
Your thoughts and feedback are greatly appreciated!
thanks
-john
Changes since v2:
* Renamed printk_once_deferred() to printk_deferred_once(), per Andrew's suggestion
* Changed adding irqsave/restore to preempt_disable/enable, per Jan's suggestion
Changes since v1:
* Rebased on next/akpm, since there are queued prink patches there
* Re-added irqsave/restore per irc discussion w/ PeterZ
John Stultz (4):
printk: Disable preemption for printk_sched
printk: Rename printk_sched to printk_deferred
printk: Add printk_deferred_once
timekeeping: Use printk_deferred when holding timekeeping seqlock
include/linux/printk.h | 17 ++++++++++++++--- kernel/printk/printk.c | 4 +++- kernel/sched/core.c | 2 +- kernel/sched/deadline.c | 7 +------ kernel/sched/rt.c | 8 +------- kernel/time/ntp.c | 15 +++++++++------ kernel/time/timekeeping.c | 7 ++++--- 7 files changed, 33 insertions(+), 27 deletions(-)
Signature · 1 line
1.9.1
PATCH 1/4 printk: Disable preemption for printk_sched
An earlier change in -mm (printk: remove separate printk_sched buffers...), removed the printk_sched irqsave/restore lines since it was safe for current users. Since we may be expanding usage of printk_sched(), disable preepmtion for this function to make it more generally safe to call.
--- kernel/printk/printk.c | 2 ++ 1 file changed, 2 insertions(+)
kernel/printk/printk.c +2 -0
@@ -2589,12 +2589,14 @@ int printk_sched(const char *fmt, ...)va_list args;int r; +preempt_disable ();va_start (args, fmt); r =vprintk_emit (0 ,SCHED_MESSAGE_LOGLEVEL ,NULL ,0 , fmt, args);va_end (args);__this_cpu_or (printk_pending,PRINTK_PENDING_OUTPUT );irq_work_queue (&__get_cpu_var (wake_up_klogd_work)); +preempt_enable ();return r; }
Signature · 1 line
1.9.1
Re: [PATCH 1/4] printk: Disable preemption for printk_sched
Quoted 5 lines · John Stultz
An earlier change in -mm (printk: remove separate
printk_schedbuffers...), removed theprintk_schedirqsave/restore lines since it was safe for current users. Since we may be expanding usage ofprintk_sched(), disable preepmtion for this function to make it more generally safe to call.
Looks good to me. You can add:
Honza
Quoted 35 lines
Cc Jan Kara <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Jiri Bohac <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Ingo Molnar <[email protected]>Cc Andrew Morton <[email protected]>Cc Steven Rostedt <[email protected]>Signed-off-by John Stultz <[email protected]>--- kernel/printk/printk.c | 2 ++ 1 file changed, 2 insertions(+)kernel/printk/printk.c +2
-0@@ -2589,12 +2589,14 @@ int printk_sched(const char *fmt, ...)va_list args;int r; +preempt_disable ();va_start (args, fmt); r =vprintk_emit (0 ,SCHED_MESSAGE_LOGLEVEL ,NULL ,0 , fmt, args);va_end (args);__this_cpu_or (printk_pending,PRINTK_PENDING_OUTPUT );irq_work_queue (&__get_cpu_var (wake_up_klogd_work)); +preempt_enable ();return r; }Signature · 1 line
1.9.1
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
PATCH 2/4 printk: Rename printk_sched to printk_deferred
In reply to John StultzAfter learning we'll need some sort of deferred printk functionality in the timekeeping core, Peter suggested we rename the printk_sched function so it can be reused by needed subsystems.
This only changes the function name. No logic changes.
--- include/linux/printk.h | 6 +++--- kernel/printk/printk.c | 2 +- kernel/sched/core.c | 2 +- kernel/sched/deadline.c | 2 +- kernel/sched/rt.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-)
include/linux/printk.h +3 -3
@@ -128,9 +128,9 @@ asmlinkage __printf(1, 2) __coldint printk (const char *fmt, ...);/* -* Special printk facility for scheduler use only, _DO_NOT_USE_ ! +* Special printk facility for scheduler/timekeeping use only, _DO_NOT_USE_ ! */ -__printf(1, 2) __cold int printk_sched(const char *fmt, ...); +__printf(1, 2) __cold int printk_deferred(const char *fmt, ...);/* * Please don't use printk_ratelimit(), because it shares ratelimiting state
@@ -165,7 +165,7 @@ int printk(const char *s, ...)return 0 ; } static inline __printf(1, 2) __cold -int printk_sched(const char *s, ...) +int printk_deferred(const char *s, ...) {return 0 ; }
kernel/printk/printk.c +1 -1
@@ -2584,7 +2584,7 @@ void wake_up_klogd(void)preempt_enable (); } -int printk_sched (const char *fmt, ...) +int printk_deferred (const char *fmt, ...) {va_list args;int r;
kernel/sched/core.c +1 -1
@@ -1336,7 +1336,7 @@ out:* leave kernel. */ if (p->mm &&printk_ratelimit ()) { -printk_sched ("process %d (%s) no longer affine to cpu%d\n" , +printk_deferred ("process %d (%s) no longer affine to cpu%d\n" ,task_pid_nr (p), p->comm, cpu); } }
kernel/sched/deadline.c +1 -1
@@ -352,7 +352,7 @@ static void replenish_dl_entity(struct sched_dl_entity *dl_se,if (!lag_once) { lag_once = true; -printk_sched ("sched: DL replenish lagged to much\n" ); +printk_deferred ("sched: DL replenish lagged to much\n" ); } dl_se->deadline =rq_clock (rq) + pi_se->dl_deadline; dl_se->runtime = pi_se->dl_runtime;
kernel/sched/rt.c +1 -1
@@ -896,7 +896,7 @@ static int sched_rt_runtime_exceeded(struct rt_rq *rt_rq)if (!once) { once = true; -printk_sched ("sched: RT throttling activated\n" ); +printk_deferred ("sched: RT throttling activated\n" ); } }else {/*
Signature · 1 line
1.9.1
Re: [PATCH 2/4] printk: Rename printk_sched to printk_deferred
Quoted 5 lines · John Stultz
After learning we'll need some sort of deferred printk functionality in the timekeeping core, Peter suggested we rename the
printk_schedfunction so it can be reused by needed subsystems.This only changes the function name. No logic changes.
Fine by me. You can add:
Honza
Quoted 98 lines
Cc Jan Kara <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Jiri Bohac <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Ingo Molnar <[email protected]>Cc Andrew Morton <[email protected]>Cc Steven Rostedt <[email protected]>Reviewed-by Steven Rostedt <[email protected]>Signed-off-by John Stultz <[email protected]>--- include/linux/printk.h | 6 +++--- kernel/printk/printk.c | 2 +- kernel/sched/core.c | 2 +- kernel/sched/deadline.c | 2 +- kernel/sched/rt.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-)include/linux/printk.h +3
-3@@ -128,9 +128,9 @@ asmlinkage __printf(1, 2) __coldint printk (const char *fmt, ...);/* -* Special printk facility for scheduler use only, _DO_NOT_USE_ ! +* Special printk facility for scheduler/timekeeping use only, _DO_NOT_USE_ ! */ -__printf(1, 2) __cold int printk_sched(const char *fmt, ...); +__printf(1, 2) __cold int printk_deferred(const char *fmt, ...);/* * Please don't use printk_ratelimit(), because it shares ratelimiting state @@ -165,7 +165,7 @@ int printk(const char *s, ...)return 0 ; } static inline __printf(1, 2) __cold -int printk_sched(const char *s, ...) +int printk_deferred(const char *s, ...) {return 0 ; }kernel/printk/printk.c +1
-1@@ -2584,7 +2584,7 @@ void wake_up_klogd(void)preempt_enable (); } -int printk_sched (const char *fmt, ...) +int printk_deferred (const char *fmt, ...) {va_list args;int r;kernel/sched/core.c +1
-1@@ -1336,7 +1336,7 @@ out:* leave kernel. */ if (p->mm &&printk_ratelimit ()) { -printk_sched ("process %d (%s) no longer affine to cpu%d\n" , +printk_deferred ("process %d (%s) no longer affine to cpu%d\n" ,task_pid_nr (p), p->comm, cpu); } }kernel/sched/deadline.c +1
-1@@ -352,7 +352,7 @@ static void replenish_dl_entity(struct sched_dl_entity *dl_se,if (!lag_once) { lag_once = true; -printk_sched ("sched: DL replenish lagged to much\n" ); +printk_deferred ("sched: DL replenish lagged to much\n" ); } dl_se->deadline =rq_clock (rq) + pi_se->dl_deadline; dl_se->runtime = pi_se->dl_runtime;kernel/sched/rt.c +1
-1@@ -896,7 +896,7 @@ static int sched_rt_runtime_exceeded(struct rt_rq *rt_rq)if (!once) { once = true; -printk_sched ("sched: RT throttling activated\n" ); +printk_deferred ("sched: RT throttling activated\n" ); } }else {/* Signature · 1 line
1.9.1
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
PATCH 3/4 printk: Add printk_deferred_once
In reply to John StultzTwo of the three prink_deferred uses are really printk_once style uses, so add a printk_deferred_once macro to simplify those call sites.
--- include/linux/printk.h | 11 +++++++++++ kernel/sched/deadline.c | 7 +------ kernel/sched/rt.c | 8 +------- 3 files changed, 13 insertions(+), 13 deletions(-)
include/linux/printk.h +11 -0
@@ -266,9 +266,20 @@ extern asmlinkage void dump_stack(void) __cold; printk(fmt, ##__VA_ARGS__); \ } \ }) +#define printk_deferred_once (fmt, ...) \ +({ \ + static bool __print_once __read_mostly; \ + \ + if (!__print_once) { \ + __print_once = true; \ + printk_deferred(fmt, ##__VA_ARGS__); \ + } \ +})#else #define printk_once (fmt, ...) \ no_printk(fmt, ##__VA_ARGS__) +#define printk_deferred_once (fmt, ...) \ + no_printk(fmt, ##__VA_ARGS__)#endif #define pr_emerg_once (fmt, ...) \
kernel/sched/deadline.c +1 -6
@@ -348,12 +348,7 @@ static void replenish_dl_entity(struct sched_dl_entity *dl_se,* entity. */ if (dl_time_before (dl_se->deadline,rq_clock (rq))) { -static bool lag_once = false; - -if (!lag_once) { - lag_once = true; -printk_deferred ("sched: DL replenish lagged to much\n" ); - } +printk_deferred_once ("sched: DL replenish lagged to much\n" ); dl_se->deadline =rq_clock (rq) + pi_se->dl_deadline; dl_se->runtime = pi_se->dl_runtime; }
kernel/sched/rt.c +1 -7
@@ -890,14 +890,8 @@ static int sched_rt_runtime_exceeded(struct rt_rq *rt_rq)* but accrue some time due to boosting. */ if (likely (rt_b->rt_runtime)) { -static bool once = false; - rt_rq->rt_throttled =1 ; - -if (!once) { - once = true; -printk_deferred ("sched: RT throttling activated\n" ); - } +printk_deferred_once ("sched: RT throttling activated\n" ); }else {/* * In case we did anyway, make it go away,
Signature · 1 line
1.9.1
Re: [PATCH 3/4] printk: Add printk_deferred_once
Quoted 4 lines · John Stultz
Two of the three
prink_deferreduses are reallyprintk_oncestyle uses, so add aprintk_deferred_oncemacro to simplify those call sites.
Quoted 9 lines
Cc Jan Kara <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Jiri Bohac <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Ingo Molnar <[email protected]>Cc Andrew Morton <[email protected]>Cc Steven Rostedt <[email protected]>Reviewed-by Steven Rostedt <[email protected]>Signed-off-by John Stultz <[email protected]>
The patch looks good. You can add:
Honza
Quoted 72 lines
--- include/linux/printk.h | 11 +++++++++++ kernel/sched/deadline.c | 7 +------ kernel/sched/rt.c | 8 +------- 3 files changed, 13 insertions(+), 13 deletions(-)include/linux/printk.h +11
-0@@ -266,9 +266,20 @@ extern asmlinkage void dump_stack(void) __cold; printk(fmt, ##__VA_ARGS__); \ } \ }) +#define printk_deferred_once (fmt, ...) \ +({ \ + static bool __print_once __read_mostly; \ + \ + if (!__print_once) { \ + __print_once = true; \ + printk_deferred(fmt, ##__VA_ARGS__); \ + } \ +})#else #define printk_once (fmt, ...) \ no_printk(fmt, ##__VA_ARGS__) +#define printk_deferred_once (fmt, ...) \ + no_printk(fmt, ##__VA_ARGS__)#endif #define pr_emerg_once (fmt, ...) \kernel/sched/deadline.c +1
-6@@ -348,12 +348,7 @@ static void replenish_dl_entity(struct sched_dl_entity *dl_se,* entity. */ if (dl_time_before (dl_se->deadline,rq_clock (rq))) { -static bool lag_once = false; - -if (!lag_once) { - lag_once = true; -printk_deferred ("sched: DL replenish lagged to much\n" ); - } +printk_deferred_once ("sched: DL replenish lagged to much\n" ); dl_se->deadline =rq_clock (rq) + pi_se->dl_deadline; dl_se->runtime = pi_se->dl_runtime; }kernel/sched/rt.c +1
-7@@ -890,14 +890,8 @@ static int sched_rt_runtime_exceeded(struct rt_rq *rt_rq)* but accrue some time due to boosting. */ if (likely (rt_b->rt_runtime)) { -static bool once = false; - rt_rq->rt_throttled =1 ; - -if (!once) { - once = true; -printk_deferred ("sched: RT throttling activated\n" ); - } +printk_deferred_once ("sched: RT throttling activated\n" ); }else {/* * In case we did anyway, make it go away, Signature · 1 line
1.9.1
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
PATCH 4/4 timekeeping: Use printk_deferred when holding timekeeping seqlock
In reply to John StultzJiri Bohac pointed out that there are rare but potential deadlock possibilities when calling printk while holding the timekeeping seqlock.
This is due to printk() triggering console sem wakeup, which can cause scheduling code to trigger hrtimers which may try to read the time.
Specifically, as Jiri pointed out, that path is:
printk
vprintk_emit
console_unlock
up(&console_sem)
__up
wake_up_process
try_to_wake_up
ttwu_do_activate
ttwu_activate
activate_task
enqueue_task
enqueue_task_fair
hrtick_update
hrtick_start_fair
hrtick_start_fair
get_time
ktime_get
--> endless loop on
read_seqcount_retry(&timekeeper_seq, ...)This patch tries to avoid this issue by using printk_deferred (previously named printk_sched) which should defer printing via a irq_work_queue.
--- kernel/time/ntp.c | 15 +++++++++------ kernel/time/timekeeping.c | 7 ++++--- 2 files changed, 13 insertions(+), 9 deletions(-)
kernel/time/ntp.c +9 -6
@@ -786,8 +786,9 @@ static long hardpps_update_freq(struct pps_normtime freq_norm) time_status |=STA_PPSERROR ; pps_errcnt++;pps_dec_freq_interval (); -pr_err ("hardpps: PPSERROR: interval too long - %ld s\n" , - freq_norm.sec); +printk_deferred (KERN_ERR +"hardpps: PPSERROR: interval too long - %ld s\n" , + freq_norm.sec);return 0 ; }
@@ -800,7 +801,8 @@ static long hardpps_update_freq(struct pps_normtime freq_norm) delta =shift_right (ftemp - pps_freq,NTP_SCALE_SHIFT ); pps_freq = ftemp;if (delta >PPS_MAXWANDER || delta < -PPS_MAXWANDER ) { -pr_warning ("hardpps: PPSWANDER: change=%ld\n" , delta); +printk_deferred (KERN_WARNING +"hardpps: PPSWANDER: change=%ld\n" , delta); time_status |=STA_PPSWANDER ; pps_stbcnt++;pps_dec_freq_interval ();
@@ -844,8 +846,9 @@ static void hardpps_update_phase(long error)* the time offset is updated. */ if (jitter > (pps_jitter <<PPS_POPCORN )) { -pr_warning ("hardpps: PPSJITTER: jitter=%ld, limit=%ld\n" , - jitter, (pps_jitter <<PPS_POPCORN )); +printk_deferred (KERN_WARNING +"hardpps: PPSJITTER: jitter=%ld, limit=%ld\n" , + jitter, (pps_jitter <<PPS_POPCORN )); time_status |=STA_PPSJITTER ; pps_jitcnt++; }else if (time_status &STA_PPSTIME ) {
@@ -902,7 +905,7 @@ void __hardpps(const struct timespec *phase_ts, const struct timespec *raw_ts) time_status |=STA_PPSJITTER ;/* restart the frequency calibration interval */ pps_fbase = *raw_ts; -pr_err ("hardpps: PPSJITTER: bad pulse\n" ); +printk_deferred (KERN_ERR "hardpps: PPSJITTER: bad pulse\n" );return ; }
kernel/time/timekeeping.c +4 -3
@@ -852,8 +852,9 @@ static void __timekeeping_inject_sleeptime(struct timekeeper *tk, struct timespec *delta) {if (!timespec_valid_strict (delta)) { -printk (KERN_WARNING "__timekeeping_inject_sleeptime: Invalid " -"sleep delta value!\n" ); +printk_deferred (KERN_WARNING +"__timekeeping_inject_sleeptime: Invalid " +"sleep delta value!\n" );return ; }tk_xtime_add (tk, delta);
@@ -1157,7 +1158,7 @@ static void timekeeping_adjust(struct timekeeper *tk, s64 offset)if (unlikely (tk->clock->maxadj && (tk->mult + adj > tk->clock->mult + tk->clock->maxadj))) { -printk_once (KERN_WARNING +printk_deferred_once (KERN_WARNING "Adjusting %s more than 11%% (%ld vs %ld)\n" , tk->clock->name, (long )tk->mult + adj, (long )tk->clock->mult + tk->clock->maxadj);
Signature · 1 line
1.9.1