summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVinícius Ossanes Aquino <vinicius.aquino@ossystems.com.br>2021-05-07 17:00:58 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-05-15 17:18:21 +0100
commit900aae50c98719619eedfa26d3cbc2e63d847e85 (patch)
treea54b1000ddb2ffc1145b50cec59af6cce5e2940b
parent337fa1104442ce595e597e8801d6e4d5f2f38b85 (diff)
downloadpoky-900aae50c98719619eedfa26d3cbc2e63d847e85.tar.gz
lttng-modules: backport patches to fix build against 5.12+ kernel
Add the following patches from stable-2.12 branch of lttng repository to fix errors when building lttng-modules against 5.12+ kernel since they are not present on the release 2.12.5: - 17cd2dc9 fix: block: add a disk_uevent helper (v5.12) - 127135b6 fix backport: block: add a disk_uevent helper (v5.12) - 853d5903 fix: mm, tracing: kfree event name mismatching with provider kmem (v5.12) (From OE-Core rev: 86bcab9e9f4ee5e06f7db8c75d4b983fd2be59d2) Signed-off-by: Vinicius Aquino <vinicius.aquino@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 2538ba2b3490e3599d9ccd637aa8486ea428f1b0) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules/0005-fix-block-add-a-disk_uevent-helper-v5.12.patch305
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules/0006-fix-backport-block-add-a-disk_uevent-helper-v5.12.patch48
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules/0007-fix-mm-tracing-kfree-event-name-mismatching-with-pro.patch71
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules_2.12.5.bb3
4 files changed, 427 insertions, 0 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0005-fix-block-add-a-disk_uevent-helper-v5.12.patch b/meta/recipes-kernel/lttng/lttng-modules/0005-fix-block-add-a-disk_uevent-helper-v5.12.patch
new file mode 100644
index 0000000000..3a2280ccdc
--- /dev/null
+++ b/meta/recipes-kernel/lttng/lttng-modules/0005-fix-block-add-a-disk_uevent-helper-v5.12.patch
@@ -0,0 +1,305 @@
1From 17cd2dc91cb82ed342b0da699f2b1a70c1bf6a03 Mon Sep 17 00:00:00 2001
2From: Michael Jeanson <mjeanson@efficios.com>
3Date: Mon, 15 Mar 2021 14:54:02 -0400
4Subject: [PATCH 2/4] fix: block: add a disk_uevent helper (v5.12)
5
6See upstream commit:
7
8 commit bc359d03c7ec1bf3b86d03bafaf6bbb21e6414fd
9 Author: Christoph Hellwig <hch@lst.de>
10 Date: Sun Jan 24 11:02:39 2021 +0100
11
12 block: add a disk_uevent helper
13
14 Add a helper to call kobject_uevent for the disk and all partitions, and
15 unexport the disk_part_iter_* helpers that are now only used in the core
16 block code.
17
18Upstream-status: Backport [2.12.6]
19
20Change-Id: If6e8797049642ab382d5699660ee1dd734e92c90
21Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
22Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
23---
24 Makefile | 1 +
25 lttng-statedump-impl.c | 34 +++++++++----
26 src/wrapper/genhd.c | 111 +++++++++++++++++++++++++++++++++++++++++
27 wrapper/genhd.h | 62 +++++++++++++++++++++++
28 4 files changed, 198 insertions(+), 10 deletions(-)
29 create mode 100644 src/wrapper/genhd.c
30
31diff --git a/Makefile b/Makefile
32index a9aff3f1..34043cfb 100644
33--- a/Makefile
34+++ b/Makefile
35@@ -80,6 +80,7 @@ ifneq ($(KERNELRELEASE),)
36 wrapper/kallsyms.o \
37 wrapper/irqdesc.o \
38 wrapper/fdtable.o \
39+ wrapper/genhd.o \
40 lttng-wrapper-impl.o
41
42 ifneq ($(CONFIG_HAVE_SYSCALL_TRACEPOINTS),)
43diff --git a/lttng-statedump-impl.c b/lttng-statedump-impl.c
44index 60b937c9..5511c7e8 100644
45--- a/lttng-statedump-impl.c
46+++ b/lttng-statedump-impl.c
47@@ -250,13 +250,17 @@ int lttng_enumerate_block_devices(struct lttng_session *session)
48 struct device_type *ptr_disk_type;
49 struct class_dev_iter iter;
50 struct device *dev;
51+ int ret = 0;
52
53 ptr_block_class = wrapper_get_block_class();
54- if (!ptr_block_class)
55- return -ENOSYS;
56+ if (!ptr_block_class) {
57+ ret = -ENOSYS;
58+ goto end;
59+ }
60 ptr_disk_type = wrapper_get_disk_type();
61 if (!ptr_disk_type) {
62- return -ENOSYS;
63+ ret = -ENOSYS;
64+ goto end;
65 }
66 class_dev_iter_init(&iter, ptr_block_class, NULL, ptr_disk_type);
67 while ((dev = class_dev_iter_next(&iter))) {
68@@ -272,22 +276,32 @@ int lttng_enumerate_block_devices(struct lttng_session *session)
69 (disk->flags & GENHD_FL_SUPPRESS_PARTITION_INFO))
70 continue;
71
72- disk_part_iter_init(&piter, disk, DISK_PITER_INCL_PART0);
73- while ((part = disk_part_iter_next(&piter))) {
74+ /*
75+ * The original 'disk_part_iter_init' returns void, but our
76+ * wrapper can fail to lookup the original symbol.
77+ */
78+ if (wrapper_disk_part_iter_init(&piter, disk, DISK_PITER_INCL_PART0) < 0) {
79+ ret = -ENOSYS;
80+ goto iter_exit;
81+ }
82+
83+ while ((part = wrapper_disk_part_iter_next(&piter))) {
84 char name_buf[BDEVNAME_SIZE];
85
86 if (lttng_get_part_name(disk, part, name_buf) == -ENOSYS) {
87- disk_part_iter_exit(&piter);
88- class_dev_iter_exit(&iter);
89- return -ENOSYS;
90+ wrapper_disk_part_iter_exit(&piter);
91+ ret = -ENOSYS;
92+ goto iter_exit;
93 }
94 trace_lttng_statedump_block_device(session,
95 lttng_get_part_devt(part), name_buf);
96 }
97- disk_part_iter_exit(&piter);
98+ wrapper_disk_part_iter_exit(&piter);
99 }
100+iter_exit:
101 class_dev_iter_exit(&iter);
102- return 0;
103+end:
104+ return ret;
105 }
106
107 #ifdef CONFIG_INET
108diff --git a/src/wrapper/genhd.c b/src/wrapper/genhd.c
109new file mode 100644
110index 00000000..a5a6c410
111--- /dev/null
112+++ b/src/wrapper/genhd.c
113@@ -0,0 +1,111 @@
114+/* SPDX-License-Identifier: (GPL-2.0-only OR LGPL-2.1-only)
115+ *
116+ * wrapper/genhd.c
117+ *
118+ * Wrapper around disk_part_iter_(init|next|exit). Using KALLSYMS to get the
119+ * addresses when available, else we need to have a kernel that exports this
120+ * function to GPL modules. This export was removed in 5.12.
121+ *
122+ * Copyright (C) 2021 Michael Jeanson <mjeanson@efficios.com>
123+ */
124+
125+#include <lttng/kernel-version.h>
126+#include <linux/module.h>
127+#include <wrapper/genhd.h>
128+
129+#if (defined(CONFIG_KALLSYMS) && \
130+ (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,12,0)))
131+
132+#include <wrapper/kallsyms.h>
133+
134+static
135+void (*disk_part_iter_init_sym)(struct disk_part_iter *piter, struct gendisk *disk,
136+ unsigned int flags);
137+
138+static
139+LTTNG_DISK_PART_TYPE *(*disk_part_iter_next_sym)(struct disk_part_iter *piter);
140+
141+static
142+void (*disk_part_iter_exit_sym)(struct disk_part_iter *piter);
143+
144+/*
145+ * This wrapper has an 'int' return type instead of the original 'void', to be
146+ * able to report the symbol lookup failure to the caller.
147+ *
148+ * Return 0 on success, -1 on error.
149+ */
150+int wrapper_disk_part_iter_init(struct disk_part_iter *piter, struct gendisk *disk,
151+ unsigned int flags)
152+{
153+ if (!disk_part_iter_init_sym)
154+ disk_part_iter_init_sym = (void *) kallsyms_lookup_funcptr("disk_part_iter_init");
155+
156+ if (disk_part_iter_init_sym) {
157+ disk_part_iter_init_sym(piter, disk, flags);
158+ } else {
159+ printk_once(KERN_WARNING "LTTng: disk_part_iter_init symbol lookup failed.\n");
160+ return -1;
161+ }
162+ return 0;
163+}
164+EXPORT_SYMBOL_GPL(wrapper_disk_part_iter_init);
165+
166+LTTNG_DISK_PART_TYPE *wrapper_disk_part_iter_next(struct disk_part_iter *piter)
167+{
168+ if (!disk_part_iter_next_sym)
169+ disk_part_iter_next_sym = (void *) kallsyms_lookup_funcptr("disk_part_iter_next");
170+
171+ if (disk_part_iter_next_sym) {
172+ return disk_part_iter_next_sym(piter);
173+ } else {
174+ printk_once(KERN_WARNING "LTTng: disk_part_iter_next symbol lookup failed.\n");
175+ return NULL;
176+ }
177+}
178+EXPORT_SYMBOL_GPL(wrapper_disk_part_iter_next);
179+
180+/*
181+ * We don't return an error on symbol lookup failure here because there is
182+ * nothing the caller can do to cleanup the iterator.
183+ */
184+void wrapper_disk_part_iter_exit(struct disk_part_iter *piter)
185+{
186+ if (!disk_part_iter_exit_sym)
187+ disk_part_iter_exit_sym = (void *) kallsyms_lookup_funcptr("disk_part_iter_exit");
188+
189+ if (disk_part_iter_exit_sym) {
190+ disk_part_iter_exit_sym(piter);
191+ } else {
192+ printk_once(KERN_WARNING "LTTng: disk_part_iter_exit symbol lookup failed.\n");
193+ }
194+}
195+EXPORT_SYMBOL_GPL(wrapper_disk_part_iter_exit);
196+
197+#else
198+
199+/*
200+ * This wrapper has an 'int' return type instead of the original 'void', so the
201+ * kallsyms variant can report the symbol lookup failure to the caller.
202+ *
203+ * This variant always succeeds and returns 0.
204+ */
205+int wrapper_disk_part_iter_init(struct disk_part_iter *piter, struct gendisk *disk,
206+ unsigned int flags)
207+{
208+ disk_part_iter_init(piter, disk, flags);
209+ return 0;
210+}
211+EXPORT_SYMBOL_GPL(wrapper_disk_part_iter_init);
212+
213+LTTNG_DISK_PART_TYPE *wrapper_disk_part_iter_next(struct disk_part_iter *piter)
214+{
215+ return disk_part_iter_next(piter);
216+}
217+EXPORT_SYMBOL_GPL(wrapper_disk_part_iter_next);
218+
219+void wrapper_disk_part_iter_exit(struct disk_part_iter *piter)
220+{
221+ disk_part_iter_exit(piter);
222+}
223+EXPORT_SYMBOL_GPL(wrapper_disk_part_iter_exit);
224+#endif
225diff --git a/wrapper/genhd.h b/wrapper/genhd.h
226index 98feb57b..6bae239d 100644
227--- a/wrapper/genhd.h
228+++ b/wrapper/genhd.h
229@@ -13,6 +13,13 @@
230 #define _LTTNG_WRAPPER_GENHD_H
231
232 #include <linux/genhd.h>
233+#include <lttng/kernel-version.h>
234+
235+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0))
236+#define LTTNG_DISK_PART_TYPE struct block_device
237+#else
238+#define LTTNG_DISK_PART_TYPE struct hd_struct
239+#endif
240
241 #ifdef CONFIG_KALLSYMS_ALL
242
243@@ -94,4 +101,59 @@ struct device_type *wrapper_get_disk_type(void)
244
245 #endif
246
247+/*
248+ * This wrapper has an 'int' return type instead of the original 'void', to be
249+ * able to report the symbol lookup failure to the caller.
250+ *
251+ * Return 0 on success, -1 on error.
252+ */
253+int wrapper_disk_part_iter_init(struct disk_part_iter *piter, struct gendisk *disk,
254+ unsigned int flags);
255+LTTNG_DISK_PART_TYPE *wrapper_disk_part_iter_next(struct disk_part_iter *piter);
256+void wrapper_disk_part_iter_exit(struct disk_part_iter *piter);
257+
258+/*
259+ * Canary function to check for 'disk_part_iter_init()' at compile time.
260+ *
261+ * From 'include/linux/genhd.h':
262+ *
263+ * extern void disk_part_iter_init(struct disk_part_iter *piter,
264+ * struct gendisk *disk, unsigned int flags);
265+ *
266+ */
267+static inline
268+void __canary__disk_part_iter_init(struct disk_part_iter *piter, struct gendisk *disk,
269+ unsigned int flags)
270+{
271+ disk_part_iter_init(piter, disk, flags);
272+}
273+
274+/*
275+ * Canary function to check for 'disk_part_iter_next()' at compile time.
276+ *
277+ * From 'include/linux/genhd.h':
278+ *
279+ * struct block_device *disk_part_iter_next(struct disk_part_iter *piter);
280+ *
281+ */
282+static inline
283+LTTNG_DISK_PART_TYPE *__canary__disk_part_iter_next(struct disk_part_iter *piter)
284+{
285+ return disk_part_iter_next(piter);
286+}
287+
288+/*
289+ * Canary function to check for 'disk_part_iter_exit()' at compile time.
290+ *
291+ * From 'include/linux/genhd.h':
292+ *
293+ * extern void disk_part_iter_exit(struct disk_part_iter *piter);
294+ *
295+ */
296+static inline
297+void __canary__disk_part_iter_exit(struct disk_part_iter *piter)
298+{
299+ return disk_part_iter_exit(piter);
300+}
301+
302 #endif /* _LTTNG_WRAPPER_GENHD_H */
303--
3042.25.1
305
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0006-fix-backport-block-add-a-disk_uevent-helper-v5.12.patch b/meta/recipes-kernel/lttng/lttng-modules/0006-fix-backport-block-add-a-disk_uevent-helper-v5.12.patch
new file mode 100644
index 0000000000..e32b3e7a2e
--- /dev/null
+++ b/meta/recipes-kernel/lttng/lttng-modules/0006-fix-backport-block-add-a-disk_uevent-helper-v5.12.patch
@@ -0,0 +1,48 @@
1From 127135b6a45d5fca828815c62308f72de97e5739 Mon Sep 17 00:00:00 2001
2From: Michael Jeanson <mjeanson@efficios.com>
3Date: Thu, 15 Apr 2021 13:56:24 -0400
4Subject: [PATCH 3/4] fix backport: block: add a disk_uevent helper (v5.12)
5
6Upstream-Status: Backport [2.12.6]
7
8Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
9Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
10Change-Id: I717162069990577abe78e5e7fed28816f32b2c84
11---
12 {src/wrapper => wrapper}/genhd.c | 2 +-
13 wrapper/genhd.h | 2 +-
14 2 files changed, 2 insertions(+), 2 deletions(-)
15 rename {src/wrapper => wrapper}/genhd.c (98%)
16
17diff --git a/src/wrapper/genhd.c b/wrapper/genhd.c
18similarity index 98%
19rename from src/wrapper/genhd.c
20rename to wrapper/genhd.c
21index a5a6c410..cbec06f7 100644
22--- a/src/wrapper/genhd.c
23+++ b/wrapper/genhd.c
24@@ -9,7 +9,7 @@
25 * Copyright (C) 2021 Michael Jeanson <mjeanson@efficios.com>
26 */
27
28-#include <lttng/kernel-version.h>
29+#include <lttng-kernel-version.h>
30 #include <linux/module.h>
31 #include <wrapper/genhd.h>
32
33diff --git a/wrapper/genhd.h b/wrapper/genhd.h
34index 6bae239d..1b4a4201 100644
35--- a/wrapper/genhd.h
36+++ b/wrapper/genhd.h
37@@ -13,7 +13,7 @@
38 #define _LTTNG_WRAPPER_GENHD_H
39
40 #include <linux/genhd.h>
41-#include <lttng/kernel-version.h>
42+#include <lttng-kernel-version.h>
43
44 #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0))
45 #define LTTNG_DISK_PART_TYPE struct block_device
46--
472.25.1
48
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0007-fix-mm-tracing-kfree-event-name-mismatching-with-pro.patch b/meta/recipes-kernel/lttng/lttng-modules/0007-fix-mm-tracing-kfree-event-name-mismatching-with-pro.patch
new file mode 100644
index 0000000000..dfc9427dca
--- /dev/null
+++ b/meta/recipes-kernel/lttng/lttng-modules/0007-fix-mm-tracing-kfree-event-name-mismatching-with-pro.patch
@@ -0,0 +1,71 @@
1From 853d5903a200d8a15b3f38780ddaea5c92fa1a03 Mon Sep 17 00:00:00 2001
2From: He Zhe <zhe.he@windriver.com>
3Date: Mon, 19 Apr 2021 09:09:28 +0000
4Subject: [PATCH 4/4] fix: mm, tracing: kfree event name mismatching with
5 provider kmem (v5.12)
6
7a8bc8ae5c932 ("fix: mm, tracing: record slab name for kmem_cache_free() (v5.12)")
8introduces the following call trace for kfree. This is caused by mismatch
9between kfree event and its provider kmem.
10
11This patch maps kfree to kmem_kfree.
12
13WARNING: CPU: 2 PID: 42294 at src/lttng-probes.c:81 fixup_lazy_probes+0xb0/0x1b0 [lttng_tracer]
14CPU: 2 PID: 42294 Comm: modprobe Tainted: G O 5.12.0-rc6-yoctodev-standard #1
15Hardware name: Intel Corporation JACOBSVILLE/JACOBSVILLE, BIOS JBVLCRB2.86B.0014.P20.2004020248 04/02/2020
16RIP: 0010:fixup_lazy_probes+0xb0/0x1b0 [lttng_tracer]
17Code: 75 28 83 c3 01 3b 5d c4 74 22 48 8b 4d d0 48 63
18 c3 4c 89 e2 4c 89 f6 48 8b 04 c1 4c 8b 38 4c 89
19 ff e8 64 9f 4b de 85 c0 74 c3 <0f> 0b 48 8b 05 bf
20 f2 1e 00 48 8d 50 e8 48 3d f0 a0 98 c0 75 18 eb
21RSP: 0018:ffffb976807bfbe0 EFLAGS: 00010286
22RAX: 00000000ffffffff RBX: 0000000000000004 RCX: 0000000000000004
23RDX: 0000000000000066 RSI: ffffffffc03c10a7 RDI: ffffffffc03c11a1
24RBP: ffffb976807bfc28 R08: 0000000000000000 R09: 0000000000000001
25R10: 0000000000000001 R11: 0000000000000001 R12: 0000000000000004
26R13: ffffffffc03c2000 R14: ffffffffc03c10a7 R15: ffffffffc03c11a1
27FS: 00007f0ef9533740(0000) GS:ffffa100faa00000(0000) knlGS:0000000000000000
28CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
29CR2: 0000561e8f0aa000 CR3: 000000015b318000 CR4: 0000000000350ee0
30Call Trace:
31 lttng_probe_register+0x38/0xe0 [lttng_tracer]
32 ? __event_probe__module_load+0x520/0x520 [lttng_probe_module]
33 __lttng_events_init__module+0x15/0x20 [lttng_probe_module]
34 do_one_initcall+0x68/0x310
35 ? kmem_cache_alloc_trace+0x2ad/0x4c0
36 ? do_init_module+0x28/0x280
37 do_init_module+0x62/0x280
38 load_module+0x26e4/0x2920
39 ? kernel_read_file+0x22e/0x290
40 __do_sys_finit_module+0xb1/0xf0
41 __x64_sys_finit_module+0x1a/0x20
42 do_syscall_64+0x38/0x50
43 entry_SYSCALL_64_after_hwframe+0x44/0xae
44
45Upstream-Status: Backport [2.12.6]
46
47Signed-off-by: He Zhe <zhe.he@windriver.com>
48Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
49Change-Id: I00e8ee2b8c35f6f8602c88295f5113fbbd139709
50---
51 instrumentation/events/lttng-module/kmem.h | 4 +++-
52 1 file changed, 3 insertions(+), 1 deletion(-)
53
54diff --git a/instrumentation/events/lttng-module/kmem.h b/instrumentation/events/lttng-module/kmem.h
55index d787ea54..c9edee61 100644
56--- a/instrumentation/events/lttng-module/kmem.h
57+++ b/instrumentation/events/lttng-module/kmem.h
58@@ -88,7 +88,9 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(kmem_alloc_node, kmem_cache_alloc_node,
59 )
60
61 #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,12,0))
62-LTTNG_TRACEPOINT_EVENT(kfree,
63+LTTNG_TRACEPOINT_EVENT_MAP(kfree,
64+
65+ kmem_kfree,
66
67 TP_PROTO(unsigned long call_site, const void *ptr),
68
69--
702.25.1
71
diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.12.5.bb b/meta/recipes-kernel/lttng/lttng-modules_2.12.5.bb
index 5b05c644a6..1a01cb0c01 100644
--- a/meta/recipes-kernel/lttng/lttng-modules_2.12.5.bb
+++ b/meta/recipes-kernel/lttng/lttng-modules_2.12.5.bb
@@ -15,6 +15,9 @@ SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \
15 file://0002-Fix-filter-interpreter-early-exits-on-uninitialized-.patch \ 15 file://0002-Fix-filter-interpreter-early-exits-on-uninitialized-.patch \
16 file://0003-fix-mm-tracing-record-slab-name-for-kmem_cache_free-.patch \ 16 file://0003-fix-mm-tracing-record-slab-name-for-kmem_cache_free-.patch \
17 file://0004-Fix-kretprobe-null-ptr-deref-on-session-destroy.patch \ 17 file://0004-Fix-kretprobe-null-ptr-deref-on-session-destroy.patch \
18 file://0005-fix-block-add-a-disk_uevent-helper-v5.12.patch \
19 file://0006-fix-backport-block-add-a-disk_uevent-helper-v5.12.patch \
20 file://0007-fix-mm-tracing-kfree-event-name-mismatching-with-pro.patch \
18 " 21 "
19 22
20SRC_URI[sha256sum] = "c4d1a1b42c728e37b6b7947ae16563a011c4b297311aa04d56f9a1791fb5a30a" 23SRC_URI[sha256sum] = "c4d1a1b42c728e37b6b7947ae16563a011c4b297311aa04d56f9a1791fb5a30a"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-04 20:27:58 +0000