* [PATCH 0/6] lttng update (add 2.4.0)
@ 2014-03-06 17:09 Tom Zanussi
2014-03-06 17:09 ` [PATCH 1/6] lttng-modules: Add version 2.4.0 Tom Zanussi
` (5 more replies)
0 siblings, 6 replies; 11+ messages in thread
From: Tom Zanussi @ 2014-03-06 17:09 UTC (permalink / raw)
To: openembedded-core; +Cc: Tom Zanussi
This adds lttng 2.4.0, which addresses build failures with
linux-yocto-dev, but still works with 3.10.
Tested with qemux86 and both linux-yocto and linux-yocto-dev.
Note that this disables lttng for arm, due to a problem with
lttng-modules and gcc-4.8.x (this is also a problem for lttng 2.3.x).
The following changes since commit f03955041d0e44d377ca1c4def630982f24f1e8b:
Revert "ncurses: use ln -r to generate relative symlink" (2014-03-03 15:55:27 +0000)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib.git tzanussi/lttng-2.4.0-update
http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=tzanussi/lttng-2.4.0-update
Tom Zanussi (6):
lttng-modules: Add version 2.4.0
lttng-tools: Add version 2.4.0
lttng-ust: Add version 2.4.0
lttng-modules: Exclude arm
lttng-modules: Fix 3.14 bio tracepoints
lttng-ust: Disable doc/examples in the build
.../packagegroup-core-tools-profile.bb | 4 +
.../lttng/lttng-modules/bio-bvec-iter.patch | 156 +++++++++++++++++++++
meta/recipes-kernel/lttng/lttng-modules_2.4.0.bb | 39 ++++++
.../lttng/lttng-tools/runtest-2.4.0.patch | 27 ++++
meta/recipes-kernel/lttng/lttng-tools_2.4.0.bb | 59 ++++++++
.../lttng-ust/lttng-ust-doc-examples-disable.patch | 18 +++
meta/recipes-kernel/lttng/lttng-ust_2.4.0.bb | 32 +++++
7 files changed, 335 insertions(+)
create mode 100644 meta/recipes-kernel/lttng/lttng-modules/bio-bvec-iter.patch
create mode 100644 meta/recipes-kernel/lttng/lttng-modules_2.4.0.bb
create mode 100644 meta/recipes-kernel/lttng/lttng-tools/runtest-2.4.0.patch
create mode 100644 meta/recipes-kernel/lttng/lttng-tools_2.4.0.bb
create mode 100644 meta/recipes-kernel/lttng/lttng-ust/lttng-ust-doc-examples-disable.patch
create mode 100644 meta/recipes-kernel/lttng/lttng-ust_2.4.0.bb
--
1.8.3.1
^ permalink raw reply [flat|nested] 11+ messages in thread* [PATCH 1/6] lttng-modules: Add version 2.4.0 2014-03-06 17:09 [PATCH 0/6] lttng update (add 2.4.0) Tom Zanussi @ 2014-03-06 17:09 ` Tom Zanussi 2014-03-06 17:09 ` [PATCH 2/6] lttng-tools: " Tom Zanussi ` (4 subsequent siblings) 5 siblings, 0 replies; 11+ messages in thread From: Tom Zanussi @ 2014-03-06 17:09 UTC (permalink / raw) To: openembedded-core From: Tom Zanussi <tom.zanussi@intel.com> This updates lttng-modules to 2.4.0, codenamed Époque Opaque, needed for interoperability with the 3.14 (dev) kernel. Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> --- meta/recipes-kernel/lttng/lttng-modules_2.4.0.bb | 34 ++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 meta/recipes-kernel/lttng/lttng-modules_2.4.0.bb diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.4.0.bb b/meta/recipes-kernel/lttng/lttng-modules_2.4.0.bb new file mode 100644 index 0000000..0b7d5e8 --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-modules_2.4.0.bb @@ -0,0 +1,34 @@ +SECTION = "devel" +SUMMARY = "Linux Trace Toolkit KERNEL MODULE" +DESCRIPTION = "The lttng-modules 2.0 package contains the kernel tracer modules" +LICENSE = "LGPLv2.1 & GPLv2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1412caf5a1aa90d6a48588a4794c0eac \ + file://gpl-2.0.txt;md5=751419260aa954499f7abaabaa882bbe \ + file://lgpl-2.1.txt;md5=243b725d71bb5df4a1e5920b344b86ad" + +DEPENDS = "virtual/kernel" + +inherit module + +SRCREV = "fb2c37799306d16fb590aebee6fad8be431264b7" +PV = "2.4.0" + +SRC_URI = "git://git.lttng.org/lttng-modules.git;branch=stable-2.4 \ + file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch" + +export INSTALL_MOD_DIR="kernel/lttng-modules" +export KERNEL_SRC="${STAGING_KERNEL_DIR}" + + +S = "${WORKDIR}/git" + +do_install_append() { + # Delete empty directories to avoid QA failures if no modules were built + find ${D}/lib -depth -type d -empty -exec rmdir {} \; +} + +python do_package_prepend() { + if not os.path.exists(os.path.join(d.getVar('D', True), 'lib/modules')): + bb.warn("%s: no modules were created; this may be due to CONFIG_TRACEPOINTS not being enabled in your kernel." % d.getVar('PN', True)) +} + -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 2/6] lttng-tools: Add version 2.4.0 2014-03-06 17:09 [PATCH 0/6] lttng update (add 2.4.0) Tom Zanussi 2014-03-06 17:09 ` [PATCH 1/6] lttng-modules: Add version 2.4.0 Tom Zanussi @ 2014-03-06 17:09 ` Tom Zanussi 2014-03-06 17:09 ` [PATCH 3/6] lttng-ust: " Tom Zanussi ` (3 subsequent siblings) 5 siblings, 0 replies; 11+ messages in thread From: Tom Zanussi @ 2014-03-06 17:09 UTC (permalink / raw) To: openembedded-core From: Tom Zanussi <tom.zanussi@intel.com> This updates lttng-tools to 2.4.0, codenamed Époque Opaque, needed for interoperability with lttng-modules and the 3.14 (dev) kernel. Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> --- .../lttng/lttng-tools/runtest-2.4.0.patch | 27 ++++++++++ meta/recipes-kernel/lttng/lttng-tools_2.4.0.bb | 59 ++++++++++++++++++++++ 2 files changed, 86 insertions(+) create mode 100644 meta/recipes-kernel/lttng/lttng-tools/runtest-2.4.0.patch create mode 100644 meta/recipes-kernel/lttng/lttng-tools_2.4.0.bb diff --git a/meta/recipes-kernel/lttng/lttng-tools/runtest-2.4.0.patch b/meta/recipes-kernel/lttng/lttng-tools/runtest-2.4.0.patch new file mode 100644 index 0000000..958bce4 --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-tools/runtest-2.4.0.patch @@ -0,0 +1,27 @@ +diff --git a/Makefile.am b/Makefile.am +index 584f59b..c2bcabd 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -12,3 +12,9 @@ dist_doc_DATA = LICENSE \ + dist_noinst_DATA = CodingStyle + + EXTRA_DIST = extras/lttng-bash_completion gpl-2.0.txt lgpl-2.1.txt ++ ++install-ptest: ++ cp -r $(srcdir)/tests $(DESTDIR) ++ for m in $$(find $(DESTDIR)/tests -name Makefile); do \ ++ sed -i -e 's|^Makefile:|_Makefile:|' $$m; \ ++ done +diff --git a/tests/run.sh b/tests/run.sh +index c6c50fd..6455359 100755 +--- a/tests/run.sh ++++ b/tests/run.sh +@@ -19,4 +19,7 @@ + + [ -z "$1" ] && echo "Error: No testlist. Please specify a testlist to run." && exit 1 + +-prove --merge --exec '' - < $1 ++prove --merge -v --exec '' - < $1 | sed \ ++ -e 's|^ok \(.*\)|PASS: \1|' \ ++ -e 's|^not ok \(.*\)|FAIL: \1|' \ ++ | egrep -h 'PASS|FAIL' diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.4.0.bb b/meta/recipes-kernel/lttng/lttng-tools_2.4.0.bb new file mode 100644 index 0000000..223b52e --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-tools_2.4.0.bb @@ -0,0 +1,59 @@ +SECTION = "devel" +SUMMARY = "Linux Trace Toolkit Control" +DESCRIPTION = "The Linux trace toolkit is a suite of tools designed \ +to extract program execution details from the Linux operating system \ +and interpret them." + +LICENSE = "GPLv2 & LGPLv2.1" +LIC_FILES_CHKSUM = "file://LICENSE;md5=01d7fc4496aacf37d90df90b90b0cac1 \ + file://gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://lgpl-2.1.txt;md5=0f0d71500e6a57fd24d825f33242b9ca" + +DEPENDS = "liburcu popt lttng-ust" +RDEPENDS_${PN}-ptest += "make" + +SRCREV = "8e3234eea2d81f8a962214c570532f8e096a9a8d" +PV = "v2.4.0" + +SRC_URI = "git://git.lttng.org/lttng-tools.git;branch=stable-2.4 \ + file://runtest-2.4.0.patch \ + file://run-ptest \ + " + +S = "${WORKDIR}/git" + +inherit autotools-brokensep ptest + +export KERNELDIR="${STAGING_KERNEL_DIR}" + +FILES_${PN} += "${libdir}/lttng/libexec/*" +FILES_${PN}-dbg += "${libdir}/lttng/libexec/.debug" + +# Since files are installed into ${libdir}/lttng/libexec we match +# the libexec insane test so skip it. +INSANE_SKIP_${PN} = "libexec" +INSANE_SKIP_${PN}-dbg = "libexec" + + +do_install_ptest () { + chmod +x ${D}/${libdir}/${PN}/ptest/tests/utils/utils.sh + for i in `find ${D}/${libdir}/${PN}/ptest -perm /u+x -type f`; do + sed -e "s:\$TESTDIR.*/src/bin/lttng/\$LTTNG_BIN:\$LTTNG_BIN:g" \ + -e "s:\$TESTDIR/../src/bin/lttng-sessiond/\$SESSIOND_BIN:\$SESSIOND_BIN:g" \ + -e "s:\$DIR/../src/bin/lttng-sessiond/\$SESSIOND_BIN:\$SESSIOND_BIN:g" \ + -e "s:\$TESTDIR/../src/bin/lttng-consumerd/:${libdir}/lttng/libexec/:g" \ + -e "s:\$DIR/../src/bin/lttng-consumerd/:${libdir}/lttng/libexec/:g" \ + -e "s:\$TESTDIR/../src/bin/lttng-relayd/\$RELAYD_BIN:\$RELAYD_BIN:g" \ + -e "s:\$DIR/../src/bin/lttng-sessiond/lttng-sessiond:\$SESSIOND_BIN:g" \ + -e "s:\$DIR/../src/bin/lttng-relayd/\$RELAYD_BIN:\$RELAYD_BIN:g" \ + -e "s:\$DIR/../bin/lttng-relayd/\$RELAYD_BIN:\$RELAYD_BIN:g" \ + -i $i + done + + sed -e "s:src/bin/lttng-sessiond:$bindir:g" \ + -e "s:src/bin/lttng-consumerd:${libexecdir}/libexec/:g" \ + -i ${D}/${libdir}/${PN}/ptest/tests/regression/run-report.py + sed -e "s:src/bin:bin:g" \ + -i ${D}/${libdir}/${PN}/ptest/tests/utils/utils.sh + +} -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 3/6] lttng-ust: Add version 2.4.0 2014-03-06 17:09 [PATCH 0/6] lttng update (add 2.4.0) Tom Zanussi 2014-03-06 17:09 ` [PATCH 1/6] lttng-modules: Add version 2.4.0 Tom Zanussi 2014-03-06 17:09 ` [PATCH 2/6] lttng-tools: " Tom Zanussi @ 2014-03-06 17:09 ` Tom Zanussi 2014-03-06 17:09 ` [PATCH 4/6] lttng-modules: Exclude arm Tom Zanussi ` (2 subsequent siblings) 5 siblings, 0 replies; 11+ messages in thread From: Tom Zanussi @ 2014-03-06 17:09 UTC (permalink / raw) To: openembedded-core From: Tom Zanussi <tom.zanussi@intel.com> This updates lttng-ust to 2.4.0, codenamed Époque Opaque, needed for interoperability with lttng-modules and the 3.14 (dev) kernel. Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> --- meta/recipes-kernel/lttng/lttng-ust_2.4.0.bb | 31 ++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 meta/recipes-kernel/lttng/lttng-ust_2.4.0.bb diff --git a/meta/recipes-kernel/lttng/lttng-ust_2.4.0.bb b/meta/recipes-kernel/lttng/lttng-ust_2.4.0.bb new file mode 100644 index 0000000..9f806c1 --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-ust_2.4.0.bb @@ -0,0 +1,31 @@ +SUMMARY = "Linux Trace Toolkit Userspace Tracer 2.x" +DESCRIPTION = "The LTTng UST 2.x package contains the userspace tracer library to trace userspace codes." +HOMEPAGE = "http://lttng.org/ust" +BUGTRACKER = "https://bugs.lttng.org/projects/lttng-ust" + +LICENSE = "LGPLv2.1+ & BSD & GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=c963eb366b781252b0bf0fdf1624d9e9 \ + file://snprintf/snprintf.c;endline=32;md5=d3d544959d8a3782b2e07451be0a903c \ + file://snprintf/various.h;endline=31;md5=89f2509b6b4682c4fc95255eec4abe44" + +inherit autotools lib_package + +DEPENDS = "liburcu util-linux" + +# For backwards compatibility after rename +RPROVIDES_${PN} = "lttng2-ust" +RREPLACES_${PN} = "lttng2-ust" +RCONFLICTS_${PN} = "lttng2-ust" + +SRCREV = "5ba5bf7fba804d2de773ae1c71106a8ed856c56a" +PV = "2.4.0" +PE = "2" + +SRC_URI = "git://git.lttng.org/lttng-ust.git;branch=stable-2.4 \ + " + +S = "${WORKDIR}/git" + +do_configure_prepend () { + ( cd ${S}; ${S}/bootstrap ) +} -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 4/6] lttng-modules: Exclude arm 2014-03-06 17:09 [PATCH 0/6] lttng update (add 2.4.0) Tom Zanussi ` (2 preceding siblings ...) 2014-03-06 17:09 ` [PATCH 3/6] lttng-ust: " Tom Zanussi @ 2014-03-06 17:09 ` Tom Zanussi 2014-03-06 17:56 ` Phil Blundell 2014-03-06 18:04 ` Phil Blundell 2014-03-06 17:09 ` [PATCH 5/6] lttng-modules: Fix 3.14 bio tracepoints Tom Zanussi 2014-03-06 17:09 ` [PATCH 6/6] lttng-ust: Disable doc/examples in the build Tom Zanussi 5 siblings, 2 replies; 11+ messages in thread From: Tom Zanussi @ 2014-03-06 17:09 UTC (permalink / raw) To: openembedded-core From: Tom Zanussi <tom.zanussi@intel.com> lttng-modules and gcc-4.8 don't mix, according to the lttng ML 'current_thread_info() not respecting program order with gcc 4.8.x', so remove it from arm builds. Without lttng-modules, lttng-tools etc don't make sense either so exclude them as well. Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> --- meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb | 4 ++++ meta/recipes-kernel/lttng/lttng-modules_2.4.0.bb | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb index 4a97c24..8771dbe 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb @@ -52,15 +52,19 @@ SYSTEMTAP_aarch64 = "" LTTNGUST = "lttng-ust" LTTNGUST_libc-uclibc = "" LTTNGUST_aarch64 = "" +LTTNGUST_arm = "" LTTNGTOOLS = "lttng-tools" LTTNGTOOLS_aarch64 = "" +LTTNGTOOLS_arm = "" LTTNGMODULES = "lttng-modules" LTTNGMODULES_aarch64 = "" +LTTNGMODULES_arm = "" BABELTRACE = "babeltrace" BABELTRACE_aarch64 = "" +BABELTRACE_arm = "" # valgrind does not work on mips diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.4.0.bb b/meta/recipes-kernel/lttng/lttng-modules_2.4.0.bb index 0b7d5e8..79d9382 100644 --- a/meta/recipes-kernel/lttng/lttng-modules_2.4.0.bb +++ b/meta/recipes-kernel/lttng/lttng-modules_2.4.0.bb @@ -13,6 +13,9 @@ inherit module SRCREV = "fb2c37799306d16fb590aebee6fad8be431264b7" PV = "2.4.0" +# lttng currently blacklists arm with gcc-4.8 +COMPATIBLE_HOST = '(x86_64|i.86|powerpc|aarch64|mips).*-linux' + SRC_URI = "git://git.lttng.org/lttng-modules.git;branch=stable-2.4 \ file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch" @@ -20,6 +23,7 @@ export INSTALL_MOD_DIR="kernel/lttng-modules" export KERNEL_SRC="${STAGING_KERNEL_DIR}" + S = "${WORKDIR}/git" do_install_append() { -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH 4/6] lttng-modules: Exclude arm 2014-03-06 17:09 ` [PATCH 4/6] lttng-modules: Exclude arm Tom Zanussi @ 2014-03-06 17:56 ` Phil Blundell 2014-03-06 18:36 ` Tom Zanussi 2014-03-06 18:04 ` Phil Blundell 1 sibling, 1 reply; 11+ messages in thread From: Phil Blundell @ 2014-03-06 17:56 UTC (permalink / raw) To: Tom Zanussi; +Cc: openembedded-core On Thu, 2014-03-06 at 11:09 -0600, Tom Zanussi wrote: > Without lttng-modules, lttng-tools etc don't make sense either so > exclude them as well. This isn't entirely true; one can quite happily use the ust tracers without the modules. I've no idea why ust is disabled on aarch64 either. p. ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 4/6] lttng-modules: Exclude arm 2014-03-06 17:56 ` Phil Blundell @ 2014-03-06 18:36 ` Tom Zanussi 0 siblings, 0 replies; 11+ messages in thread From: Tom Zanussi @ 2014-03-06 18:36 UTC (permalink / raw) To: Phil Blundell; +Cc: openembedded-core On Thu, 2014-03-06 at 17:56 +0000, Phil Blundell wrote: > On Thu, 2014-03-06 at 11:09 -0600, Tom Zanussi wrote: > > Without lttng-modules, lttng-tools etc don't make sense either so > > exclude them as well. > > This isn't entirely true; one can quite happily use the ust tracers > without the modules. I've no idea why ust is disabled on aarch64 > either. > OK, I can remove the lttng-removal.. Tom > p. > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 4/6] lttng-modules: Exclude arm 2014-03-06 17:09 ` [PATCH 4/6] lttng-modules: Exclude arm Tom Zanussi 2014-03-06 17:56 ` Phil Blundell @ 2014-03-06 18:04 ` Phil Blundell 2014-03-06 18:45 ` Tom Zanussi 1 sibling, 1 reply; 11+ messages in thread From: Phil Blundell @ 2014-03-06 18:04 UTC (permalink / raw) To: Tom Zanussi; +Cc: openembedded-core On Thu, 2014-03-06 at 11:09 -0600, Tom Zanussi wrote: > +# lttng currently blacklists arm with gcc-4.8 > +COMPATIBLE_HOST = '(x86_64|i.86|powerpc|aarch64|mips).*-linux' If the issue at hand here is GCC PR 58854 (which the lttng mailing list thread seems to suggest it is), can't we just apply the patch for it rather than disabling lttng-modules altogether? p. ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 4/6] lttng-modules: Exclude arm 2014-03-06 18:04 ` Phil Blundell @ 2014-03-06 18:45 ` Tom Zanussi 0 siblings, 0 replies; 11+ messages in thread From: Tom Zanussi @ 2014-03-06 18:45 UTC (permalink / raw) To: Phil Blundell; +Cc: openembedded-core On Thu, 2014-03-06 at 18:04 +0000, Phil Blundell wrote: > On Thu, 2014-03-06 at 11:09 -0600, Tom Zanussi wrote: > > +# lttng currently blacklists arm with gcc-4.8 > > +COMPATIBLE_HOST = '(x86_64|i.86|powerpc|aarch64|mips).*-linux' > > If the issue at hand here is GCC PR 58854 (which the lttng mailing list > thread seems to suggest it is), can't we just apply the patch for it > rather than disabling lttng-modules altogether? > Well, I think it's more than that - there's apparently an unbalanced preempt_disable in lttng somewhere that's the real root of the problem: http://gcc.gnu.org/ml/gcc/2013-11/msg00393.html So lttng is still broken, and the blacklist is still in place in the lttng code. Tom > p. > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 5/6] lttng-modules: Fix 3.14 bio tracepoints 2014-03-06 17:09 [PATCH 0/6] lttng update (add 2.4.0) Tom Zanussi ` (3 preceding siblings ...) 2014-03-06 17:09 ` [PATCH 4/6] lttng-modules: Exclude arm Tom Zanussi @ 2014-03-06 17:09 ` Tom Zanussi 2014-03-06 17:09 ` [PATCH 6/6] lttng-ust: Disable doc/examples in the build Tom Zanussi 5 siblings, 0 replies; 11+ messages in thread From: Tom Zanussi @ 2014-03-06 17:09 UTC (permalink / raw) To: openembedded-core From: Tom Zanussi <tom.zanussi@intel.com> The mainline 3.14 commit 'block: Astract out bvec iterator' broke the lttng-modules tracepoints. Fix them here. Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> --- .../lttng/lttng-modules/bio-bvec-iter.patch | 156 +++++++++++++++++++++ meta/recipes-kernel/lttng/lttng-modules_2.4.0.bb | 3 +- 2 files changed, 158 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-kernel/lttng/lttng-modules/bio-bvec-iter.patch diff --git a/meta/recipes-kernel/lttng/lttng-modules/bio-bvec-iter.patch b/meta/recipes-kernel/lttng/lttng-modules/bio-bvec-iter.patch new file mode 100644 index 0000000..d6c66e4 --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-modules/bio-bvec-iter.patch @@ -0,0 +1,156 @@ +Upstream-Status: Pending + +In 3.14, bi_sector and bi_size were moved into an iterator, thus +breaking any tracepoints that still expect them in the bio. Fix up +the lttng-module tracepoints to use the new scheme when the kernel +version is >= 3.14. + +Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> + +diff --git a/instrumentation/events/lttng-module/block.h b/instrumentation/events/lttng-module/block.h +index f3b8bff..0a61543 100644 +--- a/instrumentation/events/lttng-module/block.h ++++ b/instrumentation/events/lttng-module/block.h +@@ -341,9 +341,15 @@ TRACE_EVENT(block_bio_bounce, + TP_fast_assign( + tp_assign(dev, bio->bi_bdev ? + bio->bi_bdev->bd_dev : 0) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) ++ tp_assign(sector, bio->bi_iter.bi_sector) ++ tp_assign(nr_sector, bio->bi_iter.bi_size >> 9) ++ blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size) ++#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */ + tp_assign(sector, bio->bi_sector) + tp_assign(nr_sector, bio->bi_size >> 9) + blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size) ++#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */ + tp_memcpy(comm, current->comm, TASK_COMM_LEN) + ), + +@@ -385,14 +391,24 @@ TRACE_EVENT(block_bio_complete, + + TP_fast_assign( + tp_assign(dev, bio->bi_bdev->bd_dev) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) ++ tp_assign(sector, bio->bi_iter.bi_sector) ++ tp_assign(nr_sector, bio->bi_iter.bi_size >> 9) ++#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */ + tp_assign(sector, bio->bi_sector) + tp_assign(nr_sector, bio->bi_size >> 9) ++#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */ ++ + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)) + tp_assign(error, error) + #else + tp_assign(error, 0) + #endif ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) ++ blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size) ++#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */ + blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size) ++#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */ + ), + + TP_printk("%d,%d %s %llu + %u [%d]", +@@ -419,9 +435,15 @@ DECLARE_EVENT_CLASS(block_bio_merge, + + TP_fast_assign( + tp_assign(dev, bio->bi_bdev->bd_dev) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) ++ tp_assign(sector, bio->bi_iter.bi_sector) ++ tp_assign(nr_sector, bio->bi_iter.bi_size >> 9) ++ blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size) ++#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */ + tp_assign(sector, bio->bi_sector) + tp_assign(nr_sector, bio->bi_size >> 9) + blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size) ++#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */ + tp_memcpy(comm, current->comm, TASK_COMM_LEN) + ), + +@@ -485,9 +507,15 @@ TRACE_EVENT(block_bio_queue, + + TP_fast_assign( + tp_assign(dev, bio->bi_bdev->bd_dev) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) ++ tp_assign(sector, bio->bi_iter.bi_sector) ++ tp_assign(nr_sector, bio->bi_iter.bi_size >> 9) ++ blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size) ++#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */ + tp_assign(sector, bio->bi_sector) + tp_assign(nr_sector, bio->bi_size >> 9) + blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size) ++#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */ + tp_memcpy(comm, current->comm, TASK_COMM_LEN) + ), + +@@ -513,9 +541,15 @@ DECLARE_EVENT_CLASS(block_bio, + + TP_fast_assign( + tp_assign(dev, bio->bi_bdev ? bio->bi_bdev->bd_dev : 0) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) ++ tp_assign(sector, bio->bi_iter.bi_sector) ++ tp_assign(nr_sector, bio->bi_iter.bi_size >> 9) ++ blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size) ++#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */ + tp_assign(sector, bio->bi_sector) + tp_assign(nr_sector, bio->bi_size >> 9) + blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size) ++#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */ + tp_memcpy(comm, current->comm, TASK_COMM_LEN) + ), + +@@ -587,10 +621,17 @@ DECLARE_EVENT_CLASS(block_get_rq, + + TP_fast_assign( + tp_assign(dev, bio ? bio->bi_bdev->bd_dev : 0) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) ++ tp_assign(sector, bio ? bio->bi_iter.bi_sector : 0) ++ tp_assign(nr_sector, bio ? bio->bi_iter.bi_size >> 9 : 0) ++ blk_fill_rwbs(rwbs, bio ? bio->bi_rw : 0, ++ bio ? bio->bi_iter.bi_size >> 9 : 0) ++#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */ + tp_assign(sector, bio ? bio->bi_sector : 0) + tp_assign(nr_sector, bio ? bio->bi_size >> 9 : 0) + blk_fill_rwbs(rwbs, bio ? bio->bi_rw : 0, + bio ? bio->bi_size >> 9 : 0) ++#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */ + tp_memcpy(comm, current->comm, TASK_COMM_LEN) + ), + +@@ -759,9 +800,15 @@ TRACE_EVENT(block_split, + + TP_fast_assign( + tp_assign(dev, bio->bi_bdev->bd_dev) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) ++ tp_assign(sector, bio->bi_iter.bi_sector) ++ tp_assign(new_sector, new_sector) ++ blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size) ++#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */ + tp_assign(sector, bio->bi_sector) + tp_assign(new_sector, new_sector) + blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size) ++#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */ + tp_memcpy(comm, current->comm, TASK_COMM_LEN) + ), + +@@ -805,11 +852,19 @@ TRACE_EVENT(block_remap, + + TP_fast_assign( + tp_assign(dev, bio->bi_bdev->bd_dev) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) ++ tp_assign(sector, bio->bi_iter.bi_sector) ++ tp_assign(nr_sector, bio->bi_iter.bi_size >> 9) ++ tp_assign(old_dev, dev) ++ tp_assign(old_sector, from) ++ blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size) ++#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */ + tp_assign(sector, bio->bi_sector) + tp_assign(nr_sector, bio->bi_size >> 9) + tp_assign(old_dev, dev) + tp_assign(old_sector, from) + blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size) ++#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */ + ), + + TP_printk("%d,%d %s %llu + %u <- (%d,%d) %llu", diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.4.0.bb b/meta/recipes-kernel/lttng/lttng-modules_2.4.0.bb index 79d9382..8883094 100644 --- a/meta/recipes-kernel/lttng/lttng-modules_2.4.0.bb +++ b/meta/recipes-kernel/lttng/lttng-modules_2.4.0.bb @@ -17,7 +17,8 @@ PV = "2.4.0" COMPATIBLE_HOST = '(x86_64|i.86|powerpc|aarch64|mips).*-linux' SRC_URI = "git://git.lttng.org/lttng-modules.git;branch=stable-2.4 \ - file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch" + file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch \ + file://bio-bvec-iter.patch" export INSTALL_MOD_DIR="kernel/lttng-modules" export KERNEL_SRC="${STAGING_KERNEL_DIR}" -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 6/6] lttng-ust: Disable doc/examples in the build 2014-03-06 17:09 [PATCH 0/6] lttng update (add 2.4.0) Tom Zanussi ` (4 preceding siblings ...) 2014-03-06 17:09 ` [PATCH 5/6] lttng-modules: Fix 3.14 bio tracepoints Tom Zanussi @ 2014-03-06 17:09 ` Tom Zanussi 5 siblings, 0 replies; 11+ messages in thread From: Tom Zanussi @ 2014-03-06 17:09 UTC (permalink / raw) To: openembedded-core; +Cc: Tom Zanussi Don't build the doc examples - we don't need them and in fact they never successfully built in previous iterations of the lttng-ust recipe anyway. Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> --- .../lttng-ust/lttng-ust-doc-examples-disable.patch | 18 ++++++++++++++++++ meta/recipes-kernel/lttng/lttng-ust_2.4.0.bb | 1 + 2 files changed, 19 insertions(+) create mode 100644 meta/recipes-kernel/lttng/lttng-ust/lttng-ust-doc-examples-disable.patch diff --git a/meta/recipes-kernel/lttng/lttng-ust/lttng-ust-doc-examples-disable.patch b/meta/recipes-kernel/lttng/lttng-ust/lttng-ust-doc-examples-disable.patch new file mode 100644 index 0000000..b68a989 --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-ust/lttng-ust-doc-examples-disable.patch @@ -0,0 +1,18 @@ +Upstream-Status: Inappropriate [embedded specific] + +Don't build the doc examples - we don't need them and in fact they +never successfully built in previous iterations of the lttng-ust +recipe anyway. + +Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> + +Index: doc/Makefile.am +=================================================================== +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -1,4 +1,4 @@ +-SUBDIRS = . examples ++SUBDIRS = . + + dist_man_MANS = man/lttng-gen-tp.1 \ + man/lttng-ust.3 \ diff --git a/meta/recipes-kernel/lttng/lttng-ust_2.4.0.bb b/meta/recipes-kernel/lttng/lttng-ust_2.4.0.bb index 9f806c1..1629554 100644 --- a/meta/recipes-kernel/lttng/lttng-ust_2.4.0.bb +++ b/meta/recipes-kernel/lttng/lttng-ust_2.4.0.bb @@ -22,6 +22,7 @@ PV = "2.4.0" PE = "2" SRC_URI = "git://git.lttng.org/lttng-ust.git;branch=stable-2.4 \ + file://lttng-ust-doc-examples-disable.patch \ " S = "${WORKDIR}/git" -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2014-03-06 18:49 UTC | newest] Thread overview: 11+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-03-06 17:09 [PATCH 0/6] lttng update (add 2.4.0) Tom Zanussi 2014-03-06 17:09 ` [PATCH 1/6] lttng-modules: Add version 2.4.0 Tom Zanussi 2014-03-06 17:09 ` [PATCH 2/6] lttng-tools: " Tom Zanussi 2014-03-06 17:09 ` [PATCH 3/6] lttng-ust: " Tom Zanussi 2014-03-06 17:09 ` [PATCH 4/6] lttng-modules: Exclude arm Tom Zanussi 2014-03-06 17:56 ` Phil Blundell 2014-03-06 18:36 ` Tom Zanussi 2014-03-06 18:04 ` Phil Blundell 2014-03-06 18:45 ` Tom Zanussi 2014-03-06 17:09 ` [PATCH 5/6] lttng-modules: Fix 3.14 bio tracepoints Tom Zanussi 2014-03-06 17:09 ` [PATCH 6/6] lttng-ust: Disable doc/examples in the build Tom Zanussi
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.