* [PATCH v2 2/4] perf: Add define for libtraceevent version
2021-09-21 20:48 [PATCH v2 1/4] perf: Enable libtracefs dynamic linking Ian Rogers
@ 2021-09-21 20:48 ` Ian Rogers
2021-09-21 20:48 ` [PATCH v2 3/4] perf: Add define for libtracefs version Ian Rogers
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Ian Rogers @ 2021-09-21 20:48 UTC (permalink / raw)
To: Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo,
Mark Rutland, Alexander Shishkin, Jiri Olsa, Namhyung Kim,
linux-perf-users, linux-kernel, linux-trace-devel,
Tzvetomir Stoyanov, Steven Rostedt
Cc: eranian, Ian Rogers
The definition is derived from pkg-config as discussed in:
https://lore.kernel.org/lkml/20210610155915.20a252d3@oasis.local.home/
The definition is computed using expr rather than passed to be computed
in C code, this avoids complications with quote in the variable
expansions. For example see the target python/perf.so in Makefile.perf.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/Makefile.config | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config
index 00ec900ddbca..2001c315f0db 100644
--- a/tools/perf/Makefile.config
+++ b/tools/perf/Makefile.config
@@ -1093,6 +1093,12 @@ ifdef LIBTRACEEVENT_DYNAMIC
$(call feature_check,libtraceevent)
ifeq ($(feature-libtraceevent), 1)
EXTLIBS += -ltraceevent
+ LIBTRACEEVENT_VERSION := $(shell $(PKG_CONFIG) --modversion libtraceevent)
+ LIBTRACEEVENT_VERSION_1 := $(word 1, $(subst ., ,$(LIBTRACEEVENT_VERSION)))
+ LIBTRACEEVENT_VERSION_2 := $(word 2, $(subst ., ,$(LIBTRACEEVENT_VERSION)))
+ LIBTRACEEVENT_VERSION_3 := $(word 3, $(subst ., ,$(LIBTRACEEVENT_VERSION)))
+ LIBTRACEEVENT_VERSION_CPP := $(shell expr $(LIBTRACEEVENT_VERSION_1) \* 255 \* 255 + $(LIBTRACEEVENT_VERSION_2) \* 255 + $(LIBTRACEEVENT_VERSION_3))
+ CFLAGS += -DLIBTRACEEVENT_VERSION=$(LIBTRACEEVENT_VERSION_CPP)
else
dummy := $(error Error: No libtraceevent devel library found, please install libtraceevent-devel);
endif
--
2.33.0.464.g1972c5931b-goog
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH v2 3/4] perf: Add define for libtracefs version
2021-09-21 20:48 [PATCH v2 1/4] perf: Enable libtracefs dynamic linking Ian Rogers
2021-09-21 20:48 ` [PATCH v2 2/4] perf: Add define for libtraceevent version Ian Rogers
@ 2021-09-21 20:48 ` Ian Rogers
2021-09-21 20:48 ` [PATCH v2 4/4] libtraceevent: Increase libtraceevent logging when verbose Ian Rogers
2021-09-22 21:10 ` [PATCH v2 1/4] perf: Enable libtracefs dynamic linking Jiri Olsa
3 siblings, 0 replies; 5+ messages in thread
From: Ian Rogers @ 2021-09-21 20:48 UTC (permalink / raw)
To: Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo,
Mark Rutland, Alexander Shishkin, Jiri Olsa, Namhyung Kim,
linux-perf-users, linux-kernel, linux-trace-devel,
Tzvetomir Stoyanov, Steven Rostedt
Cc: eranian, Ian Rogers
This will allow version specific support of libtracefs.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/Makefile.config | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config
index 2001c315f0db..0ae2e3d8b832 100644
--- a/tools/perf/Makefile.config
+++ b/tools/perf/Makefile.config
@@ -1108,6 +1108,12 @@ ifdef LIBTRACEFS_DYNAMIC
$(call feature_check,libtracefs)
ifeq ($(feature-libtracefs), 1)
EXTLIBS += -ltracefs
+ LIBTRACEFS_VERSION := $(shell $(PKG_CONFIG) --modversion libtracefs)
+ LIBTRACEFS_VERSION_1 := $(word 1, $(subst ., ,$(LIBTRACEFS_VERSION)))
+ LIBTRACEFS_VERSION_2 := $(word 2, $(subst ., ,$(LIBTRACEFS_VERSION)))
+ LIBTRACEFS_VERSION_3 := $(word 3, $(subst ., ,$(LIBTRACEFS_VERSION)))
+ LIBTRACEFS_VERSION_CPP := $(shell expr $(LIBTRACEFS_VERSION_1) \* 255 \* 255 + $(LIBTRACEFS_VERSION_2) \* 255 + $(LIBTRACEFS_VERSION_3))
+ CFLAGS += -DLIBTRACEFS_VERSION=$(LIBTRACEFS_VERSION_CPP)
else
dummy := $(error Error: No libtracefs devel library found, please install libtracefs-dev);
endif
--
2.33.0.464.g1972c5931b-goog
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH v2 4/4] libtraceevent: Increase libtraceevent logging when verbose
2021-09-21 20:48 [PATCH v2 1/4] perf: Enable libtracefs dynamic linking Ian Rogers
2021-09-21 20:48 ` [PATCH v2 2/4] perf: Add define for libtraceevent version Ian Rogers
2021-09-21 20:48 ` [PATCH v2 3/4] perf: Add define for libtracefs version Ian Rogers
@ 2021-09-21 20:48 ` Ian Rogers
2021-09-22 21:10 ` [PATCH v2 1/4] perf: Enable libtracefs dynamic linking Jiri Olsa
3 siblings, 0 replies; 5+ messages in thread
From: Ian Rogers @ 2021-09-21 20:48 UTC (permalink / raw)
To: Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo,
Mark Rutland, Alexander Shishkin, Jiri Olsa, Namhyung Kim,
linux-perf-users, linux-kernel, linux-trace-devel,
Tzvetomir Stoyanov, Steven Rostedt
Cc: eranian, Ian Rogers
libtraceevent has added more levels of debug printout and with changes
like:
https://lore.kernel.org/linux-trace-devel/20210507095022.1079364-3-tz.stoyanov@gmail.com
previously generated output like "registering plugin" is no longer
displayed. This change makes it so that if perf's verbose debug output
is enabled then the debug and info libtraceevent messages can be
displayed.
The code is conditionally enabled based on the libtraceevent version as
discussed in the RFC:
https://lore.kernel.org/lkml/20210610060643.595673-1-irogers@google.com/
v2. Is a rebase and handles the case of building without
LIBTRACEEVENT_DYNAMIC.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/util/debug.c | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/tools/perf/util/debug.c b/tools/perf/util/debug.c
index 2c06abf6dcd2..c7a9fa0ffae9 100644
--- a/tools/perf/util/debug.c
+++ b/tools/perf/util/debug.c
@@ -24,6 +24,16 @@
#include "util/parse-sublevel-options.h"
#include <linux/ctype.h>
+#include <traceevent/event-parse.h>
+
+#define MAKE_LIBTRACEEVENT_VERSION(a, b, c) ((a)*255*255+(b)*255+(c))
+#ifndef LIBTRACEEVENT_VERSION
+/*
+ * If LIBTRACEEVENT_VERSION wasn't computed then set to version 1.1.0 that ships
+ * with the Linux kernel tools.
+ */
+#define LIBTRACEEVENT_VERSION MAKE_LIBTRACEEVENT_VERSION(1, 1, 0)
+#endif
int verbose;
int debug_peo_args;
@@ -228,6 +238,15 @@ int perf_debug_option(const char *str)
/* Allow only verbose value in range (0, 10), otherwise set 0. */
verbose = (verbose < 0) || (verbose > 10) ? 0 : verbose;
+#if MAKE_LIBTRACEEVENT_VERSION(1, 3, 0) <= LIBTRACEEVENT_VERSION
+ if (verbose == 1)
+ tep_set_loglevel(TEP_LOG_INFO);
+ else if (verbose == 2)
+ tep_set_loglevel(TEP_LOG_DEBUG);
+ else if (verbose >= 3)
+ tep_set_loglevel(TEP_LOG_ALL);
+#endif
+
return 0;
}
--
2.33.0.464.g1972c5931b-goog
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH v2 1/4] perf: Enable libtracefs dynamic linking
2021-09-21 20:48 [PATCH v2 1/4] perf: Enable libtracefs dynamic linking Ian Rogers
` (2 preceding siblings ...)
2021-09-21 20:48 ` [PATCH v2 4/4] libtraceevent: Increase libtraceevent logging when verbose Ian Rogers
@ 2021-09-22 21:10 ` Jiri Olsa
3 siblings, 0 replies; 5+ messages in thread
From: Jiri Olsa @ 2021-09-22 21:10 UTC (permalink / raw)
To: Ian Rogers
Cc: Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo,
Mark Rutland, Alexander Shishkin, Namhyung Kim, linux-perf-users,
linux-kernel, linux-trace-devel, Tzvetomir Stoyanov,
Steven Rostedt, eranian
On Tue, Sep 21, 2021 at 01:48:36PM -0700, Ian Rogers wrote:
> Currently libtracefs isn't used by perf, but there are potential
> improvements by using it as identified Steven Rostedt's e-mail:
> https://lore.kernel.org/lkml/20210610154759.1ef958f0@oasis.local.home/
>
> This change is modelled on the dynamic libtraceevent patch by Michael
> Petlan:
> https://lore.kernel.org/linux-perf-users/20210428092023.4009-1-mpetlan@redhat.com/
>
> Signed-off-by: Ian Rogers <irogers@google.com>
> ---
> tools/build/Makefile.feature | 1 +
> tools/build/feature/Makefile | 4 ++++
> tools/perf/Makefile.config | 9 +++++++++
> tools/perf/Makefile.perf | 2 ++
> 4 files changed, 16 insertions(+)
>
> diff --git a/tools/build/Makefile.feature b/tools/build/Makefile.feature
> index 3dd2f68366f9..45a9a59828c3 100644
> --- a/tools/build/Makefile.feature
> +++ b/tools/build/Makefile.feature
> @@ -52,6 +52,7 @@ FEATURE_TESTS_BASIC := \
> libslang \
> libslang-include-subdir \
> libtraceevent \
> + libtracefs \
> libcrypto \
> libunwind \
> pthread-attr-setaffinity-np \
> diff --git a/tools/build/feature/Makefile b/tools/build/feature/Makefile
> index eff55d287db1..d024b5204ba0 100644
> --- a/tools/build/feature/Makefile
> +++ b/tools/build/feature/Makefile
> @@ -36,6 +36,7 @@ FILES= \
> test-libslang.bin \
> test-libslang-include-subdir.bin \
> test-libtraceevent.bin \
> + test-libtracefs.bin \
> test-libcrypto.bin \
> test-libunwind.bin \
> test-libunwind-debug-frame.bin \
> @@ -199,6 +200,9 @@ $(OUTPUT)test-libslang-include-subdir.bin:
> $(OUTPUT)test-libtraceevent.bin:
> $(BUILD) -ltraceevent
>
> +$(OUTPUT)test-libtracefs.bin:
> + $(BUILD) -ltracefs
hum, looks like you forgot to git add test-libtracefs.c?
jirka
> +
> $(OUTPUT)test-libcrypto.bin:
> $(BUILD) -lcrypto
>
> diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config
> index 446180401e26..00ec900ddbca 100644
> --- a/tools/perf/Makefile.config
> +++ b/tools/perf/Makefile.config
> @@ -1098,6 +1098,15 @@ ifdef LIBTRACEEVENT_DYNAMIC
> endif
> endif
>
> +ifdef LIBTRACEFS_DYNAMIC
> + $(call feature_check,libtracefs)
> + ifeq ($(feature-libtracefs), 1)
> + EXTLIBS += -ltracefs
> + else
> + dummy := $(error Error: No libtracefs devel library found, please install libtracefs-dev);
> + endif
> +endif
> +
> # Among the variables below, these:
> # perfexecdir
> # perf_include_dir
> diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
> index e04313c4d840..7df13e74450c 100644
> --- a/tools/perf/Makefile.perf
> +++ b/tools/perf/Makefile.perf
> @@ -130,6 +130,8 @@ include ../scripts/utilities.mak
> #
> # Define LIBTRACEEVENT_DYNAMIC to enable libtraceevent dynamic linking
> #
> +# Define LIBTRACEFS_DYNAMIC to enable libtracefs dynamic linking
> +#
>
> # As per kernel Makefile, avoid funny character set dependencies
> unexport LC_ALL
> --
> 2.33.0.464.g1972c5931b-goog
>
^ permalink raw reply [flat|nested] 5+ messages in thread