clocksource/events: Overhaul (un)registration
Subsystems (4)
cover clocksource/events: Overhaul (un)registration
The clocksource_unregister() interface is broken. A clocksource can be removed unconditionally even if there is no fallback clocksource available. clocksources in a module can be removed as well. Aside of that the registration part lacks a few sanity checks as well.
The clockevents layer does not allow unregistration, but for reconfigurable hardware this is a must have feature.
The following patch series fixes the clocksource part and adds unregister support for clockevent devices.
Thanks,
tglx
--- drivers/clocksource/dw_apb_timer.c | 12 - include/linux/clockchips.h | 4 include/linux/clocksource.h | 7 include/linux/dw_apb_timer.h | 1 kernel/time/clockevents.c | 271 ++++++++++++++++++++++++++++++++----- kernel/time/clocksource.c | 190 +++++++++++++++++++------ kernel/time/tick-broadcast.c | 33 +++- kernel/time/tick-common.c | 189 +++++++++---------------- kernel/time/tick-internal.h | 17 +- kernel/time/timekeeping.c | 20 +- 10 files changed, 514 insertions(+), 230 deletions(-)
PATCH 1/15 clocksource: apb_timer: Remove unsused function
--- drivers/clocksource/dw_apb_timer.c | 12 ------------ include/linux/dw_apb_timer.h | 1 - 2 files changed, 13 deletions(-)
drivers/clocksource/dw_apb_timer.c +0 -12
@@ -387,15 +387,3 @@ cycle_t dw_apb_clocksource_read(struct d {return (cycle_t )~apbt_readl (&dw_cs->timer,APBTMR_N_CURRENT_VALUE ); } - -/** -* dw_apb_clocksource_unregister() - unregister and free a clocksource. -* -* @dw_cs: The clocksource to unregister/free. -*/ -void dw_apb_clocksource_unregister (struct dw_apb_clocksource *dw_cs) -{ -clocksource_unregister (&dw_cs->cs); - -kfree (dw_cs); -}
include/linux/dw_apb_timer.h +0 -1
@@ -51,7 +51,6 @@ dw_apb_clocksource_init(unsigned rating,void dw_apb_clocksource_register (struct dw_apb_clocksource *dw_cs);void dw_apb_clocksource_start (struct dw_apb_clocksource *dw_cs);cycle_t dw_apb_clocksource_read (struct dw_apb_clocksource *dw_cs); -void dw_apb_clocksource_unregister (struct dw_apb_clocksource *dw_cs);extern void dw_apb_timer_init (void );#endif /* __DW_APB_TIMER_H__ */
Re: [patch 01/15] clocksource: apb_timer: Remove unsused function
Hi Thomas,
Quoted 2 lines · Thomas Gleixner
Signed-off-by Thomas Gleixner <[email protected]>Cc Jamie Iles <[email protected]>
Looks good, thanks for fixing this.
Re: [patch 01/15] clocksource: apb_timer: Remove unsused function
In reply to Thomas GleixnerQuoted 2 lines · Thomas Gleixner
Signed-off-by Thomas Gleixner<[email protected]>Cc Jamie Iles<[email protected]>
thanks
-john
Quoted 39 lines
--- drivers/clocksource/dw_apb_timer.c | 12 ------------ include/linux/dw_apb_timer.h | 1 - 2 files changed, 13 deletions(-)Index:
tip/drivers/clocksource/dw_apb_timer.c
===================================================================drivers/clocksource/dw_apb_timer.c +0
-12@@ -387,15 +387,3 @@ cycle_t dw_apb_clocksource_read(struct d {return (cycle_t )~apbt_readl (&dw_cs->timer,APBTMR_N_CURRENT_VALUE ); } - -/** -* dw_apb_clocksource_unregister() - unregister and free a clocksource. -* -* @dw_cs: The clocksource to unregister/free. -*/ -void dw_apb_clocksource_unregister (struct dw_apb_clocksource *dw_cs) -{ -clocksource_unregister (&dw_cs->cs); - -kfree (dw_cs); -}Index:
tip/include/linux/dw_apb_timer.h
===================================================================include/linux/dw_apb_timer.h +0
-1@@ -51,7 +51,6 @@ dw_apb_clocksource_init(unsigned rating,void dw_apb_clocksource_register (struct dw_apb_clocksource *dw_cs);void dw_apb_clocksource_start (struct dw_apb_clocksource *dw_cs);cycle_t dw_apb_clocksource_read (struct dw_apb_clocksource *dw_cs); -void dw_apb_clocksource_unregister (struct dw_apb_clocksource *dw_cs);extern void dw_apb_timer_init (void );#endif /* __DW_APB_TIMER_H__ */
tip-bot for Thomas Gleixner
merge bot[tip:timers/core] clocksource: apb_timer: Remove unsused function
In reply to Thomas Gleixnerclocksource: apb_timer: Remove unsused function
Commit-ID: fc1f7d5606487ae28d6c84e95401952927d7379e Gitweb: http://git.kernel.org/tip/fc1f7d5606487ae28d6c84e95401952927d7379e Author: Thomas Gleixner <[email protected]> AuthorDate: Thu, 25 Apr 2013 20:31:43 +0000 Committer: Thomas Gleixner <[email protected]> CommitDate: Thu, 16 May 2013 11:09:13 +0200
clocksource: apb_timer: Remove unsused function
--- drivers/clocksource/dw_apb_timer.c | 12 ------------ include/linux/dw_apb_timer.h | 1 - 2 files changed, 13 deletions(-)
drivers/clocksource/dw_apb_timer.c +0 -12
@@ -387,15 +387,3 @@ cycle_t dw_apb_clocksource_read(struct dw_apb_clocksource *dw_cs) {return (cycle_t )~apbt_readl (&dw_cs->timer,APBTMR_N_CURRENT_VALUE ); } - -/** -* dw_apb_clocksource_unregister() - unregister and free a clocksource. -* -* @dw_cs: The clocksource to unregister/free. -*/ -void dw_apb_clocksource_unregister (struct dw_apb_clocksource *dw_cs) -{ -clocksource_unregister (&dw_cs->cs); - -kfree (dw_cs); -}
include/linux/dw_apb_timer.h +0 -1
@@ -51,7 +51,6 @@ dw_apb_clocksource_init(unsigned rating, const char *name, void __iomem *base,void dw_apb_clocksource_register (struct dw_apb_clocksource *dw_cs);void dw_apb_clocksource_start (struct dw_apb_clocksource *dw_cs);cycle_t dw_apb_clocksource_read (struct dw_apb_clocksource *dw_cs); -void dw_apb_clocksource_unregister (struct dw_apb_clocksource *dw_cs);extern void dw_apb_timer_init (void );#endif /* __DW_APB_TIMER_H__ */
PATCH 2/15 clocksource: Always verify highres capability
In reply to Thomas GleixnerIf a clocksource has a (wrong) high rating, but can't be used as a timebase for oneshot tick mode, it is unconditionally selected even when the system is already in oneshot tick mode. This causes full system failure.
Verify the clocksource selection against the oneshot mode.
--- kernel/time/clocksource.c | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-)
kernel/time/clocksource.c +26 -5
@@ -553,6 +553,26 @@ static u64 clocksource_max_deferment(str#ifndef CONFIG_ARCH_USES_GETTIMEOFFSET +static struct clocksource *clocksource_find_best (bool oneshot) +{ +struct clocksource *cs; + +if (!finished_booting ||list_empty (&clocksource_list)) +return NULL ; + +/* +* We pick the clocksource with the highest rating. If oneshot +* mode is active, we pick the highres valid clocksource with +* the best rating. +*/ +list_for_each_entry (cs, &clocksource_list, list) { +if (oneshot && !(cs->flags &CLOCK_SOURCE_VALID_FOR_HRES )) +continue ; +return cs; + } +return NULL ; +} +/** * clocksource_select - Select the best clocksource available *
@@ -563,12 +583,14 @@ static u64 clocksource_max_deferment(str*/ static void clocksource_select (void ) { +bool oneshot =tick_oneshot_mode_active ();struct clocksource *best, *cs; -if (!finished_booting ||list_empty (&clocksource_list)) +/* Find the best suitable clocksource */ + best =clocksource_find_best (oneshot); +if (!best)return ; -/* First clocksource on the list has the best rating. */ - best = list_first_entry(&clocksource_list, struct clocksource, list); +/* Check for the override clocksource. */ list_for_each_entry (cs, &clocksource_list, list) {if (strcmp (cs->name, override_name) !=0 )
@@ -578,8 +600,7 @@ static void clocksource_select(void)* capable clocksource if the tick code is in oneshot * mode (highres or nohz) */ -if (!(cs->flags &CLOCK_SOURCE_VALID_FOR_HRES ) && -tick_oneshot_mode_active ()) { +if (!(cs->flags &CLOCK_SOURCE_VALID_FOR_HRES ) && oneshot) {/* Override clocksource cannot be used. */ printk (KERN_WARNING "Override clocksource %s is not " "HRT compatible. Cannot switch while in "
Re: [patch 02/15] clocksource: Always verify highres capability
Quoted 8 lines · Thomas Gleixner
If a clocksource has a (wrong) high rating, but can't be used as a timebase for oneshot tick mode, it is unconditionally selected even when the system is already in oneshot tick mode. This causes full system failure.
Verify the clocksource selection against the oneshot mode.
Signed-off-by Thomas Gleixner<[email protected]>
thanks
-john
tip-bot for Thomas Gleixner
merge bot[tip:timers/core] clocksource: Always verify highres capability
In reply to Thomas Gleixnerclocksource: Always verify highres capability
Commit-ID: 5d33b883aed81c6fbcd09c6f7c3619eee850a7e2 Gitweb: http://git.kernel.org/tip/5d33b883aed81c6fbcd09c6f7c3619eee850a7e2 Author: Thomas Gleixner <[email protected]> AuthorDate: Thu, 25 Apr 2013 20:31:43 +0000 Committer: Thomas Gleixner <[email protected]> CommitDate: Thu, 16 May 2013 11:09:14 +0200
clocksource: Always verify highres capability
If a clocksource has a (wrong) high rating, but can't be used as a timebase for oneshot tick mode, it is unconditionally selected even when the system is already in oneshot tick mode. This causes full system failure.
Verify the clocksource selection against the oneshot mode.
--- kernel/time/clocksource.c | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-)
kernel/time/clocksource.c +26 -5
@@ -553,6 +553,26 @@ static u64 clocksource_max_deferment(struct clocksource *cs)#ifndef CONFIG_ARCH_USES_GETTIMEOFFSET +static struct clocksource *clocksource_find_best (bool oneshot) +{ +struct clocksource *cs; + +if (!finished_booting ||list_empty (&clocksource_list)) +return NULL ; + +/* +* We pick the clocksource with the highest rating. If oneshot +* mode is active, we pick the highres valid clocksource with +* the best rating. +*/ +list_for_each_entry (cs, &clocksource_list, list) { +if (oneshot && !(cs->flags &CLOCK_SOURCE_VALID_FOR_HRES )) +continue ; +return cs; + } +return NULL ; +} +/** * clocksource_select - Select the best clocksource available *
@@ -563,12 +583,14 @@ static u64 clocksource_max_deferment(struct clocksource *cs)*/ static void clocksource_select (void ) { +bool oneshot =tick_oneshot_mode_active ();struct clocksource *best, *cs; -if (!finished_booting ||list_empty (&clocksource_list)) +/* Find the best suitable clocksource */ + best =clocksource_find_best (oneshot); +if (!best)return ; -/* First clocksource on the list has the best rating. */ - best = list_first_entry(&clocksource_list, struct clocksource, list); +/* Check for the override clocksource. */ list_for_each_entry (cs, &clocksource_list, list) {if (strcmp (cs->name, override_name) !=0 )
@@ -578,8 +600,7 @@ static void clocksource_select(void)* capable clocksource if the tick code is in oneshot * mode (highres or nohz) */ -if (!(cs->flags &CLOCK_SOURCE_VALID_FOR_HRES ) && -tick_oneshot_mode_active ()) { +if (!(cs->flags &CLOCK_SOURCE_VALID_FOR_HRES ) && oneshot) {/* Override clocksource cannot be used. */ printk (KERN_WARNING "Override clocksource %s is not " "HRT compatible. Cannot switch while in "
PATCH 3/15 clocksource: Let timekeeping_notify return success/error
In reply to Thomas Gleixnertimekeeping_notify() can fail due cs->enable() failure. Though the caller does not notice and happily keeps the wrong clocksource as the current one.
Let the caller know about failure, so the current clocksource will be shown correctly in sysfs.
--- include/linux/clocksource.h | 2 +- kernel/time/clocksource.c | 6 +++--- kernel/time/timekeeping.c | 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-)
include/linux/clocksource.h +1 -1
@@ -321,7 +321,7 @@ static inline void __clocksource_updatef } -extern void timekeeping_notify (struct clocksource *clock); +extern int timekeeping_notify (struct clocksource *clock);extern cycle_t clocksource_mmio_readl_up (struct clocksource *);extern cycle_t clocksource_mmio_readl_down (struct clocksource *);
kernel/time/clocksource.c +3 -3
@@ -611,10 +611,10 @@ static void clocksource_select(void) best = cs;break ; } -if (curr_clocksource != best) { -printk (KERN_INFO "Switching to clocksource %s\n" , best->name); + +if (curr_clocksource != best && !timekeeping_notify (best)) { +pr_info ("Switched to clocksource %s\n" , best->name); curr_clocksource = best; -timekeeping_notify (curr_clocksource); } }
kernel/time/timekeeping.c +3 -2
@@ -648,14 +648,15 @@ static int change_clocksource(void *data* This function is called from clocksource.c after a new, better clock * source has been registered. The caller holds the clocksource_mutex. */ -void timekeeping_notify (struct clocksource *clock) +int timekeeping_notify (struct clocksource *clock) {struct timekeeper *tk = &timekeeper;if (tk->clock == clock) -return ; +return 0 ;stop_machine (change_clocksource, clock,NULL );tick_clock_notify (); +return tk->clock == clock ?0 :-1 ; }/**
Re: [patch 03/15] clocksource: Let timekeeping_notify return success/error
Quoted 8 lines · Thomas Gleixner
timekeeping_notify()can fail duecs->enable()failure. Though the caller does not notice and happily keeps the wrong clocksource as the current one.Let the caller know about failure, so the current clocksource will be shown correctly in sysfs.
Signed-off-by Thomas Gleixner<[email protected]>
thanks
-john
tip-bot for Thomas Gleixner
merge bot[tip:timers/core] clocksource: Let timekeeping_notify return success/error
In reply to Thomas Gleixnerclocksource: Let timekeeping_notify return success/error
Commit-ID: ba919d1caa2e624eb8c6cae1f2ce0a253e697d45 Gitweb: http://git.kernel.org/tip/ba919d1caa2e624eb8c6cae1f2ce0a253e697d45 Author: Thomas Gleixner <[email protected]> AuthorDate: Thu, 25 Apr 2013 20:31:44 +0000 Committer: Thomas Gleixner <[email protected]> CommitDate: Thu, 16 May 2013 11:09:14 +0200
clocksource: Let timekeeping_notify return success/error
timekeeping_notify() can fail due cs->enable() failure. Though the caller does not notice and happily keeps the wrong clocksource as the current one.
Let the caller know about failure, so the current clocksource will be shown correctly in sysfs.
--- include/linux/clocksource.h | 2 +- kernel/time/clocksource.c | 6 +++--- kernel/time/timekeeping.c | 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-)
include/linux/clocksource.h +1 -1
@@ -321,7 +321,7 @@ static inline void __clocksource_updatefreq_khz(struct clocksource *cs, u32 khz) } -extern void timekeeping_notify (struct clocksource *clock); +extern int timekeeping_notify (struct clocksource *clock);extern cycle_t clocksource_mmio_readl_up (struct clocksource *);extern cycle_t clocksource_mmio_readl_down (struct clocksource *);
kernel/time/clocksource.c +3 -3
@@ -611,10 +611,10 @@ static void clocksource_select(void) best = cs;break ; } -if (curr_clocksource != best) { -printk (KERN_INFO "Switching to clocksource %s\n" , best->name); + +if (curr_clocksource != best && !timekeeping_notify (best)) { +pr_info ("Switched to clocksource %s\n" , best->name); curr_clocksource = best; -timekeeping_notify (curr_clocksource); } }
kernel/time/timekeeping.c +3 -2
@@ -648,14 +648,15 @@ static int change_clocksource(void *data)* This function is called from clocksource.c after a new, better clock * source has been registered. The caller holds the clocksource_mutex. */ -void timekeeping_notify (struct clocksource *clock) +int timekeeping_notify (struct clocksource *clock) {struct timekeeper *tk = &timekeeper;if (tk->clock == clock) -return ; +return 0 ;stop_machine (change_clocksource, clock,NULL );tick_clock_notify (); +return tk->clock == clock ?0 :-1 ; }/**
PATCH 4/15 clocksource: Add module refcount
In reply to Thomas GleixnerAdd a module refcount, so the current clocksource cannot be removed unconditionally.
--- include/linux/clocksource.h | 3 +++ kernel/time/timekeeping.c | 15 ++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-)
include/linux/clocksource.h +3 -0
@@ -21,6 +21,7 @@/* clocksource cycle base type */ typedef u64 cycle_t ;struct clocksource ; +struct module ;#ifdef CONFIG_ARCH_CLOCKSOURCE_DATA #include <asm/clocksource.h>
@@ -162,6 +163,7 @@ extern u64 timecounter_cyc2time(struct t* @suspend: suspend function for the clocksource, if necessary * @resume: resume function for the clocksource, if necessary * @cycle_last: most recent cycle counter value seen by ::read() +* @owner: module reference */ struct clocksource {/*
@@ -195,6 +197,7 @@ struct clocksource {cycle_t cs_last;cycle_t wd_last;#endif +struct module *owner; }____cacheline_aligned ;/*
kernel/time/timekeeping.c +10 -5
@@ -627,11 +627,16 @@ static int change_clocksource(void *datawrite_seqcount_begin (&timekeeper_seq);timekeeping_forward_now (tk); -if (!new->enable || new->enable (new) ==0 ) { - old = tk->clock; -tk_setup_internals (tk, new); -if (old->disable) - old->disable (old); +if (try_module_get (new->owner)) { +if (!new->enable || new->enable (new) ==0 ) { + old = tk->clock; +tk_setup_internals (tk, new); +if (old->disable) + old->disable (old); +module_put (old->owner); + }else { +module_put (new->owner); + } }timekeeping_update (tk, true, true);
Re: [patch 04/15] clocksource: Add module refcount
Quoted 30 lines · Thomas Gleixner
Add a module refcount, so the current clocksource cannot be removed unconditionally.
Signed-off-by Thomas Gleixner<[email protected]>--- include/linux/clocksource.h | 3 +++ kernel/time/timekeeping.c | 15 ++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-)Index:
tip/include/linux/clocksource.h
===================================================================include/linux/clocksource.h +2
-0@@ -21,6 +21,7 @@/* clocksource cycle base type */ typedef u64 cycle_t ;struct clocksource ; +struct module ;#ifdef CONFIG_ARCH_CLOCKSOURCE_DATA #include <asm/clocksource.h> @@ -162,6 +163,7 @@ extern u64 timecounter_cyc2time(struct t* @suspend: suspend function for the clocksource, if necessary * @resume: resume function for the clocksource, if necessary * @cycle_last: most recent cycle counter value seen by ::read() +* @owner: module reference */ struct clocksource {/*
include/linux/clocksource.h struct clocksource { · line 200
Quoted 4 lines
include/linux/clocksource.h +1
-0@@ -195,6 +197,7 @@ struct clocksource {cycle_t cs_last;cycle_t wd_last;#endif +struct module *owner;
Maybe could you add a comment about who is expected to set the owner ptr?
Quoted 8 lines
include/linux/clocksource.h +0
-0}____cacheline_aligned ;/* Index:
tip/kernel/time/timekeeping.c
===================================================================
kernel/time/timekeeping.c static int change_clocksource(void *data · line 630
Quoted 9 lines
kernel/time/timekeeping.c +1
-5@@ -627,11 +627,16 @@ static int change_clocksource(void *datawrite_seqcount_begin (&timekeeper_seq);timekeeping_forward_now (tk); -if (!new->enable || new->enable (new) ==0 ) { - old = tk->clock; -tk_setup_internals (tk, new); -if (old->disable) - old->disable (old); +if (try_module_get (new->owner)) {
Hrm.. So this works, but the interface is a bit non-intuitive, since without looking up try_module_get() I'd be surprised that this would succeed if the owner ptr is null. Maybe deserves a comment?
kernel/time/timekeeping.c static int change_clocksource(void *data · line 642
Quoted 12 lines
kernel/time/timekeeping.c +9
-0+if (!new->enable || new->enable (new) ==0 ) { + old = tk->clock; +tk_setup_internals (tk, new); +if (old->disable) + old->disable (old); +module_put (old->owner); + }else { +module_put (new->owner); + } }timekeeping_update (tk, true, true);
thanks
-john
tip-bot for Thomas Gleixner
merge bot[tip:timers/core] clocksource: Add module refcount
In reply to Thomas Gleixnerclocksource: Add module refcount
Commit-ID: 09ac369c825d9d593404306d59062d854b321e9b Gitweb: http://git.kernel.org/tip/09ac369c825d9d593404306d59062d854b321e9b Author: Thomas Gleixner <[email protected]> AuthorDate: Thu, 25 Apr 2013 20:31:44 +0000 Committer: Thomas Gleixner <[email protected]> CommitDate: Thu, 16 May 2013 11:09:14 +0200
clocksource: Add module refcount
Add a module refcount, so the current clocksource cannot be removed unconditionally.
--- include/linux/clocksource.h | 3 +++ kernel/time/timekeeping.c | 19 ++++++++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-)
include/linux/clocksource.h +3 -0
@@ -21,6 +21,7 @@/* clocksource cycle base type */ typedef u64 cycle_t ;struct clocksource ; +struct module ;#ifdef CONFIG_ARCH_CLOCKSOURCE_DATA #include <asm/clocksource.h>
@@ -162,6 +163,7 @@ extern u64 timecounter_cyc2time(struct timecounter *tc,* @suspend: suspend function for the clocksource, if necessary * @resume: resume function for the clocksource, if necessary * @cycle_last: most recent cycle counter value seen by ::read() +* @owner: module reference, must be set by clocksource in modules */ struct clocksource {/*
@@ -195,6 +197,7 @@ struct clocksource {cycle_t cs_last;cycle_t wd_last;#endif +struct module *owner; }____cacheline_aligned ;/*
kernel/time/timekeeping.c +14 -5
@@ -627,11 +627,20 @@ static int change_clocksource(void *data)write_seqcount_begin (&timekeeper_seq);timekeeping_forward_now (tk); -if (!new->enable || new->enable (new) ==0 ) { - old = tk->clock; -tk_setup_internals (tk, new); -if (old->disable) - old->disable (old); +/* +* If the cs is in module, get a module reference. Succeeds +* for built-in code (owner == NULL) as well. +*/ +if (try_module_get (new->owner)) { +if (!new->enable || new->enable (new) ==0 ) { + old = tk->clock; +tk_setup_internals (tk, new); +if (old->disable) + old->disable (old); +module_put (old->owner); + }else { +module_put (new->owner); + } }timekeeping_update (tk, true, true);
PATCH 5/15 clocksource: Allow clocksource select to skip current clocksource
In reply to Thomas GleixnerPreparatory patch for clocksource unbind support.
Modify clocksource_select, so it skips the current clocksource on request and tries to find a fallback clocksource. Convert all existing users. No functional change.
--- kernel/time/clocksource.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-)
kernel/time/clocksource.c +14 -10
@@ -553,7 +553,7 @@ static u64 clocksource_max_deferment(str#ifndef CONFIG_ARCH_USES_GETTIMEOFFSET -static struct clocksource *clocksource_find_best (bool oneshot) +static struct clocksource *clocksource_find_best (bool oneshot,bool skipcur) {struct clocksource *cs;
@@ -566,6 +566,8 @@ static struct clocksource *clocksource_f* the best rating. */ list_for_each_entry (cs, &clocksource_list, list) { +if (skipcur && cs == curr_clocksource) +continue ;if (oneshot && !(cs->flags &CLOCK_SOURCE_VALID_FOR_HRES ))continue ;return cs;
@@ -581,18 +583,20 @@ static struct clocksource *clocksource_f* Select the clocksource with the best rating, or the clocksource, * which is selected by userspace override. */ -static void clocksource_select (void ) +static void clocksource_select (bool skipcur) {bool oneshot =tick_oneshot_mode_active ();struct clocksource *best, *cs;/* Find the best suitable clocksource */ - best =clocksource_find_best (oneshot); + best =clocksource_find_best (oneshot, skipcur);if (!best)return ;/* Check for the override clocksource. */ list_for_each_entry (cs, &clocksource_list, list) { +if (skipcur && cs == curr_clocksource) +continue ;if (strcmp (cs->name, override_name) !=0 )continue ;/*
@@ -620,7 +624,7 @@ static void clocksource_select(void)#else /* !CONFIG_ARCH_USES_GETTIMEOFFSET */ -static inline void clocksource_select (void ) { } +static inline void clocksource_select (bool skipcur) { }#endif
@@ -645,7 +649,7 @@ static int __init clocksource_done_booticlocksource_watchdog_kthread (NULL );mutex_lock (&clocksource_mutex); -clocksource_select (); +clocksource_select (false);mutex_unlock (&clocksource_mutex);return 0 ; }
@@ -739,7 +743,7 @@ int __clocksource_register_scale(structmutex_lock (&clocksource_mutex);clocksource_enqueue (cs);clocksource_enqueue_watchdog (cs); -clocksource_select (); +clocksource_select (false);mutex_unlock (&clocksource_mutex);return 0 ; }
@@ -766,7 +770,7 @@ int clocksource_register(struct clocksoumutex_lock (&clocksource_mutex);clocksource_enqueue (cs);clocksource_enqueue_watchdog (cs); -clocksource_select (); +clocksource_select (false);mutex_unlock (&clocksource_mutex);return 0 ; }
@@ -777,7 +781,7 @@ static void __clocksource_change_rating(list_del (&cs->list); cs->rating = rating;clocksource_enqueue (cs); -clocksource_select (); +clocksource_select (false); }/**
@@ -802,7 +806,7 @@ void clocksource_unregister(struct clockmutex_lock (&clocksource_mutex);clocksource_dequeue_watchdog (cs);list_del (&cs->list); -clocksource_select (); +clocksource_select (false);mutex_unlock (&clocksource_mutex); }EXPORT_SYMBOL (clocksource_unregister);
@@ -858,7 +862,7 @@ static ssize_t sysfs_override_clocksourcif (count >0 )memcpy (override_name, buf, count); override_name[count] =0 ; -clocksource_select (); +clocksource_select (false);mutex_unlock (&clocksource_mutex);
Re: [patch 05/15] clocksource: Allow clocksource select to skip current clocksource
Quoted 57 lines · Thomas Gleixner
Preparatory patch for clocksource unbind support.
Modify
clocksource_select, so it skips the current clocksource on request and tries to find a fallback clocksource. Convert all existing users. No functional change.Signed-off-by Thomas Gleixner<[email protected]>--- kernel/time/clocksource.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-)Index:
tip/kernel/time/clocksource.c
===================================================================kernel/time/clocksource.c +7
-3@@ -553,7 +553,7 @@ static u64 clocksource_max_deferment(str#ifndef CONFIG_ARCH_USES_GETTIMEOFFSET -static struct clocksource *clocksource_find_best (bool oneshot) +static struct clocksource *clocksource_find_best (bool oneshot,bool skipcur) {struct clocksource *cs;@@ -566,6 +566,8 @@ static struct clocksource *clocksource_f* the best rating. */ list_for_each_entry (cs, &clocksource_list, list) { +if (skipcur && cs == curr_clocksource) +continue ;if (oneshot && !(cs->flags &CLOCK_SOURCE_VALID_FOR_HRES ))continue ;return cs;@@ -581,18 +583,20 @@ static struct clocksource *clocksource_f* Select the clocksource with the best rating, or the clocksource, * which is selected by userspace override. */ -static void clocksource_select (void ) +static void clocksource_select (bool skipcur) {bool oneshot =tick_oneshot_mode_active ();struct clocksource *best, *cs;/* Find the best suitable clocksource */ - best =clocksource_find_best (oneshot); + best =clocksource_find_best (oneshot, skipcur);if (!best)return ;/* Check for the override clocksource. */ list_for_each_entry (cs, &clocksource_list, list) { +if (skipcur && cs == curr_clocksource) +continue ;if (strcmp (cs->name, override_name) !=0 )continue ;/*
kernel/time/clocksource.c static void clocksource_select(void) · line 629
Quoted 7 lines
kernel/time/clocksource.c +1
-1@@ -620,7 +624,7 @@ static void clocksource_select(void)#else /* !CONFIG_ARCH_USES_GETTIMEOFFSET */ -static inline void clocksource_select (void ) { } +static inline void clocksource_select (bool skipcur) { }#endif
Not a major objection, but I sort of don't like the bool flag arguments to function that alters their behavior, since its not really very descriptive. I know I'll be looking at the code below thinking "hmmm.. clocksource_select(false).. now what does that mean?" at some point not too far away.
Instead, would leaving clocksource_select() alone, and introducing a clocksource_select_fallback() for the skipcur behavior, be a more descriptive choice? The code could very much use the same skipcur logic, in a __clocksource_select() or something function, but just helps make the normal usage easier to read.
Quoted 20 lines
kernel/time/clocksource.c +2
-2@@ -645,7 +649,7 @@ static int __init clocksource_done_booticlocksource_watchdog_kthread (NULL );mutex_lock (&clocksource_mutex); -clocksource_select (); +clocksource_select (false);mutex_unlock (&clocksource_mutex);return 0 ; }@@ -739,7 +743,7 @@ int __clocksource_register_scale(structmutex_lock (&clocksource_mutex);clocksource_enqueue (cs);clocksource_enqueue_watchdog (cs); -clocksource_select (); +clocksource_select (false);mutex_unlock (&clocksource_mutex);return 0 ; }
kernel/time/clocksource.c int clocksource_register(struct clocksou · line 776
Quoted 8 lines
kernel/time/clocksource.c +1
-1@@ -766,7 +770,7 @@ int clocksource_register(struct clocksoumutex_lock (&clocksource_mutex);clocksource_enqueue (cs);clocksource_enqueue_watchdog (cs); -clocksource_select (); +clocksource_select (false);mutex_unlock (&clocksource_mutex);return 0 ; }
thanks
-john
Re: [patch 05/15] clocksource: Allow clocksource select to skip current clocksource
Quoted 65 lines · John Stultz
Quoted 53 lines · Thomas Gleixner
Preparatory patch for clocksource unbind support.
Modify
clocksource_select, so it skips the current clocksource on request and tries to find a fallback clocksource. Convert all existing users. No functional change.Signed-off-by Thomas Gleixner<[email protected]>--- kernel/time/clocksource.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-)Index:
tip/kernel/time/clocksource.c
===================================================================kernel/time/clocksource.c +7
-2@@ -553,7 +553,7 @@ static u64 clocksource_max_deferment(str#ifndef CONFIG_ARCH_USES_GETTIMEOFFSET -static struct clocksource *clocksource_find_best(bool oneshot) +static struct clocksource *clocksource_find_best(bool oneshot, bool skipcur) { struct clocksource *cs; @@ -566,6 +566,8 @@ static struct clocksource *clocksource_f * the best rating. */ list_for_each_entry (cs, &clocksource_list, list) { +if (skipcur && cs == curr_clocksource) +continue ;if (oneshot && !(cs->flags &CLOCK_SOURCE_VALID_FOR_HRES ))continue ;return cs;@@ -581,18 +583,20 @@ static struct clocksource *clocksource_f* Select the clocksource with the best rating, or the clocksource, * which is selected by userspace override. */ -static void clocksource_select (void ) +static void clocksource_select (bool skipcur) {bool oneshot =tick_oneshot_mode_active ();struct clocksource *best, *cs;/* Find the best suitable clocksource */ - best =clocksource_find_best (oneshot); + best =clocksource_find_best (oneshot, skipcur);if (!best)return ;/* Check for the override clocksource. */ list_for_each_entry (cs, &clocksource_list, list) { +if (skipcur && cs == curr_clocksource) +continue ;if (strcmp (cs->name, override_name) !=0 )continue ;/* kernel/time/clocksource.c static void clocksource_select(void) · line 627
Quoted 4 lines
kernel/time/clocksource.c +1
-0@@ -620,7 +624,7 @@ static void clocksource_select(void)#else /* !CONFIG_ARCH_USES_GETTIMEOFFSET */ -static inline void clocksource_select(void) { } +static inline void clocksource_select (bool skipcur) { }#endif Not a major objection, but I sort of don't like the bool flag arguments to function that alters their behavior, since its not really very descriptive. I know I'll be looking at the code below thinking "hmmm..
clocksource_select(false).. now what does that mean?" at some point not too far away.
Quoted 5 lines
Instead, would leaving
clocksource_select()alone, and introducing aclocksource_select_fallback()for the skipcur behavior, be a more descriptive choice? The code could very much use the same skipcur logic, in a__clocksource_select()or something function, but just helps make the normal usage easier to read.
Yeah, I can do that.
tip-bot for Thomas Gleixner
merge bot[tip:timers/core] clocksource: Allow clocksource select to skip current clocksource
In reply to Thomas Gleixnerclocksource: Allow clocksource select to skip current clocksource
Commit-ID: f5a2e34375a5e2b711aea488ac3ae50eeba6d57c Gitweb: http://git.kernel.org/tip/f5a2e34375a5e2b711aea488ac3ae50eeba6d57c Author: Thomas Gleixner <[email protected]> AuthorDate: Thu, 25 Apr 2013 20:31:45 +0000 Committer: Thomas Gleixner <[email protected]> CommitDate: Thu, 16 May 2013 11:09:15 +0200
clocksource: Allow clocksource select to skip current clocksource
Preparatory patch for clocksource unbind support.
Split out code from clocksource_select and modify it, so it skips the current clocksource on request and tries to find a fallback clocksource. Convert all existing users. No functional change.
--- kernel/time/clocksource.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-)
kernel/time/clocksource.c +20 -11
@@ -553,7 +553,7 @@ static u64 clocksource_max_deferment(struct clocksource *cs)#ifndef CONFIG_ARCH_USES_GETTIMEOFFSET -static struct clocksource *clocksource_find_best (bool oneshot) +static struct clocksource *clocksource_find_best (bool oneshot,bool skipcur) {struct clocksource *cs;
@@ -566,6 +566,8 @@ static struct clocksource *clocksource_find_best(bool oneshot)* the best rating. */ list_for_each_entry (cs, &clocksource_list, list) { +if (skipcur && cs == curr_clocksource) +continue ;if (oneshot && !(cs->flags &CLOCK_SOURCE_VALID_FOR_HRES ))continue ;return cs;
@@ -573,26 +575,20 @@ static struct clocksource *clocksource_find_best(bool oneshot)return NULL ; } -/** -* clocksource_select - Select the best clocksource available -* -* Private function. Must hold clocksource_mutex when called. -* -* Select the clocksource with the best rating, or the clocksource, -* which is selected by userspace override. -*/ -static void clocksource_select (void ) +static void __clocksource_select (bool skipcur) {bool oneshot =tick_oneshot_mode_active ();struct clocksource *best, *cs;/* Find the best suitable clocksource */ - best =clocksource_find_best (oneshot); + best =clocksource_find_best (oneshot, skipcur);if (!best)return ;/* Check for the override clocksource. */ list_for_each_entry (cs, &clocksource_list, list) { +if (skipcur && cs == curr_clocksource) +continue ;if (strcmp (cs->name, override_name) !=0 )continue ;/*
@@ -618,6 +614,19 @@ static void clocksource_select(void) } } +/** +* clocksource_select - Select the best clocksource available +* +* Private function. Must hold clocksource_mutex when called. +* +* Select the clocksource with the best rating, or the clocksource, +* which is selected by userspace override. +*/ +static void clocksource_select (void ) +{ +return __clocksource_select (false); +} +#else /* !CONFIG_ARCH_USES_GETTIMEOFFSET */ static inline void clocksource_select (void ) { }
PATCH 6/15 clocksource: Split out user string input
In reply to Thomas GleixnerSplit out the user string input for clocksource override. Preparatory patch for unbind.
--- kernel/time/clocksource.c | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-)
kernel/time/clocksource.c +21 -14
@@ -174,7 +174,8 @@ clocks_calc_mult_shift(u32 *mult, u32 *sstatic struct clocksource *curr_clocksource;static LIST_HEAD (clocksource_list);static DEFINE_MUTEX (clocksource_mutex); -static char override_name[32 ]; +#define CS_NAME_LEN 32 +static char override_name[CS_NAME_LEN ];static int finished_booting;#ifdef CONFIG_CLOCKSOURCE_WATCHDOG
@@ -833,6 +834,21 @@ sysfs_show_current_clocksources(struct dreturn count; } +static size_t clocksource_get_uname (const char *buf,char *dst,size_t cnt) +{ +/* strings from sysfs write are not 0 terminated! */ +if (!cnt || cnt >=CS_NAME_LEN ) +return -EINVAL ; + +/* strip of \n: */ +if (buf[cnt-1 ] =='\n' ) + cnt--; +if (cnt >0 ) +memcpy (dst, buf, cnt); + dst[cnt] =0 ; +return cnt; +} +/** * sysfs_override_clocksource - interface for manually overriding clocksource * @dev: unused
@@ -847,22 +863,13 @@ static ssize_t sysfs_override_clocksourcstruct device_attribute *attr, const char *buf, size_t count) { - size_t ret = count; - -/* strings from sysfs write are not 0 terminated! */ -if (count >=sizeof (override_name)) -return -EINVAL ; - -/* strip of \n: */ -if (buf[count-1 ] =='\n' ) - count--; + size_t ret;mutex_lock (&clocksource_mutex); -if (count >0 ) -memcpy (override_name, buf, count); - override_name[count] =0 ; -clocksource_select (false); + ret =clocksource_get_uname (buf, override_name, count); +if (ret >=0 ) +clocksource_select (false);mutex_unlock (&clocksource_mutex);
Re: [patch 06/15] clocksource: Split out user string input
Quoted 2 lines · Thomas Gleixner
Split out the user string input for clocksource override. Preparatory patch for unbind.
This patch has a bug that causes the shell to hang when \n terminated clocksource strings are sent to the sysfs interface.
echo hpet > /sys/devices/system/clocksource/clocksource0/current_clocksource <shell hang>
Quoted 36 lines
+static
size_tclocksource_get_uname(const char *buf, char *dst, size_t cnt)(quoted diff) +14
-0+{ + /* strings from sysfs write are not 0 terminated! */ + if (!cnt || cnt >= CS_NAME_LEN) + return -EINVAL; + + /* strip of \n: */ + if (buf[cnt-1] == '\n') + cnt--; + if (cnt > 0) + memcpy(dst, buf, cnt); + dst[cnt] = 0; + return cnt; +} + /** * sysfs_override_clocksource - interface for manually overridingclocksource
* @dev: unused(quoted diff) +1
-9@@ -847,22 +863,13 @@ static ssize_t sysfs_override_clocksourc struct device_attribute *attr, const char *buf, size_t count) { - size_t ret = count; - - /* strings from sysfs write are not 0 terminated! */ - if (count >= sizeof(override_name)) - return -EINVAL; - - /* strip of \n: */ - if (buf[count-1] == '\n') - count--; + size_t ret; mutex_lock(&clocksource_mutex);
Review static ssize_t sysfs_override_clocksourc · line 874
Quoted 10 lines
(quoted diff) +3
-4- if (count > 0) - memcpy(override_name, buf, count); - override_name[count] = 0; - clocksource_select(false); + ret = clocksource_get_uname(buf, override_name, count); + if (ret >= 0) + clocksource_select(false); mutex_unlock(&clocksource_mutex);
The change above *looks* ok, but is subtlly different then what we had before. Note, in the old code, we saved count to ret, and never modified ret before returning it.
With the new code, we modify cnt, as we process the copied clocksource name, and return cnt, thus we don't return to the sysfs interface the same count value we were given, causing the write call to loop.
So you probably want something like the following patch to fix this.
thanks
-john
kernel/time/clocksource.c +0 -0
@@ -836,6 +836,8 @@ sysfs_show_current_clocksources(struct device *dev, static size_t clocksource_get_uname(const char *buf, char *dst, size_t
cnt)
{
+ size_t ret = cnt;
+
/* strings from sysfs write are not 0 terminated! */
if (!cnt || cnt >= CS_NAME_LEN)
return -EINVAL;
@@ -846,7 +848,7 @@ static size_t clocksource_get_uname(const char *buf, char *dst, size_t cnt)
if (cnt > 0)
memcpy(dst, buf, cnt);
dst[cnt] = 0;
- return cnt;
+ return ret;
}
/**
Re: [patch 06/15] clocksource: Split out user string input
Quoted 2 lines · John Stultz
On Thu, Apr 25, 2013 at 1:31 PM, Thomas Gleixner <[email protected]> wrote:
So you probably want something like the following patch to fix this.
Yep, stupid me.
Quoted 29 lines
thanks
(quoted diff) +0
-1-johnkernel/time/clocksource.c +3
-1@@ -836,6 +836,8 @@ sysfs_show_current_clocksources(struct device *dev,static size_t clocksource_get_uname (const char *buf,char *dst,size_t cnt) { +size_t ret = cnt; +/* strings from sysfs write are not 0 terminated! */ if (!cnt || cnt >=CS_NAME_LEN )return -EINVAL ;@@ -846,7 +848,7 @@ static size_t clocksource_get_uname(const char *buf, char *dst, size_t cnt)if (cnt >0 )memcpy (dst, buf, cnt); dst[cnt] =0 ; -return cnt; +return ret; }/**
tip-bot for Thomas Gleixner
merge bot[tip:timers/core] clocksource: Split out user string input
In reply to Thomas Gleixnerclocksource: Split out user string input
Commit-ID: 29b5407819f59731c9423238fae03b756822708c Gitweb: http://git.kernel.org/tip/29b5407819f59731c9423238fae03b756822708c Author: Thomas Gleixner <[email protected]> AuthorDate: Thu, 25 Apr 2013 20:31:45 +0000 Committer: Thomas Gleixner <[email protected]> CommitDate: Thu, 16 May 2013 11:09:15 +0200
clocksource: Split out user string input
Split out the user string input for clocksource override. Preparatory patch for unbind.
[ jstultz: Fix an off by one error ]
--- kernel/time/clocksource.c | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-)
kernel/time/clocksource.c +23 -14
@@ -174,7 +174,8 @@ clocks_calc_mult_shift(u32 *mult, u32 *shift, u32 from, u32 to, u32 maxsec)static struct clocksource *curr_clocksource;static LIST_HEAD (clocksource_list);static DEFINE_MUTEX (clocksource_mutex); -static char override_name[32 ]; +#define CS_NAME_LEN 32 +static char override_name[CS_NAME_LEN ];static int finished_booting;#ifdef CONFIG_CLOCKSOURCE_WATCHDOG
@@ -838,6 +839,23 @@ sysfs_show_current_clocksources(struct device *dev,return count; } +static size_t clocksource_get_uname (const char *buf,char *dst,size_t cnt) +{ +size_t ret = cnt; + +/* strings from sysfs write are not 0 terminated! */ +if (!cnt || cnt >=CS_NAME_LEN ) +return -EINVAL ; + +/* strip of \n: */ +if (buf[cnt-1 ] =='\n' ) + cnt--; +if (cnt >0 ) +memcpy (dst, buf, cnt); + dst[cnt] =0 ; +return ret; +} +/** * sysfs_override_clocksource - interface for manually overriding clocksource * @dev: unused
@@ -852,22 +870,13 @@ static ssize_t sysfs_override_clocksource(struct device *dev,struct device_attribute *attr, const char *buf, size_t count) { - size_t ret = count; - -/* strings from sysfs write are not 0 terminated! */ -if (count >=sizeof (override_name)) -return -EINVAL ; - -/* strip of \n: */ -if (buf[count-1 ] =='\n' ) - count--; + size_t ret;mutex_lock (&clocksource_mutex); -if (count >0 ) -memcpy (override_name, buf, count); - override_name[count] =0 ; -clocksource_select (); + ret =clocksource_get_uname (buf, override_name, count); +if (ret >=0 ) +clocksource_select ();mutex_unlock (&clocksource_mutex);
PATCH 7/15 clocksource: Provide unbind interface in sysfs
In reply to Thomas GleixnerWith the module refcount held for the current clocksource there is no way to unload the module.
Provide a sysfs interface which allows to unbind the clocksource. One could argue that the clocksource override could be (ab)used to do so, but the clocksource override cannot be used from the kernel itself, while an unbind function can be used to programmatically check whether a clocksource can be shutdown or not.
The unbind functionality uses the new skip current feature of clocksource_select and verifies that a fallback clocksource has been installed. If the clocksource which should be unbound is the current clocksource and no fallback can be found, unbind returns -EBUSY.
This does not support the unbinding of a clocksource which is used as the watchdog clocksource. No point in fostering crappy hardware.
--- kernel/time/clocksource.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+)
kernel/time/clocksource.c +68 -0
@@ -440,6 +440,11 @@ static int clocksource_watchdog_kthread( return 0; } +static bool clocksource_is_watchdog (struct clocksource *cs) +{ +return cs == watchdog; +} +#else /* CONFIG_CLOCKSOURCE_WATCHDOG */ static void clocksource_enqueue_watchdog (struct clocksource *cs)
@@ -451,6 +456,7 @@ static void clocksource_enqueue_watchdogstatic inline void clocksource_dequeue_watchdog (struct clocksource *cs) { }static inline void clocksource_resume_watchdog (void ) { }static inline int clocksource_watchdog_kthread (void *data) {return 0 ; } +static bool clocksource_is_watchdog (struct clocksource *cs) {return false; }#endif /* CONFIG_CLOCKSOURCE_WATCHDOG */
@@ -798,6 +804,29 @@ void clocksource_change_rating(struct cl }EXPORT_SYMBOL (clocksource_change_rating); +/* +* Unbind clocksource @cs. Called with clocksource_mutex held +*/ +static int clocksource_unbind (struct clocksource *cs) +{ +/* +* I really can't convince myself to support this on hardware +* designed by lobotomized monkeys. +*/ +if (clocksource_is_watchdog (cs)) +return -EBUSY ; + +if (cs == curr_clocksource) { +/* Select and try to install a replacement clock source */ +clocksource_select (true); +if (curr_clocksource == cs) +return -EBUSY ; + } +clocksource_dequeue_watchdog (cs); +list_del_init (&cs->list); +return 0 ; +} +/** * clocksource_unregister - remove a registered clocksource * @cs: clocksource to be unregistered
@@ -877,6 +906,40 @@ static ssize_t sysfs_override_clocksourc }/** +* sysfs_unbind_current_clocksource - interface for manually unbinding clocksource +* @dev: unused +* @attr: unused +* @buf: unused +* @count: length of buffer +* +* Takes input from sysfs interface for manually unbinding a clocksource. +*/ +static ssize_t sysfs_unbind_clocksource (struct device *dev, +struct device_attribute *attr, +const char *buf,size_t count) +{ +struct clocksource *cs; +char name[CS_NAME_LEN ]; +size_t ret; + + ret =clocksource_get_uname (buf, name, count); +if (ret <0 ) +return ret; + + ret = -ENODEV ; +mutex_lock (&clocksource_mutex); +list_for_each_entry (cs, &clocksource_list, list) { +if (strcmp (cs->name, name)) +continue ; + ret =clocksource_unbind (cs); +break ; + } +mutex_unlock (&clocksource_mutex); + +return ret ? ret : count; +} + +/** * sysfs_show_available_clocksources - sysfs interface for listing clocksource * @dev: unused * @attr: unused
@@ -918,6 +981,8 @@ sysfs_show_available_clocksources(struct static DEVICE_ATTR(current_clocksource, 0644, sysfs_show_current_clocksources, sysfs_override_clocksource); +static DEVICE_ATTR(unbind_clocksource, 0200, NULL, sysfs_unbind_clocksource); + static DEVICE_ATTR(available_clocksource, 0444, sysfs_show_available_clocksources, NULL);
@@ -942,6 +1007,9 @@ static int __init init_clocksource_sysfs &device_clocksource, &dev_attr_current_clocksource);if (!error) + error =device_create_file (&device_clocksource, + &dev_attr_unbind_clocksource); +if (!error) error =device_create_file ( &device_clocksource, &dev_attr_available_clocksource);
Re: [patch 07/15] clocksource: Provide unbind interface in sysfs
Quoted 9 lines · Thomas Gleixner
With the module refcount held for the current clocksource there is no way to unload the module.
Provide a sysfs interface which allows to unbind the clocksource. One could argue that the clocksource override could be (ab)used to do so, but the clocksource override cannot be used from the kernel itself, while an unbind function can be used to programmatically check whether a clocksource can be shutdown or not.
Quoted 7 lines
The unbind functionality uses the new skip current feature of
clocksource_selectand verifies that a fallback clocksource has been installed. If the clocksource which should be unbound is the current clocksource and no fallback can be found, unbind returns-EBUSY.This does not support the unbinding of a clocksource which is used as the watchdog clocksource. No point in fostering crappy hardware.
So.. if the clocksource you want to unbind is the highest rated continuous clocksource that doesn't need a watchdog (basically what's likely to be in-use and required to be unbinded), its likely to be selected as the watchdog already.
ie: on a system that has only HPET/ACPI_PM, you can't unbind HPET, since its a watchdog.
Or are you really wanting to prohibit this functionality for all CONFIG_CLOCKSOURCE_WATCHDOG hardware, which would be easier to do via build time ifdefs?
thanks
-john
Re: [patch 07/15] clocksource: Provide unbind interface in sysfs
Quoted 18 lines · John Stultz
Quoted 9 lines · Thomas Gleixner
With the module refcount held for the current clocksource there is no way to unload the module.
Provide a sysfs interface which allows to unbind the clocksource. One could argue that the clocksource override could be (ab)used to do so, but the clocksource override cannot be used from the kernel itself, while an unbind function can be used to programmatically check whether a clocksource can be shutdown or not.
Quoted 7 lines
The unbind functionality uses the new skip current feature of
clocksource_selectand verifies that a fallback clocksource has been installed. If the clocksource which should be unbound is the current clocksource and no fallback can be found, unbind returns-EBUSY.This does not support the unbinding of a clocksource which is used as the watchdog clocksource. No point in fostering crappy hardware.
Quoted 7 lines
So.. if the clocksource you want to unbind is the highest rated continuous clocksource that doesn't need a watchdog (basically what's likely to be in-use and required to be unbinded), its likely to be selected as the watchdog already.
ie: on a system that has only HPET/ACPI_PM, you can't unbind HPET, since its a watchdog.
No. The thing is that I only prevent unbinding if it is used as the watchdog. In the above HPET/PM scenario both are potential watchdogs, but w/o a user it's valid to unbind one of them.
What I need to prevent is:
TSC is current clocksource and we only have ACPI_PM as watchdog and its used. So now you try to unbind ACPI_PM then the TSC would be left w/o a watchdog instance. That's what I'm preventing. Will reword the changelog accordingly.
Thanks,
tglx
Re: [patch 07/15] clocksource: Provide unbind interface in sysfs
Quoted 29 lines · Thomas Gleixner
Quoted 17 lines · John Stultz
Quoted 9 lines · Thomas Gleixner
With the module refcount held for the current clocksource there is no way to unload the module.
Provide a sysfs interface which allows to unbind the clocksource. One could argue that the clocksource override could be (ab)used to do so, but the clocksource override cannot be used from the kernel itself, while an unbind function can be used to programmatically check whether a clocksource can be shutdown or not.
Quoted 7 lines
The unbind functionality uses the new skip current feature of
clocksource_selectand verifies that a fallback clocksource has been installed. If the clocksource which should be unbound is the current clocksource and no fallback can be found, unbind returns-EBUSY.This does not support the unbinding of a clocksource which is used as the watchdog clocksource. No point in fostering crappy hardware.
Quoted 7 lines
So.. if the clocksource you want to unbind is the highest rated continuous clocksource that doesn't need a watchdog (basically what's likely to be in-use and required to be unbinded), its likely to be selected as the watchdog already.
ie: on a system that has only HPET/ACPI_PM, you can't unbind HPET, since its a watchdog.
No. The thing is that I only prevent unbinding if it is used as the watchdog. In the above HPET/PM scenario both are potential watchdogs, but w/o a user it's valid to unbind one of them.
Quoted 6 lines
What I need to prevent is:
TSC is current clocksource and we only have
ACPI_PMas watchdog and its used. So now you try to unbindACPI_PMthen the TSC would be left w/o a watchdog instance. That's what I'm preventing. Will reword the changelog accordingly.
You might double check the logic, because I feel like I actually hit this issue where on my vm machine w/ only hpet/acpi_pm I couldn't unbind the hpet.
Though its been a few weeks, so maybe I'm confusing things? Let me know if you want me to try to reproduce it.
thanks
-john
Re: [patch 07/15] clocksource: Provide unbind interface in sysfs
Quoted 8 lines · John Stultz
Quoted 4 lines · Thomas Gleixner
TSC is current clocksource and we only have
ACPI_PMas watchdog and its used. So now you try to unbindACPI_PMthen the TSC would be left w/o a watchdog instance. That's what I'm preventing. Will reword the changelog accordingly.You might double check the logic, because I feel like I actually hit this issue where on my vm machine w/ only hpet/acpi_pm I couldn't unbind the hpet.
Yes, that might be true. I'm only checking whether the clocksource is assigned watchdog duty. So now if the TSC is not available we still assign watchdog duty to HPET and therefor unbinding it does not work.
I really don't worry about that. The whole watchdog workaround is horrible and all I want to prevent is wreckage of that fragile piece of ...
Thanks,
tglx
tip-bot for Thomas Gleixner
merge bot[tip:timers/core] clocksource: Provide unbind interface in sysfs
In reply to Thomas Gleixnerclocksource: Provide unbind interface in sysfs
Commit-ID: 7eaeb34305dee26634f7c98ae62646da5cebe91d Gitweb: http://git.kernel.org/tip/7eaeb34305dee26634f7c98ae62646da5cebe91d Author: Thomas Gleixner <[email protected]> AuthorDate: Thu, 25 Apr 2013 20:31:46 +0000 Committer: Thomas Gleixner <[email protected]> CommitDate: Thu, 16 May 2013 11:09:15 +0200
clocksource: Provide unbind interface in sysfs
With the module refcount held for the current clocksource there is no way to unload the module.
Provide a sysfs interface which allows to unbind the clocksource. One could argue that the clocksource override could be (ab)used to do so, but the clocksource override cannot be used from the kernel itself, while an unbind function can be used to programmatically check whether a clocksource can be shutdown or not.
The unbind functionality uses the new skip current feature of clocksource_select and verifies that a fallback clocksource has been installed. If the clocksource which should be unbound is the current clocksource and no fallback can be found, unbind returns -EBUSY.
This does not support the unbinding of a clocksource which is used as the watchdog clocksource. No point in fostering crappy hardware.
--- kernel/time/clocksource.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+)
kernel/time/clocksource.c +73 -0
@@ -440,6 +440,11 @@ static int clocksource_watchdog_kthread(void *data) return 0; } +static bool clocksource_is_watchdog (struct clocksource *cs) +{ +return cs == watchdog; +} +#else /* CONFIG_CLOCKSOURCE_WATCHDOG */ static void clocksource_enqueue_watchdog (struct clocksource *cs)
@@ -451,6 +456,7 @@ static void clocksource_enqueue_watchdog(struct clocksource *cs)static inline void clocksource_dequeue_watchdog (struct clocksource *cs) { }static inline void clocksource_resume_watchdog (void ) { }static inline int clocksource_watchdog_kthread (void *data) {return 0 ; } +static bool clocksource_is_watchdog (struct clocksource *cs) {return false; }#endif /* CONFIG_CLOCKSOURCE_WATCHDOG */
@@ -628,6 +634,11 @@ static void clocksource_select(void) return __clocksource_select(false); } +static void clocksource_select_fallback (void ) +{ +return __clocksource_select (true); +} +#else /* !CONFIG_ARCH_USES_GETTIMEOFFSET */ static inline void clocksource_select (void ) { }
@@ -803,6 +814,29 @@ void clocksource_change_rating(struct clocksource *cs, int rating) }EXPORT_SYMBOL (clocksource_change_rating); +/* +* Unbind clocksource @cs. Called with clocksource_mutex held +*/ +static int clocksource_unbind (struct clocksource *cs) +{ +/* +* I really can't convince myself to support this on hardware +* designed by lobotomized monkeys. +*/ +if (clocksource_is_watchdog (cs)) +return -EBUSY ; + +if (cs == curr_clocksource) { +/* Select and try to install a replacement clock source */ +clocksource_select_fallback (); +if (curr_clocksource == cs) +return -EBUSY ; + } +clocksource_dequeue_watchdog (cs); +list_del_init (&cs->list); +return 0 ; +} +/** * clocksource_unregister - remove a registered clocksource * @cs: clocksource to be unregistered
@@ -884,6 +918,40 @@ static ssize_t sysfs_override_clocksource(struct device *dev, }/** +* sysfs_unbind_current_clocksource - interface for manually unbinding clocksource +* @dev: unused +* @attr: unused +* @buf: unused +* @count: length of buffer +* +* Takes input from sysfs interface for manually unbinding a clocksource. +*/ +static ssize_t sysfs_unbind_clocksource (struct device *dev, +struct device_attribute *attr, +const char *buf,size_t count) +{ +struct clocksource *cs; +char name[CS_NAME_LEN ]; +size_t ret; + + ret =clocksource_get_uname (buf, name, count); +if (ret <0 ) +return ret; + + ret = -ENODEV ; +mutex_lock (&clocksource_mutex); +list_for_each_entry (cs, &clocksource_list, list) { +if (strcmp (cs->name, name)) +continue ; + ret =clocksource_unbind (cs); +break ; + } +mutex_unlock (&clocksource_mutex); + +return ret ? ret : count; +} + +/** * sysfs_show_available_clocksources - sysfs interface for listing clocksource * @dev: unused * @attr: unused
@@ -925,6 +993,8 @@ sysfs_show_available_clocksources(struct device *dev, static DEVICE_ATTR(current_clocksource, 0644, sysfs_show_current_clocksources, sysfs_override_clocksource); +static DEVICE_ATTR(unbind_clocksource, 0200, NULL, sysfs_unbind_clocksource); + static DEVICE_ATTR(available_clocksource, 0444, sysfs_show_available_clocksources, NULL);
@@ -949,6 +1019,9 @@ static int __init init_clocksource_sysfs(void) &device_clocksource, &dev_attr_current_clocksource);if (!error) + error =device_create_file (&device_clocksource, + &dev_attr_unbind_clocksource); +if (!error) error =device_create_file ( &device_clocksource, &dev_attr_available_clocksource);
PATCH 8/15 clocksource: Let clocksource_unregister() return success/error
In reply to Thomas GleixnerThe unregister call can fail, if the clocksource is the current one and there is no replacement clocksource available. It can also fail, if the clocksource is the watchdog clocksource and I'm not going to provide support for this.
--- include/linux/clocksource.h | 2 +- kernel/time/clocksource.c | 33 ++++++++++++--------------------- 2 files changed, 13 insertions(+), 22 deletions(-)
include/linux/clocksource.h +1 -1
@@ -282,7 +282,7 @@ static inline s64 clocksource_cyc2ns(cycextern int clocksource_register (struct clocksource *); -extern void clocksource_unregister (struct clocksource *); +extern int clocksource_unregister (struct clocksource *);extern void clocksource_touch_watchdog (void );extern struct clocksource *clocksource_get_next (void );extern void clocksource_change_rating (struct clocksource *cs,int rating);
kernel/time/clocksource.c +12 -21
@@ -389,28 +389,17 @@ static void clocksource_enqueue_watchdogstatic void clocksource_dequeue_watchdog (struct clocksource *cs) { -struct clocksource *tmp;unsigned long flags;spin_lock_irqsave (&watchdog_lock, flags); -if (cs->flags &CLOCK_SOURCE_MUST_VERIFY ) { -/* cs is a watched clocksource. */ -list_del_init (&cs->wd_list); - }else if (cs == watchdog) { -/* Reset watchdog cycles */ -clocksource_reset_watchdog (); -/* Current watchdog is removed. Find an alternative. */ - watchdog =NULL ; -list_for_each_entry (tmp, &clocksource_list, list) { -if (tmp == cs || tmp->flags &CLOCK_SOURCE_MUST_VERIFY ) -continue ; -if (!watchdog || tmp->rating > watchdog->rating) - watchdog = tmp; +if (cs != watchdog) { +if (cs->flags &CLOCK_SOURCE_MUST_VERIFY ) { +/* cs is a watched clocksource. */ +list_del_init (&cs->wd_list); +/* Check if the watchdog timer needs to be stopped. */ +clocksource_stop_watchdog (); } } - cs->flags &= ~CLOCK_SOURCE_WATCHDOG ; -/* Check if the watchdog timer needs to be stopped. */ -clocksource_stop_watchdog ();spin_unlock_irqrestore (&watchdog_lock, flags); }
@@ -831,13 +820,15 @@ static int clocksource_unbind(struct clo* clocksource_unregister - remove a registered clocksource * @cs: clocksource to be unregistered */ -void clocksource_unregister (struct clocksource *cs) +int clocksource_unregister (struct clocksource *cs) { +int ret =0 ; +mutex_lock (&clocksource_mutex); -clocksource_dequeue_watchdog (cs); -list_del (&cs->list); -clocksource_select (false); +if (!list_empty (&cs->list)) + ret =clocksource_unbind (cs);mutex_unlock (&clocksource_mutex); +return ret; }EXPORT_SYMBOL (clocksource_unregister);
Re: [patch 08/15] clocksource: Let clocksource_unregister() return success/error
Quoted 6 lines · Thomas Gleixner
The unregister call can fail, if the clocksource is the current one and there is no replacement clocksource available. It can also fail, if the clocksource is the watchdog clocksource and I'm not going to provide support for this.
Signed-off-by Thomas Gleixner<[email protected]>
thanks
-john
tip-bot for Thomas Gleixner
merge bot[tip:timers/core] clocksource: Let clocksource_unregister() return success/error
In reply to Thomas Gleixnerclocksource: Let clocksource_unregister() return success/error
Commit-ID: a89c7edbe7d7aa80f507915f3dd801211b116b79 Gitweb: http://git.kernel.org/tip/a89c7edbe7d7aa80f507915f3dd801211b116b79 Author: Thomas Gleixner <[email protected]> AuthorDate: Thu, 25 Apr 2013 20:31:46 +0000 Committer: Thomas Gleixner <[email protected]> CommitDate: Thu, 16 May 2013 11:09:16 +0200
clocksource: Let clocksource_unregister() return success/error
The unregister call can fail, if the clocksource is the current one and there is no replacement clocksource available. It can also fail, if the clocksource is the watchdog clocksource and I'm not going to provide support for this.
--- include/linux/clocksource.h | 2 +- kernel/time/clocksource.c | 33 ++++++++++++--------------------- 2 files changed, 13 insertions(+), 22 deletions(-)
include/linux/clocksource.h +1 -1
@@ -282,7 +282,7 @@ static inline s64 clocksource_cyc2ns(cycle_t cycles, u32 mult, u32 shift)extern int clocksource_register (struct clocksource *); -extern void clocksource_unregister (struct clocksource *); +extern int clocksource_unregister (struct clocksource *);extern void clocksource_touch_watchdog (void );extern struct clocksource *clocksource_get_next (void );extern void clocksource_change_rating (struct clocksource *cs,int rating);
kernel/time/clocksource.c +12 -21
@@ -389,28 +389,17 @@ static void clocksource_enqueue_watchdog(struct clocksource *cs)static void clocksource_dequeue_watchdog (struct clocksource *cs) { -struct clocksource *tmp;unsigned long flags;spin_lock_irqsave (&watchdog_lock, flags); -if (cs->flags &CLOCK_SOURCE_MUST_VERIFY ) { -/* cs is a watched clocksource. */ -list_del_init (&cs->wd_list); - }else if (cs == watchdog) { -/* Reset watchdog cycles */ -clocksource_reset_watchdog (); -/* Current watchdog is removed. Find an alternative. */ - watchdog =NULL ; -list_for_each_entry (tmp, &clocksource_list, list) { -if (tmp == cs || tmp->flags &CLOCK_SOURCE_MUST_VERIFY ) -continue ; -if (!watchdog || tmp->rating > watchdog->rating) - watchdog = tmp; +if (cs != watchdog) { +if (cs->flags &CLOCK_SOURCE_MUST_VERIFY ) { +/* cs is a watched clocksource. */ +list_del_init (&cs->wd_list); +/* Check if the watchdog timer needs to be stopped. */ +clocksource_stop_watchdog (); } } - cs->flags &= ~CLOCK_SOURCE_WATCHDOG ; -/* Check if the watchdog timer needs to be stopped. */ -clocksource_stop_watchdog ();spin_unlock_irqrestore (&watchdog_lock, flags); }
@@ -841,13 +830,15 @@ static int clocksource_unbind(struct clocksource *cs)* clocksource_unregister - remove a registered clocksource * @cs: clocksource to be unregistered */ -void clocksource_unregister (struct clocksource *cs) +int clocksource_unregister (struct clocksource *cs) { +int ret =0 ; +mutex_lock (&clocksource_mutex); -clocksource_dequeue_watchdog (cs); -list_del (&cs->list); -clocksource_select (); +if (!list_empty (&cs->list)) + ret =clocksource_unbind (cs);mutex_unlock (&clocksource_mutex); +return ret; }EXPORT_SYMBOL (clocksource_unregister);
PATCH 9/15 clockevents: Get rid of the notifier chain
In reply to Thomas Gleixner7+ years and still a single user. Kill it.
--- include/linux/clockchips.h | 1 - kernel/time/clockevents.c | 35 +++-------------------------------- kernel/time/tick-broadcast.c | 5 ++--- kernel/time/tick-common.c | 30 +++++------------------------- kernel/time/tick-internal.h | 7 ++++--- 5 files changed, 14 insertions(+), 64 deletions(-)
include/linux/clockchips.h +0 -1
@@ -150,7 +150,6 @@ extern void clockevents_exchange_device( struct clock_event_device *new);extern void clockevents_set_mode (struct clock_event_device *dev,enum clock_event_mode mode); -extern int clockevents_register_notifier (struct notifier_block *nb);extern int clockevents_program_event (struct clock_event_device *dev,ktime_t expires,bool force);
kernel/time/clockevents.c +3 -32
@@ -15,7 +15,6 @@#include <linux/hrtimer.h> #include <linux/init.h> #include <linux/module.h> -#include <linux/notifier.h> #include <linux/smp.h> #include "tick-internal.h"
@@ -23,10 +22,6 @@/* The registered clock event devices */ static LIST_HEAD (clockevent_devices);static LIST_HEAD (clockevents_released); - -/* Notification for clock events */ -static RAW_NOTIFIER_HEAD (clockevents_chain); -/* Protection for the above */ static DEFINE_RAW_SPINLOCK (clockevents_lock);
@@ -232,30 +227,6 @@ int clockevents_program_event(struct cloreturn (rc && force) ?clockevents_program_min_delta (dev) : rc; } -/** -* clockevents_register_notifier - register a clock events change listener -*/ -int clockevents_register_notifier (struct notifier_block *nb) -{ -unsigned long flags; -int ret; - -raw_spin_lock_irqsave (&clockevents_lock, flags); - ret =raw_notifier_chain_register (&clockevents_chain, nb); -raw_spin_unlock_irqrestore (&clockevents_lock, flags); - -return ret; -} - -/* -* Notify about a clock event change. Called with clockevents_lock -* held. -*/ -static void clockevents_do_notify (unsigned long reason,void *dev) -{ -raw_notifier_call_chain (&clockevents_chain, reason, dev); -} -/* * Called after a notify add to make devices available which were * released from the notifier call.
@@ -269,7 +240,7 @@ static void clockevents_notify_released( struct clock_event_device, list);list_del (&dev->list);list_add (&dev->list, &clockevent_devices); -clockevents_do_notify (CLOCK_EVT_NOTIFY_ADD , dev); +tick_check_new_device (dev); } }
@@ -290,7 +261,7 @@ void clockevents_register_device(structraw_spin_lock_irqsave (&clockevents_lock, flags);list_add (&dev->list, &clockevent_devices); -clockevents_do_notify (CLOCK_EVT_NOTIFY_ADD , dev); +tick_check_new_device (dev);clockevents_notify_released ();raw_spin_unlock_irqrestore (&clockevents_lock, flags);
@@ -433,7 +404,7 @@ void clockevents_notify(unsigned long reint cpu;raw_spin_lock_irqsave (&clockevents_lock, flags); -clockevents_do_notify (reason, arg); +tick_notify (reason, arg);switch (reason) {case CLOCK_EVT_NOTIFY_CPU_DEAD :
kernel/time/tick-broadcast.c +2 -3
@@ -64,7 +64,7 @@ static void tick_broadcast_start_periodi/* * Check, if the device can be utilized as broadcast device: */ -int tick_check_broadcast_device (struct clock_event_device *dev) +void tick_install_broadcast_device (struct clock_event_device *dev) {struct clock_event_device *cur = tick_broadcast_device.evtdev;
@@ -72,7 +72,7 @@ int tick_check_broadcast_device(struct c (tick_broadcast_device.evtdev && tick_broadcast_device.evtdev->rating >= dev->rating) || (dev->features & CLOCK_EVT_FEAT_C3STOP)) - return 0; + return;clockevents_exchange_device (tick_broadcast_device.evtdev, dev);if (cur)
@@ -90,7 +90,6 @@ int tick_check_broadcast_device(struct c*/ if (dev->features &CLOCK_EVT_FEAT_ONESHOT )tick_clock_notify (); -return 1 ; }/*
kernel/time/tick-common.c +5 -25
@@ -205,11 +205,11 @@ static void tick_setup_device(struct tic/* * Check, if the new registered device should be used. */ -static int tick_check_new_device (struct clock_event_device *newdev) +void tick_check_new_device (struct clock_event_device *newdev) {struct clock_event_device *curdev;struct tick_device *td; -int cpu, ret =NOTIFY_OK ; +int cpu;unsigned long flags;raw_spin_lock_irqsave (&tick_device_lock, flags);
@@ -272,18 +272,14 @@ static int tick_check_new_device(structtick_oneshot_notify ();raw_spin_unlock_irqrestore (&tick_device_lock, flags); -return NOTIFY_STOP ; +return ; out_bc:/* * Can the new device be used as a broadcast device ? */ -if (tick_check_broadcast_device (newdev)) - ret =NOTIFY_STOP ; - +tick_install_broadcast_device (newdev);raw_spin_unlock_irqrestore (&tick_device_lock, flags); - -return ret; }/*
@@ -357,17 +353,10 @@ static void tick_resume(void)raw_spin_unlock_irqrestore (&tick_device_lock, flags); } -/* -* Notification about clock event devices -*/ -static int tick_notify (struct notifier_block *nb,unsigned long reason, -void *dev) +void tick_notify (unsigned long reason,void *dev) {switch (reason) { -case CLOCK_EVT_NOTIFY_ADD : -return tick_check_new_device (dev); -case CLOCK_EVT_NOTIFY_BROADCAST_ON :case CLOCK_EVT_NOTIFY_BROADCAST_OFF :case CLOCK_EVT_NOTIFY_BROADCAST_FORCE :
@@ -401,21 +390,12 @@ static int tick_notify(struct notifier_bdefault :break ; } - -return NOTIFY_OK ; } -static struct notifier_block tick_notifier = { - .notifier_call = tick_notify, -}; -/** * tick_init - initialize the tick control -* -* Register the notifier with the clockevents framework */ void __init tick_init (void ) { -clockevents_register_notifier (&tick_notifier);tick_broadcast_init (); }
kernel/time/tick-internal.h +4 -3
@@ -18,6 +18,8 @@ extern int tick_do_timer_cpu __read_mostextern void tick_setup_periodic (struct clock_event_device *dev,int broadcast);extern void tick_handle_periodic (struct clock_event_device *dev); +extern void tick_notify (unsigned long reason,void *dev); +extern void tick_check_new_device (struct clock_event_device *dev);extern void clockevents_shutdown (struct clock_event_device *dev);
@@ -90,7 +92,7 @@ static inline bool tick_broadcast_onesho*/ #ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST extern int tick_device_uses_broadcast (struct clock_event_device *dev,int cpu); -extern int tick_check_broadcast_device (struct clock_event_device *dev); +extern void tick_install_broadcast_device (struct clock_event_device *dev);extern int tick_is_broadcast_device (struct clock_event_device *dev);extern void tick_broadcast_on_off (unsigned long reason,int *oncpu);extern void tick_shutdown_broadcast (unsigned int *cpup);
@@ -102,9 +104,8 @@ tick_set_periodic_handler(struct clock_e#else /* !BROADCAST */ -static inline int tick_check_broadcast_device (struct clock_event_device *dev) +static inline void tick_install_broadcast_device (struct clock_event_device *dev) { -return 0 ; }static inline int tick_is_broadcast_device (struct clock_event_device *dev)
tip-bot for Thomas Gleixner
merge bot[tip:timers/core] clockevents: Get rid of the notifier chain
clockevents: Get rid of the notifier chain
Commit-ID: 7172a286ced0c1f4f239a0fa09db54ed37d3ead2 Gitweb: http://git.kernel.org/tip/7172a286ced0c1f4f239a0fa09db54ed37d3ead2 Author: Thomas Gleixner <[email protected]> AuthorDate: Thu, 25 Apr 2013 20:31:47 +0000 Committer: Thomas Gleixner <[email protected]> CommitDate: Thu, 16 May 2013 11:09:16 +0200
clockevents: Get rid of the notifier chain
7+ years and still a single user. Kill it.
--- include/linux/clockchips.h | 1 - kernel/time/clockevents.c | 35 +++-------------------------------- kernel/time/tick-broadcast.c | 5 ++--- kernel/time/tick-common.c | 30 +++++------------------------- kernel/time/tick-internal.h | 7 ++++--- 5 files changed, 14 insertions(+), 64 deletions(-)
include/linux/clockchips.h +0 -1
@@ -150,7 +150,6 @@ extern void clockevents_exchange_device(struct clock_event_device *old, struct clock_event_device *new);extern void clockevents_set_mode (struct clock_event_device *dev,enum clock_event_mode mode); -extern int clockevents_register_notifier (struct notifier_block *nb);extern int clockevents_program_event (struct clock_event_device *dev,ktime_t expires,bool force);
kernel/time/clockevents.c +3 -32
@@ -15,7 +15,6 @@#include <linux/hrtimer.h> #include <linux/init.h> #include <linux/module.h> -#include <linux/notifier.h> #include <linux/smp.h> #include "tick-internal.h"
@@ -23,10 +22,6 @@/* The registered clock event devices */ static LIST_HEAD (clockevent_devices);static LIST_HEAD (clockevents_released); - -/* Notification for clock events */ -static RAW_NOTIFIER_HEAD (clockevents_chain); -/* Protection for the above */ static DEFINE_RAW_SPINLOCK (clockevents_lock);
@@ -232,30 +227,6 @@ int clockevents_program_event(struct clock_event_device *dev, ktime_t expires,return (rc && force) ?clockevents_program_min_delta (dev) : rc; } -/** -* clockevents_register_notifier - register a clock events change listener -*/ -int clockevents_register_notifier (struct notifier_block *nb) -{ -unsigned long flags; -int ret; - -raw_spin_lock_irqsave (&clockevents_lock, flags); - ret =raw_notifier_chain_register (&clockevents_chain, nb); -raw_spin_unlock_irqrestore (&clockevents_lock, flags); - -return ret; -} - -/* -* Notify about a clock event change. Called with clockevents_lock -* held. -*/ -static void clockevents_do_notify (unsigned long reason,void *dev) -{ -raw_notifier_call_chain (&clockevents_chain, reason, dev); -} -/* * Called after a notify add to make devices available which were * released from the notifier call.
@@ -269,7 +240,7 @@ static void clockevents_notify_released(void) struct clock_event_device, list);list_del (&dev->list);list_add (&dev->list, &clockevent_devices); -clockevents_do_notify (CLOCK_EVT_NOTIFY_ADD , dev); +tick_check_new_device (dev); } }
@@ -290,7 +261,7 @@ void clockevents_register_device(struct clock_event_device *dev)raw_spin_lock_irqsave (&clockevents_lock, flags);list_add (&dev->list, &clockevent_devices); -clockevents_do_notify (CLOCK_EVT_NOTIFY_ADD , dev); +tick_check_new_device (dev);clockevents_notify_released ();raw_spin_unlock_irqrestore (&clockevents_lock, flags);
@@ -433,7 +404,7 @@ void clockevents_notify(unsigned long reason, void *arg)int cpu;raw_spin_lock_irqsave (&clockevents_lock, flags); -clockevents_do_notify (reason, arg); +tick_notify (reason, arg);switch (reason) {case CLOCK_EVT_NOTIFY_CPU_DEAD :
kernel/time/tick-broadcast.c +2 -3
@@ -64,7 +64,7 @@ static void tick_broadcast_start_periodic(struct clock_event_device *bc)/* * Check, if the device can be utilized as broadcast device: */ -int tick_check_broadcast_device (struct clock_event_device *dev) +void tick_install_broadcast_device (struct clock_event_device *dev) {struct clock_event_device *cur = tick_broadcast_device.evtdev;
@@ -72,7 +72,7 @@ int tick_check_broadcast_device(struct clock_event_device *dev) (tick_broadcast_device.evtdev && tick_broadcast_device.evtdev->rating >= dev->rating) || (dev->features & CLOCK_EVT_FEAT_C3STOP)) - return 0; + return;clockevents_exchange_device (tick_broadcast_device.evtdev, dev);if (cur)
@@ -90,7 +90,6 @@ int tick_check_broadcast_device(struct clock_event_device *dev)*/ if (dev->features &CLOCK_EVT_FEAT_ONESHOT )tick_clock_notify (); -return 1 ; }/*
kernel/time/tick-common.c +5 -25
@@ -208,11 +208,11 @@ static void tick_setup_device(struct tick_device *td,/* * Check, if the new registered device should be used. */ -static int tick_check_new_device (struct clock_event_device *newdev) +void tick_check_new_device (struct clock_event_device *newdev) {struct clock_event_device *curdev;struct tick_device *td; -int cpu, ret =NOTIFY_OK ; +int cpu;unsigned long flags;raw_spin_lock_irqsave (&tick_device_lock, flags);
@@ -275,18 +275,14 @@ static int tick_check_new_device(struct clock_event_device *newdev)tick_oneshot_notify ();raw_spin_unlock_irqrestore (&tick_device_lock, flags); -return NOTIFY_STOP ; +return ; out_bc:/* * Can the new device be used as a broadcast device ? */ -if (tick_check_broadcast_device (newdev)) - ret =NOTIFY_STOP ; - +tick_install_broadcast_device (newdev);raw_spin_unlock_irqrestore (&tick_device_lock, flags); - -return ret; }/*
@@ -360,17 +356,10 @@ static void tick_resume(void)raw_spin_unlock_irqrestore (&tick_device_lock, flags); } -/* -* Notification about clock event devices -*/ -static int tick_notify (struct notifier_block *nb,unsigned long reason, -void *dev) +void tick_notify (unsigned long reason,void *dev) {switch (reason) { -case CLOCK_EVT_NOTIFY_ADD : -return tick_check_new_device (dev); -case CLOCK_EVT_NOTIFY_BROADCAST_ON :case CLOCK_EVT_NOTIFY_BROADCAST_OFF :case CLOCK_EVT_NOTIFY_BROADCAST_FORCE :
@@ -404,21 +393,12 @@ static int tick_notify(struct notifier_block *nb, unsigned long reason,default :break ; } - -return NOTIFY_OK ; } -static struct notifier_block tick_notifier = { - .notifier_call = tick_notify, -}; -/** * tick_init - initialize the tick control -* -* Register the notifier with the clockevents framework */ void __init tick_init (void ) { -clockevents_register_notifier (&tick_notifier);tick_broadcast_init (); }
kernel/time/tick-internal.h +4 -3
@@ -18,6 +18,8 @@ extern int tick_do_timer_cpu __read_mostly;extern void tick_setup_periodic (struct clock_event_device *dev,int broadcast);extern void tick_handle_periodic (struct clock_event_device *dev); +extern void tick_notify (unsigned long reason,void *dev); +extern void tick_check_new_device (struct clock_event_device *dev);extern void clockevents_shutdown (struct clock_event_device *dev);
@@ -90,7 +92,7 @@ static inline bool tick_broadcast_oneshot_available(void) { return false; }*/ #ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST extern int tick_device_uses_broadcast (struct clock_event_device *dev,int cpu); -extern int tick_check_broadcast_device (struct clock_event_device *dev); +extern void tick_install_broadcast_device (struct clock_event_device *dev);extern int tick_is_broadcast_device (struct clock_event_device *dev);extern void tick_broadcast_on_off (unsigned long reason,int *oncpu);extern void tick_shutdown_broadcast (unsigned int *cpup);
@@ -102,9 +104,8 @@ tick_set_periodic_handler(struct clock_event_device *dev, int broadcast);#else /* !BROADCAST */ -static inline int tick_check_broadcast_device (struct clock_event_device *dev) +static inline void tick_install_broadcast_device (struct clock_event_device *dev) { -return 0 ; }static inline int tick_is_broadcast_device (struct clock_event_device *dev)
PATCH 10/15 clockevents: Simplify locking
In reply to Thomas GleixnerNow that the notifier chain is gone there are no other users and it's pointless to nest tick_device_lock inside of clockevents_lock because there is no other use case.
--- kernel/time/tick-common.c | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-)
kernel/time/tick-common.c +5 -17
@@ -33,7 +33,6 @@ DEFINE_PER_CPU(struct tick_device, tick_ktime_t tick_next_period;ktime_t tick_period;int tick_do_timer_cpu__read_mostly =TICK_DO_TIMER_BOOT ; -static DEFINE_RAW_SPINLOCK (tick_device_lock);/* * Debugging: see timer_list.c
@@ -203,16 +202,14 @@ static void tick_setup_device(struct tic }/* -* Check, if the new registered device should be used. +* Check, if the new registered device should be used. Called with +* clockevents_lock held and interrupts disabled. */ void tick_check_new_device (struct clock_event_device *newdev) {struct clock_event_device *curdev;struct tick_device *td;int cpu; -unsigned long flags; - -raw_spin_lock_irqsave (&tick_device_lock, flags); cpu =smp_processor_id ();if (!cpumask_test_cpu (cpu, newdev->cpumask))
@@ -270,8 +267,6 @@ void tick_check_new_device(struct clock_tick_setup_device (td, newdev, cpu,cpumask_of (cpu));if (newdev->features &CLOCK_EVT_FEAT_ONESHOT )tick_oneshot_notify (); - -raw_spin_unlock_irqrestore (&tick_device_lock, flags);return ; out_bc:
@@ -279,7 +274,6 @@ out_bc:* Can the new device be used as a broadcast device ? */ tick_install_broadcast_device (newdev); -raw_spin_unlock_irqrestore (&tick_device_lock, flags); }/*
@@ -308,9 +302,7 @@ static void tick_shutdown(unsigned int * {struct tick_device *td = &per_cpu (tick_cpu_device, *cpup);struct clock_event_device *dev = td->evtdev; -unsigned long flags; -raw_spin_lock_irqsave (&tick_device_lock, flags); td->mode =TICKDEV_MODE_PERIODIC ;if (dev) {/*
@@ -322,26 +314,20 @@ static void tick_shutdown(unsigned int * dev->event_handler = clockevents_handle_noop; td->evtdev =NULL ; } -raw_spin_unlock_irqrestore (&tick_device_lock, flags); }static void tick_suspend (void ) {struct tick_device *td = &__get_cpu_var (tick_cpu_device); -unsigned long flags; -raw_spin_lock_irqsave (&tick_device_lock, flags);clockevents_shutdown (td->evtdev); -raw_spin_unlock_irqrestore (&tick_device_lock, flags); }static void tick_resume (void ) {struct tick_device *td = &__get_cpu_var (tick_cpu_device); -unsigned long flags;int broadcast =tick_resume_broadcast (); -raw_spin_lock_irqsave (&tick_device_lock, flags);clockevents_set_mode (td->evtdev,CLOCK_EVT_MODE_RESUME );if (!broadcast) {
@@ -350,9 +336,11 @@ static void tick_resume(void)else tick_resume_oneshot (); } -raw_spin_unlock_irqrestore (&tick_device_lock, flags); } +/* +* Called with clockevents_lock held and interrupts disabled +*/ void tick_notify (unsigned long reason,void *dev) {switch (reason) {
tip-bot for Thomas Gleixner
merge bot[tip:timers/core] clockevents: Simplify locking
clockevents: Simplify locking
Commit-ID: 7126cac426137633e470167524e7bcb590fd49b3 Gitweb: http://git.kernel.org/tip/7126cac426137633e470167524e7bcb590fd49b3 Author: Thomas Gleixner <[email protected]> AuthorDate: Thu, 25 Apr 2013 20:31:48 +0000 Committer: Thomas Gleixner <[email protected]> CommitDate: Thu, 16 May 2013 11:09:16 +0200
clockevents: Simplify locking
Now that the notifier chain is gone there are no other users and it's pointless to nest tick_device_lock inside of clockevents_lock because there is no other use case.
--- kernel/time/tick-common.c | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-)
kernel/time/tick-common.c +5 -17
@@ -33,7 +33,6 @@ DEFINE_PER_CPU(struct tick_device, tick_cpu_device);ktime_t tick_next_period;ktime_t tick_period;int tick_do_timer_cpu__read_mostly =TICK_DO_TIMER_BOOT ; -static DEFINE_RAW_SPINLOCK (tick_device_lock);/* * Debugging: see timer_list.c
@@ -206,16 +205,14 @@ static void tick_setup_device(struct tick_device *td, }/* -* Check, if the new registered device should be used. +* Check, if the new registered device should be used. Called with +* clockevents_lock held and interrupts disabled. */ void tick_check_new_device (struct clock_event_device *newdev) {struct clock_event_device *curdev;struct tick_device *td;int cpu; -unsigned long flags; - -raw_spin_lock_irqsave (&tick_device_lock, flags); cpu =smp_processor_id ();if (!cpumask_test_cpu (cpu, newdev->cpumask))
@@ -273,8 +270,6 @@ void tick_check_new_device(struct clock_event_device *newdev)tick_setup_device (td, newdev, cpu,cpumask_of (cpu));if (newdev->features &CLOCK_EVT_FEAT_ONESHOT )tick_oneshot_notify (); - -raw_spin_unlock_irqrestore (&tick_device_lock, flags);return ; out_bc:
@@ -282,7 +277,6 @@ out_bc:* Can the new device be used as a broadcast device ? */ tick_install_broadcast_device (newdev); -raw_spin_unlock_irqrestore (&tick_device_lock, flags); }/*
@@ -311,9 +305,7 @@ static void tick_shutdown(unsigned int *cpup) {struct tick_device *td = &per_cpu (tick_cpu_device, *cpup);struct clock_event_device *dev = td->evtdev; -unsigned long flags; -raw_spin_lock_irqsave (&tick_device_lock, flags); td->mode =TICKDEV_MODE_PERIODIC ;if (dev) {/*
@@ -325,26 +317,20 @@ static void tick_shutdown(unsigned int *cpup) dev->event_handler = clockevents_handle_noop; td->evtdev =NULL ; } -raw_spin_unlock_irqrestore (&tick_device_lock, flags); }static void tick_suspend (void ) {struct tick_device *td = &__get_cpu_var (tick_cpu_device); -unsigned long flags; -raw_spin_lock_irqsave (&tick_device_lock, flags);clockevents_shutdown (td->evtdev); -raw_spin_unlock_irqrestore (&tick_device_lock, flags); }static void tick_resume (void ) {struct tick_device *td = &__get_cpu_var (tick_cpu_device); -unsigned long flags;int broadcast =tick_resume_broadcast (); -raw_spin_lock_irqsave (&tick_device_lock, flags);clockevents_set_mode (td->evtdev,CLOCK_EVT_MODE_RESUME );if (!broadcast) {
@@ -353,9 +339,11 @@ static void tick_resume(void)else tick_resume_oneshot (); } -raw_spin_unlock_irqrestore (&tick_device_lock, flags); } +/* +* Called with clockevents_lock held and interrupts disabled +*/ void tick_notify (unsigned long reason,void *dev) {switch (reason) {
PATCH 11/15 clockevents: Move the tick_notify() switch case to clockevents_notify()
In reply to Thomas GleixnerNo need to call another function and have duplicated cases.
--- kernel/time/clockevents.c | 28 +++++++++++++++++++++++- kernel/time/tick-common.c | 50 +++----------------------------------------- kernel/time/tick-internal.h | 5 +++- 3 files changed, 35 insertions(+), 48 deletions(-)
kernel/time/clockevents.c +27 -1
@@ -404,10 +404,36 @@ void clockevents_notify(unsigned long reint cpu;raw_spin_lock_irqsave (&clockevents_lock, flags); -tick_notify (reason, arg);switch (reason) { +case CLOCK_EVT_NOTIFY_BROADCAST_ON : +case CLOCK_EVT_NOTIFY_BROADCAST_OFF : +case CLOCK_EVT_NOTIFY_BROADCAST_FORCE : +tick_broadcast_on_off (reason, arg); +break ; + +case CLOCK_EVT_NOTIFY_BROADCAST_ENTER : +case CLOCK_EVT_NOTIFY_BROADCAST_EXIT : +tick_broadcast_oneshot_control (reason); +break ; + +case CLOCK_EVT_NOTIFY_CPU_DYING : +tick_handover_do_timer (arg); +break ; + +case CLOCK_EVT_NOTIFY_SUSPEND : +tick_suspend (); +tick_suspend_broadcast (); +break ; + +case CLOCK_EVT_NOTIFY_RESUME : +tick_resume (); +break ; +case CLOCK_EVT_NOTIFY_CPU_DEAD : +tick_shutdown_broadcast_oneshot (arg); +tick_shutdown_broadcast (arg); +tick_shutdown (arg);/* * Unregister the clock event devices which were * released from the users in the notify chain.
kernel/time/tick-common.c +4 -46
80 lines not on this page · raw message
kernel/time/tick-internal.h +4 -1
@@ -18,8 +18,11 @@ extern int tick_do_timer_cpu __read_mostextern void tick_setup_periodic (struct clock_event_device *dev,int broadcast);extern void tick_handle_periodic (struct clock_event_device *dev); -extern void tick_notify (unsigned long reason,void *dev);extern void tick_check_new_device (struct clock_event_device *dev); +extern void tick_handover_do_timer (int *cpup); +extern void tick_shutdown (unsigned int *cpup); +extern void tick_suspend (void ); +extern void tick_resume (void );extern void clockevents_shutdown (struct clock_event_device *dev);
tip-bot for Thomas Gleixner
merge bot[tip:timers/core] clockevents: Move the tick_notify() switch case to clockevents_notify()
clockevents: Move the tick_notify() switch case to clockevents_notify()
Commit-ID: 8c53daf63f56791ed47fc585206ef3049489612f Gitweb: http://git.kernel.org/tip/8c53daf63f56791ed47fc585206ef3049489612f Author: Thomas Gleixner <[email protected]> AuthorDate: Thu, 25 Apr 2013 20:31:48 +0000 Committer: Thomas Gleixner <[email protected]> CommitDate: Thu, 16 May 2013 11:09:16 +0200
clockevents: Move the tick_notify() switch case to clockevents_notify()
No need to call another function and have duplicated cases.
--- kernel/time/clockevents.c | 28 ++++++++++++++++++++++++- kernel/time/tick-common.c | 50 ++++----------------------------------------- kernel/time/tick-internal.h | 5 ++++- 3 files changed, 35 insertions(+), 48 deletions(-)
kernel/time/clockevents.c +27 -1
@@ -404,10 +404,36 @@ void clockevents_notify(unsigned long reason, void *arg)int cpu;raw_spin_lock_irqsave (&clockevents_lock, flags); -tick_notify (reason, arg);switch (reason) { +case CLOCK_EVT_NOTIFY_BROADCAST_ON : +case CLOCK_EVT_NOTIFY_BROADCAST_OFF : +case CLOCK_EVT_NOTIFY_BROADCAST_FORCE : +tick_broadcast_on_off (reason, arg); +break ; + +case CLOCK_EVT_NOTIFY_BROADCAST_ENTER : +case CLOCK_EVT_NOTIFY_BROADCAST_EXIT : +tick_broadcast_oneshot_control (reason); +break ; + +case CLOCK_EVT_NOTIFY_CPU_DYING : +tick_handover_do_timer (arg); +break ; + +case CLOCK_EVT_NOTIFY_SUSPEND : +tick_suspend (); +tick_suspend_broadcast (); +break ; + +case CLOCK_EVT_NOTIFY_RESUME : +tick_resume (); +break ; +case CLOCK_EVT_NOTIFY_CPU_DEAD : +tick_shutdown_broadcast_oneshot (arg); +tick_shutdown_broadcast (arg); +tick_shutdown (arg);/* * Unregister the clock event devices which were * released from the users in the notify chain.
kernel/time/tick-common.c +4 -46
80 lines not on this page · raw message
kernel/time/tick-internal.h +4 -1
@@ -18,8 +18,11 @@ extern int tick_do_timer_cpu __read_mostly;extern void tick_setup_periodic (struct clock_event_device *dev,int broadcast);extern void tick_handle_periodic (struct clock_event_device *dev); -extern void tick_notify (unsigned long reason,void *dev);extern void tick_check_new_device (struct clock_event_device *dev); +extern void tick_handover_do_timer (int *cpup); +extern void tick_shutdown (unsigned int *cpup); +extern void tick_suspend (void ); +extern void tick_resume (void );extern void clockevents_shutdown (struct clock_event_device *dev);
PATCH 12/15 clockevents: Add module refcount
In reply to Thomas GleixnerWe want to be able to remove clockevent modules as well. Add a refcount so we don't remove a module with an active clock event device.
--- include/linux/clockchips.h | 3 +++ kernel/time/clockevents.c | 1 + kernel/time/tick-broadcast.c | 3 +++ kernel/time/tick-common.c | 4 ++++ 4 files changed, 11 insertions(+)
include/linux/clockchips.h +3 -0
@@ -16,6 +16,7 @@#include <linux/notifier.h> struct clock_event_device ; +struct module ;/* Clock event mode commands */ enum clock_event_mode {
@@ -83,6 +84,7 @@ enum clock_event_nofitiers {* @irq: IRQ number (only for non CPU local devices) * @cpumask: cpumask to indicate for which CPUs this device works * @list: list head for the management code +* @owner: module reference */ struct clock_event_device {void (*event_handler)(struct clock_event_device *);
@@ -112,6 +114,7 @@ struct clock_event_device {int irq;const struct cpumask *cpumask;struct list_head list; +struct module *owner; }____cacheline_aligned ;/*
kernel/time/clockevents.c +1 -0
@@ -357,6 +357,7 @@ void clockevents_exchange_device(struct* released list and do a notify add later. */ if (old) { +module_put (old->owner);clockevents_set_mode (old,CLOCK_EVT_MODE_UNUSED );list_del (&old->list);list_add (&old->list, &clockevents_released);
kernel/time/tick-broadcast.c +3 -0
@@ -19,6 +19,7 @@#include <linux/profile.h> #include <linux/sched.h> #include <linux/smp.h> +#include <linux/module.h> #include "tick-internal.h"
@@ -73,6 +74,8 @@ void tick_install_broadcast_device(struc tick_broadcast_device.evtdev->rating >= dev->rating) || (dev->features & CLOCK_EVT_FEAT_C3STOP))return ; +if (!try_module_get (dev->owner)) +return ;clockevents_exchange_device (tick_broadcast_device.evtdev, dev);if (cur)
kernel/time/tick-common.c +4 -0
@@ -18,6 +18,7 @@#include <linux/percpu.h> #include <linux/profile.h> #include <linux/sched.h> +#include <linux/module.h> #include <asm/irq_regs.h>
@@ -254,6 +255,9 @@ void tick_check_new_device(struct clock_ goto out_bc; } +if (!try_module_get (newdev->owner)) +return ; +/* * Replace the eventually existing device by the new * device. If the current device is the broadcast device, do
tip-bot for Thomas Gleixner
merge bot[tip:timers/core] clockevents: Add module refcount
clockevents: Add module refcount
Commit-ID: ccf33d6880f39a35158fff66db13000ae4943fac Gitweb: http://git.kernel.org/tip/ccf33d6880f39a35158fff66db13000ae4943fac Author: Thomas Gleixner <[email protected]> AuthorDate: Thu, 25 Apr 2013 20:31:49 +0000 Committer: Thomas Gleixner <[email protected]> CommitDate: Thu, 16 May 2013 11:09:17 +0200
clockevents: Add module refcount
We want to be able to remove clockevent modules as well. Add a refcount so we don't remove a module with an active clock event device.
--- include/linux/clockchips.h | 3 +++ kernel/time/clockevents.c | 1 + kernel/time/tick-broadcast.c | 3 +++ kernel/time/tick-common.c | 4 ++++ 4 files changed, 11 insertions(+)
include/linux/clockchips.h +3 -0
@@ -30,6 +30,7 @@ enum clock_event_nofitiers {#include <linux/notifier.h> struct clock_event_device ; +struct module ;/* Clock event mode commands */ enum clock_event_mode {
@@ -83,6 +84,7 @@ enum clock_event_mode {* @irq: IRQ number (only for non CPU local devices) * @cpumask: cpumask to indicate for which CPUs this device works * @list: list head for the management code +* @owner: module reference */ struct clock_event_device {void (*event_handler)(struct clock_event_device *);
@@ -112,6 +114,7 @@ struct clock_event_device {int irq;const struct cpumask *cpumask;struct list_head list; +struct module *owner; }____cacheline_aligned ;/*
kernel/time/clockevents.c +1 -0
@@ -357,6 +357,7 @@ void clockevents_exchange_device(struct clock_event_device *old,* released list and do a notify add later. */ if (old) { +module_put (old->owner);clockevents_set_mode (old,CLOCK_EVT_MODE_UNUSED );list_del (&old->list);list_add (&old->list, &clockevents_released);
kernel/time/tick-broadcast.c +3 -0
@@ -19,6 +19,7 @@#include <linux/profile.h> #include <linux/sched.h> #include <linux/smp.h> +#include <linux/module.h> #include "tick-internal.h"
@@ -73,6 +74,8 @@ void tick_install_broadcast_device(struct clock_event_device *dev) tick_broadcast_device.evtdev->rating >= dev->rating) || (dev->features & CLOCK_EVT_FEAT_C3STOP))return ; +if (!try_module_get (dev->owner)) +return ;clockevents_exchange_device (tick_broadcast_device.evtdev, dev);if (cur)
kernel/time/tick-common.c +4 -0
@@ -18,6 +18,7 @@#include <linux/percpu.h> #include <linux/profile.h> #include <linux/sched.h> +#include <linux/module.h> #include <asm/irq_regs.h>
@@ -257,6 +258,9 @@ void tick_check_new_device(struct clock_event_device *newdev) goto out_bc; } +if (!try_module_get (newdev->owner)) +return ; +/* * Replace the eventually existing device by the new * device. If the current device is the broadcast device, do
PATCH 13/15 clockevents: Provide sysfs interface
In reply to Thomas GleixnerProvide a simple sysfs interface for the clockevent devices. Show the current active clockevent device.
--- kernel/time/clockevents.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+)
kernel/time/clockevents.c +86 -0
@@ -16,6 +16,7 @@#include <linux/init.h> #include <linux/module.h> #include <linux/smp.h> +#include <linux/device.h> #include "tick-internal.h"
@@ -460,4 +461,89 @@ void clockevents_notify(unsigned long reraw_spin_unlock_irqrestore (&clockevents_lock, flags); }EXPORT_SYMBOL_GPL (clockevents_notify); + +#ifdef CONFIG_SYSFS +struct bus_type clockevents_subsys = { + .name ="clockevents" , + .dev_name ="clockevent" , +}; + +static DEFINE_PER_CPU(struct device, tick_percpu_dev); +static struct tick_device *tick_get_tick_dev (struct device *dev); + +static ssize_t sysfs_show_current_tick_dev (struct device *dev, +struct device_attribute *attr, +char *buf) +{ +struct tick_device *td; +ssize_t count =0 ; + +raw_spin_lock_irq (&clockevents_lock); + td =tick_get_tick_dev (dev); +if (td && td->evtdev) + count =snprintf (buf,PAGE_SIZE ,"%s\n" , td->evtdev->name); +raw_spin_unlock_irq (&clockevents_lock); +return count; +} +static DEVICE_ATTR(current_device, 0444, sysfs_show_current_tick_dev, NULL); + +#ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST +static struct device tick_bc_dev = { + .init_name ="broadcast" , + .id =0 , + .bus = &clockevents_subsys, +}; + +static struct tick_device *tick_get_tick_dev (struct device *dev) +{ +return dev == &tick_bc_dev ?tick_get_broadcast_device () : + &per_cpu (tick_cpu_device, dev->id); +} + +static int tick_broadcast_init_sysfs (void ) +{ +int err =device_register (&tick_bc_dev); + +if (!err) + err =device_create_file (&tick_bc_dev, &dev_attr_current_device); +return err; +} +#else +static struct tick_device *tick_get_tick_dev (struct device *dev) +{ +return &per_cpu (tick_cpu_device, dev->id); +} +static inline int tick_broadcast_init_sysfs (void ) {return 0 ; }#endif + +int __init tick_init_sysfs (void ) +{ +int cpu; + +for_each_possible_cpu (cpu) { +struct device *dev = &per_cpu (tick_percpu_dev, cpu); +int err; + + dev->id = cpu; + dev->bus = &clockevents_subsys; + err =device_register (dev); +if (!err) + err =device_create_file (dev, &dev_attr_current_device); +if (err) +return err; + } +return tick_broadcast_init_sysfs (); +} + +static int __init clockevents_init_sysfs (void ) +{ +int err =subsys_system_register (&clockevents_subsys,NULL ); + +if (!err) + err =tick_init_sysfs (); +return err; +} +device_initcall (clockevents_init_sysfs); +#endif /* SYSFS */ + +#endif /* GENERIC_CLOCK_EVENTS */
Re: [patch 13/15] clockevents: Provide sysfs interface
Quoted 3 lines · Thomas Gleixner
Provide a simple sysfs interface for the clockevent devices. Show the current active clockevent device.
Neat. Does this do anything about clockevents that aren't in use for the tick devices or broadcast device?
Quoted 38 lines
Index:
tip/kernel/time/clockevents.c
===================================================================kernel/time/clockevents.c +30
-0@@ -460,4 +461,89 @@ void clockevents_notify(unsigned long reraw_spin_unlock_irqrestore (&clockevents_lock, flags); }EXPORT_SYMBOL_GPL (clockevents_notify); + +#ifdef CONFIG_SYSFS +struct bus_type clockevents_subsys = { + .name ="clockevents" , + .dev_name ="clockevent" , +}; + +static DEFINE_PER_CPU(struct device, tick_percpu_dev); +static struct tick_device *tick_get_tick_dev (struct device *dev); + +static ssize_t sysfs_show_current_tick_dev (struct device *dev, +struct device_attribute *attr, +char *buf) +{ +struct tick_device *td; +ssize_t count =0 ; + +raw_spin_lock_irq (&clockevents_lock); + td =tick_get_tick_dev (dev); +if (td && td->evtdev) + count =snprintf (buf,PAGE_SIZE ,"%s\n" , td->evtdev->name); +raw_spin_unlock_irq (&clockevents_lock); +return count; +} +static DEVICE_ATTR(current_device, 0444, sysfs_show_current_tick_dev, NULL); + +#ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST +static struct device tick_bc_dev = { + .init_name ="broadcast" , + .id = 0,
kernel/time/clockevents.c void clockevents_notify(unsigned long re · line 503
Quoted 10 lines
kernel/time/clockevents.c +10
-0+ .bus = &clockevents_subsys, +}; + +static struct tick_device *tick_get_tick_dev (struct device *dev) +{ +return dev == &tick_bc_dev ?tick_get_broadcast_device () : + &per_cpu (tick_cpu_device, dev->id); +} + +static int tick_broadcast_init_sysfs (void )
__init?
Quoted 6 lines
kernel/time/clockevents.c +6
-0+{ +int err =device_register (&tick_bc_dev); + +if (!err) + err =device_create_file (&tick_bc_dev, &dev_attr_current_device); +return err;
kernel/time/clockevents.c void clockevents_notify(unsigned long re · line 519
Quoted 10 lines
kernel/time/clockevents.c +9
-0+} +#else +static struct tick_device *tick_get_tick_dev (struct device *dev) +{ +return &per_cpu (tick_cpu_device, dev->id); +} +static inline int tick_broadcast_init_sysfs (void ) {return 0 ; }#endif + +int __init tick_init_sysfs (void )
static?
Quoted 17 lines
kernel/time/clockevents.c +17
-0+{ +int cpu; + +for_each_possible_cpu (cpu) { +struct device *dev = &per_cpu (tick_percpu_dev, cpu); +int err; + + dev->id = cpu; + dev->bus = &clockevents_subsys; + err =device_register (dev); +if (!err) + err =device_create_file (dev, &dev_attr_current_device); +if (err) +return err; + } +return tick_broadcast_init_sysfs (); +}
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Re: [patch 13/15] clockevents: Provide sysfs interface
Quoted 7 lines · Stephen Boyd
Quoted 3 lines · Thomas Gleixner
Provide a simple sysfs interface for the clockevent devices. Show the current active clockevent device.
Neat. Does this do anything about clockevents that aren't in use for the tick devices or broadcast device?
No, but that would be simple to add.
Quoted 3 lines
Quoted 1 line
+static int
tick_broadcast_init_sysfs(void)
__init?
Yes
Quoted 10 lines
Quoted 10 lines
kernel/time/clockevents.c +10
-0+{ +int err =device_register (&tick_bc_dev); + +if (!err) + err =device_create_file (&tick_bc_dev, &dev_attr_current_device); +return err; +} +#else +static struct tick_device *tick_get_tick_dev (struct device *dev) +{
Quoted 8 lines
kernel/time/clockevents.c void clockevents_notify(unsigned long re · line 519
Quoted 6 lines
kernel/time/clockevents.c +5
-0+ return &per_cpu(tick_cpu_device, dev->id); +} +static inline int tick_broadcast_init_sysfs (void ) {return 0 ; }#endif + +int __init tick_init_sysfs (void )static?
Yes
Quoted 22 lines
Quoted 17 lines
kernel/time/clockevents.c +17
-0+{ +int cpu; + +for_each_possible_cpu (cpu) { +struct device *dev = &per_cpu (tick_percpu_dev, cpu); +int err; + + dev->id = cpu; + dev->bus = &clockevents_subsys; + err =device_register (dev); +if (!err) + err =device_create_file (dev, &dev_attr_current_device); +if (err) +return err; + } +return tick_broadcast_init_sysfs (); +}Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Re: [patch 13/15] clockevents: Provide sysfs interface
Quoted 9 lines · Thomas Gleixner
Quoted 6 lines · Stephen Boyd
Quoted 3 lines · Thomas Gleixner
Provide a simple sysfs interface for the clockevent devices. Show the current active clockevent device.
Neat. Does this do anything about clockevents that aren't in use for the tick devices or broadcast device?
No, but that would be simple to add.
What would it look like? Right now I think we have clockevent0,1,2,3, etc. for all the cpus and a broadcast0 device. The broadcast0 device is present even if we don't actually have a broadcast device in the system (i.e. it says <null> for its name).
Would we add unused_clockevent0,1,2? Maybe we should have clockevent devices for each physical evtdev and then symlinks for clockevent0,1,2,3 and broadcast0 that point to the physical clockevent device?
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
tip-bot for Thomas Gleixner
merge bot[tip:timers/core] clockevents: Provide sysfs interface
In reply to Thomas Gleixnerclockevents: Provide sysfs interface
Commit-ID: 501f867064e95f9a6f540e60705be0937280e7ec Gitweb: http://git.kernel.org/tip/501f867064e95f9a6f540e60705be0937280e7ec Author: Thomas Gleixner <[email protected]> AuthorDate: Thu, 25 Apr 2013 20:31:49 +0000 Committer: Thomas Gleixner <[email protected]> CommitDate: Thu, 16 May 2013 11:09:17 +0200
clockevents: Provide sysfs interface
Provide a simple sysfs interface for the clockevent devices. Show the current active clockevent device.
--- kernel/time/clockevents.c | 86 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+)
kernel/time/clockevents.c +86 -0
@@ -16,6 +16,7 @@#include <linux/init.h> #include <linux/module.h> #include <linux/smp.h> +#include <linux/device.h> #include "tick-internal.h"
@@ -460,4 +461,89 @@ void clockevents_notify(unsigned long reason, void *arg)raw_spin_unlock_irqrestore (&clockevents_lock, flags); }EXPORT_SYMBOL_GPL (clockevents_notify); + +#ifdef CONFIG_SYSFS +struct bus_type clockevents_subsys = { + .name ="clockevents" , + .dev_name ="clockevent" , +}; + +static DEFINE_PER_CPU(struct device, tick_percpu_dev); +static struct tick_device *tick_get_tick_dev (struct device *dev); + +static ssize_t sysfs_show_current_tick_dev (struct device *dev, +struct device_attribute *attr, +char *buf) +{ +struct tick_device *td; +ssize_t count =0 ; + +raw_spin_lock_irq (&clockevents_lock); + td =tick_get_tick_dev (dev); +if (td && td->evtdev) + count =snprintf (buf,PAGE_SIZE ,"%s\n" , td->evtdev->name); +raw_spin_unlock_irq (&clockevents_lock); +return count; +} +static DEVICE_ATTR(current_device, 0444, sysfs_show_current_tick_dev, NULL); + +#ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST +static struct device tick_bc_dev = { + .init_name ="broadcast" , + .id =0 , + .bus = &clockevents_subsys, +}; + +static struct tick_device *tick_get_tick_dev (struct device *dev) +{ +return dev == &tick_bc_dev ?tick_get_broadcast_device () : + &per_cpu (tick_cpu_device, dev->id); +} + +static __init int tick_broadcast_init_sysfs (void ) +{ +int err =device_register (&tick_bc_dev); + +if (!err) + err =device_create_file (&tick_bc_dev, &dev_attr_current_device); +return err; +} +#else +static struct tick_device *tick_get_tick_dev (struct device *dev) +{ +return &per_cpu (tick_cpu_device, dev->id); +} +static inline int tick_broadcast_init_sysfs (void ) {return 0 ; }#endif + +static int __init tick_init_sysfs (void ) +{ +int cpu; + +for_each_possible_cpu (cpu) { +struct device *dev = &per_cpu (tick_percpu_dev, cpu); +int err; + + dev->id = cpu; + dev->bus = &clockevents_subsys; + err =device_register (dev); +if (!err) + err =device_create_file (dev, &dev_attr_current_device); +if (err) +return err; + } +return tick_broadcast_init_sysfs (); +} + +static int __init clockevents_init_sysfs (void ) +{ +int err =subsys_system_register (&clockevents_subsys,NULL ); + +if (!err) + err =tick_init_sysfs (); +return err; +} +device_initcall (clockevents_init_sysfs); +#endif /* SYSFS */ + +#endif /* GENERIC_CLOCK_EVENTS */
PATCH 14/15 clockevents: Split out selection logic
In reply to Thomas GleixnerSplit out the clockevent device selection logic. Preparatory patch to allow unbinding active clockevent devices.
--- kernel/time/tick-broadcast.c | 25 ++++++++++++--- kernel/time/tick-common.c | 69 ++++++++++++++++++++++--------------------- 2 files changed, 56 insertions(+), 38 deletions(-)
kernel/time/tick-broadcast.c +20 -5
@@ -65,19 +65,34 @@ static void tick_broadcast_start_periodi/* * Check, if the device can be utilized as broadcast device: */ +static bool tick_check_broadcast_device (struct clock_event_device *curdev, +struct clock_event_device *newdev) +{ +if ((newdev->features &CLOCK_EVT_FEAT_DUMMY ) || + (newdev->features &CLOCK_EVT_FEAT_C3STOP )) +return false; + +if (tick_broadcast_device.mode ==TICKDEV_MODE_ONESHOT && + !(newdev->features &CLOCK_EVT_FEAT_ONESHOT )) +return false; + +return !curdev || newdev->rating > curdev->rating; +} + +/* +* Conditionally install/replace broadcast device +*/ void tick_install_broadcast_device (struct clock_event_device *dev) {struct clock_event_device *cur = tick_broadcast_device.evtdev; -if ((dev->features &CLOCK_EVT_FEAT_DUMMY ) || - (tick_broadcast_device.evtdev && - tick_broadcast_device.evtdev->rating >= dev->rating) || - (dev->features &CLOCK_EVT_FEAT_C3STOP )) +if (!tick_check_broadcast_device (cur, dev))return ; +if (!try_module_get (dev->owner))return ; -clockevents_exchange_device (tick_broadcast_device.evtdev, dev); +clockevents_exchange_device (cur, dev);if (cur) cur->event_handler = clockevents_handle_noop; tick_broadcast_device.evtdev = dev;
kernel/time/tick-common.c +36 -33
82 lines not on this page · raw message
tip-bot for Thomas Gleixner
merge bot[tip:timers/core] clockevents: Split out selection logic
clockevents: Split out selection logic
Commit-ID: 45cb8e01b2ecef1c2afb18333e95793fa1a90281 Gitweb: http://git.kernel.org/tip/45cb8e01b2ecef1c2afb18333e95793fa1a90281 Author: Thomas Gleixner <[email protected]> AuthorDate: Thu, 25 Apr 2013 20:31:50 +0000 Committer: Thomas Gleixner <[email protected]> CommitDate: Thu, 16 May 2013 11:09:17 +0200
clockevents: Split out selection logic
Split out the clockevent device selection logic. Preparatory patch to allow unbinding active clockevent devices.
--- kernel/time/tick-broadcast.c | 25 ++++++++++++---- kernel/time/tick-common.c | 69 +++++++++++++++++++++++--------------------- 2 files changed, 56 insertions(+), 38 deletions(-)
kernel/time/tick-broadcast.c +20 -5
@@ -65,19 +65,34 @@ static void tick_broadcast_start_periodic(struct clock_event_device *bc)/* * Check, if the device can be utilized as broadcast device: */ +static bool tick_check_broadcast_device (struct clock_event_device *curdev, +struct clock_event_device *newdev) +{ +if ((newdev->features &CLOCK_EVT_FEAT_DUMMY ) || + (newdev->features &CLOCK_EVT_FEAT_C3STOP )) +return false; + +if (tick_broadcast_device.mode ==TICKDEV_MODE_ONESHOT && + !(newdev->features &CLOCK_EVT_FEAT_ONESHOT )) +return false; + +return !curdev || newdev->rating > curdev->rating; +} + +/* +* Conditionally install/replace broadcast device +*/ void tick_install_broadcast_device (struct clock_event_device *dev) {struct clock_event_device *cur = tick_broadcast_device.evtdev; -if ((dev->features &CLOCK_EVT_FEAT_DUMMY ) || - (tick_broadcast_device.evtdev && - tick_broadcast_device.evtdev->rating >= dev->rating) || - (dev->features &CLOCK_EVT_FEAT_C3STOP )) +if (!tick_check_broadcast_device (cur, dev))return ; +if (!try_module_get (dev->owner))return ; -clockevents_exchange_device (tick_broadcast_device.evtdev, dev); +clockevents_exchange_device (cur, dev);if (cur) cur->event_handler = clockevents_handle_noop; tick_broadcast_device.evtdev = dev;
kernel/time/tick-common.c +36 -33
82 lines not on this page · raw message
PATCH 15/15 clockevents: Implement unbind functionality
In reply to Thomas GleixnerProvide a sysfs interface to allow unbinding of clockevent devices. The device is unbound if it is unused or if there is a replacement device available. Unbinding of broadcast devices is not supported as we don't want to foster that nonsense. If no replacement device is available the unbind returns -EBUSY. Unbind is available from the kernel and through sysfs, which is necessary to drop the module refcount.
--- include/linux/clockchips.h | 1 + kernel/time/clockevents.c | 125 ++++++++++++++++++++++++++++++++++++++++++++ kernel/time/clocksource.c | 9 +-- kernel/time/tick-common.c | 24 ++++++++ kernel/time/tick-internal.h | 7 ++ 5 files changed, 162 insertions(+), 4 deletions(-)
include/linux/clockchips.h +1 -0
@@ -141,6 +141,7 @@ static inline unsigned long div_sc(unsigextern u64 clockevent_delta2ns (unsigned long latch,struct clock_event_device *evt);extern void clockevents_register_device (struct clock_event_device *dev); +extern int clockevents_unbind_device (struct clock_event_device *ced,int cpu);extern void clockevents_config (struct clock_event_device *dev,u32 freq); extern void clockevents_config_and_register(struct clock_event_device *dev,
kernel/time/clockevents.c +125 -0
149 lines not on this page · raw message
kernel/time/clocksource.c +5 -4
@@ -31,6 +31,8 @@#include <linux/tick.h> #include <linux/kthread.h> +#include "tick-internal.h" +void timecounter_init (struct timecounter *tc,const struct cyclecounter *cc,u64 start_tstamp)
@@ -174,7 +176,6 @@ clocks_calc_mult_shift(u32 *mult, u32 *sstatic struct clocksource *curr_clocksource;static LIST_HEAD (clocksource_list);static DEFINE_MUTEX (clocksource_mutex); -#define CS_NAME_LEN 32static char override_name[CS_NAME_LEN ];static int finished_booting;
@@ -854,7 +855,7 @@ sysfs_show_current_clocksources(struct dreturn count; } -static size_t clocksource_get_uname (const char *buf,char *dst,size_t cnt) +size_t sysfs_get_uname (const char *buf,char *dst,size_t cnt) {/* strings from sysfs write are not 0 terminated! */ if (!cnt || cnt >=CS_NAME_LEN )
@@ -887,7 +888,7 @@ static ssize_t sysfs_override_clocksourcmutex_lock (&clocksource_mutex); - ret =clocksource_get_uname (buf, override_name, count); + ret =sysfs_get_uname (buf, override_name, count);if (ret >=0 )clocksource_select (false);
@@ -913,7 +914,7 @@ static ssize_t sysfs_unbind_clocksource(char name[CS_NAME_LEN ];size_t ret; - ret =clocksource_get_uname (buf, name, count); + ret =sysfs_get_uname (buf, name, count);if (ret <0 )return ret;
kernel/time/tick-common.c +24 -0
@@ -202,6 +202,17 @@ static void tick_setup_device(struct tictick_setup_oneshot (newdev, handler, next_event); } +void tick_install_replacement (struct clock_event_device *newdev) +{ +struct tick_device *td = &__get_cpu_var (tick_cpu_device); +int cpu =smp_processor_id (); + +clockevents_exchange_device (td->evtdev, newdev); +tick_setup_device (td, newdev, cpu,cpumask_of (cpu)); +if (newdev->features &CLOCK_EVT_FEAT_ONESHOT ) +tick_oneshot_notify (); +} +static bool tick_check_percpu (struct clock_event_device *curdev,struct clock_event_device *newdev,int cpu) {
@@ -234,6 +245,19 @@ static bool tick_check_preferred(struct }/* +* Check whether the new device is a better fit than curdev. curdev +* can be NULL ! +*/ +bool tick_check_replacement (struct clock_event_device *curdev, +struct clock_event_device *newdev) +{ +if (tick_check_percpu (curdev, newdev,smp_processor_id ())) +return false; + +return tick_check_preferred (curdev, newdev); +} + +/* * Check, if the new registered device should be used. Called with * clockevents_lock held and interrupts disabled. */
kernel/time/tick-internal.h +7 -0
@@ -11,6 +11,8 @@ extern seqlock_t jiffies_lock;#define TICK_DO_TIMER_NONE -1#define TICK_DO_TIMER_BOOT -2 +#define CS_NAME_LEN 32 + DECLARE_PER_CPU(struct tick_device, tick_cpu_device);extern ktime_t tick_next_period;extern ktime_t tick_period;
@@ -23,9 +25,14 @@ extern void tick_handover_do_timer(int *extern void tick_shutdown (unsigned int *cpup);extern void tick_suspend (void );extern void tick_resume (void ); +extern bool tick_check_replacement (struct clock_event_device *curdev, +struct clock_event_device *newdev); +extern void tick_install_replacement (struct clock_event_device *dev);extern void clockevents_shutdown (struct clock_event_device *dev); +extern size_t sysfs_get_uname (const char *buf,char *dst,size_t cnt); +/* * NO_HZ / high resolution timer shared code */
tip-bot for Thomas Gleixner
merge bot[tip:timers/core] clockevents: Implement unbind functionality
clockevents: Implement unbind functionality
Commit-ID: 03e13cf5ee60584fe0c831682c67212effb7fca4 Gitweb: http://git.kernel.org/tip/03e13cf5ee60584fe0c831682c67212effb7fca4 Author: Thomas Gleixner <[email protected]> AuthorDate: Thu, 25 Apr 2013 20:31:50 +0000 Committer: Thomas Gleixner <[email protected]> CommitDate: Thu, 16 May 2013 11:09:18 +0200
clockevents: Implement unbind functionality
Provide a sysfs interface to allow unbinding of clockevent devices. The device is unbound if it is unused or if there is a replacement device available. Unbinding of broadcast devices is not supported as we don't want to foster that nonsense. If no replacement device is available the unbind returns -EBUSY. Unbind is available from the kernel and through sysfs, which is necessary to drop the module refcount.
--- include/linux/clockchips.h | 1 + kernel/time/clockevents.c | 125 ++++++++++++++++++++++++++++++++++++++++++++ kernel/time/clocksource.c | 9 ++-- kernel/time/tick-common.c | 24 +++++++++ kernel/time/tick-internal.h | 7 +++ 5 files changed, 162 insertions(+), 4 deletions(-)
include/linux/clockchips.h +1 -0
@@ -141,6 +141,7 @@ static inline unsigned long div_sc(unsigned long ticks, unsigned long nsec,extern u64 clockevent_delta2ns (unsigned long latch,struct clock_event_device *evt);extern void clockevents_register_device (struct clock_event_device *dev); +extern int clockevents_unbind_device (struct clock_event_device *ced,int cpu);extern void clockevents_config (struct clock_event_device *dev,u32 freq); extern void clockevents_config_and_register(struct clock_event_device *dev,
kernel/time/clockevents.c +125 -0
149 lines not on this page · raw message
kernel/time/clocksource.c +5 -4
@@ -31,6 +31,8 @@#include <linux/tick.h> #include <linux/kthread.h> +#include "tick-internal.h" +void timecounter_init (struct timecounter *tc,const struct cyclecounter *cc,u64 start_tstamp)
@@ -174,7 +176,6 @@ clocks_calc_mult_shift(u32 *mult, u32 *shift, u32 from, u32 to, u32 maxsec)static struct clocksource *curr_clocksource;static LIST_HEAD (clocksource_list);static DEFINE_MUTEX (clocksource_mutex); -#define CS_NAME_LEN 32static char override_name[CS_NAME_LEN ];static int finished_booting;
@@ -864,7 +865,7 @@ sysfs_show_current_clocksources(struct device *dev,return count; } -static size_t clocksource_get_uname (const char *buf,char *dst,size_t cnt) +size_t sysfs_get_uname (const char *buf,char *dst,size_t cnt) {size_t ret = cnt;
@@ -899,7 +900,7 @@ static ssize_t sysfs_override_clocksource(struct device *dev,mutex_lock (&clocksource_mutex); - ret =clocksource_get_uname (buf, override_name, count); + ret =sysfs_get_uname (buf, override_name, count);if (ret >=0 )clocksource_select ();
@@ -925,7 +926,7 @@ static ssize_t sysfs_unbind_clocksource(struct device *dev,char name[CS_NAME_LEN ];size_t ret; - ret =clocksource_get_uname (buf, name, count); + ret =sysfs_get_uname (buf, name, count);if (ret <0 )return ret;
kernel/time/tick-common.c +24 -0
@@ -205,6 +205,17 @@ static void tick_setup_device(struct tick_device *td,tick_setup_oneshot (newdev, handler, next_event); } +void tick_install_replacement (struct clock_event_device *newdev) +{ +struct tick_device *td = &__get_cpu_var (tick_cpu_device); +int cpu =smp_processor_id (); + +clockevents_exchange_device (td->evtdev, newdev); +tick_setup_device (td, newdev, cpu,cpumask_of (cpu)); +if (newdev->features &CLOCK_EVT_FEAT_ONESHOT ) +tick_oneshot_notify (); +} +static bool tick_check_percpu (struct clock_event_device *curdev,struct clock_event_device *newdev,int cpu) {
@@ -237,6 +248,19 @@ static bool tick_check_preferred(struct clock_event_device *curdev, }/* +* Check whether the new device is a better fit than curdev. curdev +* can be NULL ! +*/ +bool tick_check_replacement (struct clock_event_device *curdev, +struct clock_event_device *newdev) +{ +if (tick_check_percpu (curdev, newdev,smp_processor_id ())) +return false; + +return tick_check_preferred (curdev, newdev); +} + +/* * Check, if the new registered device should be used. Called with * clockevents_lock held and interrupts disabled. */
kernel/time/tick-internal.h +7 -0
@@ -11,6 +11,8 @@ extern seqlock_t jiffies_lock;#define TICK_DO_TIMER_NONE -1#define TICK_DO_TIMER_BOOT -2 +#define CS_NAME_LEN 32 + DECLARE_PER_CPU(struct tick_device, tick_cpu_device);extern ktime_t tick_next_period;extern ktime_t tick_period;
@@ -23,9 +25,14 @@ extern void tick_handover_do_timer(int *cpup);extern void tick_shutdown (unsigned int *cpup);extern void tick_suspend (void );extern void tick_resume (void ); +extern bool tick_check_replacement (struct clock_event_device *curdev, +struct clock_event_device *newdev); +extern void tick_install_replacement (struct clock_event_device *dev);extern void clockevents_shutdown (struct clock_event_device *dev); +extern size_t sysfs_get_uname (const char *buf,char *dst,size_t cnt); +/* * NO_HZ / high resolution timer shared code */