[PATCH 0/1] lttng-2.0 fixes

[PATCH 0/1] lttng-2.0 fixes

[tom.zanussi]

From: Tom Zanussi <tom.zanussi@intel.com>

When trying out the current lttng-2.0, I found that it didn't work in
its current state.  This patch makes it work again, or at least a
a quick test on qemux86 works:

Before:

root@qemux86:~# lttng create
Spawning a session daemon
FATAL: Module lttng-tracer not found.
Error: Unable to load module lttng-tracer
Error: Unable to remove module lttng-tracer
Warning: No kernel tracer available
Session auto-20121012-190712 created.
Traces will be written in /home/root/lttng-traces/auto-20121012-190712

After:

root@qemux86:~# lttng create
Spawning a session daemon
Session auto-20121012-192342 created.
Traces will be written in /home/root/lttng-traces/auto-20121012-192342
root@qemux86:~# lttng enable-event --kernel --all
All kernel events are enabled in channel channel0
root@qemux86:~# lttng start
Tracing started for session auto-20121012-192342
root@qemux86:~# lttng stop
Tracing stopped for session auto-20121012-192342
root@qemux86:~# lttng view
[19:27:01.661844467] (+?.?????????) hrtimer_cancel: { 0 }, { hrtimer = 3354328992 }
[19:27:01.661854316] (+0.000009849) hrtimer_expire_entry: { 0 }, { hrtimer = 3354328992, now = \
318684045266, function = 3238494992 }
[19:27:01.661870669] (+0.000016353) softirq_raise: { 0 }, { vec = 1 }
[19:27:01.661876340] (+0.000005671) softirq_raise: { 0 }, { vec = 9 }
[19:27:01.661887892] (+0.000011552) sched_stat_runtime: { 0 }, { comm = "lttng-sessiond", tid =


The following changes since commit 0260bb5c6978839c068007fcff2f704937805faf:

  gitignore: Fix for poky repository (2012-10-11 13:52:14 +0100)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib.git tzanussi/lttng-fixes.0
  http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=tzanussi/lttng-fixes.0

Tom Zanussi (2):
  lttng-modules: update SRCREV and remove is_compat_task patch

 ...ls-protect-is_compat_task-from-redefiniti.patch | 41 ----------------------
 .../lttng-2.0/lttng-modules_2.0.5.bb               |  9 +++--
 2 files changed, 9 insertions(+), 50 deletions(-)
 delete mode 100644 meta/recipes-kernel/lttng-2.0/lttng-modules/lttng-sycalls-protect-is_compat_task-from-redefiniti.patch

-- 
1.7.11.4

[PATCH 1/1] lttng-modules: update SRCREV and remove is_compat_task patch

[tom.zanussi]

From: Tom Zanussi <tom.zanussi@intel.com>

The existing SRCREV doesn't point to v2.0.5 as the recipe version
suggests, and is actually building modules that won't work with the
lttng-tools it's supposed to be matching.

Also, remove the is_compat_task patch for lttng-syscalls.c to avoid
do_patch errors, as recent versions of lttng-modules have added this
check.

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
 ...ls-protect-is_compat_task-from-redefiniti.patch | 41 ----------------------
 .../lttng-2.0/lttng-modules_2.0.5.bb               |  9 +++--
 2 files changed, 4 insertions(+), 46 deletions(-)
 delete mode 100644 meta/recipes-kernel/lttng-2.0/lttng-modules/lttng-sycalls-protect-is_compat_task-from-redefiniti.patch

diff --git a/meta/recipes-kernel/lttng-2.0/lttng-modules/lttng-sycalls-protect-is_compat_task-from-redefiniti.patch b/meta/recipes-kernel/lttng-2.0/lttng-modules/lttng-sycalls-protect-is_compat_task-from-redefiniti.patch
deleted file mode 100644
index 0056633..0000000
--- a/meta/recipes-kernel/lttng-2.0/lttng-modules/lttng-sycalls-protect-is_compat_task-from-redefiniti.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 415a1a678cb2fcf603f9777f2c7b71c1e38f8101 Mon Sep 17 00:00:00 2001
-From: Bruce Ashfield <bruce.ashfield@windriver.com>
-Date: Mon, 19 Mar 2012 13:30:31 -0400
-Subject: [PATCH] lttng-sycalls: protect is_compat_task from redefinition
-
-recent -stable kernels have their own fallback definition of is_compat_task
-
-   #define is_compat_task() (0)
-
-To protect against this double definition of is_compat_task we can check
-to see if it is already defined, and skip the lttng variant.
-
-Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
----
- lttng-syscalls.c |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/lttng-syscalls.c b/lttng-syscalls.c
-index 9de3c07..80d0f05 100644
---- a/lttng-syscalls.c
-+++ b/lttng-syscalls.c
-@@ -17,12 +17,16 @@
- #include "ltt-events.h"
- 
- #ifndef CONFIG_COMPAT
-+
-+#ifndef is_compat_task
- static inline int is_compat_task(void)
- {
- 	return 0;
- }
- #endif
- 
-+#endif
-+
- static
- void syscall_entry_probe(void *__data, struct pt_regs *regs, long id);
- 
--- 
-1.7.5.4
-
diff --git a/meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.5.bb b/meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.5.bb
index 4c78f36..96ab85f 100644
--- a/meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.5.bb
+++ b/meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.5.bb
@@ -10,13 +10,12 @@ DEPENDS = "virtual/kernel"
 
 inherit module
 
-SRCREV = "4d3e89e379fc66480d729abe8daa5c86eb585400"
-PV = "2.0.pre11+git${SRCREV}"
-PR = "r0"
+SRCREV = "cbb0f0f5203e9901084f38792e484f6fa988e10a"
+PV = "2.0.5+git${SRCREV}"
+PR = "r1"
 
 SRC_URI = "git://git.lttng.org/lttng-modules.git;protocol=git \
-           file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch \
-           file://lttng-sycalls-protect-is_compat_task-from-redefiniti.patch"
+           file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch"
 
 export INSTALL_MOD_DIR="kernel/lttng-modules"
 export KERNEL_SRC="${STAGING_KERNEL_DIR}"
-- 
1.7.11.4

Re: [PATCH 1/1] lttng-modules: update SRCREV and remove is_compat_task patch

[Bruce Ashfield]

On 12-10-12 03:52 PM, tom.zanussi@intel.com wrote:
> From: Tom Zanussi<tom.zanussi@intel.com>
>
> The existing SRCREV doesn't point to v2.0.5 as the recipe version
> suggests, and is actually building modules that won't work with the
> lttng-tools it's supposed to be matching.
>
> Also, remove the is_compat_task patch for lttng-syscalls.c to avoid
> do_patch errors, as recent versions of lttng-modules have added this
> check.

Acked-by: Bruce Ashfield <bruce.ashfield@windriver.com>

>
> Signed-off-by: Tom Zanussi<tom.zanussi@intel.com>
> ---
>   ...ls-protect-is_compat_task-from-redefiniti.patch | 41 ----------------------
>   .../lttng-2.0/lttng-modules_2.0.5.bb               |  9 +++--
>   2 files changed, 4 insertions(+), 46 deletions(-)
>   delete mode 100644 meta/recipes-kernel/lttng-2.0/lttng-modules/lttng-sycalls-protect-is_compat_task-from-redefiniti.patch
>
> diff --git a/meta/recipes-kernel/lttng-2.0/lttng-modules/lttng-sycalls-protect-is_compat_task-from-redefiniti.patch b/meta/recipes-kernel/lttng-2.0/lttng-modules/lttng-sycalls-protect-is_compat_task-from-redefiniti.patch
> deleted file mode 100644
> index 0056633..0000000
> --- a/meta/recipes-kernel/lttng-2.0/lttng-modules/lttng-sycalls-protect-is_compat_task-from-redefiniti.patch
> +++ /dev/null
> @@ -1,41 +0,0 @@
> -From 415a1a678cb2fcf603f9777f2c7b71c1e38f8101 Mon Sep 17 00:00:00 2001
> -From: Bruce Ashfield<bruce.ashfield@windriver.com>
> -Date: Mon, 19 Mar 2012 13:30:31 -0400
> -Subject: [PATCH] lttng-sycalls: protect is_compat_task from redefinition
> -
> -recent -stable kernels have their own fallback definition of is_compat_task
> -
> -   #define is_compat_task() (0)
> -
> -To protect against this double definition of is_compat_task we can check
> -to see if it is already defined, and skip the lttng variant.
> -
> -Signed-off-by: Bruce Ashfield<bruce.ashfield@windriver.com>
> ----
> - lttng-syscalls.c |    4 ++++
> - 1 files changed, 4 insertions(+), 0 deletions(-)
> -
> -diff --git a/lttng-syscalls.c b/lttng-syscalls.c
> -index 9de3c07..80d0f05 100644
> ---- a/lttng-syscalls.c
> -+++ b/lttng-syscalls.c
> -@@ -17,12 +17,16 @@
> - #include "ltt-events.h"
> -
> - #ifndef CONFIG_COMPAT
> -+
> -+#ifndef is_compat_task
> - static inline int is_compat_task(void)
> - {
> - 	return 0;
> - }
> - #endif
> -
> -+#endif
> -+
> - static
> - void syscall_entry_probe(void *__data, struct pt_regs *regs, long id);
> -
> ---
> -1.7.5.4
> -
> diff --git a/meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.5.bb b/meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.5.bb
> index 4c78f36..96ab85f 100644
> --- a/meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.5.bb
> +++ b/meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.5.bb
> @@ -10,13 +10,12 @@ DEPENDS = "virtual/kernel"
>
>   inherit module
>
> -SRCREV = "4d3e89e379fc66480d729abe8daa5c86eb585400"
> -PV = "2.0.pre11+git${SRCREV}"
> -PR = "r0"
> +SRCREV = "cbb0f0f5203e9901084f38792e484f6fa988e10a"
> +PV = "2.0.5+git${SRCREV}"
> +PR = "r1"
>
>   SRC_URI = "git://git.lttng.org/lttng-modules.git;protocol=git \
> -           file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch \
> -           file://lttng-sycalls-protect-is_compat_task-from-redefiniti.patch"
> +           file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch"
>
>   export INSTALL_MOD_DIR="kernel/lttng-modules"
>   export KERNEL_SRC="${STAGING_KERNEL_DIR}"

Re: [PATCH 0/1] lttng-2.0 fixes

[Bruce Ashfield]

On 12-10-12 03:52 PM, tom.zanussi@intel.com wrote:
> From: Tom Zanussi<tom.zanussi@intel.com>
>
> When trying out the current lttng-2.0, I found that it didn't work in
> its current state.  This patch makes it work again, or at least a
> a quick test on qemux86 works:
>
> Before:
>
> root@qemux86:~# lttng create
> Spawning a session daemon
> FATAL: Module lttng-tracer not found.
> Error: Unable to load module lttng-tracer
> Error: Unable to remove module lttng-tracer
> Warning: No kernel tracer available
> Session auto-20121012-190712 created.
> Traces will be written in /home/root/lttng-traces/auto-20121012-190712
>
> After:
>
> root@qemux86:~# lttng create
> Spawning a session daemon
> Session auto-20121012-192342 created.
> Traces will be written in /home/root/lttng-traces/auto-20121012-192342
> root@qemux86:~# lttng enable-event --kernel --all
> All kernel events are enabled in channel channel0
> root@qemux86:~# lttng start
> Tracing started for session auto-20121012-192342
> root@qemux86:~# lttng stop
> Tracing stopped for session auto-20121012-192342
> root@qemux86:~# lttng view
> [19:27:01.661844467] (+?.?????????) hrtimer_cancel: { 0 }, { hrtimer = 3354328992 }
> [19:27:01.661854316] (+0.000009849) hrtimer_expire_entry: { 0 }, { hrtimer = 3354328992, now = \
> 318684045266, function = 3238494992 }
> [19:27:01.661870669] (+0.000016353) softirq_raise: { 0 }, { vec = 1 }
> [19:27:01.661876340] (+0.000005671) softirq_raise: { 0 }, { vec = 9 }
> [19:27:01.661887892] (+0.000011552) sched_stat_runtime: { 0 }, { comm = "lttng-sessiond", tid =
>
>

That's what I'd expect.

Looks good from here.

Bruce

> The following changes since commit 0260bb5c6978839c068007fcff2f704937805faf:
>
>    gitignore: Fix for poky repository (2012-10-11 13:52:14 +0100)
>
> are available in the git repository at:
>
>    git://git.yoctoproject.org/poky-contrib.git tzanussi/lttng-fixes.0
>    http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=tzanussi/lttng-fixes.0
>
> Tom Zanussi (2):
>    lttng-modules: update SRCREV and remove is_compat_task patch
>
>   ...ls-protect-is_compat_task-from-redefiniti.patch | 41 ----------------------
>   .../lttng-2.0/lttng-modules_2.0.5.bb               |  9 +++--
>   2 files changed, 9 insertions(+), 50 deletions(-)
>   delete mode 100644 meta/recipes-kernel/lttng-2.0/lttng-modules/lttng-sycalls-protect-is_compat_task-from-redefiniti.patch
>