From: Alexander Graf <graf@amazon.com>
To: <linux-kernel@vger.kernel.org>
Cc: <linux-trace-kernel@vger.kernel.org>, <linux-mm@kvack.org>,
<devicetree@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<kexec@lists.infradead.org>, <linux-doc@vger.kernel.org>,
<x86@kernel.org>, Eric Biederman <ebiederm@xmission.com>,
"H. Peter Anvin" <hpa@zytor.com>,
Andy Lutomirski <luto@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
"Rob Herring" <robh+dt@kernel.org>,
Steven Rostedt <rostedt@goodmis.org>,
"Andrew Morton" <akpm@linux-foundation.org>,
Mark Rutland <mark.rutland@arm.com>,
"Tom Lendacky" <thomas.lendacky@amd.com>,
Ashish Kalra <ashish.kalra@amd.com>,
James Gowans <jgowans@amazon.com>,
Stanislav Kinsburskii <skinsburskii@linux.microsoft.com>,
<arnd@arndb.de>, <pbonzini@redhat.com>,
<madvenka@linux.microsoft.com>,
Anthony Yznaga <anthony.yznaga@oracle.com>,
Usama Arif <usama.arif@bytedance.com>,
David Woodhouse <dwmw@amazon.co.uk>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>
Subject: [PATCH 10/15] tracing: Introduce kho serialization
Date: Wed, 13 Dec 2023 00:04:47 +0000 [thread overview]
Message-ID: <20231213000452.88295-11-graf@amazon.com> (raw)
In-Reply-To: <20231213000452.88295-1-graf@amazon.com>
We want to be able to transfer ftrace state from one kernel to the next.
To start off with, let's establish all the boiler plate to get a write
hook when KHO wants to serialize and fill out basic data.
Follow-up patches will fill in serialization of ring buffers and events.
Signed-off-by: Alexander Graf <graf@amazon.com>
---
kernel/trace/trace.c | 52 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 52 insertions(+)
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 7700ca1be2a5..3e7f61cf773e 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -32,6 +32,7 @@
#include <linux/percpu.h>
#include <linux/splice.h>
#include <linux/kdebug.h>
+#include <linux/kexec.h>
#include <linux/string.h>
#include <linux/mount.h>
#include <linux/rwsem.h>
@@ -866,6 +867,10 @@ static struct tracer *trace_types __read_mostly;
*/
DEFINE_MUTEX(trace_types_lock);
+#ifdef CONFIG_FTRACE_KHO
+static bool trace_in_kho;
+#endif
+
/*
* serialize the access of the ring buffer
*
@@ -10591,12 +10596,59 @@ void __init early_trace_init(void)
init_events();
}
+#ifdef CONFIG_FTRACE_KHO
+static int trace_kho_notifier(struct notifier_block *self,
+ unsigned long cmd,
+ void *v)
+{
+ const char compatible[] = "ftrace-v1";
+ void *fdt = v;
+ int err = 0;
+
+ switch (cmd) {
+ case KEXEC_KHO_ABORT:
+ if (trace_in_kho)
+ mutex_unlock(&trace_types_lock);
+ trace_in_kho = false;
+ return NOTIFY_DONE;
+ case KEXEC_KHO_DUMP:
+ /* Handled below */
+ break;
+ default:
+ return NOTIFY_BAD;
+ }
+
+ if (unlikely(tracing_disabled))
+ return NOTIFY_DONE;
+
+ err |= fdt_begin_node(fdt, "ftrace");
+ err |= fdt_property(fdt, "compatible", compatible, sizeof(compatible));
+ err |= fdt_end_node(fdt);
+
+ if (!err) {
+ /* Hold all future allocations */
+ mutex_lock(&trace_types_lock);
+ trace_in_kho = true;
+ }
+
+ return err ? NOTIFY_BAD : NOTIFY_DONE;
+}
+
+static struct notifier_block trace_kho_nb = {
+ .notifier_call = trace_kho_notifier,
+};
+#endif
+
void __init trace_init(void)
{
trace_event_init();
if (boot_instance_index)
enable_instances();
+
+#ifdef CONFIG_FTRACE_KHO
+ register_kho_notifier(&trace_kho_nb);
+#endif
}
__init static void clear_boot_tracer(void)
--
2.40.1
Amazon Development Center Germany GmbH
Krausenstr. 38
10117 Berlin
Geschaeftsfuehrung: Christian Schlaeger, Jonathan Weiss
Eingetragen am Amtsgericht Charlottenburg unter HRB 149173 B
Sitz: Berlin
Ust-ID: DE 289 237 879
_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec
WARNING: multiple messages have this Message-ID (diff)
From: Alexander Graf <graf@amazon.com>
To: <linux-kernel@vger.kernel.org>
Cc: <linux-trace-kernel@vger.kernel.org>, <linux-mm@kvack.org>,
<devicetree@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<kexec@lists.infradead.org>, <linux-doc@vger.kernel.org>,
<x86@kernel.org>, Eric Biederman <ebiederm@xmission.com>,
"H. Peter Anvin" <hpa@zytor.com>,
Andy Lutomirski <luto@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
"Rob Herring" <robh+dt@kernel.org>,
Steven Rostedt <rostedt@goodmis.org>,
"Andrew Morton" <akpm@linux-foundation.org>,
Mark Rutland <mark.rutland@arm.com>,
"Tom Lendacky" <thomas.lendacky@amd.com>,
Ashish Kalra <ashish.kalra@amd.com>,
James Gowans <jgowans@amazon.com>,
Stanislav Kinsburskii <skinsburskii@linux.microsoft.com>,
<arnd@arndb.de>, <pbonzini@redhat.com>,
<madvenka@linux.microsoft.com>,
Anthony Yznaga <anthony.yznaga@oracle.com>,
Usama Arif <usama.arif@bytedance.com>,
David Woodhouse <dwmw@amazon.co.uk>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>
Subject: [PATCH 10/15] tracing: Introduce kho serialization
Date: Wed, 13 Dec 2023 00:04:47 +0000 [thread overview]
Message-ID: <20231213000452.88295-11-graf@amazon.com> (raw)
In-Reply-To: <20231213000452.88295-1-graf@amazon.com>
We want to be able to transfer ftrace state from one kernel to the next.
To start off with, let's establish all the boiler plate to get a write
hook when KHO wants to serialize and fill out basic data.
Follow-up patches will fill in serialization of ring buffers and events.
Signed-off-by: Alexander Graf <graf@amazon.com>
---
kernel/trace/trace.c | 52 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 52 insertions(+)
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 7700ca1be2a5..3e7f61cf773e 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -32,6 +32,7 @@
#include <linux/percpu.h>
#include <linux/splice.h>
#include <linux/kdebug.h>
+#include <linux/kexec.h>
#include <linux/string.h>
#include <linux/mount.h>
#include <linux/rwsem.h>
@@ -866,6 +867,10 @@ static struct tracer *trace_types __read_mostly;
*/
DEFINE_MUTEX(trace_types_lock);
+#ifdef CONFIG_FTRACE_KHO
+static bool trace_in_kho;
+#endif
+
/*
* serialize the access of the ring buffer
*
@@ -10591,12 +10596,59 @@ void __init early_trace_init(void)
init_events();
}
+#ifdef CONFIG_FTRACE_KHO
+static int trace_kho_notifier(struct notifier_block *self,
+ unsigned long cmd,
+ void *v)
+{
+ const char compatible[] = "ftrace-v1";
+ void *fdt = v;
+ int err = 0;
+
+ switch (cmd) {
+ case KEXEC_KHO_ABORT:
+ if (trace_in_kho)
+ mutex_unlock(&trace_types_lock);
+ trace_in_kho = false;
+ return NOTIFY_DONE;
+ case KEXEC_KHO_DUMP:
+ /* Handled below */
+ break;
+ default:
+ return NOTIFY_BAD;
+ }
+
+ if (unlikely(tracing_disabled))
+ return NOTIFY_DONE;
+
+ err |= fdt_begin_node(fdt, "ftrace");
+ err |= fdt_property(fdt, "compatible", compatible, sizeof(compatible));
+ err |= fdt_end_node(fdt);
+
+ if (!err) {
+ /* Hold all future allocations */
+ mutex_lock(&trace_types_lock);
+ trace_in_kho = true;
+ }
+
+ return err ? NOTIFY_BAD : NOTIFY_DONE;
+}
+
+static struct notifier_block trace_kho_nb = {
+ .notifier_call = trace_kho_notifier,
+};
+#endif
+
void __init trace_init(void)
{
trace_event_init();
if (boot_instance_index)
enable_instances();
+
+#ifdef CONFIG_FTRACE_KHO
+ register_kho_notifier(&trace_kho_nb);
+#endif
}
__init static void clear_boot_tracer(void)
--
2.40.1
Amazon Development Center Germany GmbH
Krausenstr. 38
10117 Berlin
Geschaeftsfuehrung: Christian Schlaeger, Jonathan Weiss
Eingetragen am Amtsgericht Charlottenburg unter HRB 149173 B
Sitz: Berlin
Ust-ID: DE 289 237 879
WARNING: multiple messages have this Message-ID (diff)
From: Alexander Graf <graf@amazon.com>
To: <linux-kernel@vger.kernel.org>
Cc: <linux-trace-kernel@vger.kernel.org>, <linux-mm@kvack.org>,
<devicetree@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<kexec@lists.infradead.org>, <linux-doc@vger.kernel.org>,
<x86@kernel.org>, Eric Biederman <ebiederm@xmission.com>,
"H. Peter Anvin" <hpa@zytor.com>,
Andy Lutomirski <luto@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
"Rob Herring" <robh+dt@kernel.org>,
Steven Rostedt <rostedt@goodmis.org>,
"Andrew Morton" <akpm@linux-foundation.org>,
Mark Rutland <mark.rutland@arm.com>,
"Tom Lendacky" <thomas.lendacky@amd.com>,
Ashish Kalra <ashish.kalra@amd.com>,
James Gowans <jgowans@amazon.com>,
Stanislav Kinsburskii <skinsburskii@linux.microsoft.com>,
<arnd@arndb.de>, <pbonzini@redhat.com>,
<madvenka@linux.microsoft.com>,
Anthony Yznaga <anthony.yznaga@oracle.com>,
Usama Arif <usama.arif@bytedance.com>,
David Woodhouse <dwmw@amazon.co.uk>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>
Subject: [PATCH 10/15] tracing: Introduce kho serialization
Date: Wed, 13 Dec 2023 00:04:47 +0000 [thread overview]
Message-ID: <20231213000452.88295-11-graf@amazon.com> (raw)
In-Reply-To: <20231213000452.88295-1-graf@amazon.com>
We want to be able to transfer ftrace state from one kernel to the next.
To start off with, let's establish all the boiler plate to get a write
hook when KHO wants to serialize and fill out basic data.
Follow-up patches will fill in serialization of ring buffers and events.
Signed-off-by: Alexander Graf <graf@amazon.com>
---
kernel/trace/trace.c | 52 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 52 insertions(+)
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 7700ca1be2a5..3e7f61cf773e 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -32,6 +32,7 @@
#include <linux/percpu.h>
#include <linux/splice.h>
#include <linux/kdebug.h>
+#include <linux/kexec.h>
#include <linux/string.h>
#include <linux/mount.h>
#include <linux/rwsem.h>
@@ -866,6 +867,10 @@ static struct tracer *trace_types __read_mostly;
*/
DEFINE_MUTEX(trace_types_lock);
+#ifdef CONFIG_FTRACE_KHO
+static bool trace_in_kho;
+#endif
+
/*
* serialize the access of the ring buffer
*
@@ -10591,12 +10596,59 @@ void __init early_trace_init(void)
init_events();
}
+#ifdef CONFIG_FTRACE_KHO
+static int trace_kho_notifier(struct notifier_block *self,
+ unsigned long cmd,
+ void *v)
+{
+ const char compatible[] = "ftrace-v1";
+ void *fdt = v;
+ int err = 0;
+
+ switch (cmd) {
+ case KEXEC_KHO_ABORT:
+ if (trace_in_kho)
+ mutex_unlock(&trace_types_lock);
+ trace_in_kho = false;
+ return NOTIFY_DONE;
+ case KEXEC_KHO_DUMP:
+ /* Handled below */
+ break;
+ default:
+ return NOTIFY_BAD;
+ }
+
+ if (unlikely(tracing_disabled))
+ return NOTIFY_DONE;
+
+ err |= fdt_begin_node(fdt, "ftrace");
+ err |= fdt_property(fdt, "compatible", compatible, sizeof(compatible));
+ err |= fdt_end_node(fdt);
+
+ if (!err) {
+ /* Hold all future allocations */
+ mutex_lock(&trace_types_lock);
+ trace_in_kho = true;
+ }
+
+ return err ? NOTIFY_BAD : NOTIFY_DONE;
+}
+
+static struct notifier_block trace_kho_nb = {
+ .notifier_call = trace_kho_notifier,
+};
+#endif
+
void __init trace_init(void)
{
trace_event_init();
if (boot_instance_index)
enable_instances();
+
+#ifdef CONFIG_FTRACE_KHO
+ register_kho_notifier(&trace_kho_nb);
+#endif
}
__init static void clear_boot_tracer(void)
--
2.40.1
Amazon Development Center Germany GmbH
Krausenstr. 38
10117 Berlin
Geschaeftsfuehrung: Christian Schlaeger, Jonathan Weiss
Eingetragen am Amtsgericht Charlottenburg unter HRB 149173 B
Sitz: Berlin
Ust-ID: DE 289 237 879
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2023-12-13 1:16 UTC|newest]
Thread overview: 93+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-13 0:04 [PATCH 00/15] kexec: Allow preservation of ftrace buffers Alexander Graf
2023-12-13 0:04 ` Alexander Graf
2023-12-13 0:04 ` Alexander Graf
2023-12-13 0:04 ` [PATCH 01/15] mm,memblock: Add support for scratch memory Alexander Graf
2023-12-13 0:04 ` Alexander Graf
2023-12-13 0:04 ` Alexander Graf
2023-12-13 0:04 ` [PATCH 02/15] memblock: Declare scratch memory as CMA Alexander Graf
2023-12-13 0:04 ` Alexander Graf
2023-12-13 0:04 ` Alexander Graf
2023-12-13 11:32 ` kernel test robot
2023-12-13 11:32 ` kernel test robot
2023-12-13 11:32 ` kernel test robot
2023-12-13 0:04 ` [PATCH 03/15] kexec: Add Kexec HandOver (KHO) generation helpers Alexander Graf
2023-12-13 0:04 ` Alexander Graf
2023-12-13 0:04 ` Alexander Graf
2023-12-13 18:36 ` Stanislav Kinsburskii
2023-12-13 18:36 ` Stanislav Kinsburskii
2023-12-13 18:36 ` Stanislav Kinsburskii
2023-12-13 23:36 ` Alexander Graf
2023-12-13 23:36 ` Alexander Graf
2023-12-13 23:36 ` Alexander Graf
2023-12-13 0:04 ` [PATCH 04/15] kexec: Add KHO parsing support Alexander Graf
2023-12-13 0:04 ` Alexander Graf
2023-12-13 0:04 ` Alexander Graf
2023-12-13 18:56 ` Stanislav Kinsburskii
2023-12-13 18:56 ` Stanislav Kinsburskii
2023-12-13 18:56 ` Stanislav Kinsburskii
2023-12-13 0:04 ` [PATCH 05/15] kexec: Add KHO support to kexec file loads Alexander Graf
2023-12-13 0:04 ` Alexander Graf
2023-12-13 0:04 ` Alexander Graf
2023-12-13 0:04 ` [PATCH 06/15] arm64: Add KHO support Alexander Graf
2023-12-13 0:04 ` Alexander Graf
2023-12-13 0:04 ` Alexander Graf
2023-12-13 11:22 ` kernel test robot
2023-12-13 11:22 ` kernel test robot
2023-12-13 11:22 ` kernel test robot
2023-12-13 13:41 ` kernel test robot
2023-12-13 13:41 ` kernel test robot
2023-12-13 13:41 ` kernel test robot
2023-12-14 22:36 ` Rob Herring
2023-12-14 22:36 ` Rob Herring
2023-12-14 22:36 ` Rob Herring
2023-12-18 23:01 ` Alexander Graf
2023-12-18 23:01 ` Alexander Graf
2023-12-18 23:01 ` Alexander Graf
2023-12-13 0:04 ` [PATCH 07/15] x86: " Alexander Graf
2023-12-13 0:04 ` Alexander Graf
2023-12-13 0:04 ` Alexander Graf
2023-12-13 0:04 ` [PATCH 08/15] tracing: Introduce names for ring buffers Alexander Graf
2023-12-13 0:04 ` Alexander Graf
2023-12-13 0:04 ` Alexander Graf
2023-12-13 0:15 ` Steven Rostedt
2023-12-13 0:15 ` Steven Rostedt
2023-12-13 0:15 ` Steven Rostedt
2023-12-13 0:35 ` Alexander Graf
2023-12-13 0:35 ` Alexander Graf
2023-12-13 0:35 ` Alexander Graf
2023-12-13 0:44 ` Steven Rostedt
2023-12-13 0:44 ` Steven Rostedt
2023-12-13 0:44 ` Steven Rostedt
2023-12-13 11:22 ` kernel test robot
2023-12-13 11:22 ` kernel test robot
2023-12-13 11:22 ` kernel test robot
2023-12-13 0:04 ` [PATCH 09/15] tracing: Introduce names for events Alexander Graf
2023-12-13 0:04 ` Alexander Graf
2023-12-13 0:04 ` Alexander Graf
2023-12-13 0:49 ` Steven Rostedt
2023-12-13 0:49 ` Steven Rostedt
2023-12-13 0:49 ` Steven Rostedt
2023-12-13 0:04 ` Alexander Graf [this message]
2023-12-13 0:04 ` [PATCH 10/15] tracing: Introduce kho serialization Alexander Graf
2023-12-13 0:04 ` Alexander Graf
2023-12-13 0:04 ` [PATCH 11/15] tracing: Add kho serialization of trace buffers Alexander Graf
2023-12-13 0:04 ` Alexander Graf
2023-12-13 0:04 ` Alexander Graf
2023-12-13 0:04 ` [PATCH 12/15] tracing: Recover trace buffers from kexec handover Alexander Graf
2023-12-13 0:04 ` Alexander Graf
2023-12-13 0:04 ` Alexander Graf
2023-12-13 0:04 ` [PATCH 13/15] tracing: Add kho serialization of trace events Alexander Graf
2023-12-13 0:04 ` Alexander Graf
2023-12-13 0:04 ` Alexander Graf
2023-12-13 0:04 ` [PATCH 14/15] tracing: Recover trace events from kexec handover Alexander Graf
2023-12-13 0:04 ` Alexander Graf
2023-12-13 0:04 ` Alexander Graf
2023-12-13 0:04 ` [PATCH 15/15] tracing: Add config option for " Alexander Graf
2023-12-13 0:04 ` Alexander Graf
2023-12-13 0:04 ` Alexander Graf
2023-12-14 14:58 ` [PATCH 00/15] kexec: Allow preservation of ftrace buffers Eric W. Biederman
2023-12-14 14:58 ` Eric W. Biederman
2023-12-14 14:58 ` Eric W. Biederman
2023-12-14 16:02 ` Alexander Graf
2023-12-14 16:02 ` Alexander Graf
2023-12-14 16:02 ` Alexander Graf
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=20231213000452.88295-11-graf@amazon.com \
--to=graf@amazon.com \
--cc=akpm@linux-foundation.org \
--cc=anthony.yznaga@oracle.com \
--cc=arnd@arndb.de \
--cc=ashish.kalra@amd.com \
--cc=benh@kernel.crashing.org \
--cc=devicetree@vger.kernel.org \
--cc=dwmw@amazon.co.uk \
--cc=ebiederm@xmission.com \
--cc=hpa@zytor.com \
--cc=jgowans@amazon.com \
--cc=kexec@lists.infradead.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-trace-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=madvenka@linux.microsoft.com \
--cc=mark.rutland@arm.com \
--cc=pbonzini@redhat.com \
--cc=peterz@infradead.org \
--cc=robh+dt@kernel.org \
--cc=rostedt@goodmis.org \
--cc=skinsburskii@linux.microsoft.com \
--cc=thomas.lendacky@amd.com \
--cc=usama.arif@bytedance.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.