diff options
Diffstat (limited to 'meta/recipes-kernel')
4 files changed, 145 insertions, 0 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0017-fix-random-remove-unused-tracepoints-v5.18.patch b/meta/recipes-kernel/lttng/lttng-modules/0017-fix-random-remove-unused-tracepoints-v5.18.patch new file mode 100644 index 0000000000..3fc7fd733d --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-modules/0017-fix-random-remove-unused-tracepoints-v5.18.patch | |||
@@ -0,0 +1,46 @@ | |||
1 | From 25b70c486bb96de0caf7cea1da42ed07801cca84 Mon Sep 17 00:00:00 2001 | ||
2 | From: Michael Jeanson <mjeanson@efficios.com> | ||
3 | Date: Mon, 4 Apr 2022 14:33:42 -0400 | ||
4 | Subject: [PATCH 17/19] fix: random: remove unused tracepoints (v5.18) | ||
5 | |||
6 | See upstream commit : | ||
7 | |||
8 | commit 14c174633f349cb41ea90c2c0aaddac157012f74 | ||
9 | Author: Jason A. Donenfeld <Jason@zx2c4.com> | ||
10 | Date: Thu Feb 10 16:40:44 2022 +0100 | ||
11 | |||
12 | random: remove unused tracepoints | ||
13 | |||
14 | These explicit tracepoints aren't really used and show sign of aging. | ||
15 | It's work to keep these up to date, and before I attempted to keep them | ||
16 | up to date, they weren't up to date, which indicates that they're not | ||
17 | really used. These days there are better ways of introspecting anyway. | ||
18 | |||
19 | Upstream-Status: Backport [369d82bb1746447514c877088d7c5fd0f39140f8] | ||
20 | Change-Id: I3b8c3e2732e7efdd76ce63204ac53a48784d0df6 | ||
21 | Signed-off-by: Michael Jeanson <mjeanson@efficios.com> | ||
22 | Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> | ||
23 | --- | ||
24 | probes/Kbuild | 5 ++++- | ||
25 | 1 file changed, 4 insertions(+), 1 deletion(-) | ||
26 | |||
27 | diff --git a/probes/Kbuild b/probes/Kbuild | ||
28 | index 3ae2d39e..58da82b8 100644 | ||
29 | --- a/probes/Kbuild | ||
30 | +++ b/probes/Kbuild | ||
31 | @@ -215,8 +215,11 @@ ifneq ($(CONFIG_FRAME_WARN),0) | ||
32 | CFLAGS_lttng-probe-printk.o += -Wframe-larger-than=2200 | ||
33 | endif | ||
34 | |||
35 | +# Introduced in v3.6, remove in v5.18 | ||
36 | obj-$(CONFIG_LTTNG) += $(shell \ | ||
37 | - if [ $(VERSION) -ge 4 \ | ||
38 | + if [ \( ! \( $(VERSION) -ge 6 -o \( $(VERSION) -eq 5 -a $(PATCHLEVEL) -ge 18 \) \) \) \ | ||
39 | + -a \ | ||
40 | + $(VERSION) -ge 4 \ | ||
41 | -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 6 \) \ | ||
42 | -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -eq 5 -a $(SUBLEVEL) -ge 2 \) \ | ||
43 | -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -eq 4 -a $(SUBLEVEL) -ge 9 \) \ | ||
44 | -- | ||
45 | 2.35.1 | ||
46 | |||
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0018-fix-random-remove-unused-tracepoints-v5.10-v5.15.patch b/meta/recipes-kernel/lttng/lttng-modules/0018-fix-random-remove-unused-tracepoints-v5.10-v5.15.patch new file mode 100644 index 0000000000..5c324a9bde --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-modules/0018-fix-random-remove-unused-tracepoints-v5.10-v5.15.patch | |||
@@ -0,0 +1,45 @@ | |||
1 | From da956d1444139883f5d01078d945078738ffade4 Mon Sep 17 00:00:00 2001 | ||
2 | From: He Zhe <zhe.he@windriver.com> | ||
3 | Date: Thu, 2 Jun 2022 06:36:08 +0000 | ||
4 | Subject: [PATCH 18/19] fix: random: remove unused tracepoints (v5.10, v5.15) | ||
5 | |||
6 | The following kernel commit has been back ported to v5.10.119 and v5.15.44. | ||
7 | |||
8 | commit 14c174633f349cb41ea90c2c0aaddac157012f74 | ||
9 | Author: Jason A. Donenfeld <Jason@zx2c4.com> | ||
10 | Date: Thu Feb 10 16:40:44 2022 +0100 | ||
11 | |||
12 | random: remove unused tracepoints | ||
13 | |||
14 | These explicit tracepoints aren't really used and show sign of aging. | ||
15 | It's work to keep these up to date, and before I attempted to keep them | ||
16 | up to date, they weren't up to date, which indicates that they're not | ||
17 | really used. These days there are better ways of introspecting anyway. | ||
18 | |||
19 | Upstream-Status: Backport [1901e0eb58795e850e8fdcb5e1c235e4397b470d] | ||
20 | Signed-off-by: He Zhe <zhe.he@windriver.com> | ||
21 | Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> | ||
22 | Change-Id: I0b7eb8aa78b5bd2039e20ae3e1da4c5eb9018789 | ||
23 | --- | ||
24 | probes/Kbuild | 5 ++++- | ||
25 | 1 file changed, 4 insertions(+), 1 deletion(-) | ||
26 | |||
27 | diff --git a/probes/Kbuild b/probes/Kbuild | ||
28 | index 58da82b8..87f2d681 100644 | ||
29 | --- a/probes/Kbuild | ||
30 | +++ b/probes/Kbuild | ||
31 | @@ -217,7 +217,10 @@ endif | ||
32 | |||
33 | # Introduced in v3.6, remove in v5.18 | ||
34 | obj-$(CONFIG_LTTNG) += $(shell \ | ||
35 | - if [ \( ! \( $(VERSION) -ge 6 -o \( $(VERSION) -eq 5 -a $(PATCHLEVEL) -ge 18 \) \) \) \ | ||
36 | + if [ \( ! \( $(VERSION) -ge 6 \ | ||
37 | + -o \( $(VERSION) -eq 5 -a $(PATCHLEVEL) -ge 18 \) \ | ||
38 | + -o \( $(VERSION) -eq 5 -a $(PATCHLEVEL) -eq 15 -a $(SUBLEVEL) -ge 44 \) \ | ||
39 | + -o \( $(VERSION) -eq 5 -a $(PATCHLEVEL) -eq 10 -a $(SUBLEVEL) -ge 119\) \) \) \ | ||
40 | -a \ | ||
41 | $(VERSION) -ge 4 \ | ||
42 | -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 6 \) \ | ||
43 | -- | ||
44 | 2.35.1 | ||
45 | |||
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0019-fix-random-tracepoints-removed-in-stable-kernels.patch b/meta/recipes-kernel/lttng/lttng-modules/0019-fix-random-tracepoints-removed-in-stable-kernels.patch new file mode 100644 index 0000000000..73ba4d06bc --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-modules/0019-fix-random-tracepoints-removed-in-stable-kernels.patch | |||
@@ -0,0 +1,51 @@ | |||
1 | From 2c98e0cd03eba0aa935796bc7413c51b5e4b055c Mon Sep 17 00:00:00 2001 | ||
2 | From: Michael Jeanson <mjeanson@efficios.com> | ||
3 | Date: Tue, 31 May 2022 15:24:48 -0400 | ||
4 | Subject: [PATCH 19/19] fix: 'random' tracepoints removed in stable kernels | ||
5 | |||
6 | The upstream commit 14c174633f349cb41ea90c2c0aaddac157012f74 removing | ||
7 | the 'random' tracepoints is being backported to multiple stable kernel | ||
8 | branches, I don't see how that qualifies as a fix but here we are. | ||
9 | |||
10 | Use the presence of 'include/trace/events/random.h' in the kernel source | ||
11 | tree instead of the rather tortuous version check to determine if we | ||
12 | need to build 'lttng-probe-random.ko'. | ||
13 | |||
14 | Upstream-Status: Backport [ed1149ef88fb62c365ac66cf62c58ac6abd8d7e8] | ||
15 | Change-Id: I8f5f2f4c9e09c61127c49c7949b22dd3fab0460d | ||
16 | Signed-off-by: Michael Jeanson <mjeanson@efficios.com> | ||
17 | Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> | ||
18 | --- | ||
19 | probes/Kbuild | 16 ++++------------ | ||
20 | 1 file changed, 4 insertions(+), 12 deletions(-) | ||
21 | |||
22 | diff --git a/probes/Kbuild b/probes/Kbuild | ||
23 | index 87f2d681..f09d6b65 100644 | ||
24 | --- a/probes/Kbuild | ||
25 | +++ b/probes/Kbuild | ||
26 | @@ -216,18 +216,10 @@ ifneq ($(CONFIG_FRAME_WARN),0) | ||
27 | endif | ||
28 | |||
29 | # Introduced in v3.6, remove in v5.18 | ||
30 | -obj-$(CONFIG_LTTNG) += $(shell \ | ||
31 | - if [ \( ! \( $(VERSION) -ge 6 \ | ||
32 | - -o \( $(VERSION) -eq 5 -a $(PATCHLEVEL) -ge 18 \) \ | ||
33 | - -o \( $(VERSION) -eq 5 -a $(PATCHLEVEL) -eq 15 -a $(SUBLEVEL) -ge 44 \) \ | ||
34 | - -o \( $(VERSION) -eq 5 -a $(PATCHLEVEL) -eq 10 -a $(SUBLEVEL) -ge 119\) \) \) \ | ||
35 | - -a \ | ||
36 | - $(VERSION) -ge 4 \ | ||
37 | - -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 6 \) \ | ||
38 | - -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -eq 5 -a $(SUBLEVEL) -ge 2 \) \ | ||
39 | - -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -eq 4 -a $(SUBLEVEL) -ge 9 \) \ | ||
40 | - -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -eq 0 -a $(SUBLEVEL) -ge 41 \) ] ; then \ | ||
41 | - echo "lttng-probe-random.o" ; fi;) | ||
42 | +random_dep = $(srctree)/include/trace/events/random.h | ||
43 | +ifneq ($(wildcard $(random_dep)),) | ||
44 | + obj-$(CONFIG_LTTNG) += lttng-probe-random.o | ||
45 | +endif | ||
46 | |||
47 | obj-$(CONFIG_LTTNG) += $(shell \ | ||
48 | if [ $(VERSION) -ge 4 \ | ||
49 | -- | ||
50 | 2.35.1 | ||
51 | |||
diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.11.6.bb b/meta/recipes-kernel/lttng/lttng-modules_2.11.6.bb index 3145f0298c..76b9f13618 100644 --- a/meta/recipes-kernel/lttng/lttng-modules_2.11.6.bb +++ b/meta/recipes-kernel/lttng/lttng-modules_2.11.6.bb | |||
@@ -28,6 +28,9 @@ SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \ | |||
28 | file://0014-Revert-fix-include-order-for-older-kernels.patch \ | 28 | file://0014-Revert-fix-include-order-for-older-kernels.patch \ |
29 | file://0015-fix-backport-of-fix-tracepoint-Optimize-using-static.patch \ | 29 | file://0015-fix-backport-of-fix-tracepoint-Optimize-using-static.patch \ |
30 | file://0016-fix-adjust-version-range-for-trace_find_free_extent.patch \ | 30 | file://0016-fix-adjust-version-range-for-trace_find_free_extent.patch \ |
31 | file://0017-fix-random-remove-unused-tracepoints-v5.18.patch \ | ||
32 | file://0018-fix-random-remove-unused-tracepoints-v5.10-v5.15.patch \ | ||
33 | file://0019-fix-random-tracepoints-removed-in-stable-kernels.patch \ | ||
31 | " | 34 | " |
32 | 35 | ||
33 | SRC_URI[md5sum] = "8ef09fdfcdec669d33f7fc1c1c80f2c4" | 36 | SRC_URI[md5sum] = "8ef09fdfcdec669d33f7fc1c1c80f2c4" |