* [PATCH 1/4] perf: Enable libtracefs dynamic linking
@ 2021-06-22 4:38 Ian Rogers
2021-06-22 4:38 ` [PATCH 2/4] perf: Add define for libtraceevent version Ian Rogers
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Ian Rogers @ 2021-06-22 4:38 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-users,
Tzvetomir Stoyanov, Steven Rostedt, Claire Jensen
Cc: eranian, Ian Rogers
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 04a8e3db8a54..c87e876b6dd7 100644
--- a/tools/build/Makefile.feature
+++ b/tools/build/Makefile.feature
@@ -53,6 +53,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 ec203e28407f..9488c4b4026e 100644
--- a/tools/build/feature/Makefile
+++ b/tools/build/feature/Makefile
@@ -37,6 +37,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 \
@@ -200,6 +201,9 @@ $(OUTPUT)test-libslang-include-subdir.bin:
$(OUTPUT)test-libtraceevent.bin:
$(BUILD) -ltraceevent
+$(OUTPUT)test-libtracefs.bin:
+ $(BUILD) -ltracefs
+
$(OUTPUT)test-libcrypto.bin:
$(BUILD) -lcrypto
diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config
index a62d09808fef..3a8a54b71654 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 e47f04e5b51e..b56e26b703ff 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.32.0.288.g62a8d224e6-goog
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 2/4] perf: Add define for libtraceevent version
2021-06-22 4:38 [PATCH 1/4] perf: Enable libtracefs dynamic linking Ian Rogers
@ 2021-06-22 4:38 ` Ian Rogers
2021-06-22 4:38 ` [PATCH 3/4] perf: Add define for libtracefs version Ian Rogers
2021-06-22 4:38 ` [PATCH 4/4] libtraceevent: Increase libtraceevent logging when verbose Ian Rogers
2 siblings, 0 replies; 4+ messages in thread
From: Ian Rogers @ 2021-06-22 4:38 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-users,
Tzvetomir Stoyanov, Steven Rostedt, Claire Jensen
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 3a8a54b71654..6f318c16e8f1 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.32.0.288.g62a8d224e6-goog
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 3/4] perf: Add define for libtracefs version
2021-06-22 4:38 [PATCH 1/4] perf: Enable libtracefs dynamic linking Ian Rogers
2021-06-22 4:38 ` [PATCH 2/4] perf: Add define for libtraceevent version Ian Rogers
@ 2021-06-22 4:38 ` Ian Rogers
2021-06-22 4:38 ` [PATCH 4/4] libtraceevent: Increase libtraceevent logging when verbose Ian Rogers
2 siblings, 0 replies; 4+ messages in thread
From: Ian Rogers @ 2021-06-22 4:38 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-users,
Tzvetomir Stoyanov, Steven Rostedt, Claire Jensen
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 6f318c16e8f1..9389ef68e2fb 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.32.0.288.g62a8d224e6-goog
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 4/4] libtraceevent: Increase libtraceevent logging when verbose
2021-06-22 4:38 [PATCH 1/4] perf: Enable libtracefs dynamic linking Ian Rogers
2021-06-22 4:38 ` [PATCH 2/4] perf: Add define for libtraceevent version Ian Rogers
2021-06-22 4:38 ` [PATCH 3/4] perf: Add define for libtracefs version Ian Rogers
@ 2021-06-22 4:38 ` Ian Rogers
2 siblings, 0 replies; 4+ messages in thread
From: Ian Rogers @ 2021-06-22 4:38 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-users,
Tzvetomir Stoyanov, Steven Rostedt, Claire Jensen
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/
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/util/debug.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/tools/perf/util/debug.c b/tools/perf/util/debug.c
index 2c06abf6dcd2..7e085d7cd8a9 100644
--- a/tools/perf/util/debug.c
+++ b/tools/perf/util/debug.c
@@ -24,6 +24,9 @@
#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))
int verbose;
int debug_peo_args;
@@ -228,6 +231,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.32.0.288.g62a8d224e6-goog
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-06-22 4:38 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-22 4:38 [PATCH 1/4] perf: Enable libtracefs dynamic linking Ian Rogers
2021-06-22 4:38 ` [PATCH 2/4] perf: Add define for libtraceevent version Ian Rogers
2021-06-22 4:38 ` [PATCH 3/4] perf: Add define for libtracefs version Ian Rogers
2021-06-22 4:38 ` [PATCH 4/4] libtraceevent: Increase libtraceevent logging when verbose Ian Rogers
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).