| Message ID | 1459541050-13654-1-git-send-email-daniel.lezcano@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
On 04/13/2016 11:41 AM, Ingo Molnar wrote: > > * Daniel Lezcano <daniel.lezcano@linaro.org> wrote: > >> The local_clock/cpu_clock functions were changed to prevent a double >> identical test with sched_clock_cpu() when HAVE_UNSTABLE_SCHED_CLOCK >> is set. That resulted in one line functions. >> >> As these functions are in all the cases one line functions and in the >> hot path, it is useful to specify them as static inline in order to >> give a strong hint to the compiler. >> >> After verification, it appears the compiler does not inline them >> without this hint. Change those functions to static inline. >> >> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> >> --- >> include/linux/sched.h | 32 ++++++++++++++++++++++++++++++-- >> kernel/sched/clock.c | 41 ----------------------------------------- >> 2 files changed, 30 insertions(+), 43 deletions(-) > > Hm, this does not seem to apply to v4.6-rc3 cleanly. Actually I based the patches on top of tip/sched/core. Shall I rebase them against v4.6-rc3 ? -- <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog
On 04/13/2016 11:51 AM, Ingo Molnar wrote: > > * Daniel Lezcano <daniel.lezcano@linaro.org> wrote: > >> On 04/13/2016 11:41 AM, Ingo Molnar wrote: >>> >>> * Daniel Lezcano <daniel.lezcano@linaro.org> wrote: >>> >>>> The local_clock/cpu_clock functions were changed to prevent a double >>>> identical test with sched_clock_cpu() when HAVE_UNSTABLE_SCHED_CLOCK >>>> is set. That resulted in one line functions. >>>> >>>> As these functions are in all the cases one line functions and in the >>>> hot path, it is useful to specify them as static inline in order to >>>> give a strong hint to the compiler. >>>> >>>> After verification, it appears the compiler does not inline them >>>> without this hint. Change those functions to static inline. >>>> >>>> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> >>>> --- >>>> include/linux/sched.h | 32 ++++++++++++++++++++++++++++++-- >>>> kernel/sched/clock.c | 41 ----------------------------------------- >>>> 2 files changed, 30 insertions(+), 43 deletions(-) >>> >>> Hm, this does not seem to apply to v4.6-rc3 cleanly. >> >> Actually I based the patches on top of tip/sched/core. > > This patch does not seem to apply to tip/sched/core either (2b8c41daba32). Ah, yes. I received a compilation error because of a missing EXPORT_SYMBOL_GPL for an inlined function call from kbuild test: ERROR: "sched_clock_cpu" [kernel/torture.ko] undefined! ERROR: "sched_clock_cpu" [drivers/gpu/drm/i915/i915.ko] undefined! So I resent a fixed V2. https://lkml.org/lkml/2016/4/11/603 https://lkml.org/lkml/2016/4/11/602 Sorry, I did not notice you were mentioning the first version which is outdated. The V2 is based on top of 2b8c41daba32. -- Daniel -- <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog
diff --git a/include/linux/sched.h b/include/linux/sched.h index 52c4847..13c1c1d 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -2303,8 +2303,6 @@ extern unsigned long long notrace sched_clock(void); /* * See the comment in kernel/sched/clock.c */ -extern u64 cpu_clock(int cpu); -extern u64 local_clock(void); extern u64 running_clock(void); extern u64 sched_clock_cpu(int cpu); @@ -2323,6 +2321,16 @@ static inline void sched_clock_idle_sleep_event(void) static inline void sched_clock_idle_wakeup_event(u64 delta_ns) { } + +static inline u64 cpu_clock(int cpu) +{ + return sched_clock(); +} + +static inline u64 local_clock(void) +{ + return sched_clock(); +} #else /* * Architectures can set this to 1 if they have specified @@ -2337,6 +2345,26 @@ extern void clear_sched_clock_stable(void); extern void sched_clock_tick(void); extern void sched_clock_idle_sleep_event(void); extern void sched_clock_idle_wakeup_event(u64 delta_ns); + +/* + * As outlined in clock.c, provides a fast, high resolution, nanosecond + * time source that is monotonic per cpu argument and has bounded drift + * between cpus. + * + * ######################### BIG FAT WARNING ########################## + * # when comparing cpu_clock(i) to cpu_clock(j) for i != j, time can # + * # go backwards !! # + * #################################################################### + */ +static inline u64 cpu_clock(int cpu) +{ + return sched_clock_cpu(cpu); +} + +static inline u64 local_clock(void) +{ + return sched_clock_cpu(raw_smp_processor_id()); +} #endif #ifdef CONFIG_IRQ_TIME_ACCOUNTING diff --git a/kernel/sched/clock.c b/kernel/sched/clock.c index 30c4b20..e9d6d6a 100644 --- a/kernel/sched/clock.c +++ b/kernel/sched/clock.c @@ -363,33 +363,6 @@ void sched_clock_idle_wakeup_event(u64 delta_ns) } EXPORT_SYMBOL_GPL(sched_clock_idle_wakeup_event); -/* - * As outlined at the top, provides a fast, high resolution, nanosecond - * time source that is monotonic per cpu argument and has bounded drift - * between cpus. - * - * ######################### BIG FAT WARNING ########################## - * # when comparing cpu_clock(i) to cpu_clock(j) for i != j, time can # - * # go backwards !! # - * #################################################################### - */ -u64 cpu_clock(int cpu) -{ - return sched_clock_cpu(cpu); -} - -/* - * Similar to cpu_clock() for the current cpu. Time will only be observed - * to be monotonic if care is taken to only compare timestampt taken on the - * same CPU. - * - * See cpu_clock(). - */ -u64 local_clock(void) -{ - return sched_clock_cpu(raw_smp_processor_id()); -} - #else /* CONFIG_HAVE_UNSTABLE_SCHED_CLOCK */ void sched_clock_init(void) @@ -404,22 +377,8 @@ u64 sched_clock_cpu(int cpu) return sched_clock(); } - -u64 cpu_clock(int cpu) -{ - return sched_clock(); -} - -u64 local_clock(void) -{ - return sched_clock(); -} - #endif /* CONFIG_HAVE_UNSTABLE_SCHED_CLOCK */ -EXPORT_SYMBOL_GPL(cpu_clock); -EXPORT_SYMBOL_GPL(local_clock); - /* * Running clock - returns the time that has elapsed while a guest has been * running.
The local_clock/cpu_clock functions were changed to prevent a double identical test with sched_clock_cpu() when HAVE_UNSTABLE_SCHED_CLOCK is set. That resulted in one line functions. As these functions are in all the cases one line functions and in the hot path, it is useful to specify them as static inline in order to give a strong hint to the compiler. After verification, it appears the compiler does not inline them without this hint. Change those functions to static inline. Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> --- include/linux/sched.h | 32 ++++++++++++++++++++++++++++++-- kernel/sched/clock.c | 41 ----------------------------------------- 2 files changed, 30 insertions(+), 43 deletions(-) -- 1.9.1