[ptxdist] [PATCH v3 0/2] add libtraceevent for perf

[ptxdist] [PATCH v3 0/2] add libtraceevent for perf

[Uwe Kleine-König]

Hello,

changes since (implicit) v1 available at
https://lore.ptxdist.org/ptxdist/ZjtM5u8mjdcZjx-B@pengutronix.de/:

 - split in two patches (suggested by Michael Tretter)
 - drop commented out targets (suggested by Michael Tretter)
 - install plugin libraries
 - comment about unset meson config options

changes since v2 available at https://lore.ptxdist.org/ptxdist/ZjtM5u8mjdcZjx-B@pengutronix.de/:

 - use SECTION=system_libraries, sorry missed that when sending v2 :-\

Michael requested that I explicitly set all configuration options to
their default value. This felt wrong as most of them don't matter when
documentation is disabled (which is the case here). So as a suggested
compromise I explicitly listed the unset options.

Best regards
Uwe

Uwe Kleine-König (2):
  libtraceevent: new package
  kernel/perf: Make use of libtraceevent

 rules/kernel.in          |  1 +
 rules/kernel.make        |  1 -
 rules/libtraceevent.in   |  8 +++++
 rules/libtraceevent.make | 70 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 79 insertions(+), 1 deletion(-)
 create mode 100644 rules/libtraceevent.in
 create mode 100644 rules/libtraceevent.make

base-commit: 9de477ba07b1778daa58537121091d9f3b8ea670
-- 
2.39.2

[ptxdist] [PATCH v3 1/2] libtraceevent: new package

[Uwe Kleine-König]

This is required for perf (PTXCONF_KERNEL_TOOL_PERF) to work with
tracepoints and enable the subcommands kmem, kwork, lock, sched and
timechart.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 rules/libtraceevent.in   |  8 +++++
 rules/libtraceevent.make | 70 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 78 insertions(+)
 create mode 100644 rules/libtraceevent.in
 create mode 100644 rules/libtraceevent.make

diff --git a/rules/libtraceevent.in b/rules/libtraceevent.in
new file mode 100644
index 000000000..a3b7b9737
--- /dev/null
+++ b/rules/libtraceevent.in
@@ -0,0 +1,8 @@
+## SECTION=system_libraries
+
+config LIBTRACEEVENT
+	bool
+	prompt "libtraceevent"
+	select HOST_MESON
+	help
+	  FIXME
diff --git a/rules/libtraceevent.make b/rules/libtraceevent.make
new file mode 100644
index 000000000..7acc9c965
--- /dev/null
+++ b/rules/libtraceevent.make
@@ -0,0 +1,70 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2024 by Uwe Kleine-Koenig <u.kleine-koenig@pengutronix.de>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_LIBTRACEEVENT) += libtraceevent
+
+#
+# Paths and names
+#
+LIBTRACEEVENT_VERSION	:= 1.8.2
+LIBTRACEEVENT_MD5 	:= 671645965e835ef4236b96851fb889c9
+LIBTRACEEVENT		:= libtraceevent-$(LIBTRACEEVENT_VERSION)
+LIBTRACEEVENT_SUFFIX	:= tar.xz
+LIBTRACEEVENT_URL	:= https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git;tag=libtraceevent-$(LIBTRACEEVENT_VERSION)
+LIBTRACEEVENT_SOURCE	:= $(SRCDIR)/$(LIBTRACEEVENT).$(LIBTRACEEVENT_SUFFIX)
+LIBTRACEEVENT_DIR	:= $(BUILDDIR)/$(LIBTRACEEVENT)
+LIBTRACEEVENT_LICENSE	:= LGPL-2.1 + GPL-2.0
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+#LIBTRACEEVENT_CONF_ENV	:= $(CROSS_ENV)
+
+#
+# meson
+#
+LIBTRACEEVENT_CONF_TOOL	:= meson
+
+# There are some more configuration variables that don't have any effect given
+# -Ddoc=false.
+# Currently these are: docbook-suppress-sp, docbook-xls-172, htmldir, man-bold-literal
+#
+# The variable plugindir defaults to '' which is then interpreted as
+# join_paths(libdir, 'traceevent/plugins')
+LIBTRACEEVENT_CONF_OPT	:= \
+	$(CROSS_MESON_USR) \
+	-Ddoc=false \
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/libtraceevent.targetinstall:
+	@$(call targetinfo)
+
+	@$(call install_init, libtraceevent)
+	@$(call install_fixup, libtraceevent, PRIORITY, optional)
+	@$(call install_fixup, libtraceevent, SECTION, base)
+	@$(call install_fixup, libtraceevent, AUTHOR, "Uwe Kleine-König <u.kleine-koenig@pengutronix.de>")
+	@$(call install_fixup, libtraceevent, DESCRIPTION, missing)
+
+	@$(call install_lib, libtraceevent, 0, 0, 0644, libtraceevent)
+
+	@for plugin in cfg80211 function futex hrtimer jbd2 kmem kvm mac80211 sched_switch scsi tlb xen; do \
+		$(call install_lib, libtraceevent, 0, 0, 0644, libtraceevent/plugins/plugin_$${plugin}); \
+	done
+
+	@$(call install_finish, libtraceevent)
+
+	@$(call touch)
+
+# vim: syntax=make
-- 
2.39.2

