diff options
Diffstat (limited to 'meta/recipes-kernel/lttng')
16 files changed, 46 insertions, 925 deletions
diff --git a/meta/recipes-kernel/lttng/babeltrace/0001-Fix-Support-out-of-tree-builds-in-babeltrace.patch b/meta/recipes-kernel/lttng/babeltrace/0001-Fix-Support-out-of-tree-builds-in-babeltrace.patch deleted file mode 100644 index 258eedd3ba..0000000000 --- a/meta/recipes-kernel/lttng/babeltrace/0001-Fix-Support-out-of-tree-builds-in-babeltrace.patch +++ /dev/null @@ -1,17 +0,0 @@ -Upstream-Status: backport - -babeltrace: Fix support out of tree builds in babeltrace - -Signed-off-by: Lars Persson <larper@axis.com> - -diff --git a/formats/lttng-live/Makefile.am b/formats/lttng-live/Makefile.am -index c834699..2c6b0bd 100644 ---- a/formats/lttng-live/Makefile.am -+++ b/formats/lttng-live/Makefile.am -@@ -1,4 +1,4 @@ --AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -I$(top_builddir)/include -+AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir) - - lib_LTLIBRARIES = libbabeltrace-lttng-live.la - - diff --git a/meta/recipes-kernel/lttng/babeltrace/0001-Fix-don-t-perform-unaligned-integer-read-writes.patch b/meta/recipes-kernel/lttng/babeltrace/0001-Fix-don-t-perform-unaligned-integer-read-writes.patch deleted file mode 100644 index ea0aad699d..0000000000 --- a/meta/recipes-kernel/lttng/babeltrace/0001-Fix-don-t-perform-unaligned-integer-read-writes.patch +++ /dev/null @@ -1,252 +0,0 @@ -From 6a0b6cd5133db9e3c72914d4e5dd7fc792360934 Mon Sep 17 00:00:00 2001 -From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> -Date: Wed, 16 Jul 2014 10:58:48 -0400 -Subject: [PATCH] Fix: don't perform unaligned integer read/writes - -Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> - -Upstream-Status: Backport -Signed-off-by: Saul Wold <sgw@linux.intel.com> - ---- - formats/ctf/types/integer.c | 108 ++++++++++++++++++++++++++++---------------- - 1 file changed, 70 insertions(+), 38 deletions(-) - -diff --git a/formats/ctf/types/integer.c b/formats/ctf/types/integer.c -index 189943e..85931be 100644 ---- a/formats/ctf/types/integer.c -+++ b/formats/ctf/types/integer.c -@@ -62,7 +62,7 @@ int _aligned_integer_read(struct bt_stream_pos *ppos, - { - uint8_t v; - -- v = *(const uint8_t *) ctf_get_pos_addr(pos); -+ memcpy(&v, ctf_get_pos_addr(pos), sizeof(v)); - integer_definition->value._unsigned = v; - break; - } -@@ -70,7 +70,7 @@ int _aligned_integer_read(struct bt_stream_pos *ppos, - { - uint16_t v; - -- v = *(const uint16_t *) ctf_get_pos_addr(pos); -+ memcpy(&v, ctf_get_pos_addr(pos), sizeof(v)); - integer_definition->value._unsigned = - rbo ? GUINT16_SWAP_LE_BE(v) : v; - break; -@@ -79,7 +79,7 @@ int _aligned_integer_read(struct bt_stream_pos *ppos, - { - uint32_t v; - -- v = *(const uint32_t *) ctf_get_pos_addr(pos); -+ memcpy(&v, ctf_get_pos_addr(pos), sizeof(v)); - integer_definition->value._unsigned = - rbo ? GUINT32_SWAP_LE_BE(v) : v; - break; -@@ -88,7 +88,7 @@ int _aligned_integer_read(struct bt_stream_pos *ppos, - { - uint64_t v; - -- v = *(const uint64_t *) ctf_get_pos_addr(pos); -+ memcpy(&v, ctf_get_pos_addr(pos), sizeof(v)); - integer_definition->value._unsigned = - rbo ? GUINT64_SWAP_LE_BE(v) : v; - break; -@@ -102,7 +102,7 @@ int _aligned_integer_read(struct bt_stream_pos *ppos, - { - int8_t v; - -- v = *(const int8_t *) ctf_get_pos_addr(pos); -+ memcpy(&v, ctf_get_pos_addr(pos), sizeof(v)); - integer_definition->value._signed = v; - break; - } -@@ -110,7 +110,7 @@ int _aligned_integer_read(struct bt_stream_pos *ppos, - { - int16_t v; - -- v = *(const int16_t *) ctf_get_pos_addr(pos); -+ memcpy(&v, ctf_get_pos_addr(pos), sizeof(v)); - integer_definition->value._signed = - rbo ? (int16_t) GUINT16_SWAP_LE_BE(v) : v; - break; -@@ -119,7 +119,7 @@ int _aligned_integer_read(struct bt_stream_pos *ppos, - { - int32_t v; - -- v = *(const int32_t *) ctf_get_pos_addr(pos); -+ memcpy(&v, ctf_get_pos_addr(pos), sizeof(v)); - integer_definition->value._signed = - rbo ? (int32_t) GUINT32_SWAP_LE_BE(v) : v; - break; -@@ -128,7 +128,7 @@ int _aligned_integer_read(struct bt_stream_pos *ppos, - { - int64_t v; - -- v = *(const int64_t *) ctf_get_pos_addr(pos); -+ memcpy(&v, ctf_get_pos_addr(pos), sizeof(v)); - integer_definition->value._signed = - rbo ? (int64_t) GUINT64_SWAP_LE_BE(v) : v; - break; -@@ -163,48 +163,80 @@ int _aligned_integer_write(struct bt_stream_pos *ppos, - if (pos->dummy) - goto end; - if (!integer_declaration->signedness) { -- uint64_t v = integer_definition->value._unsigned; -- - switch (integer_declaration->len) { -- case 8: *(uint8_t *) ctf_get_pos_addr(pos) = (uint8_t) v; -+ case 8: -+ { -+ uint8_t v = integer_definition->value._unsigned; -+ -+ memcpy(ctf_get_pos_addr(pos), &v, sizeof(v)); - break; -+ } - case 16: -- *(uint16_t *) ctf_get_pos_addr(pos) = rbo ? -- GUINT16_SWAP_LE_BE((uint16_t) v) : -- (uint16_t) v; -+ { -+ uint16_t v = integer_definition->value._unsigned; -+ -+ if (rbo) -+ v = GUINT16_SWAP_LE_BE(v); -+ memcpy(ctf_get_pos_addr(pos), &v, sizeof(v)); - break; -+ } - case 32: -- *(uint32_t *) ctf_get_pos_addr(pos) = rbo ? -- GUINT32_SWAP_LE_BE((uint32_t) v) : -- (uint32_t) v; -+ { -+ uint32_t v = integer_definition->value._unsigned; -+ -+ if (rbo) -+ v = GUINT32_SWAP_LE_BE(v); -+ memcpy(ctf_get_pos_addr(pos), &v, sizeof(v)); - break; -+ } - case 64: -- *(uint64_t *) ctf_get_pos_addr(pos) = rbo ? -- GUINT64_SWAP_LE_BE(v) : v; -+ { -+ uint64_t v = integer_definition->value._unsigned; -+ -+ if (rbo) -+ v = GUINT64_SWAP_LE_BE(v); -+ memcpy(ctf_get_pos_addr(pos), &v, sizeof(v)); - break; -+ } - default: - assert(0); - } - } else { -- int64_t v = integer_definition->value._signed; -- - switch (integer_declaration->len) { -- case 8: *(int8_t *) ctf_get_pos_addr(pos) = (int8_t) v; -+ case 8: -+ { -+ uint8_t v = integer_definition->value._signed; -+ -+ memcpy(ctf_get_pos_addr(pos), &v, sizeof(v)); - break; -+ } - case 16: -- *(int16_t *) ctf_get_pos_addr(pos) = rbo ? -- (int16_t) GUINT16_SWAP_LE_BE((int16_t) v) : -- (int16_t) v; -+ { -+ int16_t v = integer_definition->value._signed; -+ -+ if (rbo) -+ v = GUINT16_SWAP_LE_BE(v); -+ memcpy(ctf_get_pos_addr(pos), &v, sizeof(v)); - break; -+ } - case 32: -- *(int32_t *) ctf_get_pos_addr(pos) = rbo ? -- (int32_t) GUINT32_SWAP_LE_BE((int32_t) v) : -- (int32_t) v; -+ { -+ int32_t v = integer_definition->value._signed; -+ -+ if (rbo) -+ v = GUINT32_SWAP_LE_BE(v); -+ memcpy(ctf_get_pos_addr(pos), &v, sizeof(v)); - break; -+ } - case 64: -- *(int64_t *) ctf_get_pos_addr(pos) = rbo ? -- GUINT64_SWAP_LE_BE(v) : v; -+ { -+ int64_t v = integer_definition->value._signed; -+ -+ if (rbo) -+ v = GUINT64_SWAP_LE_BE(v); -+ memcpy(ctf_get_pos_addr(pos), &v, sizeof(v)); - break; -+ } - default: - assert(0); - } -@@ -237,23 +269,23 @@ int ctf_integer_read(struct bt_stream_pos *ppos, struct bt_definition *definitio - if (!integer_declaration->signedness) { - if (integer_declaration->byte_order == LITTLE_ENDIAN) - bt_bitfield_read_le(mmap_align_addr(pos->base_mma) + -- pos->mmap_base_offset, unsigned long, -+ pos->mmap_base_offset, unsigned char, - pos->offset, integer_declaration->len, - &integer_definition->value._unsigned); - else - bt_bitfield_read_be(mmap_align_addr(pos->base_mma) + -- pos->mmap_base_offset, unsigned long, -+ pos->mmap_base_offset, unsigned char, - pos->offset, integer_declaration->len, - &integer_definition->value._unsigned); - } else { - if (integer_declaration->byte_order == LITTLE_ENDIAN) - bt_bitfield_read_le(mmap_align_addr(pos->base_mma) + -- pos->mmap_base_offset, unsigned long, -+ pos->mmap_base_offset, unsigned char, - pos->offset, integer_declaration->len, - &integer_definition->value._signed); - else - bt_bitfield_read_be(mmap_align_addr(pos->base_mma) + -- pos->mmap_base_offset, unsigned long, -+ pos->mmap_base_offset, unsigned char, - pos->offset, integer_declaration->len, - &integer_definition->value._signed); - } -@@ -286,23 +318,23 @@ int ctf_integer_write(struct bt_stream_pos *ppos, struct bt_definition *definiti - if (!integer_declaration->signedness) { - if (integer_declaration->byte_order == LITTLE_ENDIAN) - bt_bitfield_write_le(mmap_align_addr(pos->base_mma) + -- pos->mmap_base_offset, unsigned long, -+ pos->mmap_base_offset, unsigned char, - pos->offset, integer_declaration->len, - integer_definition->value._unsigned); - else - bt_bitfield_write_be(mmap_align_addr(pos->base_mma) + -- pos->mmap_base_offset, unsigned long, -+ pos->mmap_base_offset, unsigned char, - pos->offset, integer_declaration->len, - integer_definition->value._unsigned); - } else { - if (integer_declaration->byte_order == LITTLE_ENDIAN) - bt_bitfield_write_le(mmap_align_addr(pos->base_mma) + -- pos->mmap_base_offset, unsigned long, -+ pos->mmap_base_offset, unsigned char, - pos->offset, integer_declaration->len, - integer_definition->value._signed); - else - bt_bitfield_write_be(mmap_align_addr(pos->base_mma) + -- pos->mmap_base_offset, unsigned long, -+ pos->mmap_base_offset, unsigned char, - pos->offset, integer_declaration->len, - integer_definition->value._signed); - } --- -1.8.3.1 - diff --git a/meta/recipes-kernel/lttng/babeltrace/Fix-Align-buffers-from-objstack_alloc-on-sizeof-void.patch b/meta/recipes-kernel/lttng/babeltrace/Fix-Align-buffers-from-objstack_alloc-on-sizeof-void.patch deleted file mode 100644 index 8e81d2d781..0000000000 --- a/meta/recipes-kernel/lttng/babeltrace/Fix-Align-buffers-from-objstack_alloc-on-sizeof-void.patch +++ /dev/null @@ -1,54 +0,0 @@ -From cae67efbd9ddf2cee6bbefec076dc8933ababc43 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fredrik=20Markstr=C3=B6m?= <fredrik.markstrom@gmail.com> -Date: Fri, 16 May 2014 10:10:38 +0800 -Subject: [PATCH] Fix: Align buffers from objstack_alloc on sizeof(void *) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Backport - -The buffers from objstack_alloc will store pointers, so they must -be aligned on a pointer's size, or else it will cause issues on the -CPUs which do not support unaligned addresses access. - -Signed-off-by: Fredrik Markstrom <fredrik.markstrom@gmail.com> -Signed-off-by: Roy Li <rongqing.li@windriver.com> -Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com> ---- - formats/ctf/metadata/objstack.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/formats/ctf/metadata/objstack.c b/formats/ctf/metadata/objstack.c -index 9e264a4..14d9252 100644 ---- a/formats/ctf/metadata/objstack.c -+++ b/formats/ctf/metadata/objstack.c -@@ -27,6 +27,7 @@ - #include <stdlib.h> - #include <babeltrace/list.h> - #include <babeltrace/babeltrace-internal.h> -+#include <babeltrace/align.h> - - #define OBJSTACK_INIT_LEN 128 - #define OBJSTACK_POISON 0xcc -@@ -39,7 +40,7 @@ struct objstack_node { - struct bt_list_head node; - size_t len; - size_t used_len; -- char data[]; -+ char __attribute__ ((aligned (sizeof(void *)))) data[]; - }; - - BT_HIDDEN -@@ -118,6 +119,8 @@ void *objstack_alloc(struct objstack *objstack, size_t len) - struct objstack_node *last_node; - void *p; - -+ len = ALIGN(len, sizeof(void *)); -+ - /* Get last node */ - last_node = bt_list_entry(objstack->head.prev, - struct objstack_node, node); --- -1.7.10.4 - diff --git a/meta/recipes-kernel/lttng/babeltrace_1.2.1.bb b/meta/recipes-kernel/lttng/babeltrace_1.2.4.bb index 1c41e25827..f616146393 100644 --- a/meta/recipes-kernel/lttng/babeltrace_1.2.1.bb +++ b/meta/recipes-kernel/lttng/babeltrace_1.2.4.bb @@ -10,14 +10,10 @@ inherit autotools pkgconfig DEPENDS = "glib-2.0 util-linux popt bison-native flex-native" -SRCREV = "66c2a20b4391fb5c7f870aeb0dde854f0ae1fc79" -PV = "1.2.1+git${SRCPV}" +SRCREV = "90395824efc007de88787a6b8e400a07c980be1c" +PV = "1.2.4+git${SRCPV}" -SRC_URI = "git://git.efficios.com/babeltrace.git;branch=stable-1.2 \ - file://0001-Fix-Support-out-of-tree-builds-in-babeltrace.patch \ - file://Fix-Align-buffers-from-objstack_alloc-on-sizeof-void.patch \ - file://0001-Fix-don-t-perform-unaligned-integer-read-writes.patch \ -" +SRC_URI = "git://git.efficios.com/babeltrace.git;branch=stable-1.2" S = "${WORKDIR}/git" diff --git a/meta/recipes-kernel/lttng/lttng-modules/Fix-noargs-probes-should-calculate-alignment-and-eve.patch b/meta/recipes-kernel/lttng/lttng-modules/Fix-noargs-probes-should-calculate-alignment-and-eve.patch deleted file mode 100644 index 9c3dc9c1e1..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/Fix-noargs-probes-should-calculate-alignment-and-eve.patch +++ /dev/null @@ -1,130 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> - -From d3de7f1468be0b18145ff85b3c1a7c7fb1d48c15 Mon Sep 17 00:00:00 2001 -From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> -Date: Fri, 25 Jul 2014 12:30:43 -0400 -Subject: [PATCH 1/3] Fix: noargs probes should calculate alignment and event - length - -A noargs probe could have event fields. noargs just means that the probe -does not receive any argument as parameter. However, it could very well -serialize data into fields (global variables, constants, etc). - -It just happens that LTTng does not serialize any data in noargs events -at the moment, but this may very well change. - -The if (0) with (void) variable access strategy to stop compiler from -complaining from unused variables does not seem to work as expected with -gcc 4.9.1. Use "unused" attribute instead. - -Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> ---- - probes/lttng-events.h | 49 +++++++++++++++++++++++++++++++++++-------------- - 1 file changed, 35 insertions(+), 14 deletions(-) - -diff --git a/probes/lttng-events.h b/probes/lttng-events.h -index 596b70608584..ba9563b15cf9 100644 ---- a/probes/lttng-events.h -+++ b/probes/lttng-events.h -@@ -456,10 +456,19 @@ static __used struct lttng_probe_desc TP_ID(__probe_desc___, TRACE_SYSTEM) = { - static inline size_t __event_get_size__##_name(size_t *__dynamic_len, _proto) \ - { \ - size_t __event_len = 0; \ -- unsigned int __dynamic_len_idx = 0; \ -+ unsigned int __dynamic_len_idx __attribute__((unused)) = 0; \ -+ \ -+ _tstruct \ -+ return __event_len; \ -+} -+ -+#undef DECLARE_EVENT_CLASS_NOARGS -+#define DECLARE_EVENT_CLASS_NOARGS(_name, _tstruct, _assign, _print) \ -+static inline size_t __event_get_size__##_name(size_t *__dynamic_len) \ -+{ \ -+ size_t __event_len = 0; \ -+ unsigned int __dynamic_len_idx __attribute__((unused)) = 0; \ - \ -- if (0) \ -- (void) __dynamic_len_idx; /* don't warn if unused */ \ - _tstruct \ - return __event_len; \ - } -@@ -514,6 +523,15 @@ static inline size_t __event_get_align__##_name(_proto) \ - return __event_align; \ - } - -+#undef DECLARE_EVENT_CLASS_NOARGS -+#define DECLARE_EVENT_CLASS_NOARGS(_name, _tstruct, _assign, _print) \ -+static inline size_t __event_get_align__##_name(void) \ -+{ \ -+ size_t __event_align = 1; \ -+ _tstruct \ -+ return __event_align; \ -+} -+ - #include TRACE_INCLUDE(TRACE_INCLUDE_FILE) - - -@@ -553,12 +571,16 @@ static inline size_t __event_get_align__##_name(_proto) \ - #undef TP_STRUCT__entry - #define TP_STRUCT__entry(args...) args - --#undef DECLARE_EVENT_CLASS --#define DECLARE_EVENT_CLASS(_name, _proto, _args, _tstruct, _assign, _print) \ -+#undef DECLARE_EVENT_CLASS_NOARGS -+#define DECLARE_EVENT_CLASS_NOARGS(_name, _tstruct, _assign, _print) \ - struct __event_typemap__##_name { \ - _tstruct \ - }; - -+#undef DECLARE_EVENT_CLASS -+#define DECLARE_EVENT_CLASS(_name, _proto, _args, _tstruct, _assign, _print) \ -+ DECLARE_EVENT_CLASS_NOARGS(_name, _tstruct, _assign, _print) -+ - #include TRACE_INCLUDE(TRACE_INCLUDE_FILE) - - -@@ -760,15 +782,11 @@ static void __event_probe__##_name(void *__data, _proto) \ - struct lttng_channel *__chan = __event->chan; \ - struct lib_ring_buffer_ctx __ctx; \ - size_t __event_len, __event_align; \ -- size_t __dynamic_len_idx = 0; \ -- size_t __dynamic_len[2 * ARRAY_SIZE(__event_fields___##_name)]; \ -- struct __event_typemap__##_name __typemap; \ -+ size_t __dynamic_len_idx __attribute__((unused)) = 0; \ -+ size_t __dynamic_len[2 * ARRAY_SIZE(__event_fields___##_name)] __attribute__((unused)); \ -+ struct __event_typemap__##_name __typemap __attribute__((unused)); \ - int __ret; \ - \ -- if (0) { \ -- (void) __dynamic_len_idx; /* don't warn if unused */ \ -- (void) __typemap; /* don't warn if unused */ \ -- } \ - if (!_TP_SESSION_CHECK(session, __chan->session)) \ - return; \ - if (unlikely(!ACCESS_ONCE(__chan->session->active))) \ -@@ -800,6 +818,9 @@ static void __event_probe__##_name(void *__data) \ - struct lttng_channel *__chan = __event->chan; \ - struct lib_ring_buffer_ctx __ctx; \ - size_t __event_len, __event_align; \ -+ size_t __dynamic_len_idx __attribute__((unused)) = 0; \ -+ size_t __dynamic_len[2 * ARRAY_SIZE(__event_fields___##_name)] __attribute__((unused)); \ -+ struct __event_typemap__##_name __typemap __attribute__((unused)); \ - int __ret; \ - \ - if (!_TP_SESSION_CHECK(session, __chan->session)) \ -@@ -810,8 +831,8 @@ static void __event_probe__##_name(void *__data) \ - return; \ - if (unlikely(!ACCESS_ONCE(__event->enabled))) \ - return; \ -- __event_len = 0; \ -- __event_align = 1; \ -+ __event_len = __event_get_size__##_name(__dynamic_len); \ -+ __event_align = __event_get_align__##_name(); \ - lib_ring_buffer_ctx_init(&__ctx, __chan->chan, __event, __event_len, \ - __event_align, -1); \ - __ret = __chan->ops->event_reserve(&__ctx, __event->id); \ --- -1.8.1.2 - diff --git a/meta/recipes-kernel/lttng/lttng-modules/Update-compaction-instrumentation-to-3.16-kernel.patch b/meta/recipes-kernel/lttng/lttng-modules/Update-compaction-instrumentation-to-3.16-kernel.patch deleted file mode 100644 index 0a056a9475..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/Update-compaction-instrumentation-to-3.16-kernel.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 0007344741ef65259bc52dea72259173dfbf96c0 Mon Sep 17 00:00:00 2001 -From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> -Date: Sun, 13 Jul 2014 13:33:21 -0400 -Subject: [PATCH 2/2] Update compaction instrumentation to 3.16 kernel - -Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> ---- - instrumentation/events/lttng-module/compaction.h | 45 +++++++++++++++++++++++- - 1 file changed, 44 insertions(+), 1 deletion(-) - -diff --git a/instrumentation/events/lttng-module/compaction.h b/instrumentation/events/lttng-module/compaction.h -index 1b237fa45ab0..22024e9ee582 100644 ---- a/instrumentation/events/lttng-module/compaction.h -+++ b/instrumentation/events/lttng-module/compaction.h -@@ -6,6 +6,7 @@ - - #include <linux/types.h> - #include <linux/tracepoint.h> -+#include <linux/version.h> - #include <trace/events/gfpflags.h> - - DECLARE_EVENT_CLASS(mm_compaction_isolate_template, -@@ -45,6 +46,48 @@ DEFINE_EVENT(mm_compaction_isolate_template, mm_compaction_isolate_freepages, - TP_ARGS(nr_scanned, nr_taken) - ) - -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) -+TRACE_EVENT(mm_compaction_migratepages, -+ -+ TP_PROTO(unsigned long nr_all, -+ int migrate_rc, -+ struct list_head *migratepages), -+ -+ TP_ARGS(nr_all, migrate_rc, migratepages), -+ -+ TP_STRUCT__entry( -+ __field(unsigned long, nr_migrated) -+ __field(unsigned long, nr_failed) -+ ), -+ -+ TP_fast_assign( -+ tp_assign(nr_migrated, -+ nr_all - -+ (migrate_rc >= 0 ? migrate_rc : -+ ({ -+ unsigned long nr_failed = 0; -+ struct list_head *page_lru; -+ -+ list_for_each(page_lru, migratepages) -+ nr_failed++; -+ nr_failed; -+ }))) -+ tp_assign(nr_failed, -+ ({ -+ unsigned long nr_failed = 0; -+ struct list_head *page_lru; -+ -+ list_for_each(page_lru, migratepages) -+ nr_failed++; -+ nr_failed; -+ })) -+ ), -+ -+ TP_printk("nr_migrated=%lu nr_failed=%lu", -+ __entry->nr_migrated, -+ __entry->nr_failed) -+) -+#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) */ - TRACE_EVENT(mm_compaction_migratepages, - - TP_PROTO(unsigned long nr_migrated, -@@ -66,7 +109,7 @@ TRACE_EVENT(mm_compaction_migratepages, - __entry->nr_migrated, - __entry->nr_failed) - ) -- -+#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) */ - - #endif /* _TRACE_COMPACTION_H */ - --- -1.8.1.2 - diff --git a/meta/recipes-kernel/lttng/lttng-modules/Update-kvm-instrumentation-compile-on-3.17-rc1.patch b/meta/recipes-kernel/lttng/lttng-modules/Update-kvm-instrumentation-compile-on-3.17-rc1.patch deleted file mode 100644 index 3541b50b79..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/Update-kvm-instrumentation-compile-on-3.17-rc1.patch +++ /dev/null @@ -1,46 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> - -From 458c2022e992c057bd21d02e4c77bcc7d4d6cd6c Mon Sep 17 00:00:00 2001 -From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> -Date: Thu, 21 Aug 2014 11:15:50 -0400 -Subject: [PATCH 3/3] Update kvm instrumentation: compile on 3.17-rc1 - -Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> ---- - instrumentation/events/lttng-module/arch/x86/kvm/trace.h | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - -diff --git a/instrumentation/events/lttng-module/arch/x86/kvm/trace.h b/instrumentation/events/lttng-module/arch/x86/kvm/trace.h -index 2354884074eb..3c299c58a1cf 100644 ---- a/instrumentation/events/lttng-module/arch/x86/kvm/trace.h -+++ b/instrumentation/events/lttng-module/arch/x86/kvm/trace.h -@@ -724,7 +724,7 @@ TRACE_EVENT(kvm_emulate_insn, - tp_memcpy(insn, - vcpu->arch.emulate_ctxt.decode.fetch.data, - 15) --#else -+#elif (LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0)) - tp_assign(rip, vcpu->arch.emulate_ctxt.fetch.start) - tp_assign(csbase, kvm_x86_ops->get_segment_base(vcpu, VCPU_SREG_CS)) - tp_assign(len, vcpu->arch.emulate_ctxt._eip -@@ -732,6 +732,16 @@ TRACE_EVENT(kvm_emulate_insn, - tp_memcpy(insn, - vcpu->arch.emulate_ctxt.fetch.data, - 15) -+#else -+ tp_assign(rip, vcpu->arch.emulate_ctxt._eip - -+ (vcpu->arch.emulate_ctxt.fetch.ptr - -+ vcpu->arch.emulate_ctxt.fetch.data)) -+ tp_assign(csbase, kvm_x86_ops->get_segment_base(vcpu, VCPU_SREG_CS)) -+ tp_assign(len, vcpu->arch.emulate_ctxt.fetch.ptr - -+ vcpu->arch.emulate_ctxt.fetch.data) -+ tp_memcpy(insn, -+ vcpu->arch.emulate_ctxt.fetch.data, -+ 15) - #endif - tp_assign(flags, kei_decode_mode(vcpu->arch.emulate_ctxt.mode)) - tp_assign(failed, failed) --- -1.8.1.2 - diff --git a/meta/recipes-kernel/lttng/lttng-modules/Update-statedump-to-3.17-nsproxy-locking.patch b/meta/recipes-kernel/lttng/lttng-modules/Update-statedump-to-3.17-nsproxy-locking.patch deleted file mode 100644 index 0f18c8a3e6..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/Update-statedump-to-3.17-nsproxy-locking.patch +++ /dev/null @@ -1,70 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> - -From 4ba1f53c5aebb4433fedc25d65af010274985043 Mon Sep 17 00:00:00 2001 -From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> -Date: Thu, 21 Aug 2014 10:53:12 -0400 -Subject: [PATCH 2/3] Update statedump to 3.17 nsproxy locking - -This Linux upstream commit introduces locking strategy back and forth: - -commit 728dba3a39c66b3d8ac889ddbe38b5b1c264aec3 -Author: Eric W. Biederman <ebiederm@xmission.com> -Date: Mon Feb 3 19:13:49 2014 -0800 - - namespaces: Use task_lock and not rcu to protect nsproxy - -Use the task lock starting from kernel 3.17 rather than RCU to access -the task nsproxy. - -Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> ---- - lttng-statedump-impl.c | 15 +++++++++++++++ - 1 file changed, 15 insertions(+) - -diff --git a/lttng-statedump-impl.c b/lttng-statedump-impl.c -index dad51ddaa250..e4caa488e436 100644 ---- a/lttng-statedump-impl.c -+++ b/lttng-statedump-impl.c -@@ -378,6 +378,9 @@ int lttng_list_interrupts(struct lttng_session *session) - } - #endif - -+/* -+ * Called with task lock held. -+ */ - static - void lttng_statedump_process_ns(struct lttng_session *session, - struct task_struct *p, -@@ -389,8 +392,18 @@ void lttng_statedump_process_ns(struct lttng_session *session, - struct nsproxy *proxy; - struct pid_namespace *pid_ns; - -+ /* -+ * Back and forth on locking strategy within Linux upstream for nsproxy. -+ * See Linux upstream commit 728dba3a39c66b3d8ac889ddbe38b5b1c264aec3 -+ * "namespaces: Use task_lock and not rcu to protect nsproxy" -+ * for details. -+ */ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0)) - rcu_read_lock(); - proxy = task_nsproxy(p); -+#else /* #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0)) */ -+ proxy = p->nsproxy; -+#endif /* #else #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0)) */ - if (proxy) { - pid_ns = lttng_get_proxy_pid_ns(proxy); - do { -@@ -402,7 +415,9 @@ void lttng_statedump_process_ns(struct lttng_session *session, - trace_lttng_statedump_process_state(session, - p, type, mode, submode, status, NULL); - } -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0)) - rcu_read_unlock(); -+#endif /* #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0)) */ - } - - static --- -1.8.1.2 - diff --git a/meta/recipes-kernel/lttng/lttng-modules/Update-vmscan-instrumentation-to-3.16-kernel.patch b/meta/recipes-kernel/lttng/lttng-modules/Update-vmscan-instrumentation-to-3.16-kernel.patch deleted file mode 100644 index 5f02270e89..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/Update-vmscan-instrumentation-to-3.16-kernel.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 5defe623568273e9b87da1b817e373ff087fd862 Mon Sep 17 00:00:00 2001 -From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> -Date: Sun, 13 Jul 2014 13:27:01 -0400 -Subject: [PATCH 1/2] Update vmscan instrumentation to 3.16 kernel - -Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> ---- - instrumentation/events/lttng-module/vmscan.h | 39 ++++++++++++++++++++++++++++ - 1 file changed, 39 insertions(+) - -diff --git a/instrumentation/events/lttng-module/vmscan.h b/instrumentation/events/lttng-module/vmscan.h -index 1fd50ba7c235..0b4aa56761dc 100644 ---- a/instrumentation/events/lttng-module/vmscan.h -+++ b/instrumentation/events/lttng-module/vmscan.h -@@ -238,6 +238,44 @@ TRACE_EVENT(mm_shrink_slab_start, - __entry->total_scan) - ) - -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) -+TRACE_EVENT(mm_shrink_slab_end, -+ TP_PROTO(struct shrinker *shr, int nid, int shrinker_retval, -+ long unused_scan_cnt, long new_scan_cnt, long total_scan), -+ -+ TP_ARGS(shr, nid, shrinker_retval, unused_scan_cnt, new_scan_cnt, -+ total_scan), -+ -+ TP_STRUCT__entry( -+ __field(struct shrinker *, shr) -+ __field(int, nid) -+ __field(void *, shrink) -+ __field(long, unused_scan) -+ __field(long, new_scan) -+ __field(int, retval) -+ __field(long, total_scan) -+ ), -+ -+ TP_fast_assign( -+ tp_assign(shr, shr) -+ tp_assign(nid, nid) -+ tp_assign(shrink, shr->scan_objects) -+ tp_assign(unused_scan, unused_scan_cnt) -+ tp_assign(new_scan, new_scan_cnt) -+ tp_assign(retval, shrinker_retval) -+ tp_assign(total_scan, total_scan) -+ ), -+ -+ TP_printk("%pF %p: nid %d unused scan count %ld new scan count %ld total_scan %ld last shrinker return val %d", -+ __entry->shrink, -+ __entry->shr, -+ __entry->nid, -+ __entry->unused_scan, -+ __entry->new_scan, -+ __entry->total_scan, -+ __entry->retval) -+) -+#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) */ - TRACE_EVENT(mm_shrink_slab_end, - TP_PROTO(struct shrinker *shr, int shrinker_retval, - long unused_scan_cnt, long new_scan_cnt), -@@ -274,6 +312,7 @@ TRACE_EVENT(mm_shrink_slab_end, - __entry->total_scan, - __entry->retval) - ) -+#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) */ - #endif - - DECLARE_EVENT_CLASS(mm_vmscan_lru_isolate_template, --- -1.8.1.2 - diff --git a/meta/recipes-kernel/lttng/lttng-modules/compaction-fix-mm_compaction_isolate_template-build.patch b/meta/recipes-kernel/lttng/lttng-modules/compaction-fix-mm_compaction_isolate_template-build.patch deleted file mode 100644 index a99871a62e..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/compaction-fix-mm_compaction_isolate_template-build.patch +++ /dev/null @@ -1,41 +0,0 @@ -From af48c7b08de4b811d3d974e65e362b86ce8c4a34 Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield <bruce.ashfield@windriver.com> -Date: Wed, 10 Dec 2014 03:19:28 -0500 -Subject: [PATCH] compaction: fix mm_compaction_isolate_template build - -linux-stable integrated the 3.16 commit f8c9301fa5a2a [mm/compaction: do -not count migratepages when unnecessary] with the 3.14.25 update. - -So we have to update the lttng-module linux version codes to use the -new definition in builds greater than 3.14.24 or 3.16. - -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> ---- - instrumentation/events/lttng-module/compaction.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/instrumentation/events/lttng-module/compaction.h b/instrumentation/events/lttng-module/compaction.h -index 22024e9ee582..07afbe06f1a6 100644 ---- a/instrumentation/events/lttng-module/compaction.h -+++ b/instrumentation/events/lttng-module/compaction.h -@@ -46,7 +46,7 @@ DEFINE_EVENT(mm_compaction_isolate_template, mm_compaction_isolate_freepages, - TP_ARGS(nr_scanned, nr_taken) - ) - --#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0) || LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,25)) - TRACE_EVENT(mm_compaction_migratepages, - - TP_PROTO(unsigned long nr_all, -@@ -87,7 +87,7 @@ TRACE_EVENT(mm_compaction_migratepages, - __entry->nr_migrated, - __entry->nr_failed) - ) --#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) */ -+#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0) || LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,25)) */ - TRACE_EVENT(mm_compaction_migratepages, - - TP_PROTO(unsigned long nr_migrated, --- -2.1.0 - diff --git a/meta/recipes-kernel/lttng/lttng-modules/fix_build_with_v3.17_kernel.patch b/meta/recipes-kernel/lttng/lttng-modules/fix_build_with_v3.17_kernel.patch deleted file mode 100644 index 97b7a53a07..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/fix_build_with_v3.17_kernel.patch +++ /dev/null @@ -1,113 +0,0 @@ - -Upstream-Status: Backport - -commit 7df57eb5d6bdc85ddcf2b9afb6cd0cacfb22096e -Author: Nitin A Kamble <nitin.a.kamble@intel.com> -Date: Thu Sep 25 18:19:43 2014 -0700 - - asoc.h: fix build with v3.17 kernel - - The snd_soc_codec structure has changed in the v3.17 kernel. Some - of the redundant fields have been removed. To be specific this commit - from the v3.17 kernel causes the build failure for lttng-modules. - - |commit f4333203ec933f9272c90c7add01774ec2cf94d3 - |Author: Lars-Peter Clausen <lars@metafoo.de> - |Date: Mon Jun 16 18:13:02 2014 +0200 - | - | ASoC: Move name and id from CODEC/platform to component - | - | The component struct already has a name and id field which are initialized to - | the same values as the same fields in the CODEC and platform structs. So remove - | them from the CODEC and platform structs and used the ones from the component - | struct instead. - | - | Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> - | Signed-off-by: Mark Brown <broonie@linaro.org> - - The asoc.h is changed according to the change in the above kernel commit - to fix the lttng-modules build. The change in the lttng-modules code is - conditional on the kernel version, so that it does not break builds with - previous kernel versions. - - Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> - Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> - -diff --git a/instrumentation/events/lttng-module/asoc.h b/instrumentation/events/lttng-module/asoc.h -index 672bea4..bf9cf86 100644 ---- a/instrumentation/events/lttng-module/asoc.h -+++ b/instrumentation/events/lttng-module/asoc.h -@@ -21,6 +21,14 @@ struct snd_soc_card; - struct snd_soc_dapm_widget; - #endif - -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) -+#define CODEC_NAME_FIELD component.name -+#define CODEC_ID_FIELD component.id -+#else -+#define CODEC_NAME_FIELD name -+#define CODEC_ID_FIELD id -+#endif -+ - /* - * Log register events - */ -@@ -32,15 +40,15 @@ DECLARE_EVENT_CLASS(snd_soc_reg, - TP_ARGS(codec, reg, val), - - TP_STRUCT__entry( -- __string( name, codec->name ) -+ __string( name, codec->CODEC_NAME_FIELD ) - __field( int, id ) - __field( unsigned int, reg ) - __field( unsigned int, val ) - ), - - TP_fast_assign( -- tp_strcpy(name, codec->name) -- tp_assign(id, codec->id) -+ tp_strcpy(name, codec->CODEC_NAME_FIELD) -+ tp_assign(id, codec->CODEC_ID_FIELD) - tp_assign(reg, reg) - tp_assign(val, val) - ), -@@ -77,15 +85,15 @@ DECLARE_EVENT_CLASS(snd_soc_preg, - TP_ARGS(platform, reg, val), - - TP_STRUCT__entry( -- __string( name, platform->name ) -+ __string( name, platform->CODEC_NAME_FIELD ) - __field( int, id ) - __field( unsigned int, reg ) - __field( unsigned int, val ) - ), - - TP_fast_assign( -- tp_strcpy(name, platform->name) -- tp_assign(id, platform->id) -+ tp_strcpy(name, platform->CODEC_NAME_FIELD) -+ tp_assign(id, platform->CODEC_ID_FIELD) - tp_assign(reg, reg) - tp_assign(val, val) - ), -@@ -399,17 +407,17 @@ TRACE_EVENT(snd_soc_cache_sync, - TP_ARGS(codec, type, status), - - TP_STRUCT__entry( -- __string( name, codec->name ) -+ __string( name, codec->CODEC_NAME_FIELD ) - __string( status, status ) - __string( type, type ) - __field( int, id ) - ), - - TP_fast_assign( -- tp_strcpy(name, codec->name) -+ tp_strcpy(name, codec->CODEC_NAME_FIELD) - tp_strcpy(status, status) - tp_strcpy(type, type) -- tp_assign(id, codec->id) -+ tp_assign(id, codec->CODEC_ID_FIELD) - ), - - TP_printk("codec=%s.%d type=%s status=%s", __get_str(name), diff --git a/meta/recipes-kernel/lttng/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch b/meta/recipes-kernel/lttng/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch index 30f825c414..bbfa38a0b5 100644 --- a/meta/recipes-kernel/lttng/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch +++ b/meta/recipes-kernel/lttng/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch @@ -8,11 +8,11 @@ it as-is. Signed-off-by: Zumeng Chen <zumeng.chen@windriver.com> -diff --git a/Makefile b/Makefile -index a9d1cb1..c1b65b9 100644 ---- a/Makefile -+++ b/Makefile -@@ -43,19 +43,19 @@ obj-m += lib/ +Index: git/Makefile +=================================================================== +--- git.orig/Makefile ++++ git/Makefile +@@ -62,19 +62,19 @@ obj-m += lib/ endif # CONFIG_TRACEPOINTS else # KERNELRELEASE @@ -37,26 +37,11 @@ index a9d1cb1..c1b65b9 100644 - $(MAKE) -C $(KERNELDIR) M=$(PWD) $@ + $(MAKE) -C $(KERNEL_SRC) M=$(PWD) $@ endif # KERNELRELEASE -diff --git a/README b/README -index 8c5dd46..6bd3334 100644 ---- a/README -+++ b/README -@@ -27,8 +27,8 @@ access to your full kernel source tree), and use: - If you need to specify the target directory to the kernel you want to build - against, use: - --% KERNELDIR=path_to_kernel_dir make --# KERNELDIR=path_to_kernel_dir make modules_install -+% KERNEL_SRC=path_to_kernel_dir make -+# KERNEL_SRC=path_to_kernel_dir make modules_install - # depmod -a kernel_version - - Use lttng-tools to control the tracer. LTTng tools should automatically load -diff --git a/probes/Makefile b/probes/Makefile -index 225803c..3449866 100644 ---- a/probes/Makefile -+++ b/probes/Makefile -@@ -212,18 +212,18 @@ endif +Index: git/probes/Makefile +=================================================================== +--- git.orig/probes/Makefile ++++ git/probes/Makefile +@@ -231,18 +231,18 @@ endif endif else diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.5.0.bb b/meta/recipes-kernel/lttng/lttng-modules_2.6.0.bb index 0f98aa571f..d0039b3b14 100644 --- a/meta/recipes-kernel/lttng/lttng-modules_2.5.0.bb +++ b/meta/recipes-kernel/lttng/lttng-modules_2.6.0.bb @@ -7,22 +7,16 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1412caf5a1aa90d6a48588a4794c0eac \ file://lgpl-2.1.txt;md5=243b725d71bb5df4a1e5920b344b86ad" DEPENDS = "virtual/kernel" +do_configure[depends] += "virtual/kernel:do_shared_workdir" inherit module -SRCREV = "789fd1d06d07aeb9a403bdce1b3318560cfc6eca" +SRCREV = "9e8bcbf975844986f021e99e2a30ceedc41b46a8" COMPATIBLE_HOST = '(x86_64|i.86|powerpc|aarch64|mips|arm).*-linux' -SRC_URI = "git://git.lttng.org/lttng-modules.git;branch=stable-2.5 \ +SRC_URI = "git://git.lttng.org/lttng-modules.git;branch=stable-2.6 \ file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch \ - file://Update-compaction-instrumentation-to-3.16-kernel.patch \ - file://Update-vmscan-instrumentation-to-3.16-kernel.patch \ - file://Fix-noargs-probes-should-calculate-alignment-and-eve.patch \ - file://Update-statedump-to-3.17-nsproxy-locking.patch \ - file://Update-kvm-instrumentation-compile-on-3.17-rc1.patch \ - file://fix_build_with_v3.17_kernel.patch \ - file://compaction-fix-mm_compaction_isolate_template-build.patch \ " export INSTALL_MOD_DIR="kernel/lttng-modules" diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.5.0.bb b/meta/recipes-kernel/lttng/lttng-tools_2.6.0.bb index fd44aa5f6d..f0969b5241 100644 --- a/meta/recipes-kernel/lttng/lttng-tools_2.5.0.bb +++ b/meta/recipes-kernel/lttng/lttng-tools_2.6.0.bb @@ -12,8 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=01d7fc4496aacf37d90df90b90b0cac1 \ DEPENDS = "liburcu popt lttng-ust libxml2" RDEPENDS_${PN}-ptest += "make perl bash" -SRCREV = "8b27cacb277c2cdab791139b08da8eb87ab14a88" -PV = "v2.5.0" +SRCREV = "d522c1f14285e2e8b10b7c0cd011847696ffe779" PYTHON_OPTION = "am_cv_python_pyexecdir='${libdir}/python${PYTHON_BASEVERSION}/site-packages' \ am_cv_python_pythondir='${libdir}/python${PYTHON_BASEVERSION}/site-packages' \ @@ -21,16 +20,20 @@ PYTHON_OPTION = "am_cv_python_pyexecdir='${libdir}/python${PYTHON_BASEVERSION}/s " PACKAGECONFIG ??= "lttng-ust" PACKAGECONFIG[python] = "--enable-python-bindings ${PYTHON_OPTION},,python swig-native" -PACKAGECONFIG[lttng-ust] = ", --disable-lttng-ust, lttng-ust" +PACKAGECONFIG[lttng-ust] = "--enable-lttng-ust, --disable-lttng-ust, lttng-ust" +PACKAGECONFIG[kmod] = "--enable-kmod, --disable-kmod, kmod" -SRC_URI = "git://git.lttng.org/lttng-tools.git;branch=stable-2.5 \ +SRC_URI = "git://git.lttng.org/lttng-tools.git;branch=stable-2.6 \ file://runtest-2.4.0.patch \ file://run-ptest \ " S = "${WORKDIR}/git" -inherit autotools-brokensep ptest pkgconfig +inherit autotools-brokensep ptest pkgconfig useradd + +USERADD_PACKAGES = "${PN}" +GROUPADD_PARAM_${PN} = "tracing" export KERNELDIR="${STAGING_KERNEL_DIR}" diff --git a/meta/recipes-kernel/lttng/lttng-ust/add-aarch64.patch b/meta/recipes-kernel/lttng/lttng-ust/add-aarch64.patch new file mode 100644 index 0000000000..cec5410369 --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-ust/add-aarch64.patch @@ -0,0 +1,19 @@ +lttng-ust: add aarch64 recognition + +Treat the same as "arm". + +Upstream-Status: Pending + +Signed-off-by: joe.slater@windriver.com + + +--- a/configure.ac ++++ b/configure.ac +@@ -230,6 +230,7 @@ changequote([,])dnl + s390) NO_UNALIGNED_ACCESS=1 ;; + s390x) NO_UNALIGNED_ACCESS=1 ;; + arm*) NO_UNALIGNED_ACCESS=1 ;; ++ aarch64) NO_UNALIGNED_ACCESS=1 ;; + mips*) NO_UNALIGNED_ACCESS=1 ;; + tile*) NO_UNALIGNED_ACCESS=1 ;; + *) AC_MSG_ERROR([unable to detect alignment requirements (unsupported architecture ($host_cpu)?)]) ;; diff --git a/meta/recipes-kernel/lttng/lttng-ust_2.5.0.bb b/meta/recipes-kernel/lttng/lttng-ust_2.6.0.bb index 71ea5bccf2..080e7448b2 100644 --- a/meta/recipes-kernel/lttng/lttng-ust_2.5.0.bb +++ b/meta/recipes-kernel/lttng/lttng-ust_2.6.0.bb @@ -18,12 +18,12 @@ RPROVIDES_${PN} = "lttng2-ust" RREPLACES_${PN} = "lttng2-ust" RCONFLICTS_${PN} = "lttng2-ust" -SRCREV = "ce59a997afdb7dc8af02b464430bb7e35549fa66" -PV = "2.5.0" +SRCREV = "5748584c5ae8ca5c4da26f41b6c61bb816e6d50b" PE = "2" -SRC_URI = "git://git.lttng.org/lttng-ust.git;branch=stable-2.5 \ +SRC_URI = "git://git.lttng.org/lttng-ust.git;branch=stable-2.6 \ file://lttng-ust-doc-examples-disable.patch \ + file://add-aarch64.patch \ " S = "${WORKDIR}/git" |