tool/sched_ext: Event counter dumping updates

- There's no need to dump event counters from both scx_qmap and scx_central.
  Drop counter dumping from scx_central.

- bpf_printk() implies a trailing new line and the explicit new line leads
  to double new lines. Drop the explicit new lines.

Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Changwoo Min <changwoo@igalia.com>

diff --git a/tools/sched_ext/scx_central.bpf.c b/tools/sched_ext/scx_central.bpf.c
index 907a844723c12f856c28bb9a24065125df0f4841..5c165af1fa27cf56e6fd76389440d3e52b5ca8c6 100644 (file)
--- a/tools/sched_ext/scx_central.bpf.c
+++ b/tools/sched_ext/scx_central.bpf.c
@@ -293,27 +293,6 @@ static int central_timerfn(void *map, int *key, struct bpf_timer *timer)
        bpf_timer_start(timer, TIMER_INTERVAL_NS, BPF_F_TIMER_CPU_PIN);
        __sync_fetch_and_add(&nr_timers, 1);
 
-       /* print event counters every second */
-       if (nr_timers % 1000 == 0) {
-               scx_bpf_events(&events, sizeof(events));
-
-               bpf_printk("%35s: %llu\n", "SCX_EV_SELECT_CPU_FALLBACK",
-                          scx_read_event(&events, SCX_EV_SELECT_CPU_FALLBACK));
-               bpf_printk("%35s: %llu\n", "SCX_EV_DISPATCH_LOCAL_DSQ_OFFLINE",
-                          scx_read_event(&events, SCX_EV_DISPATCH_LOCAL_DSQ_OFFLINE));
-               bpf_printk("%35s: %llu\n", "SCX_EV_DISPATCH_KEEP_LAST",
-                          scx_read_event(&events, SCX_EV_DISPATCH_KEEP_LAST));
-               bpf_printk("%35s: %llu\n", "SCX_EV_ENQ_SKIP_EXITING",
-                          scx_read_event(&events, SCX_EV_ENQ_SKIP_EXITING));
-               bpf_printk("%35s: %llu\n", "SCX_EV_ENQ_SLICE_DFL",
-                          scx_read_event(&events, SCX_EV_ENQ_SLICE_DFL));
-               bpf_printk("%35s: %llu\n", "SCX_EV_BYPASS_DURATION",
-                          scx_read_event(&events, SCX_EV_BYPASS_DURATION));
-               bpf_printk("%35s: %llu\n", "SCX_EV_BYPASS_DISPATCH",
-                          scx_read_event(&events, SCX_EV_BYPASS_DISPATCH));
-               bpf_printk("%35s: %llu\n", "SCX_EV_BYPASS_ACTIVATE",
-                          scx_read_event(&events, SCX_EV_BYPASS_ACTIVATE));
-       }
        return 0;
 }
 

diff --git a/tools/sched_ext/scx_qmap.bpf.c b/tools/sched_ext/scx_qmap.bpf.c
index 7d9d1e5d2358998d2e5ac27f3612d8db3691d579..e0e766d402e1c553cb4c0c7902e91cf48568b530 100644 (file)
--- a/tools/sched_ext/scx_qmap.bpf.c
+++ b/tools/sched_ext/scx_qmap.bpf.c
@@ -776,21 +776,21 @@ static int monitor_timerfn(void *map, int *key, struct bpf_timer *timer)
 
        scx_bpf_events(&events, sizeof(events));
 
-       bpf_printk("%35s: %llu\n", "SCX_EV_SELECT_CPU_FALLBACK",
+       bpf_printk("%35s: %llu", "SCX_EV_SELECT_CPU_FALLBACK",
                   scx_read_event(&events, SCX_EV_SELECT_CPU_FALLBACK));
-       bpf_printk("%35s: %llu\n", "SCX_EV_DISPATCH_LOCAL_DSQ_OFFLINE",
+       bpf_printk("%35s: %llu", "SCX_EV_DISPATCH_LOCAL_DSQ_OFFLINE",
                   scx_read_event(&events, SCX_EV_DISPATCH_LOCAL_DSQ_OFFLINE));
-       bpf_printk("%35s: %llu\n", "SCX_EV_DISPATCH_KEEP_LAST",
+       bpf_printk("%35s: %llu", "SCX_EV_DISPATCH_KEEP_LAST",
                   scx_read_event(&events, SCX_EV_DISPATCH_KEEP_LAST));
-       bpf_printk("%35s: %llu\n", "SCX_EV_ENQ_SKIP_EXITING",
+       bpf_printk("%35s: %llu", "SCX_EV_ENQ_SKIP_EXITING",
                   scx_read_event(&events, SCX_EV_ENQ_SKIP_EXITING));
-       bpf_printk("%35s: %llu\n", "SCX_EV_ENQ_SLICE_DFL",
+       bpf_printk("%35s: %llu", "SCX_EV_ENQ_SLICE_DFL",
                   scx_read_event(&events, SCX_EV_ENQ_SLICE_DFL));
-       bpf_printk("%35s: %llu\n", "SCX_EV_BYPASS_DURATION",
+       bpf_printk("%35s: %llu", "SCX_EV_BYPASS_DURATION",
                   scx_read_event(&events, SCX_EV_BYPASS_DURATION));
-       bpf_printk("%35s: %llu\n", "SCX_EV_BYPASS_DISPATCH",
+       bpf_printk("%35s: %llu", "SCX_EV_BYPASS_DISPATCH",
                   scx_read_event(&events, SCX_EV_BYPASS_DISPATCH));
-       bpf_printk("%35s: %llu\n", "SCX_EV_BYPASS_ACTIVATE",
+       bpf_printk("%35s: %llu", "SCX_EV_BYPASS_ACTIVATE",
                   scx_read_event(&events, SCX_EV_BYPASS_ACTIVATE));
 
        bpf_timer_start(timer, ONE_SEC_IN_NS, 0);