[ptxdist] [PATCH v3 2/2] kernel/perf: Make use of libtraceevent

[Uwe Kleine-König]

This makes it possible to use with tracepoints and enable the
subcommands kmem, kwork, lock, sched and timechart.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 rules/kernel.in   | 1 +
 rules/kernel.make | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/kernel.in b/rules/kernel.in
index 817481577..862d52598 100644
--- a/rules/kernel.in
+++ b/rules/kernel.in
@@ -6,6 +6,7 @@ menuconfig KERNEL
 	select LIBELF_LIBDW	if KERNEL_TOOL_PERF
 	select SLANG		if KERNEL_TOOL_PERF
 	select BINUTILS		if KERNEL_TOOL_PERF
+	select LIBTRACEEVENT	if KERNEL_TOOL_PERF
 	select LIBUNWIND	if KERNEL_TOOL_PERF
 
 if KERNEL
diff --git a/rules/kernel.make b/rules/kernel.make
index d82aa27fb..0fe4f1e1b 100644
--- a/rules/kernel.make
+++ b/rules/kernel.make
@@ -223,7 +223,6 @@ KERNEL_TOOL_PERF_OPTS	:= \
 	NO_LIBBIONIC=1 \
 	NO_LIBCRYPTO=1 \
 	NO_LIBDW_DWARF_UNWIND= \
-	NO_LIBTRACEEVENT=1 \
 	NO_PERF_READ_VDSO32=1 \
 	NO_PERF_READ_VDSOX32=1 \
 	NO_ZLIB= \
-- 
2.39.2

Re: [ptxdist] [APPLIED] libtraceevent: new package

[Michael Olbrich]

Thanks, applied as 84741db5d065b58f307ecea288ef8cc76503f30f.

Michael

[sent from post-receive hook]

