Hi Steven,
two patches for ftrace direct multi sample:
- fix ftrace direct multi sample config option handling, required
because of an incorrect merge resolution proposed by me.
- add s390 support for ftrace direct multi sample
If you are happy with them, I could carry with the s390 tree and
target for rc2, or you could pick them up. Whatever you prefer.
Thanks,
Heiko
Heiko Carstens (2):
ftrace/samples: add missing Kconfig option for ftrace direct multi sample
ftrace/samples: add s390 support for ftrace direct multi sample
arch/s390/Kconfig | 1 +
arch/x86/Kconfig | 2 +-
samples/Kconfig | 11 +++++++++-
samples/Makefile | 2 +-
samples/ftrace/Makefile | 2 +-
samples/ftrace/ftrace-direct-multi.c | 30 ++++++++++++++++++++++++++++
6 files changed, 44 insertions(+), 4 deletions(-)
--
2.25.1
Currently it is not possible to build the ftrace direct multi example
anymore due to broken config dependencies. Fix this by adding
SAMPLE_FTRACE_DIRECT_MULTI config option.
This broke when merging s390-5.16-1 due to an incorrect merge conflict
resolution proposed by me.
Also rename SAMPLE_FTRACE_MULTI_DIRECT to SAMPLE_FTRACE_DIRECT_MULTI
so it matches the module name.
Fixes: 0b707e572a19 ("Merge tag 's390-5.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux")
Signed-off-by: Heiko Carstens <[email protected]>
---
arch/x86/Kconfig | 2 +-
samples/Kconfig | 11 ++++++++++-
samples/Makefile | 2 +-
samples/ftrace/Makefile | 2 +-
4 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 95dd1ee01546..7399327d1eff 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -193,7 +193,7 @@ config X86
select HAVE_DYNAMIC_FTRACE_WITH_ARGS if X86_64
select HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS
select HAVE_SAMPLE_FTRACE_DIRECT if X86_64
- select HAVE_SAMPLE_FTRACE_MULTI_DIRECT if X86_64
+ select HAVE_SAMPLE_FTRACE_DIRECT_MULTI if X86_64
select HAVE_EBPF_JIT
select HAVE_EFFICIENT_UNALIGNED_ACCESS
select HAVE_EISA
diff --git a/samples/Kconfig b/samples/Kconfig
index bec3528aa2de..43d2e9aa557f 100644
--- a/samples/Kconfig
+++ b/samples/Kconfig
@@ -31,6 +31,15 @@ config SAMPLE_FTRACE_DIRECT
This builds an ftrace direct function example
that hooks to wake_up_process and prints the parameters.
+config SAMPLE_FTRACE_DIRECT_MULTI
+ tristate "Build register_ftrace_direct_multi() example"
+ depends on DYNAMIC_FTRACE_WITH_DIRECT_CALLS && m
+ depends on HAVE_SAMPLE_FTRACE_DIRECT_MULTI
+ help
+ This builds an ftrace direct function example
+ that hooks to wake_up_process and schedule, and prints
+ the function addresses.
+
config SAMPLE_TRACE_ARRAY
tristate "Build sample module for kernel access to Ftrace instancess"
depends on EVENT_TRACING && m
@@ -237,5 +246,5 @@ endif # SAMPLES
config HAVE_SAMPLE_FTRACE_DIRECT
bool
-config HAVE_SAMPLE_FTRACE_MULTI_DIRECT
+config HAVE_SAMPLE_FTRACE_DIRECT_MULTI
bool
diff --git a/samples/Makefile b/samples/Makefile
index b7b98307c2b4..4bcd6b93bffa 100644
--- a/samples/Makefile
+++ b/samples/Makefile
@@ -22,7 +22,7 @@ subdir-$(CONFIG_SAMPLE_TIMER) += timers
obj-$(CONFIG_SAMPLE_TRACE_EVENTS) += trace_events/
obj-$(CONFIG_SAMPLE_TRACE_PRINTK) += trace_printk/
obj-$(CONFIG_SAMPLE_FTRACE_DIRECT) += ftrace/
-obj-$(CONFIG_SAMPLE_FTRACE_MULTI_DIRECT) += ftrace/
+obj-$(CONFIG_SAMPLE_FTRACE_DIRECT_MULTI) += ftrace/
obj-$(CONFIG_SAMPLE_TRACE_ARRAY) += ftrace/
subdir-$(CONFIG_SAMPLE_UHID) += uhid
obj-$(CONFIG_VIDEO_PCI_SKELETON) += v4l/
diff --git a/samples/ftrace/Makefile b/samples/ftrace/Makefile
index e8a3f8520a44..b9198e2eef28 100644
--- a/samples/ftrace/Makefile
+++ b/samples/ftrace/Makefile
@@ -3,7 +3,7 @@
obj-$(CONFIG_SAMPLE_FTRACE_DIRECT) += ftrace-direct.o
obj-$(CONFIG_SAMPLE_FTRACE_DIRECT) += ftrace-direct-too.o
obj-$(CONFIG_SAMPLE_FTRACE_DIRECT) += ftrace-direct-modify.o
-obj-$(CONFIG_SAMPLE_FTRACE_MULTI_DIRECT) += ftrace-direct-multi.o
+obj-$(CONFIG_SAMPLE_FTRACE_DIRECT_MULTI) += ftrace-direct-multi.o
CFLAGS_sample-trace-array.o := -I$(src)
obj-$(CONFIG_SAMPLE_TRACE_ARRAY) += sample-trace-array.o
--
2.25.1
On Mon, 15 Nov 2021 20:56:13 +0100
Heiko Carstens <[email protected]> wrote:
> Currently it is not possible to build the ftrace direct multi example
> anymore due to broken config dependencies. Fix this by adding
> SAMPLE_FTRACE_DIRECT_MULTI config option.
>
> This broke when merging s390-5.16-1 due to an incorrect merge conflict
> resolution proposed by me.
>
> Also rename SAMPLE_FTRACE_MULTI_DIRECT to SAMPLE_FTRACE_DIRECT_MULTI
> so it matches the module name.
>
> Fixes: 0b707e572a19 ("Merge tag 's390-5.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux")
> Signed-off-by: Heiko Carstens <[email protected]>
> ---
>
Acked-by: Steven Rostedt (VMware) <[email protected]>
-- Steve
On Mon, 15 Nov 2021 20:56:12 +0100
Heiko Carstens <[email protected]> wrote:
> Hi Steven,
>
> two patches for ftrace direct multi sample:
>
> - fix ftrace direct multi sample config option handling, required
> because of an incorrect merge resolution proposed by me.
>
> - add s390 support for ftrace direct multi sample
>
> If you are happy with them, I could carry with the s390 tree and
> target for rc2, or you could pick them up. Whatever you prefer.
I'm good with you taking them through your tree. I acked the first patch as
it touches my code. And the second belongs to you anyway, but I would still
ask you to add some description to the change log.
Cheers,
-- Steve
On Tue, Nov 16, 2021 at 05:45:33PM -0500, Steven Rostedt wrote:
> > two patches for ftrace direct multi sample:
> >
> > - fix ftrace direct multi sample config option handling, required
> > because of an incorrect merge resolution proposed by me.
> >
> > - add s390 support for ftrace direct multi sample
> >
> > If you are happy with them, I could carry with the s390 tree and
> > target for rc2, or you could pick them up. Whatever you prefer.
>
> I'm good with you taking them through your tree. I acked the first patch as
> it touches my code. And the second belongs to you anyway, but I would still
> ask you to add some description to the change log.
Will do, and I'll add to the s390 tree.
Thanks!