time: Remove CONFIG_TIMER_STATS
PATCH 1/1 time: Remove CONFIG_TIMER_STATS
Currently CONFIG_TIMER_STATS exposes process information across namespaces:
kernel/time/timer_list.c print_timer():
SEQ_printf(m, ", %s/%d", tmp, timer->start_pid);
/proc/timer_list:
#11: <0000000000000000>, hrtimer_wakeup, S:01, do_nanosleep, cron/2570
Given that the tracer can give the same information, this patch entirely removes CONFIG_TIMER_STATS.
--- Documentation/timers/timer_stats.txt | 73 ------ include/linux/hrtimer.h | 5 - include/linux/timer.h | 45 ---- kernel/kthread.c | 1 - kernel/time/Makefile | 1 - kernel/time/hrtimer.c | 38 ---- kernel/time/timer.c | 48 +--- kernel/time/timer_list.c | 10 - kernel/time/timer_stats.c | 425 ----------------------------------- kernel/workqueue.c | 2 - lib/Kconfig.debug | 14 -- 11 files changed, 2 insertions(+), 660 deletions(-) delete mode 100644 Documentation/timers/timer_stats.txt delete mode 100644 kernel/time/timer_stats.c
Documentation/timers/timer_stats.txt deleted +0 -73
@@ -1,73 +0,0 @@ -timer_stats - timer usage statistics ------------------------------------- - -timer_stats is a debugging facility to make the timer (ab)usage in a Linux -system visible to kernel and userspace developers. If enabled in the config -but not used it has almost zero runtime overhead, and a relatively small -data structure overhead. Even if collection is enabled runtime all the -locking is per-CPU and lookup is hashed. - -timer_stats should be used by kernel and userspace developers to verify that -their code does not make unduly use of timers. This helps to avoid unnecessary -wakeups, which should be avoided to optimize power consumption. - -It can be enabled by CONFIG_TIMER_STATS in the "Kernel hacking" configuration -section. - -timer_stats collects information about the timer events which are fired in a -Linux system over a sample period: - -- the pid of the task(process) which initialized the timer -- the name of the process which initialized the timer -- the function where the timer was initialized -- the callback function which is associated to the timer -- the number of events (callbacks) - -timer_stats adds an entry to /proc: /proc/timer_stats - -This entry is used to control the statistics functionality and to read out the -sampled information. - -The timer_stats functionality is inactive on bootup. - -To activate a sample period issue: -# echo 1 >/proc/timer_stats - -To stop a sample period issue: -# echo 0 >/proc/timer_stats - -The statistics can be retrieved by: -# cat /proc/timer_stats - -While sampling is enabled, each readout from /proc/timer_stats will see -newly updated statistics. Once sampling is disabled, the sampled information -is kept until a new sample period is started. This allows multiple readouts. - -Sample output of /proc/timer_stats: - -Timerstats sample period: 3.888770 s - 12, 0 swapper hrtimer_stop_sched_tick (hrtimer_sched_tick) - 15, 1 swapper hcd_submit_urb (rh_timer_func) - 4, 959 kedac schedule_timeout (process_timeout) - 1, 0 swapper page_writeback_init (wb_timer_fn) - 28, 0 swapper hrtimer_stop_sched_tick (hrtimer_sched_tick) - 22, 2948 IRQ 4 tty_flip_buffer_push (delayed_work_timer_fn) - 3, 3100 bash schedule_timeout (process_timeout) - 1, 1 swapper queue_delayed_work_on (delayed_work_timer_fn) - 1, 1 swapper queue_delayed_work_on (delayed_work_timer_fn) - 1, 1 swapper neigh_table_init_no_netlink (neigh_periodic_timer) - 1, 2292 ip __netdev_watchdog_up (dev_watchdog) - 1, 23 events/1 do_cache_clean (delayed_work_timer_fn) -90 total events, 30.0 events/sec - -The first column is the number of events, the second column the pid, the third -column is the name of the process. The forth column shows the function which -initialized the timer and in parenthesis the callback function which was -executed on expiry. - - Thomas, Ingo - -Added flag to indicate 'deferrable timer' in /proc/timer_stats. A deferrable -timer will appear as follows - 10D, 1 swapper queue_delayed_work_on (delayed_work_timer_fn) -
include/linux/hrtimer.h +0 -5
@@ -104,11 +104,6 @@ struct hrtimer {struct hrtimer_clock_base *base;u8 state;u8 is_rel; -#ifdef CONFIG_TIMER_STATS -int start_pid; -void *start_site; -char start_comm[16 ]; -#endif };/**
include/linux/timer.h +0 -45
57 lines not on this page · raw message
kernel/kthread.c +0 -1
@@ -850,7 +850,6 @@ void __kthread_queue_delayed_work(struct kthread_worker *worker,list_add (&work->node, &worker->delayed_work_list); work->worker = worker; -timer_stats_timer_set_start_info (&dwork->timer); timer->expires = jiffies + delay;add_timer (timer); }
kernel/time/Makefile +0 -1
@@ -15,6 +15,5 @@ ifeq ($(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST),y) endif obj-$(CONFIG_GENERIC_SCHED_CLOCK) += sched_clock.o obj-$(CONFIG_TICK_ONESHOT) += tick-oneshot.o tick-sched.o -obj-$(CONFIG_TIMER_STATS) += timer_stats.o obj-$(CONFIG_DEBUG_FS) += timekeeping_debug.o obj-$(CONFIG_TEST_UDELAY) += test_udelay.o
kernel/time/hrtimer.c +0 -38
@@ -766,34 +766,6 @@ void hrtimers_resume(void)clock_was_set_delayed (); } -static inline void timer_stats_hrtimer_set_start_info (struct hrtimer *timer) -{ -#ifdef CONFIG_TIMER_STATS -if (timer->start_site) -return ; - timer->start_site =__builtin_return_address (0 ); -memcpy (timer->start_comm, current->comm,TASK_COMM_LEN ); - timer->start_pid = current->pid; -#endif -} - -static inline void timer_stats_hrtimer_clear_start_info (struct hrtimer *timer) -{ -#ifdef CONFIG_TIMER_STATS - timer->start_site =NULL ; -#endif -} - -static inline void timer_stats_account_hrtimer (struct hrtimer *timer) -{ -#ifdef CONFIG_TIMER_STATS -if (likely (!timer_stats_active)) -return ; -timer_stats_update_stats (timer, timer->start_pid, timer->start_site, - timer->function, timer->start_comm,0 ); -#endif -} -/* * Counterpart to lock_hrtimer_base above: */
@@ -932,7 +904,6 @@ remove_hrtimer(struct hrtimer *timer, struct hrtimer_clock_base *base, bool rest* rare case and less expensive than a smp call. */ debug_deactivate (timer); -timer_stats_hrtimer_clear_start_info (timer); reprogram = base->cpu_base ==this_cpu_ptr (&hrtimer_bases);if (!restart)
@@ -990,8 +961,6 @@ void hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim,/* Switch the timer base, if necessary: */ new_base =switch_hrtimer_base (timer, base, mode &HRTIMER_MODE_PINNED ); -timer_stats_hrtimer_set_start_info (timer); - leftmost =enqueue_hrtimer (timer, new_base);if (!leftmost) goto unlock;
@@ -1128,12 +1097,6 @@ static void __hrtimer_init(struct hrtimer *timer, clockid_t clock_id, base =hrtimer_clockid_to_base (clock_id); timer->base = &cpu_base->clock_base[base];timerqueue_init (&timer->node); - -#ifdef CONFIG_TIMER_STATS - timer->start_site =NULL ; - timer->start_pid =-1 ; -memset (timer->start_comm,0 ,TASK_COMM_LEN ); -#endif }/**
@@ -1217,7 +1180,6 @@ static void __run_hrtimer(struct hrtimer_cpu_base *cpu_base,raw_write_seqcount_barrier (&cpu_base->seq);__remove_hrtimer (timer, base,HRTIMER_STATE_INACTIVE ,0 ); -timer_stats_account_hrtimer (timer); fn = timer->function;/*
kernel/time/timer.c +2 -46
97 lines not on this page · raw message
kernel/time/timer_list.c +0 -10
@@ -62,21 +62,11 @@ static void print_timer(struct seq_file *m, struct hrtimer *taddr, struct hrtimer *timer, int idx, u64 now) { -#ifdef CONFIG_TIMER_STATS - char tmp[TASK_COMM_LEN + 1]; -#endif SEQ_printf(m, " #%d: ", idx);print_name_offset (m, taddr);SEQ_printf (m,", " );print_name_offset (m, timer->function);SEQ_printf (m,", S:%02x" , timer->state); -#ifdef CONFIG_TIMER_STATS -SEQ_printf (m,", " ); -print_name_offset (m, timer->start_site); -memcpy (tmp, timer->start_comm,TASK_COMM_LEN ); - tmp[TASK_COMM_LEN ] =0 ; -SEQ_printf (m,", %s/%d" , tmp, timer->start_pid); -#endif SEQ_printf (m,"\n" ); SEQ_printf(m, " # expires at %Lu-%Lu nsecs [in %Ld to %Ld nsecs]\n", (unsigned long long)ktime_to_ns(hrtimer_get_softexpires(timer)),
kernel/time/timer_stats.c deleted +0 -425
425 lines not on this page · raw message
kernel/workqueue.c +0 -2
@@ -1523,8 +1523,6 @@ static void __queue_delayed_work(int cpu, struct workqueue_struct *wq,return ; } -timer_stats_timer_set_start_info (&dwork->timer); - dwork->wq = wq; dwork->cpu = cpu; timer->expires = jiffies + delay;
lib/Kconfig.debug +0 -14
@@ -980,20 +980,6 @@ config DEBUG_TIMEKEEPING If unsure, say N. -config TIMER_STATS - bool "Collect kernel timers statistics" - depends on DEBUG_KERNEL && PROC_FS - help - If you say Y here, additional code will be inserted into the - timer routines to collect statistics about kernel timers being - reprogrammed. The statistics can be read from /proc/timer_stats. - The statistics collection is started by writing 1 to /proc/timer_stats, - writing 0 stops it. This feature is useful to collect information - about timer usage patterns in kernel and userspace. This feature - is lightweight if enabled in the kernel config but not activated - (it defaults to deactivated on bootup and will only be activated - if some application like powertop activates it explicitly). - config DEBUG_PREEMPT bool "Debug preemptible kernel" depends on DEBUG_KERNEL && PREEMPT && TRACE_IRQFLAGS_SUPPORT
Signature · 6 lines
2.7.4 -- Kees Cook Pixel Security
Quoted 8 lines · Kees Cook
Currently
CONFIG_TIMER_STATSexposes process information across namespaces:
kernel/time/timer_list.cprint_timer():SEQ_printf(m, ", %s/%d", tmp, timer->start_pid);
/proc/timer_list:
Quoted 7 lines
#11: <0000000000000000>,
hrtimer_wakeup, S:01,do_nanosleep, cron/2570Given that the tracer can give the same information, this patch entirely removes
CONFIG_TIMER_STATS.Suggested-by Thomas Gleixner <[email protected]>Signed-off-by Kees Cook <[email protected]>
I don't have an issue with this, but I worry this would break some tooling out there. Should it be marked as deprecated first?
Or maybe just pulling the band-aid off is the best way?
thanks
-john
Quoted 14 lines · John Stultz
Quoted 13 lines · Kees Cook
Currently
CONFIG_TIMER_STATSexposes process information across namespaces:
kernel/time/timer_list.cprint_timer():SEQ_printf(m, ", %s/%d", tmp, timer->start_pid);
/proc/timer_list:#11: <0000000000000000>,
hrtimer_wakeup, S:01,do_nanosleep, cron/2570Given that the tracer can give the same information, this patch entirely removes
CONFIG_TIMER_STATS.
Quoted 7 lines
Quoted 2 lines
Suggested-by Thomas Gleixner <[email protected]>Signed-off-by Kees Cook <[email protected]>I don't have an issue with this, but I worry this would break some tooling out there. Should it be marked as deprecated first?
Or maybe just pulling the band-aid off is the best way?
I think we should just kill it.
No tools can really rely on the behaviour of that file because it depends on CONFIG_TIMER_STATS and the information available there is just a random snapshot of queued timers at a given point of time, which is in no way usefull.
Thanks,
tglx
John Stultz
Acked-byQuoted 21 lines · Thomas Gleixner
Quoted 20 lines · John Stultz
Quoted 8 lines · Kees Cook
Currently
CONFIG_TIMER_STATSexposes process information across namespaces:
kernel/time/timer_list.cprint_timer():SEQ_printf(m, ", %s/%d", tmp, timer->start_pid);
/proc/timer_list:Quoted 7 lines
#11: <0000000000000000>,
hrtimer_wakeup, S:01,do_nanosleep, cron/2570Given that the tracer can give the same information, this patch entirely removes
CONFIG_TIMER_STATS.Suggested-by Thomas Gleixner <[email protected]>Signed-off-by Kees Cook <[email protected]>I don't have an issue with this, but I worry this would break some tooling out there. Should it be marked as deprecated first?
Quoted 8 lines
Quoted 1 line
Or maybe just pulling the band-aid off is the best way?
I think we should just kill it.
No tools can really rely on the behaviour of that file because it depends on
CONFIG_TIMER_STATSand the information available there is just a random snapshot of queued timers at a given point of time, which is in no way usefull.
Fair enough.
kbuild test robot
build boturl: https://github.com/0day-ci/linux/commits/Kees-Cook/time-Remove-CONFIG_TIMER_STATS/20170208-080916 reproduce: make htmldocs
Hi Kees,
[auto build test WARNING on tip/timers/core]
[also build test WARNING on v4.10-rc7 next-20170207]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Kees-Cook/time-Remove-CONFIG_TIMER_STATS/20170208-080916
reproduce: make htmldocs
All warnings (new ones prefixed by >>):
make[3]: warning: jobserver unavailable: using -j1. Add '+' to parent make rule. include/linux/init.h:1: warning: no structured comments found
>> include/linux/hrtimer.h:108: warning: Excess struct/union/enum/typedef member 'start_pid' description in 'hrtimer' >> include/linux/hrtimer.h:108: warning: Excess struct/union/enum/typedef member 'start_site' description in 'hrtimer' >> include/linux/hrtimer.h:108: warning: Excess struct/union/enum/typedef member 'start_comm' description in 'hrtimer'
include/linux/kthread.h:26: warning: Excess function parameter '...' description in 'kthread_create' kernel/sys.c:1: warning: no structured comments found
drivers/dma-buf/seqno-fence.c:1: warning: no structured comments found include/drm/drm_drv.h:409: warning: No description found for parameter 'load' include/drm/drm_drv.h:409: warning: No description found for parameter 'firstopen' include/drm/drm_drv.h:409: warning: No description found for parameter 'open' include/drm/drm_drv.h:409: warning: No description found for parameter 'preclose' include/drm/drm_drv.h:409: warning: No description found for parameter 'postclose' include/drm/drm_drv.h:409: warning: No description found for parameter 'lastclose' include/drm/drm_drv.h:409: warning: No description found for parameter 'unload' include/drm/drm_drv.h:409: warning: No description found for parameter 'dma_ioctl' include/drm/drm_drv.h:409: warning: No description found for parameter 'dma_quiescent' include/drm/drm_drv.h:409: warning: No description found for parameter 'context_dtor' include/drm/drm_drv.h:409: warning: No description found for parameter 'set_busid' include/drm/drm_drv.h:409: warning: No description found for parameter 'irq_handler' include/drm/drm_drv.h:409: warning: No description found for parameter 'irq_preinstall' include/drm/drm_drv.h:409: warning: No description found for parameter 'irq_postinstall' include/drm/drm_drv.h:409: warning: No description found for parameter 'irq_uninstall' include/drm/drm_drv.h:409: warning: No description found for parameter 'debugfs_init' include/drm/drm_drv.h:409: warning: No description found for parameter 'debugfs_cleanup' include/drm/drm_drv.h:409: warning: No description found for parameter 'gem_open_object' include/drm/drm_drv.h:409: warning: No description found for parameter 'gem_close_object' include/drm/drm_drv.h:409: warning: No description found for parameter 'prime_handle_to_fd' include/drm/drm_drv.h:409: warning: No description found for parameter 'prime_fd_to_handle' include/drm/drm_drv.h:409: warning: No description found for parameter 'gem_prime_export' include/drm/drm_drv.h:409: warning: No description found for parameter 'gem_prime_import' include/drm/drm_drv.h:409: warning: No description found for parameter 'gem_prime_pin' include/drm/drm_drv.h:409: warning: No description found for parameter 'gem_prime_unpin' include/drm/drm_drv.h:409: warning: No description found for parameter 'gem_prime_res_obj' include/drm/drm_drv.h:409: warning: No description found for parameter 'gem_prime_get_sg_table' include/drm/drm_drv.h:409: warning: No description found for parameter 'gem_prime_import_sg_table' include/drm/drm_drv.h:409: warning: No description found for parameter 'gem_prime_vmap' include/drm/drm_drv.h:409: warning: No description found for parameter 'gem_prime_vunmap' include/drm/drm_drv.h:409: warning: No description found for parameter 'gem_prime_mmap' include/drm/drm_drv.h:409: warning: No description found for parameter 'vgaarb_irq' include/drm/drm_drv.h:409: warning: No description found for parameter 'gem_vm_ops' include/drm/drm_drv.h:409: warning: No description found for parameter 'major' include/drm/drm_drv.h:409: warning: No description found for parameter 'minor' include/drm/drm_drv.h:409: warning: No description found for parameter 'patchlevel' include/drm/drm_drv.h:409: warning: No description found for parameter 'name' include/drm/drm_drv.h:409: warning: No description found for parameter 'desc' include/drm/drm_drv.h:409: warning: No description found for parameter 'date' include/drm/drm_drv.h:409: warning: No description found for parameter 'driver_features' include/drm/drm_drv.h:409: warning: No description found for parameter 'dev_priv_size' include/drm/drm_drv.h:409: warning: No description found for parameter 'ioctls' include/drm/drm_drv.h:409: warning: No description found for parameter 'num_ioctls' include/drm/drm_drv.h:409: warning: No description found for parameter 'fops' include/drm/drm_drv.h:409: warning: No description found for parameter 'legacy_dev_list' drivers/media/dvb-core/dvb_frontend.h:677: warning: No description found for parameter 'refcount' drivers/char/tpm/tpm_vtpm_proxy.c:73: warning: No description found for parameter 'filp' drivers/char/tpm/tpm_vtpm_proxy.c:73: warning: No description found for parameter 'buf' drivers/char/tpm/tpm_vtpm_proxy.c:73: warning: No description found for parameter 'count' drivers/char/tpm/tpm_vtpm_proxy.c:73: warning: No description found for parameter 'off' drivers/char/tpm/tpm_vtpm_proxy.c:123: warning: No description found for parameter 'filp' drivers/char/tpm/tpm_vtpm_proxy.c:123: warning: No description found for parameter 'buf' drivers/char/tpm/tpm_vtpm_proxy.c:123: warning: No description found for parameter 'count' drivers/char/tpm/tpm_vtpm_proxy.c:123: warning: No description found for parameter 'off' drivers/char/tpm/tpm_vtpm_proxy.c:203: warning: No description found for parameter 'proxy_dev' sound/soc/soc-core.c:994: warning: No description found for parameter 'stream_name' Documentation/core-api/assoc_array.rst:13: WARNING: Enumerated list ends without a blank line; unexpected unindent. Documentation/doc-guide/sphinx.rst:110: ERROR: Unknown target name: "sphinx c domain". include/net/cfg80211.h:3154: ERROR: Unexpected indentation.
include/net/mac80211.h:3214: ERROR: Unexpected indentation.
include/net/mac80211.h:3217: WARNING: Block quote ends without a blank line; unexpected unindent. include/net/mac80211.h:3219: ERROR: Unexpected indentation.
include/net/mac80211.h:3220: WARNING: Block quote ends without a blank line; unexpected unindent. include/net/mac80211.h:1773: ERROR: Unexpected indentation.
include/net/mac80211.h:1777: WARNING: Block quote ends without a blank line; unexpected unindent. kernel/sched/fair.c:7587: WARNING: Inline emphasis start-string without end-string. kernel/time/timer.c:1198: ERROR: Unexpected indentation.
kernel/time/timer.c:1200: ERROR: Unexpected indentation.
kernel/time/timer.c:1201: WARNING: Block quote ends without a blank line; unexpected unindent. include/linux/wait.h:121: WARNING: Block quote ends without a blank line; unexpected unindent. include/linux/wait.h:124: ERROR: Unexpected indentation.
include/linux/wait.h:126: WARNING: Block quote ends without a blank line; unexpected unindent. kernel/time/hrtimer.c:990: WARNING: Block quote ends without a blank line; unexpected unindent. kernel/signal.c:317: WARNING: Inline literal start-string without end-string. drivers/message/fusion/mptbase.c:5051: WARNING: Definition list ends without a blank line; unexpected unindent. drivers/tty/serial/serial_core.c:1897: WARNING: Definition list ends without a blank line; unexpected unindent. include/linux/spi/spi.h:369: ERROR: Unexpected indentation.
drivers/usb/core/message.c:481: ERROR: Unexpected indentation.
drivers/usb/core/message.c:482: WARNING: Block quote ends without a blank line; unexpected unindent. Documentation/driver-api/usb.rst:623: ERROR: Unknown target name: "usb_type". Documentation/driver-api/usb.rst:623: ERROR: Unknown target name: "usb_dir". Documentation/driver-api/usb.rst:623: ERROR: Unknown target name: "usb_recip". Documentation/driver-api/usb.rst:689: ERROR: Unknown target name: "usbdevfs_urb_type". sound/soc/soc-core.c:2508: ERROR: Unknown target name: "snd_soc_daifmt".
sound/core/jack.c:312: ERROR: Unknown target name: "snd_jack_btn". Documentation/translations/ko_KR/howto.rst:293: WARNING: Inline emphasis start-string without end-string.
WARNING: dvipng command 'dvipng' cannot be run (needed for math display), check the imgmath_dvipng setting
vim +108 include/linux/hrtimer.h
e2e680fb Viresh Kumar 2014-03-19 92 * started the timer
54cdfdb4 Thomas Gleixner 2007-02-16 93 * @start_site: timer statistics field to store the site where the timer
54cdfdb4 Thomas Gleixner 2007-02-16 94 * was started
54cdfdb4 Thomas Gleixner 2007-02-16 95 * @start_comm: timer statistics field to store the name of the process which
54cdfdb4 Thomas Gleixner 2007-02-16 96 * started the timer
c0a31329 Thomas Gleixner 2006-01-09 97 *
54cdfdb4 Thomas Gleixner 2007-02-16 98 * The hrtimer structure must be initialized by hrtimer_init()
c0a31329 Thomas Gleixner 2006-01-09 99 */
c0a31329 Thomas Gleixner 2006-01-09 100 struct hrtimer {
998adc3d John Stultz 2010-09-20 101 struct timerqueue_node node;
654c8e0b Arjan van de Ven 2008-09-01 102 ktime_t _softexpires;
c9cb2e3d Thomas Gleixner 2007-02-16 103 enum hrtimer_restart (*function)(struct hrtimer *);
3c8aa39d Thomas Gleixner 2007-02-16 104 struct hrtimer_clock_base *base;
203cbf77 Thomas Gleixner 2016-01-14 105 u8 state;
203cbf77 Thomas Gleixner 2016-01-14 106 u8 is_rel;
c0a31329 Thomas Gleixner 2006-01-09 107 };
c0a31329 Thomas Gleixner 2006-01-09 @108
c0a31329 Thomas Gleixner 2006-01-09 109 /**
00362e33 Thomas Gleixner 2006-03-31 110 * struct hrtimer_sleeper - simple sleeper structure
00362e33 Thomas Gleixner 2006-03-31 111 * @timer: embedded timer structure
00362e33 Thomas Gleixner 2006-03-31 112 * @task: task to wake up
00362e33 Thomas Gleixner 2006-03-31 113 *
00362e33 Thomas Gleixner 2006-03-31 114 * task is set to NULL, when the timer expires.
00362e33 Thomas Gleixner 2006-03-31 115 */
00362e33 Thomas Gleixner 2006-03-31 116 struct hrtimer_sleeper {:::::: The code at line 108 was first introduced by commit
:::::: c0a3132963db68f1fbbd0e316b73de100fee3f08 [PATCH] hrtimer: hrtimer core code
:::::: TO: Thomas Gleixner <[email protected]> :::::: CC: Linus Torvalds <[email protected]>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation