From f4cf9fe05bb3f32fabea4e54dd92d368967a80da Mon Sep 17 00:00:00 2001 From: Adrian Dudau Date: Thu, 26 Jun 2014 14:36:22 +0200 Subject: initial commit for Enea Linux 4.0 Migrated from the internal git server on the daisy-enea branch Signed-off-by: Adrian Dudau --- meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb | 30 +++++++ .../trace-cmd/trace-cmd/addldflags.patch | 51 ++++++++++++ .../trace-cmd/blktrace-api-compatibility.patch | 29 +++++++ .../kernelshark-fix-syntax-error-of-shell.patch | 30 +++++++ .../trace-cmd/trace-cmd/make-docs-optional.patch | 36 ++++++++ ...dd-checks-for-invalid-pointers-to-fix-seg.patch | 61 ++++++++++++++ ...o-not-call-stop_threads-if-doing-latency-.patch | 38 +++++++++ ...etting-plugin-to-nop-clears-data-before-i.patch | 96 ++++++++++++++++++++++ .../trace-cmd-fix-syntax-error-of-shell.patch | 30 +++++++ meta/recipes-kernel/trace-cmd/trace-cmd_1.2.bb | 31 +++++++ 10 files changed, 432 insertions(+) create mode 100644 meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb create mode 100644 meta/recipes-kernel/trace-cmd/trace-cmd/addldflags.patch create mode 100644 meta/recipes-kernel/trace-cmd/trace-cmd/blktrace-api-compatibility.patch create mode 100644 meta/recipes-kernel/trace-cmd/trace-cmd/kernelshark-fix-syntax-error-of-shell.patch create mode 100644 meta/recipes-kernel/trace-cmd/trace-cmd/make-docs-optional.patch create mode 100644 meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-Add-checks-for-invalid-pointers-to-fix-seg.patch create mode 100644 meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-Do-not-call-stop_threads-if-doing-latency-.patch create mode 100644 meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-Setting-plugin-to-nop-clears-data-before-i.patch create mode 100644 meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-fix-syntax-error-of-shell.patch create mode 100644 meta/recipes-kernel/trace-cmd/trace-cmd_1.2.bb (limited to 'meta/recipes-kernel/trace-cmd') diff --git a/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb b/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb new file mode 100644 index 0000000000..d61097df91 --- /dev/null +++ b/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb @@ -0,0 +1,30 @@ +SUMMARY = "Graphical trace viewer for Ftrace" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ + file://kernel-shark.c;beginline=6;endline=8;md5=2c22c965a649ddd7973d7913c5634a5e" + +SRCREV = "7055ffd37beeb44714e86a4abc703f7e175a0db5" +PR = "r3" +PV = "1.2+git${SRCPV}" + +DEPENDS = "gtk+" +RDEPENDS_${PN} = "trace-cmd" + +inherit pkgconfig pythonnative + +SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git \ + file://addldflags.patch \ + file://make-docs-optional.patch \ + file://blktrace-api-compatibility.patch \ + file://kernelshark-fix-syntax-error-of-shell.patch" +S = "${WORKDIR}/git" + +EXTRA_OEMAKE = "'CC=${CC}' 'AR=${AR}' 'prefix=${prefix}' gui" + +FILESPATH = "${FILE_DIRNAME}/trace-cmd" + +do_install() { + oe_runmake CC="${CC}" AR="${AR}" prefix="${prefix}" DESTDIR="${D}" install_gui + rm -rf ${D}${datadir}/trace-cmd + rmdir ${D}${datadir} +} diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd/addldflags.patch b/meta/recipes-kernel/trace-cmd/trace-cmd/addldflags.patch new file mode 100644 index 0000000000..14730db905 --- /dev/null +++ b/meta/recipes-kernel/trace-cmd/trace-cmd/addldflags.patch @@ -0,0 +1,51 @@ +trace-cmd: Cross-compile fixes for LDFLAGS and include path + +Add ability for the Makefile to respect LDFLAGS. +Also remove hardcoded /usr/local/include include path. + +Upstream-Status: Accepted [Post 1.2: 5f576e9af7ad706774d9764a9ae3989376797c0e] + +Signed-off-by: Richard Purdie +Signed-off-by: Darren Hart + +--- + Makefile | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +Index: git/Makefile +=================================================================== +--- git.orig/Makefile ++++ git/Makefile +@@ -202,12 +202,13 @@ export Q VERBOSE + TRACECMD_VERSION = $(TC_VERSION).$(TC_PATCHLEVEL).$(TC_EXTRAVERSION) + KERNELSHARK_VERSION = $(KS_VERSION).$(KS_PATCHLEVEL).$(KS_EXTRAVERSION) + +-INCLUDES = -I. -I/usr/local/include $(CONFIG_INCLUDES) ++INCLUDES = -I. $(CONFIG_INCLUDES) + + include features.mk + + # Set compile option CFLAGS if not set elsewhere + CFLAGS ?= -g -Wall ++LDFLAGS ?= + + ifndef NO_PTRACE + ifneq ($(call try-cc,$(SOURCE_PTRACE),),y) +@@ -251,7 +252,7 @@ do_fpic_compile = \ + + do_app_build = \ + ($(print_app_build) \ +- $(CC) $^ -rdynamic -o $@ $(CONFIG_LIBS) $(LIBS)) ++ $(CC) $^ -rdynamic -o $@ $(LDFLAGS) $(CONFIG_LIBS) $(LIBS)) + + do_compile_shared_library = \ + ($(print_shared_lib_compile) \ +@@ -263,7 +264,7 @@ do_compile_plugin_obj = \ + + do_plugin_build = \ + ($(print_plugin_build) \ +- $(CC) $(CFLAGS) -shared -nostartfiles -o $@ $<) ++ $(CC) $(CFLAGS) $(LDFLAGS) -shared -nostartfiles -o $@ $<) + + do_build_static_lib = \ + ($(print_static_lib_build) \ diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd/blktrace-api-compatibility.patch b/meta/recipes-kernel/trace-cmd/trace-cmd/blktrace-api-compatibility.patch new file mode 100644 index 0000000000..0789e9fdf7 --- /dev/null +++ b/meta/recipes-kernel/trace-cmd/trace-cmd/blktrace-api-compatibility.patch @@ -0,0 +1,29 @@ +trace-cmd: Add blktrace_api compatibility for TC_BARRIER + +Newer kernels replace TC_BARRIER with TC_FLUSH. Ensure trace-cmd +can build regardless of the linux-kernel-headers version. + +Upstream-Status: Innapropriate [Stop gap] + +Signed-off-by: Darren Hart + +diff --git a/plugin_blk.c b/plugin_blk.c +index 9327b17..c8e5e1c 100644 +--- a/plugin_blk.c ++++ b/plugin_blk.c +@@ -44,6 +44,15 @@ struct blk_data { + unsigned short pdu_len; + }; + ++/* ++ * Newer kernels don't define BLK_TC_BARRIER and have replaced it with ++ * BLK_TC_FLUSH. In this case, define it here and report FLUSHES as BARRIERS as ++ * a workaround, as described in: ++ * http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=commit;h=c09c47caedc9854d59378d6e34c989e51cfdd2b4 ++ */ ++#ifndef BLK_TC_BARRIER ++#define BLK_TC_BARRIER 1<<2 ++#endif + static void fill_rwbs(char *rwbs, int action, unsigned int bytes) + { + int i = 0; diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd/kernelshark-fix-syntax-error-of-shell.patch b/meta/recipes-kernel/trace-cmd/trace-cmd/kernelshark-fix-syntax-error-of-shell.patch new file mode 100644 index 0000000000..351b24b82f --- /dev/null +++ b/meta/recipes-kernel/trace-cmd/trace-cmd/kernelshark-fix-syntax-error-of-shell.patch @@ -0,0 +1,30 @@ +kernelshark: fix syntax error of shell + +Delete "<<<" syntax of bash in Makefile, else we would get following error: + + Syntax error: redirection unexpected + +Upstream-status: Pending + +Signed-off-by: Chong Lu +--- + Makefile | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index c1fa906..be84415 100644 +--- a/Makefile ++++ b/Makefile +@@ -89,8 +89,7 @@ endif + + # $(call test-build, snippet, ret) -> ret if snippet compiles + # -> empty otherwise +-test-build = $(if $(shell $(CC) -o /dev/null -c -x c - > /dev/null 2>&1 \ +- <<<'$1' && echo y), $2) ++test-build = $(if $(shell echo '$1' |$(CC) -o /dev/null -c -x c - > /dev/null 2>&1 && echo y), $2) + + # have udis86 disassembler library? + udis86-flags := $(call test-build,\#include ,-DHAVE_UDIS86 -ludis86) +-- +1.7.9.5 + diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd/make-docs-optional.patch b/meta/recipes-kernel/trace-cmd/trace-cmd/make-docs-optional.patch new file mode 100644 index 0000000000..8402426c5f --- /dev/null +++ b/meta/recipes-kernel/trace-cmd/trace-cmd/make-docs-optional.patch @@ -0,0 +1,36 @@ +Disable building docs until we have asciidocs available as a recipe. + +Upstream-Status: Inappropriate [Account for missing dependency, the lazy way] + +Signed-off-by: Darren Hart + +--- + Makefile | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +Index: git/Makefile +=================================================================== +--- git.orig/Makefile ++++ git/Makefile +@@ -327,7 +327,9 @@ TARGETS = $(CMD_TARGETS) $(GUI_TARGETS) + # If you want kernelshark, then do: make gui + ### + +-all: all_cmd doc show_gui_make ++# Make doc optional ++#all: all_cmd doc show_gui_make ++all: all_cmd show_gui_make + + all_cmd: $(CMD_TARGETS) + +@@ -503,7 +505,9 @@ install_python: $(PYTHON_SO_INSTALL) $(P + install_cmd: all_cmd install_plugins install_python + $(Q)$(call do_install,trace-cmd,$(bindir_SQ)) + +-install: install_cmd install_doc ++# Make doc optional ++#install: install_cmd install_doc ++install: install_cmd + @echo "Note: to install the gui, type \"make install_gui\"" + + install_gui: install_cmd gui diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-Add-checks-for-invalid-pointers-to-fix-seg.patch b/meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-Add-checks-for-invalid-pointers-to-fix-seg.patch new file mode 100644 index 0000000000..8fdeedb008 --- /dev/null +++ b/meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-Add-checks-for-invalid-pointers-to-fix-seg.patch @@ -0,0 +1,61 @@ +From a6e259b2cd43db3c0f69441f627a8cf214f88506 Mon Sep 17 00:00:00 2001 +From: Mark Asselstine +Date: Thu, 5 Apr 2012 15:19:44 -0400 +Subject: [PATCH] trace-cmd: Add checks for invalid pointers to fix segfaults + +Upstream-Status: Backport + +Running 'trace-cmd report' after running latency tracers will cause a +segfault due to invalid pointers. Adding checks to ensure +pointers/lists are initialized before attempting to use them prevents +these segfaults. + +Link: http://lkml.kernel.org/r/1333653586-3379-2-git-send-email-mark.asselstine@windriver.com + +Signed-off-by: Mark Asselstine +Signed-off-by: Steven Rostedt +--- + trace-input.c | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/trace-input.c b/trace-input.c +index b6af1e6..5151c1e 100644 +--- a/trace-input.c ++++ b/trace-input.c +@@ -695,7 +695,8 @@ static void __free_page(struct tracecmd_input *handle, struct page *page) + + static void free_page(struct tracecmd_input *handle, int cpu) + { +- if (!handle->cpu_data[cpu].page) ++ if (!handle->cpu_data || cpu >= handle->cpus || ++ !handle->cpu_data[cpu].page) + return; + + __free_page(handle, handle->cpu_data[cpu].page); +@@ -746,8 +747,12 @@ void tracecmd_record_ref(struct record *record) + + static void free_next(struct tracecmd_input *handle, int cpu) + { +- struct record *record = handle->cpu_data[cpu].next; ++ struct record *record; ++ ++ if (!handle->cpu_data || cpu >= handle->cpus) ++ return; + ++ record = handle->cpu_data[cpu].next; + if (!record) + return; + +@@ -2337,7 +2342,8 @@ void tracecmd_close(struct tracecmd_input *handle) + /* The tracecmd_peek_data may have cached a record */ + free_next(handle, cpu); + free_page(handle, cpu); +- if (!list_empty(&handle->cpu_data[cpu].pages)) ++ if (handle->cpu_data && ++ !list_empty(&handle->cpu_data[cpu].pages)) + warning("pages still allocated on cpu %d%s", + cpu, show_records(&handle->cpu_data[cpu].pages)); + } +-- +1.7.10.4 + diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-Do-not-call-stop_threads-if-doing-latency-.patch b/meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-Do-not-call-stop_threads-if-doing-latency-.patch new file mode 100644 index 0000000000..4c00c512bb --- /dev/null +++ b/meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-Do-not-call-stop_threads-if-doing-latency-.patch @@ -0,0 +1,38 @@ +From 356dee73d9ced3e019dea2883a7f357fd4664b3e Mon Sep 17 00:00:00 2001 +From: Mark Asselstine +Date: Thu, 5 Apr 2012 15:19:45 -0400 +Subject: [PATCH] trace-cmd: Do not call stop_threads() if doing latency + tracing + +Upstream-Status: Backport + +If we are using a latency tracer we do not call start_threads() we +should therefore not call stop_threads() if 'latency'. Attempting +to call stop_threads() without first calling start_threads() will +cause a segfault since pids will be uninitialized. + +Link: http://lkml.kernel.org/r/1333653586-3379-3-git-send-email-mark.asselstine@windriver.com + +Signed-off-by: Mark Asselstine +Signed-off-by: Steven Rostedt +--- + trace-record.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/trace-record.c b/trace-record.c +index fcec28b..1c56fa9 100644 +--- a/trace-record.c ++++ b/trace-record.c +@@ -2216,7 +2216,8 @@ void trace_record (int argc, char **argv) + } + + disable_tracing(); +- stop_threads(); ++ if (!latency) ++ stop_threads(); + } + + for (cpu = 0; cpu < cpu_count; cpu++) { +-- +1.7.10.4 + diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-Setting-plugin-to-nop-clears-data-before-i.patch b/meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-Setting-plugin-to-nop-clears-data-before-i.patch new file mode 100644 index 0000000000..724e1e80b1 --- /dev/null +++ b/meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-Setting-plugin-to-nop-clears-data-before-i.patch @@ -0,0 +1,96 @@ +From d65740d61e7a4ea6d8d77237954b33dd18e3276c Mon Sep 17 00:00:00 2001 +From: Mark Asselstine +Date: Sun, 8 Apr 2012 11:38:45 -0400 +Subject: [PATCH] trace-cmd: Setting plugin to 'nop' clears data before it's + recorded + +Upstream-Status: Backport + +commit e09a5db1a929ab668c273b87c4f0a32b81e1c21a +[trace-cmd: Add trace-cmd record --date option] + +moved the call to disable_all() in trace_record() from after record_data() +to before it. Unfortunately disable_all() sets 'nop' in 'current_tracer' +which has the side affect of clearing 'trace', thus all the latency tracer +reports are empty/useless. Here we make disable_all() optionally call +set_plugin() thus, where we need to, we can delay the disabling of the tracer +until we have had a chance to capture 'trace'. We have added this delayed +behavior to trace_record() to fix the latency reports, for all other calls to +disable_all() we continue to have set_plugin() called. + +Link: http://lkml.kernel.org/r/1333899525-6436-1-git-send-email-mark.asselstine@windriver.com + +Signed-off-by: Mark Asselstine +Signed-off-by: Steven Rostedt +--- + trace-record.c | 16 ++++++++++------ + 1 file changed, 10 insertions(+), 6 deletions(-) + +diff --git a/trace-record.c b/trace-record.c +index 1c56fa9..95d4a2a 100644 +--- a/trace-record.c ++++ b/trace-record.c +@@ -897,11 +897,13 @@ static void disable_tracing(void) + write_tracing_on(0); + } + +-static void disable_all(void) ++static void disable_all(int disable_tracer) + { + disable_tracing(); + +- set_plugin("nop"); ++ if (disable_tracer) ++ set_plugin("nop"); ++ + reset_events(); + + /* Force close and reset of ftrace pid file */ +@@ -1573,7 +1575,7 @@ static void set_funcs(void) + /* make sure we are filtering functions */ + if (func_stack) { + if (!functions_filtered()) { +- disable_all(); ++ disable_all(1); + die("Function stack trace set, but functions not filtered"); + } + save_option(FUNC_STACK_TRACE); +@@ -1938,7 +1940,7 @@ void trace_record (int argc, char **argv) + break; + } + } +- disable_all(); ++ disable_all(1); + set_buffer_size(); + exit(0); + } else +@@ -2147,7 +2149,7 @@ void trace_record (int argc, char **argv) + + if (!extract) { + fset = set_ftrace(!disable); +- disable_all(); ++ disable_all(1); + + /* Record records the date first */ + if (record && date) +@@ -2227,7 +2229,7 @@ void trace_record (int argc, char **argv) + } + + if (!keep) +- disable_all(); ++ disable_all(0); + + printf("Kernel buffer statistics:\n" + " Note: \"entries\" are the entries left in the kernel ring buffer and are not\n" +@@ -2249,6 +2251,8 @@ void trace_record (int argc, char **argv) + if (keep) + exit(0); + ++ set_plugin("nop"); ++ + /* If tracing_on was enabled before we started, set it on now */ + if (tracing_on_init_val) + write_tracing_on(tracing_on_init_val); +-- +1.7.10.4 + diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-fix-syntax-error-of-shell.patch b/meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-fix-syntax-error-of-shell.patch new file mode 100644 index 0000000000..b1ebf49830 --- /dev/null +++ b/meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-fix-syntax-error-of-shell.patch @@ -0,0 +1,30 @@ +trace-cmd: fix syntax error of shell + +Delete "<<<" syntax of bash in Makefile, else we would get following error: + + Syntax error: redirection unexpected + +Upstream-status: Pending + +Signed-off-by: Chong Lu +--- + Makefile | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index c1fa906..7973c53 100644 +--- a/Makefile ++++ b/Makefile +@@ -89,8 +89,7 @@ endif + + # $(call test-build, snippet, ret) -> ret if snippet compiles + # -> empty otherwise +-test-build = $(if $(shell $(CC) -o /dev/null -c -x c - > /dev/null 2>&1 \ +- <<<'$1' && echo y), $2) ++test-build = $(if $(shell echo '$1' |$(CC) -o /dev/null -c -x c - > /dev/null 2>&1 && echo y), $2) + + # have udis86 disassembler library? + udis86-flags := $(call test-build,\#include ,-DHAVE_UDIS86 -ludis86) +-- +1.7.9.5 + diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd_1.2.bb b/meta/recipes-kernel/trace-cmd/trace-cmd_1.2.bb new file mode 100644 index 0000000000..a0c823bf62 --- /dev/null +++ b/meta/recipes-kernel/trace-cmd/trace-cmd_1.2.bb @@ -0,0 +1,31 @@ +SUMMARY = "User interface to Ftrace" +LICENSE = "GPLv2 & LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ + file://trace-cmd.c;beginline=6;endline=8;md5=2c22c965a649ddd7973d7913c5634a5e \ + file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff \ + file://trace-input.c;beginline=5;endine=8;md5=6ad47cc2b03385d8456771eec5eeea0b" + +SRCREV = "7055ffd37beeb44714e86a4abc703f7e175a0db5" +PR = "r3" +PV = "1.2+git${SRCPV}" + +inherit pkgconfig pythonnative + +SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git \ + file://addldflags.patch \ + file://make-docs-optional.patch \ + file://blktrace-api-compatibility.patch \ + file://trace-cmd-Add-checks-for-invalid-pointers-to-fix-seg.patch \ + file://trace-cmd-Do-not-call-stop_threads-if-doing-latency-.patch \ + file://trace-cmd-Setting-plugin-to-nop-clears-data-before-i.patch \ + file://trace-cmd-fix-syntax-error-of-shell.patch \ +" +S = "${WORKDIR}/git" + +EXTRA_OEMAKE = "'prefix=${prefix}'" + +FILES_${PN}-dbg += "${datadir}/trace-cmd/plugins/.debug/" + +do_install() { + oe_runmake prefix="${prefix}" DESTDIR="${D}" install +} -- cgit v1.2.3-54-g00ecf