summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/lttng
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2014-12-30 14:25:49 -0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-31 17:04:48 +0000
commitb371b6b2db8fab2b3c379967fd6e4b7b4715830e (patch)
tree1ad67bf723a941985a5d2de93cc99d3dab80b23c /meta/recipes-kernel/lttng
parent93f902f50691a9adc97ec5f267744204a3396c52 (diff)
downloadpoky-b371b6b2db8fab2b3c379967fd6e4b7b4715830e.tar.gz
lttng-modules: Update to revision to 16d7431c3
This update the source code to the 2.5.2 version and also brings two fixes from stable-2.5 branch. The update also allowed the removal of some already applied patches from the metadata. Doing this update, it fixes following build error: ,---- | make[1]: Entering directory `.../build-framebuffer/tmp/sysroots/imx23evk/usr/src/kernel' | | ERROR: Kernel configuration is invalid. | include/generated/autoconf.h or include/config/auto.conf are missing. | Run 'make oldconfig && make prepare' on kernel src to fix it. | | Building modules, stage 2. | ./scripts/Makefile.modpost:42: include/config/auto.conf: No such file or directory | make[2]: *** No rule to make target `include/config/auto.conf'. Stop. | make[1]: *** [modules] Error 2 | make[1]: Leaving directory `.../build-framebuffer/tmp/sysroots/imx23evk/usr/src/kernel' | make: *** [default] Error 2 `---- (From OE-Core rev: e575ab81f0cf145503c4afd9ce62040721a526b2) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/lttng')
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules/Update-compaction-instrumentation-to-3.16-kernel.patch83
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules/Update-statedump-to-3.17-nsproxy-locking.patch70
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules/Update-vmscan-instrumentation-to-3.16-kernel.patch70
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules/compaction-fix-mm_compaction_isolate_template-build.patch41
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules/fix_build_with_v3.17_kernel.patch113
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules_2.5.2.bb (renamed from meta/recipes-kernel/lttng/lttng-modules_2.5.0.bb)7
6 files changed, 1 insertions, 383 deletions
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 @@
1From 0007344741ef65259bc52dea72259173dfbf96c0 Mon Sep 17 00:00:00 2001
2From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
3Date: Sun, 13 Jul 2014 13:33:21 -0400
4Subject: [PATCH 2/2] Update compaction instrumentation to 3.16 kernel
5
6Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
7---
8 instrumentation/events/lttng-module/compaction.h | 45 +++++++++++++++++++++++-
9 1 file changed, 44 insertions(+), 1 deletion(-)
10
11diff --git a/instrumentation/events/lttng-module/compaction.h b/instrumentation/events/lttng-module/compaction.h
12index 1b237fa45ab0..22024e9ee582 100644
13--- a/instrumentation/events/lttng-module/compaction.h
14+++ b/instrumentation/events/lttng-module/compaction.h
15@@ -6,6 +6,7 @@
16
17 #include <linux/types.h>
18 #include <linux/tracepoint.h>
19+#include <linux/version.h>
20 #include <trace/events/gfpflags.h>
21
22 DECLARE_EVENT_CLASS(mm_compaction_isolate_template,
23@@ -45,6 +46,48 @@ DEFINE_EVENT(mm_compaction_isolate_template, mm_compaction_isolate_freepages,
24 TP_ARGS(nr_scanned, nr_taken)
25 )
26
27+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0))
28+TRACE_EVENT(mm_compaction_migratepages,
29+
30+ TP_PROTO(unsigned long nr_all,
31+ int migrate_rc,
32+ struct list_head *migratepages),
33+
34+ TP_ARGS(nr_all, migrate_rc, migratepages),
35+
36+ TP_STRUCT__entry(
37+ __field(unsigned long, nr_migrated)
38+ __field(unsigned long, nr_failed)
39+ ),
40+
41+ TP_fast_assign(
42+ tp_assign(nr_migrated,
43+ nr_all -
44+ (migrate_rc >= 0 ? migrate_rc :
45+ ({
46+ unsigned long nr_failed = 0;
47+ struct list_head *page_lru;
48+
49+ list_for_each(page_lru, migratepages)
50+ nr_failed++;
51+ nr_failed;
52+ })))
53+ tp_assign(nr_failed,
54+ ({
55+ unsigned long nr_failed = 0;
56+ struct list_head *page_lru;
57+
58+ list_for_each(page_lru, migratepages)
59+ nr_failed++;
60+ nr_failed;
61+ }))
62+ ),
63+
64+ TP_printk("nr_migrated=%lu nr_failed=%lu",
65+ __entry->nr_migrated,
66+ __entry->nr_failed)
67+)
68+#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) */
69 TRACE_EVENT(mm_compaction_migratepages,
70
71 TP_PROTO(unsigned long nr_migrated,
72@@ -66,7 +109,7 @@ TRACE_EVENT(mm_compaction_migratepages,
73 __entry->nr_migrated,
74 __entry->nr_failed)
75 )
76-
77+#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) */
78
79 #endif /* _TRACE_COMPACTION_H */
80
81--
821.8.1.2
83
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 @@
1Upstream-Status: Backport
2Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
3
4From 4ba1f53c5aebb4433fedc25d65af010274985043 Mon Sep 17 00:00:00 2001
5From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
6Date: Thu, 21 Aug 2014 10:53:12 -0400
7Subject: [PATCH 2/3] Update statedump to 3.17 nsproxy locking
8
9This Linux upstream commit introduces locking strategy back and forth:
10
11commit 728dba3a39c66b3d8ac889ddbe38b5b1c264aec3
12Author: Eric W. Biederman <ebiederm@xmission.com>
13Date: Mon Feb 3 19:13:49 2014 -0800
14
15 namespaces: Use task_lock and not rcu to protect nsproxy
16
17Use the task lock starting from kernel 3.17 rather than RCU to access
18the task nsproxy.
19
20Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
21---
22 lttng-statedump-impl.c | 15 +++++++++++++++
23 1 file changed, 15 insertions(+)
24
25diff --git a/lttng-statedump-impl.c b/lttng-statedump-impl.c
26index dad51ddaa250..e4caa488e436 100644
27--- a/lttng-statedump-impl.c
28+++ b/lttng-statedump-impl.c
29@@ -378,6 +378,9 @@ int lttng_list_interrupts(struct lttng_session *session)
30 }
31 #endif
32
33+/*
34+ * Called with task lock held.
35+ */
36 static
37 void lttng_statedump_process_ns(struct lttng_session *session,
38 struct task_struct *p,
39@@ -389,8 +392,18 @@ void lttng_statedump_process_ns(struct lttng_session *session,
40 struct nsproxy *proxy;
41 struct pid_namespace *pid_ns;
42
43+ /*
44+ * Back and forth on locking strategy within Linux upstream for nsproxy.
45+ * See Linux upstream commit 728dba3a39c66b3d8ac889ddbe38b5b1c264aec3
46+ * "namespaces: Use task_lock and not rcu to protect nsproxy"
47+ * for details.
48+ */
49+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0))
50 rcu_read_lock();
51 proxy = task_nsproxy(p);
52+#else /* #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0)) */
53+ proxy = p->nsproxy;
54+#endif /* #else #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0)) */
55 if (proxy) {
56 pid_ns = lttng_get_proxy_pid_ns(proxy);
57 do {
58@@ -402,7 +415,9 @@ void lttng_statedump_process_ns(struct lttng_session *session,
59 trace_lttng_statedump_process_state(session,
60 p, type, mode, submode, status, NULL);
61 }
62+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0))
63 rcu_read_unlock();
64+#endif /* #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0)) */
65 }
66
67 static
68--
691.8.1.2
70
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 @@
1From 5defe623568273e9b87da1b817e373ff087fd862 Mon Sep 17 00:00:00 2001
2From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
3Date: Sun, 13 Jul 2014 13:27:01 -0400
4Subject: [PATCH 1/2] Update vmscan instrumentation to 3.16 kernel
5
6Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
7---
8 instrumentation/events/lttng-module/vmscan.h | 39 ++++++++++++++++++++++++++++
9 1 file changed, 39 insertions(+)
10
11diff --git a/instrumentation/events/lttng-module/vmscan.h b/instrumentation/events/lttng-module/vmscan.h
12index 1fd50ba7c235..0b4aa56761dc 100644
13--- a/instrumentation/events/lttng-module/vmscan.h
14+++ b/instrumentation/events/lttng-module/vmscan.h
15@@ -238,6 +238,44 @@ TRACE_EVENT(mm_shrink_slab_start,
16 __entry->total_scan)
17 )
18
19+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0))
20+TRACE_EVENT(mm_shrink_slab_end,
21+ TP_PROTO(struct shrinker *shr, int nid, int shrinker_retval,
22+ long unused_scan_cnt, long new_scan_cnt, long total_scan),
23+
24+ TP_ARGS(shr, nid, shrinker_retval, unused_scan_cnt, new_scan_cnt,
25+ total_scan),
26+
27+ TP_STRUCT__entry(
28+ __field(struct shrinker *, shr)
29+ __field(int, nid)
30+ __field(void *, shrink)
31+ __field(long, unused_scan)
32+ __field(long, new_scan)
33+ __field(int, retval)
34+ __field(long, total_scan)
35+ ),
36+
37+ TP_fast_assign(
38+ tp_assign(shr, shr)
39+ tp_assign(nid, nid)
40+ tp_assign(shrink, shr->scan_objects)
41+ tp_assign(unused_scan, unused_scan_cnt)
42+ tp_assign(new_scan, new_scan_cnt)
43+ tp_assign(retval, shrinker_retval)
44+ tp_assign(total_scan, total_scan)
45+ ),
46+
47+ TP_printk("%pF %p: nid %d unused scan count %ld new scan count %ld total_scan %ld last shrinker return val %d",
48+ __entry->shrink,
49+ __entry->shr,
50+ __entry->nid,
51+ __entry->unused_scan,
52+ __entry->new_scan,
53+ __entry->total_scan,
54+ __entry->retval)
55+)
56+#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) */
57 TRACE_EVENT(mm_shrink_slab_end,
58 TP_PROTO(struct shrinker *shr, int shrinker_retval,
59 long unused_scan_cnt, long new_scan_cnt),
60@@ -274,6 +312,7 @@ TRACE_EVENT(mm_shrink_slab_end,
61 __entry->total_scan,
62 __entry->retval)
63 )
64+#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) */
65 #endif
66
67 DECLARE_EVENT_CLASS(mm_vmscan_lru_isolate_template,
68--
691.8.1.2
70
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 @@
1From af48c7b08de4b811d3d974e65e362b86ce8c4a34 Mon Sep 17 00:00:00 2001
2From: Bruce Ashfield <bruce.ashfield@windriver.com>
3Date: Wed, 10 Dec 2014 03:19:28 -0500
4Subject: [PATCH] compaction: fix mm_compaction_isolate_template build
5
6linux-stable integrated the 3.16 commit f8c9301fa5a2a [mm/compaction: do
7not count migratepages when unnecessary] with the 3.14.25 update.
8
9So we have to update the lttng-module linux version codes to use the
10new definition in builds greater than 3.14.24 or 3.16.
11
12Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
13---
14 instrumentation/events/lttng-module/compaction.h | 4 ++--
15 1 file changed, 2 insertions(+), 2 deletions(-)
16
17diff --git a/instrumentation/events/lttng-module/compaction.h b/instrumentation/events/lttng-module/compaction.h
18index 22024e9ee582..07afbe06f1a6 100644
19--- a/instrumentation/events/lttng-module/compaction.h
20+++ b/instrumentation/events/lttng-module/compaction.h
21@@ -46,7 +46,7 @@ DEFINE_EVENT(mm_compaction_isolate_template, mm_compaction_isolate_freepages,
22 TP_ARGS(nr_scanned, nr_taken)
23 )
24
25-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0))
26+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0) || LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,25))
27 TRACE_EVENT(mm_compaction_migratepages,
28
29 TP_PROTO(unsigned long nr_all,
30@@ -87,7 +87,7 @@ TRACE_EVENT(mm_compaction_migratepages,
31 __entry->nr_migrated,
32 __entry->nr_failed)
33 )
34-#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) */
35+#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0) || LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,25)) */
36 TRACE_EVENT(mm_compaction_migratepages,
37
38 TP_PROTO(unsigned long nr_migrated,
39--
402.1.0
41
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 @@
1
2Upstream-Status: Backport
3
4commit 7df57eb5d6bdc85ddcf2b9afb6cd0cacfb22096e
5Author: Nitin A Kamble <nitin.a.kamble@intel.com>
6Date: Thu Sep 25 18:19:43 2014 -0700
7
8 asoc.h: fix build with v3.17 kernel
9
10 The snd_soc_codec structure has changed in the v3.17 kernel. Some
11 of the redundant fields have been removed. To be specific this commit
12 from the v3.17 kernel causes the build failure for lttng-modules.
13
14 |commit f4333203ec933f9272c90c7add01774ec2cf94d3
15 |Author: Lars-Peter Clausen <lars@metafoo.de>
16 |Date: Mon Jun 16 18:13:02 2014 +0200
17 |
18 | ASoC: Move name and id from CODEC/platform to component
19 |
20 | The component struct already has a name and id field which are initialized to
21 | the same values as the same fields in the CODEC and platform structs. So remove
22 | them from the CODEC and platform structs and used the ones from the component
23 | struct instead.
24 |
25 | Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
26 | Signed-off-by: Mark Brown <broonie@linaro.org>
27
28 The asoc.h is changed according to the change in the above kernel commit
29 to fix the lttng-modules build. The change in the lttng-modules code is
30 conditional on the kernel version, so that it does not break builds with
31 previous kernel versions.
32
33 Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
34 Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
35
36diff --git a/instrumentation/events/lttng-module/asoc.h b/instrumentation/events/lttng-module/asoc.h
37index 672bea4..bf9cf86 100644
38--- a/instrumentation/events/lttng-module/asoc.h
39+++ b/instrumentation/events/lttng-module/asoc.h
40@@ -21,6 +21,14 @@ struct snd_soc_card;
41 struct snd_soc_dapm_widget;
42 #endif
43
44+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0))
45+#define CODEC_NAME_FIELD component.name
46+#define CODEC_ID_FIELD component.id
47+#else
48+#define CODEC_NAME_FIELD name
49+#define CODEC_ID_FIELD id
50+#endif
51+
52 /*
53 * Log register events
54 */
55@@ -32,15 +40,15 @@ DECLARE_EVENT_CLASS(snd_soc_reg,
56 TP_ARGS(codec, reg, val),
57
58 TP_STRUCT__entry(
59- __string( name, codec->name )
60+ __string( name, codec->CODEC_NAME_FIELD )
61 __field( int, id )
62 __field( unsigned int, reg )
63 __field( unsigned int, val )
64 ),
65
66 TP_fast_assign(
67- tp_strcpy(name, codec->name)
68- tp_assign(id, codec->id)
69+ tp_strcpy(name, codec->CODEC_NAME_FIELD)
70+ tp_assign(id, codec->CODEC_ID_FIELD)
71 tp_assign(reg, reg)
72 tp_assign(val, val)
73 ),
74@@ -77,15 +85,15 @@ DECLARE_EVENT_CLASS(snd_soc_preg,
75 TP_ARGS(platform, reg, val),
76
77 TP_STRUCT__entry(
78- __string( name, platform->name )
79+ __string( name, platform->CODEC_NAME_FIELD )
80 __field( int, id )
81 __field( unsigned int, reg )
82 __field( unsigned int, val )
83 ),
84
85 TP_fast_assign(
86- tp_strcpy(name, platform->name)
87- tp_assign(id, platform->id)
88+ tp_strcpy(name, platform->CODEC_NAME_FIELD)
89+ tp_assign(id, platform->CODEC_ID_FIELD)
90 tp_assign(reg, reg)
91 tp_assign(val, val)
92 ),
93@@ -399,17 +407,17 @@ TRACE_EVENT(snd_soc_cache_sync,
94 TP_ARGS(codec, type, status),
95
96 TP_STRUCT__entry(
97- __string( name, codec->name )
98+ __string( name, codec->CODEC_NAME_FIELD )
99 __string( status, status )
100 __string( type, type )
101 __field( int, id )
102 ),
103
104 TP_fast_assign(
105- tp_strcpy(name, codec->name)
106+ tp_strcpy(name, codec->CODEC_NAME_FIELD)
107 tp_strcpy(status, status)
108 tp_strcpy(type, type)
109- tp_assign(id, codec->id)
110+ tp_assign(id, codec->CODEC_ID_FIELD)
111 ),
112
113 TP_printk("codec=%s.%d type=%s status=%s", __get_str(name),
diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.5.0.bb b/meta/recipes-kernel/lttng/lttng-modules_2.5.2.bb
index f9475e9d85..55df07f632 100644
--- a/meta/recipes-kernel/lttng/lttng-modules_2.5.0.bb
+++ b/meta/recipes-kernel/lttng/lttng-modules_2.5.2.bb
@@ -11,19 +11,14 @@ do_configure[depends] += "virtual/kernel:do_install"
11 11
12inherit module 12inherit module
13 13
14SRCREV = "789fd1d06d07aeb9a403bdce1b3318560cfc6eca" 14SRCREV = "16d7431c3a78605ea598dbd3f081a2b1a8463f23"
15 15
16COMPATIBLE_HOST = '(x86_64|i.86|powerpc|aarch64|mips|arm).*-linux' 16COMPATIBLE_HOST = '(x86_64|i.86|powerpc|aarch64|mips|arm).*-linux'
17 17
18SRC_URI = "git://git.lttng.org/lttng-modules.git;branch=stable-2.5 \ 18SRC_URI = "git://git.lttng.org/lttng-modules.git;branch=stable-2.5 \
19 file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch \ 19 file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch \
20 file://Update-compaction-instrumentation-to-3.16-kernel.patch \
21 file://Update-vmscan-instrumentation-to-3.16-kernel.patch \
22 file://Fix-noargs-probes-should-calculate-alignment-and-eve.patch \ 20 file://Fix-noargs-probes-should-calculate-alignment-and-eve.patch \
23 file://Update-statedump-to-3.17-nsproxy-locking.patch \
24 file://Update-kvm-instrumentation-compile-on-3.17-rc1.patch \ 21 file://Update-kvm-instrumentation-compile-on-3.17-rc1.patch \
25 file://fix_build_with_v3.17_kernel.patch \
26 file://compaction-fix-mm_compaction_isolate_template-build.patch \
27 " 22 "
28 23
29export INSTALL_MOD_DIR="kernel/lttng-modules" 24export INSTALL_MOD_DIR="kernel/lttng-modules"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-15 08:54:48 +0000