On Tue, 21 May 2024 11:58:49 +0200, Uwe Kleine-König <u.kleine-koenig@pengutronix.de> wrote:
> This is required for perf (PTXCONF_KERNEL_TOOL_PERF) to work with
> tracepoints and enable the subcommands kmem, kwork, lock, sched and
> timechart.
> 
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> Message-Id: <20240515072254.12082-5-u.kleine-koenig@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/libtraceevent.in b/rules/libtraceevent.in
> new file mode 100644
> index 000000000000..a3b7b97379f3
> --- /dev/null
> +++ b/rules/libtraceevent.in
> @@ -0,0 +1,8 @@
> +## SECTION=system_libraries
> +
> +config LIBTRACEEVENT
> +	bool
> +	prompt "libtraceevent"
> +	select HOST_MESON
> +	help
> +	  FIXME
> diff --git a/rules/libtraceevent.make b/rules/libtraceevent.make
> new file mode 100644
> index 000000000000..7acc9c9652c4
> --- /dev/null
> +++ b/rules/libtraceevent.make
> @@ -0,0 +1,70 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2024 by Uwe Kleine-Koenig <u.kleine-koenig@pengutronix.de>
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_LIBTRACEEVENT) += libtraceevent
> +
> +#
> +# Paths and names
> +#
> +LIBTRACEEVENT_VERSION	:= 1.8.2
> +LIBTRACEEVENT_MD5 	:= 671645965e835ef4236b96851fb889c9
> +LIBTRACEEVENT		:= libtraceevent-$(LIBTRACEEVENT_VERSION)
> +LIBTRACEEVENT_SUFFIX	:= tar.xz
> +LIBTRACEEVENT_URL	:= https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git;tag=libtraceevent-$(LIBTRACEEVENT_VERSION)
> +LIBTRACEEVENT_SOURCE	:= $(SRCDIR)/$(LIBTRACEEVENT).$(LIBTRACEEVENT_SUFFIX)
> +LIBTRACEEVENT_DIR	:= $(BUILDDIR)/$(LIBTRACEEVENT)
> +LIBTRACEEVENT_LICENSE	:= LGPL-2.1 + GPL-2.0
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +#LIBTRACEEVENT_CONF_ENV	:= $(CROSS_ENV)
> +
> +#
> +# meson
> +#
> +LIBTRACEEVENT_CONF_TOOL	:= meson
> +
> +# There are some more configuration variables that don't have any effect given
> +# -Ddoc=false.
> +# Currently these are: docbook-suppress-sp, docbook-xls-172, htmldir, man-bold-literal
> +#
> +# The variable plugindir defaults to '' which is then interpreted as
> +# join_paths(libdir, 'traceevent/plugins')
> +LIBTRACEEVENT_CONF_OPT	:= \
> +	$(CROSS_MESON_USR) \
> +	-Ddoc=false \
> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/libtraceevent.targetinstall:
> +	@$(call targetinfo)
> +
> +	@$(call install_init, libtraceevent)
> +	@$(call install_fixup, libtraceevent, PRIORITY, optional)
> +	@$(call install_fixup, libtraceevent, SECTION, base)
> +	@$(call install_fixup, libtraceevent, AUTHOR, "Uwe Kleine-König <u.kleine-koenig@pengutronix.de>")
> +	@$(call install_fixup, libtraceevent, DESCRIPTION, missing)
> +
> +	@$(call install_lib, libtraceevent, 0, 0, 0644, libtraceevent)
> +
> +	@for plugin in cfg80211 function futex hrtimer jbd2 kmem kvm mac80211 sched_switch scsi tlb xen; do \
> +		$(call install_lib, libtraceevent, 0, 0, 0644, libtraceevent/plugins/plugin_$${plugin}); \
> +	done
> +
> +	@$(call install_finish, libtraceevent)
> +
> +	@$(call touch)
> +
> +# vim: syntax=make

Re: [ptxdist] [APPLIED] kernel/perf: Make use of libtraceevent

[Michael Olbrich]

Thanks, applied as 5022500e42936a12a97c63d45e9712c69fa58141.

Michael

[sent from post-receive hook]

On Tue, 21 May 2024 11:58:50 +0200, Uwe Kleine-König <u.kleine-koenig@pengutronix.de> wrote:
> This makes it possible to use with tracepoints and enable the
> subcommands kmem, kwork, lock, sched and timechart.
> 
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> Message-Id: <20240515072254.12082-6-u.kleine-koenig@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/kernel.in b/rules/kernel.in
> index 8174815775c0..862d52598556 100644
> --- a/rules/kernel.in
> +++ b/rules/kernel.in
> @@ -6,6 +6,7 @@ menuconfig KERNEL
>  	select LIBELF_LIBDW	if KERNEL_TOOL_PERF
>  	select SLANG		if KERNEL_TOOL_PERF
>  	select BINUTILS		if KERNEL_TOOL_PERF
> +	select LIBTRACEEVENT	if KERNEL_TOOL_PERF
>  	select LIBUNWIND	if KERNEL_TOOL_PERF
>  
>  if KERNEL
> diff --git a/rules/kernel.make b/rules/kernel.make
> index d82aa27fb78e..0fe4f1e1b12a 100644
> --- a/rules/kernel.make
> +++ b/rules/kernel.make
> @@ -223,7 +223,6 @@ KERNEL_TOOL_PERF_OPTS	:= \
>  	NO_LIBBIONIC=1 \
>  	NO_LIBCRYPTO=1 \
>  	NO_LIBDW_DWARF_UNWIND= \
> -	NO_LIBTRACEEVENT=1 \
>  	NO_PERF_READ_VDSO32=1 \
>  	NO_PERF_READ_VDSOX32=1 \
>  	NO_ZLIB= \