From: Daniel Bristot de Oliveira <bristot@redhat.com>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: Phil Auld <pauld@redhat.com>,
Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
Kate Carcia <kcarcia@redhat.com>,
Daniel Bristot de Oliveira <bristot@redhat.com>,
Jonathan Corbet <corbet@lwn.net>, Ingo Molnar <mingo@redhat.com>,
Peter Zijlstra <peterz@infradead.org>,
Thomas Gleixner <tglx@linutronix.de>,
Alexandre Chartre <alexandre.chartre@oracle.com>,
Clark Willaims <williams@redhat.com>,
John Kacur <jkacur@redhat.com>,
Juri Lelli <juri.lelli@redhat.com>,
Borislav Petkov <bp@alien8.de>, "H. Peter Anvin" <hpa@zytor.com>,
x86@kernel.org, linux-doc@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V5 14/14] trace/osnoise: Support hotplug operations
Date: Tue, 22 Jun 2021 16:42:32 +0200 [thread overview]
Message-ID: <39f98590b3caeb3c32f09526214058efe0e9272a.1624372313.git.bristot@redhat.com> (raw)
In-Reply-To: <cover.1624372313.git.bristot@redhat.com>
Enable and disable osnoise/timerlat thread during on CPU hotplug online
and offline operations respectivelly.
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Alexandre Chartre <alexandre.chartre@oracle.com>
Cc: Clark Willaims <williams@redhat.com>
Cc: John Kacur <jkacur@redhat.com>
Cc: Juri Lelli <juri.lelli@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org
Cc: linux-doc@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Daniel Bristot de Oliveira <bristot@redhat.com>
---
kernel/trace/trace_osnoise.c | 165 ++++++++++++++++++++++++++++-------
1 file changed, 135 insertions(+), 30 deletions(-)
diff --git a/kernel/trace/trace_osnoise.c b/kernel/trace/trace_osnoise.c
index f4b1330ac89d..e8a63af1aeb6 100644
--- a/kernel/trace/trace_osnoise.c
+++ b/kernel/trace/trace_osnoise.c
@@ -1414,22 +1414,67 @@ static int timerlat_main(void *data)
#endif /* CONFIG_TIMERLAT_TRACER */
/*
- * stop_per_cpu_kthread - stop per-cpu threads
+ * stop_kthread - stop a workload thread
+ */
+static void stop_kthread(unsigned int cpu)
+{
+ struct task_struct *kthread;
+
+ kthread = per_cpu(per_cpu_osnoise_var, cpu).kthread;
+ if (kthread)
+ kthread_stop(kthread);
+ per_cpu(per_cpu_osnoise_var, cpu).kthread = NULL;
+}
+
+/*
+ * stop_per_cpu_kthread - Stop per-cpu threads
*
* Stop the osnoise sampling htread. Use this on unload and at system
* shutdown.
*/
static void stop_per_cpu_kthreads(void)
{
- struct task_struct *kthread;
int cpu;
- for_each_online_cpu(cpu) {
- kthread = per_cpu(per_cpu_osnoise_var, cpu).kthread;
- if (kthread)
- kthread_stop(kthread);
- per_cpu(per_cpu_osnoise_var, cpu).kthread = NULL;
+ get_online_cpus();
+
+ for_each_online_cpu(cpu)
+ stop_kthread(cpu);
+
+ put_online_cpus();
+}
+
+/*
+ * start_kthread - Start a workload tread
+ */
+static int start_kthread(unsigned int cpu)
+{
+ struct task_struct *kthread;
+ void *main = osnoise_main;
+ char comm[24];
+
+#ifdef CONFIG_TIMERLAT_TRACER
+ if (osnoise_data.timerlat_tracer) {
+ snprintf(comm, 24, "timerlat/%d", cpu);
+ main = timerlat_main;
+ } else {
+ snprintf(comm, 24, "osnoise/%d", cpu);
}
+#else
+ snprintf(comm, 24, "osnoise/%d", cpu);
+#endif
+ kthread = kthread_create_on_cpu(main, NULL, cpu, comm);
+
+ if (IS_ERR(kthread)) {
+ pr_err(BANNER "could not start sampling thread\n");
+ stop_per_cpu_kthreads();
+ return -ENOMEM;
+ }
+
+ per_cpu(per_cpu_osnoise_var, cpu).kthread = kthread;
+ wake_up_process(kthread);
+
+ return 0;
}
/*
@@ -1441,9 +1486,7 @@ static void stop_per_cpu_kthreads(void)
static int start_per_cpu_kthreads(struct trace_array *tr)
{
struct cpumask *current_mask = &save_cpumask;
- struct task_struct *kthread;
- char comm[24];
- void *main = osnoise_main;
+ int retval;
int cpu;
get_online_cpus();
@@ -1455,37 +1498,91 @@ static int start_per_cpu_kthreads(struct trace_array *tr)
* And the CPU is online.
*/
cpumask_and(current_mask, cpu_online_mask, current_mask);
- put_online_cpus();
- for_each_online_cpu(cpu)
+ for_each_possible_cpu(cpu)
per_cpu(per_cpu_osnoise_var, cpu).kthread = NULL;
for_each_cpu(cpu, current_mask) {
-#ifdef CONFIG_TIMERLAT_TRACER
- if (osnoise_data.timerlat_tracer) {
- snprintf(comm, 24, "timerlat/%d", cpu);
- main = timerlat_main;
- } else {
- snprintf(comm, 24, "osnoise/%d", cpu);
- }
-#else
- snprintf(comm, 24, "osnoise/%d", cpu);
-#endif
- kthread = kthread_create_on_cpu(main, NULL, cpu, comm);
-
- if (IS_ERR(kthread)) {
- pr_err(BANNER "could not start sampling thread\n");
+ retval = start_kthread(cpu);
+ if (retval) {
stop_per_cpu_kthreads();
- return -ENOMEM;
+ return retval;
}
-
- per_cpu(per_cpu_osnoise_var, cpu).kthread = kthread;
- wake_up_process(kthread);
}
+ put_online_cpus();
+
return 0;
}
+#ifdef CONFIG_HOTPLUG_CPU
+static void osnoise_hotplug_workfn(struct work_struct *dummy)
+{
+ struct trace_array *tr = osnoise_trace;
+ unsigned int cpu = smp_processor_id();
+
+
+ mutex_lock(&trace_types_lock);
+
+ if (!osnoise_busy)
+ goto out_unlock_trace;
+
+ mutex_lock(&interface_lock);
+ get_online_cpus();
+
+ if (!cpumask_test_cpu(cpu, &osnoise_cpumask))
+ goto out_unlock;
+
+ if (!cpumask_test_cpu(cpu, tr->tracing_cpumask))
+ goto out_unlock;
+
+ start_kthread(cpu);
+
+out_unlock:
+ put_online_cpus();
+ mutex_unlock(&interface_lock);
+out_unlock_trace:
+ mutex_unlock(&trace_types_lock);
+}
+
+static DECLARE_WORK(osnoise_hotplug_work, osnoise_hotplug_workfn);
+
+/*
+ * osnoise_cpu_init - CPU hotplug online callback function
+ */
+static int osnoise_cpu_init(unsigned int cpu)
+{
+ schedule_work_on(cpu, &osnoise_hotplug_work);
+ return 0;
+}
+
+/*
+ * osnoise_cpu_die - CPU hotplug offline callback function
+ */
+static int osnoise_cpu_die(unsigned int cpu)
+{
+ stop_kthread(cpu);
+ return 0;
+}
+
+static void osnoise_init_hotplug_support(void)
+{
+ int ret;
+
+ ret = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "trace/osnoise:online",
+ osnoise_cpu_init, osnoise_cpu_die);
+ if (ret < 0)
+ pr_warn(BANNER "Error to init cpu hotplug support\n");
+
+ return;
+}
+#else /* CONFIG_HOTPLUG_CPU */
+static void osnoise_init_hotplug_support(void)
+{
+ return 0;
+}
+#endif /* CONFIG_HOTPLUG_CPU */
+
/*
* osnoise_cpus_read - Read function for reading the "cpus" file
* @filp: The active open file structure
@@ -1581,7 +1678,14 @@ osnoise_cpus_write(struct file *filp, const char __user *ubuf, size_t count,
osnoise_tracer_stop(tr);
mutex_lock(&interface_lock);
+ /*
+ * osnoise_cpumask is read by CPU hotplug operations.
+ */
+ get_online_cpus();
+
cpumask_copy(&osnoise_cpumask, osnoise_cpumask_new);
+
+ put_online_cpus();
mutex_unlock(&interface_lock);
if (running)
@@ -1938,6 +2042,7 @@ __init static int init_osnoise_tracer(void)
return ret;
}
#endif
+ osnoise_init_hotplug_support();
init_tracefs();
--
2.31.1
prev parent reply other threads:[~2021-06-22 14:45 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-22 14:42 [PATCH V5 00/14] hwlat improvements and osnoise/timerlat tracers Daniel Bristot de Oliveira
2021-06-22 14:42 ` [PATCH V5 01/14] trace/hwlat: Fix Clark's email Daniel Bristot de Oliveira
2021-06-22 14:42 ` [PATCH V5 02/14] trace/hwlat: Implement the mode config option Daniel Bristot de Oliveira
2021-06-22 14:42 ` [PATCH V5 03/14] trace/hwlat: Switch disable_migrate to mode none Daniel Bristot de Oliveira
2021-06-22 14:42 ` [PATCH V5 04/14] trace/hwlat: Implement the per-cpu mode Daniel Bristot de Oliveira
2021-06-22 14:42 ` [PATCH V5 05/14] trace: Add a generic function to read/write u64 values from tracefs Daniel Bristot de Oliveira
2021-06-22 14:42 ` [PATCH V5 06/14] trace/hwlat: Use trace_min_max_param for width and window params Daniel Bristot de Oliveira
2021-06-22 14:42 ` [PATCH V5 07/14] trace/hwlat: Remove printk from sampling loop Daniel Bristot de Oliveira
2021-06-22 14:42 ` [PATCH V5 08/14] trace: Add __print_ns_to_secs() and __print_ns_without_secs() helpers Daniel Bristot de Oliveira
2021-06-22 14:42 ` [PATCH V5 09/14] trace: Add osnoise tracer Daniel Bristot de Oliveira
2021-06-22 14:42 ` [PATCH V5 10/14] trace: Add timerlat tracer Daniel Bristot de Oliveira
2021-06-22 14:42 ` [PATCH V5 11/14] trace/hwlat: Protect kdata->kthread with get/put_online_cpus Daniel Bristot de Oliveira
2021-06-22 14:42 ` [PATCH V5 12/14] trace: Protect tr->tracing_cpumask " Daniel Bristot de Oliveira
2021-06-24 21:39 ` Steven Rostedt
2021-06-25 4:34 ` Daniel Bristot de Oliveira
2021-06-25 9:27 ` Peter Zijlstra
2021-06-25 9:31 ` Sebastian Andrzej Siewior
2021-06-22 14:42 ` [PATCH V5 13/14] trace/hwlat: Support hotplug operations Daniel Bristot de Oliveira
2021-06-22 14:42 ` Daniel Bristot de Oliveira [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=39f98590b3caeb3c32f09526214058efe0e9272a.1624372313.git.bristot@redhat.com \
--to=bristot@redhat.com \
--cc=alexandre.chartre@oracle.com \
--cc=bigeasy@linutronix.de \
--cc=bp@alien8.de \
--cc=corbet@lwn.net \
--cc=hpa@zytor.com \
--cc=jkacur@redhat.com \
--cc=juri.lelli@redhat.com \
--cc=kcarcia@redhat.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=pauld@redhat.com \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
--cc=williams@redhat.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).