summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules/0001-fix-net-skb-introduce-kfree_skb_reason-v5.15.58.v5.1.patch53
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules_2.13.4.bb1
2 files changed, 54 insertions, 0 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-net-skb-introduce-kfree_skb_reason-v5.15.58.v5.1.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-fix-net-skb-introduce-kfree_skb_reason-v5.15.58.v5.1.patch
new file mode 100644
index 0000000000..ca6abea9c0
--- /dev/null
+++ b/meta/recipes-kernel/lttng/lttng-modules/0001-fix-net-skb-introduce-kfree_skb_reason-v5.15.58.v5.1.patch
@@ -0,0 +1,53 @@
1From d8254360c7f2ff9b3f945e9668d89c0b56b9bd91 Mon Sep 17 00:00:00 2001
2From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
3Date: Fri, 29 Jul 2022 15:37:43 -0400
4Subject: [PATCH] fix: net: skb: introduce kfree_skb_reason() (v5.15.58..v5.16)
5
6See upstream commit :
7
8 commit c504e5c2f9648a1e5c2be01e8c3f59d394192bd3
9 Author: Menglong Dong <imagedong@tencent.com>
10 Date: Sun Jan 9 14:36:26 2022 +0800
11
12 net: skb: introduce kfree_skb_reason()
13
14 Introduce the interface kfree_skb_reason(), which is able to pass
15 the reason why the skb is dropped to 'kfree_skb' tracepoint.
16
17 Add the 'reason' field to 'trace_kfree_skb', therefor user can get
18 more detail information about abnormal skb with 'drop_monitor' or
19 eBPF.
20
21 All drop reasons are defined in the enum 'skb_drop_reason', and
22 they will be print as string in 'kfree_skb' tracepoint in format
23 of 'reason: XXX'.
24
25 ( Maybe the reasons should be defined in a uapi header file, so that
26 user space can use them? )
27
28Upstream-Status: Backport
29
30Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
31Change-Id: Ib3c039207739dad10f097cf76474e0822e351273
32---
33 include/instrumentation/events/skb.h | 4 +++-
34 1 file changed, 3 insertions(+), 1 deletion(-)
35
36diff --git a/include/instrumentation/events/skb.h b/include/instrumentation/events/skb.h
37index 237e54ad..186732ea 100644
38--- a/include/instrumentation/events/skb.h
39+++ b/include/instrumentation/events/skb.h
40@@ -13,7 +13,9 @@
41 /*
42 * Tracepoint for free an sk_buff:
43 */
44-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,17,0))
45+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,17,0) \
46+ || LTTNG_KERNEL_RANGE(5,15,58, 5,16,0))
47+
48 LTTNG_TRACEPOINT_ENUM(skb_drop_reason,
49 TP_ENUM_VALUES(
50 ctf_enum_value("NOT_SPECIFIED", SKB_DROP_REASON_NOT_SPECIFIED)
51--
522.17.1
53
diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.13.4.bb b/meta/recipes-kernel/lttng/lttng-modules_2.13.4.bb
index ea2ec3c380..fea0e383c9 100644
--- a/meta/recipes-kernel/lttng/lttng-modules_2.13.4.bb
+++ b/meta/recipes-kernel/lttng/lttng-modules_2.13.4.bb
@@ -14,6 +14,7 @@ SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \
14 file://0001-fix-mm-page_alloc-fix-tracepoint-mm_page_alloc_zone_.patch \ 14 file://0001-fix-mm-page_alloc-fix-tracepoint-mm_page_alloc_zone_.patch \
15 file://0002-fix-fs-Remove-flags-parameter-from-aops-write_begin-.patch \ 15 file://0002-fix-fs-Remove-flags-parameter-from-aops-write_begin-.patch \
16 file://0003-fix-workqueue-Fix-type-of-cpu-in-trace-event-v5.19.patch \ 16 file://0003-fix-workqueue-Fix-type-of-cpu-in-trace-event-v5.19.patch \
17 file://0001-fix-net-skb-introduce-kfree_skb_reason-v5.15.58.v5.1.patch \
17 " 18 "
18 19
19# Use :append here so that the patch is applied also when using devupstream 20# Use :append here so that the patch is applied also when using devupstream