Merge branch 'for-3.10' of git://linux-nfs.org/~bfields/linux

[firefly-linux-kernel-4.4.55.git] / kernel / time / timer_list.c

diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c
index af5a7e9f164b53b3bedbc32ac0b516c7091760db..3bdf28323012639c9cc60b43f3add4ff257cbe91 100644 (file)
--- a/kernel/time/timer_list.c
+++ b/kernel/time/timer_list.c
@@ -20,6 +20,13 @@
 
 #include <asm/uaccess.h>
 
+
+struct timer_list_iter {
+       int cpu;
+       bool second_pass;
+       u64 now;
+};
+
 typedef void (*print_fn_t)(struct seq_file *m, unsigned int *classes);
 
 DECLARE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases);
@@ -133,7 +140,6 @@ static void print_cpu(struct seq_file *m, int cpu, u64 now)
        struct hrtimer_cpu_base *cpu_base = &per_cpu(hrtimer_bases, cpu);
        int i;
 
-       SEQ_printf(m, "\n");
        SEQ_printf(m, "cpu: %d\n", cpu);
        for (i = 0; i < HRTIMER_MAX_CLOCK_BASES; i++) {
                SEQ_printf(m, " clock %d:\n", i);
@@ -187,6 +193,7 @@ static void print_cpu(struct seq_file *m, int cpu, u64 now)
 
 #undef P
 #undef P_ns
+       SEQ_printf(m, "\n");
 }
 
 #ifdef CONFIG_GENERIC_CLOCKEVENTS
@@ -195,7 +202,6 @@ print_tickdevice(struct seq_file *m, struct tick_device *td, int cpu)
 {
        struct clock_event_device *dev = td->evtdev;
 
-       SEQ_printf(m, "\n");
        SEQ_printf(m, "Tick Device: mode:     %d\n", td->mode);
        if (cpu < 0)
                SEQ_printf(m, "Broadcast device\n");
@@ -230,12 +236,11 @@ print_tickdevice(struct seq_file *m, struct tick_device *td, int cpu)
        print_name_offset(m, dev->event_handler);
        SEQ_printf(m, "\n");
        SEQ_printf(m, " retries:        %lu\n", dev->retries);
+       SEQ_printf(m, "\n");
 }
 
-static void timer_list_show_tickdevices(struct seq_file *m)
+static void timer_list_show_tickdevices_header(struct seq_file *m)
 {
-       int cpu;
-
 #ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST
        print_tickdevice(m, tick_get_broadcast_device(), -1);
        SEQ_printf(m, "tick_broadcast_mask: %08lx\n",
@@ -246,47 +251,104 @@ static void timer_list_show_tickdevices(struct seq_file *m)
 #endif
        SEQ_printf(m, "\n");
 #endif
-       for_each_online_cpu(cpu)
-               print_tickdevice(m, tick_get_device(cpu), cpu);
-       SEQ_printf(m, "\n");
 }
-#else
-static void timer_list_show_tickdevices(struct seq_file *m) { }
 #endif
 
+static inline void timer_list_header(struct seq_file *m, u64 now)
+{
+       SEQ_printf(m, "Timer List Version: v0.7\n");
+       SEQ_printf(m, "HRTIMER_MAX_CLOCK_BASES: %d\n", HRTIMER_MAX_CLOCK_BASES);
+       SEQ_printf(m, "now at %Ld nsecs\n", (unsigned long long)now);
+       SEQ_printf(m, "\n");
+}
+
 static int timer_list_show(struct seq_file *m, void *v)
+{
+       struct timer_list_iter *iter = v;
+       u64 now = ktime_to_ns(ktime_get());
+
+       if (iter->cpu == -1 && !iter->second_pass)
+               timer_list_header(m, now);
+       else if (!iter->second_pass)
+               print_cpu(m, iter->cpu, iter->now);
+#ifdef CONFIG_GENERIC_CLOCKEVENTS
+       else if (iter->cpu == -1 && iter->second_pass)
+               timer_list_show_tickdevices_header(m);
+       else
+               print_tickdevice(m, tick_get_device(iter->cpu), iter->cpu);
+#endif
+       return 0;
+}
+
+void sysrq_timer_list_show(void)
 {
        u64 now = ktime_to_ns(ktime_get());
        int cpu;
 
-       SEQ_printf(m, "Timer List Version: v0.7\n");
-       SEQ_printf(m, "HRTIMER_MAX_CLOCK_BASES: %d\n", HRTIMER_MAX_CLOCK_BASES);
-       SEQ_printf(m, "now at %Ld nsecs\n", (unsigned long long)now);
+       timer_list_header(NULL, now);
 
        for_each_online_cpu(cpu)
-               print_cpu(m, cpu, now);
+               print_cpu(NULL, cpu, now);
 
-       SEQ_printf(m, "\n");
-       timer_list_show_tickdevices(m);
+#ifdef CONFIG_GENERIC_CLOCKEVENTS
+       timer_list_show_tickdevices_header(NULL);
+       for_each_online_cpu(cpu)
+               print_tickdevice(NULL, tick_get_device(cpu), cpu);
+#endif
+       return;
+}
 
-       return 0;
+static void *timer_list_start(struct seq_file *file, loff_t *offset)
+{
+       struct timer_list_iter *iter = file->private;
+
+       if (!*offset) {
+               iter->cpu = -1;
+               iter->now = ktime_to_ns(ktime_get());
+       } else if (iter->cpu >= nr_cpu_ids) {
+#ifdef CONFIG_GENERIC_CLOCKEVENTS
+               if (!iter->second_pass) {
+                       iter->cpu = -1;
+                       iter->second_pass = true;
+               } else
+                       return NULL;
+#else
+               return NULL;
+#endif
+       }
+       return iter;
 }
 
-void sysrq_timer_list_show(void)
+static void *timer_list_next(struct seq_file *file, void *v, loff_t *offset)
+{
+       struct timer_list_iter *iter = file->private;
+       iter->cpu = cpumask_next(iter->cpu, cpu_online_mask);
+       ++*offset;
+       return timer_list_start(file, offset);
+}
+
+static void timer_list_stop(struct seq_file *seq, void *v)
 {
-       timer_list_show(NULL, NULL);
 }
 
+static const struct seq_operations timer_list_sops = {
+       .start = timer_list_start,
+       .next = timer_list_next,
+       .stop = timer_list_stop,
+       .show = timer_list_show,
+};
+
 static int timer_list_open(struct inode *inode, struct file *filp)
 {
-       return single_open(filp, timer_list_show, NULL);
+       return seq_open_private(filp, &timer_list_sops,
+                       sizeof(struct timer_list_iter));
 }
 
 static const struct file_operations timer_list_fops = {
        .open           = timer_list_open,
        .read           = seq_read,
        .llseek         = seq_lseek,
-       .release        = single_release,
+       .release        = seq_release_private,
 };
 
 static int __init init_timer_list_procfs(void)