summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules/bio-bvec-iter.patch156
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules/fixup_block_driver.patch122
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules_2.3.3.bb2
3 files changed, 157 insertions, 123 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-modules/bio-bvec-iter.patch b/meta/recipes-kernel/lttng/lttng-modules/bio-bvec-iter.patch
new file mode 100644
index 0000000000..d6c66e4f2b
--- /dev/null
+++ b/meta/recipes-kernel/lttng/lttng-modules/bio-bvec-iter.patch
@@ -0,0 +1,156 @@
1Upstream-Status: Pending
2
3In 3.14, bi_sector and bi_size were moved into an iterator, thus
4breaking any tracepoints that still expect them in the bio. Fix up
5the lttng-module tracepoints to use the new scheme when the kernel
6version is >= 3.14.
7
8Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
9
10diff --git a/instrumentation/events/lttng-module/block.h b/instrumentation/events/lttng-module/block.h
11index f3b8bff..0a61543 100644
12--- a/instrumentation/events/lttng-module/block.h
13+++ b/instrumentation/events/lttng-module/block.h
14@@ -341,9 +341,15 @@ TRACE_EVENT(block_bio_bounce,
15 TP_fast_assign(
16 tp_assign(dev, bio->bi_bdev ?
17 bio->bi_bdev->bd_dev : 0)
18+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
19+ tp_assign(sector, bio->bi_iter.bi_sector)
20+ tp_assign(nr_sector, bio->bi_iter.bi_size >> 9)
21+ blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
22+#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
23 tp_assign(sector, bio->bi_sector)
24 tp_assign(nr_sector, bio->bi_size >> 9)
25 blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
26+#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
27 tp_memcpy(comm, current->comm, TASK_COMM_LEN)
28 ),
29
30@@ -385,14 +391,24 @@ TRACE_EVENT(block_bio_complete,
31
32 TP_fast_assign(
33 tp_assign(dev, bio->bi_bdev->bd_dev)
34+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
35+ tp_assign(sector, bio->bi_iter.bi_sector)
36+ tp_assign(nr_sector, bio->bi_iter.bi_size >> 9)
37+#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
38 tp_assign(sector, bio->bi_sector)
39 tp_assign(nr_sector, bio->bi_size >> 9)
40+#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
41+
42 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38))
43 tp_assign(error, error)
44 #else
45 tp_assign(error, 0)
46 #endif
47+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
48+ blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
49+#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
50 blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
51+#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
52 ),
53
54 TP_printk("%d,%d %s %llu + %u [%d]",
55@@ -419,9 +435,15 @@ DECLARE_EVENT_CLASS(block_bio_merge,
56
57 TP_fast_assign(
58 tp_assign(dev, bio->bi_bdev->bd_dev)
59+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
60+ tp_assign(sector, bio->bi_iter.bi_sector)
61+ tp_assign(nr_sector, bio->bi_iter.bi_size >> 9)
62+ blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
63+#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
64 tp_assign(sector, bio->bi_sector)
65 tp_assign(nr_sector, bio->bi_size >> 9)
66 blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
67+#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
68 tp_memcpy(comm, current->comm, TASK_COMM_LEN)
69 ),
70
71@@ -485,9 +507,15 @@ TRACE_EVENT(block_bio_queue,
72
73 TP_fast_assign(
74 tp_assign(dev, bio->bi_bdev->bd_dev)
75+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
76+ tp_assign(sector, bio->bi_iter.bi_sector)
77+ tp_assign(nr_sector, bio->bi_iter.bi_size >> 9)
78+ blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
79+#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
80 tp_assign(sector, bio->bi_sector)
81 tp_assign(nr_sector, bio->bi_size >> 9)
82 blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
83+#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
84 tp_memcpy(comm, current->comm, TASK_COMM_LEN)
85 ),
86
87@@ -513,9 +541,15 @@ DECLARE_EVENT_CLASS(block_bio,
88
89 TP_fast_assign(
90 tp_assign(dev, bio->bi_bdev ? bio->bi_bdev->bd_dev : 0)
91+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
92+ tp_assign(sector, bio->bi_iter.bi_sector)
93+ tp_assign(nr_sector, bio->bi_iter.bi_size >> 9)
94+ blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
95+#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
96 tp_assign(sector, bio->bi_sector)
97 tp_assign(nr_sector, bio->bi_size >> 9)
98 blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
99+#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
100 tp_memcpy(comm, current->comm, TASK_COMM_LEN)
101 ),
102
103@@ -587,10 +621,17 @@ DECLARE_EVENT_CLASS(block_get_rq,
104
105 TP_fast_assign(
106 tp_assign(dev, bio ? bio->bi_bdev->bd_dev : 0)
107+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
108+ tp_assign(sector, bio ? bio->bi_iter.bi_sector : 0)
109+ tp_assign(nr_sector, bio ? bio->bi_iter.bi_size >> 9 : 0)
110+ blk_fill_rwbs(rwbs, bio ? bio->bi_rw : 0,
111+ bio ? bio->bi_iter.bi_size >> 9 : 0)
112+#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
113 tp_assign(sector, bio ? bio->bi_sector : 0)
114 tp_assign(nr_sector, bio ? bio->bi_size >> 9 : 0)
115 blk_fill_rwbs(rwbs, bio ? bio->bi_rw : 0,
116 bio ? bio->bi_size >> 9 : 0)
117+#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
118 tp_memcpy(comm, current->comm, TASK_COMM_LEN)
119 ),
120
121@@ -759,9 +800,15 @@ TRACE_EVENT(block_split,
122
123 TP_fast_assign(
124 tp_assign(dev, bio->bi_bdev->bd_dev)
125+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
126+ tp_assign(sector, bio->bi_iter.bi_sector)
127+ tp_assign(new_sector, new_sector)
128+ blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
129+#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
130 tp_assign(sector, bio->bi_sector)
131 tp_assign(new_sector, new_sector)
132 blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
133+#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
134 tp_memcpy(comm, current->comm, TASK_COMM_LEN)
135 ),
136
137@@ -805,11 +852,19 @@ TRACE_EVENT(block_remap,
138
139 TP_fast_assign(
140 tp_assign(dev, bio->bi_bdev->bd_dev)
141+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
142+ tp_assign(sector, bio->bi_iter.bi_sector)
143+ tp_assign(nr_sector, bio->bi_iter.bi_size >> 9)
144+ tp_assign(old_dev, dev)
145+ tp_assign(old_sector, from)
146+ blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
147+#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
148 tp_assign(sector, bio->bi_sector)
149 tp_assign(nr_sector, bio->bi_size >> 9)
150 tp_assign(old_dev, dev)
151 tp_assign(old_sector, from)
152 blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
153+#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
154 ),
155
156 TP_printk("%d,%d %s %llu + %u <- (%d,%d) %llu",
diff --git a/meta/recipes-kernel/lttng/lttng-modules/fixup_block_driver.patch b/meta/recipes-kernel/lttng/lttng-modules/fixup_block_driver.patch
deleted file mode 100644
index 3644a47d5a..0000000000
--- a/meta/recipes-kernel/lttng/lttng-modules/fixup_block_driver.patch
+++ /dev/null
@@ -1,122 +0,0 @@
1Fix errors like
2
3block.h:344:24: error: 'struct bio' has no member named 'bi_sector'
4
5Signed-off-by: Khem Raj <raj.khem@gmail.com>
6Upstream-Status: Pending
7
8Index: git/instrumentation/events/lttng-module/block.h
9===================================================================
10--- git.orig/instrumentation/events/lttng-module/block.h 2014-05-02 22:20:01.814125429 -0700
11+++ git/instrumentation/events/lttng-module/block.h 2014-05-02 22:28:48.927455709 -0700
12@@ -341,9 +341,9 @@
13 TP_fast_assign(
14 tp_assign(dev, bio->bi_bdev ?
15 bio->bi_bdev->bd_dev : 0)
16- tp_assign(sector, bio->bi_sector)
17- tp_assign(nr_sector, bio->bi_size >> 9)
18- blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
19+ tp_assign(sector, bio->bi_iter.bi_sector)
20+ tp_assign(nr_sector, bio->bi_iter.bi_size >> 9)
21+ blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
22 tp_memcpy(comm, current->comm, TASK_COMM_LEN)
23 ),
24
25@@ -385,14 +385,14 @@
26
27 TP_fast_assign(
28 tp_assign(dev, bio->bi_bdev->bd_dev)
29- tp_assign(sector, bio->bi_sector)
30- tp_assign(nr_sector, bio->bi_size >> 9)
31+ tp_assign(sector, bio->bi_iter.bi_sector)
32+ tp_assign(nr_sector, bio->bi_iter.bi_size >> 9)
33 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38))
34 tp_assign(error, error)
35 #else
36 tp_assign(error, 0)
37 #endif
38- blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
39+ blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
40 ),
41
42 TP_printk("%d,%d %s %llu + %u [%d]",
43@@ -419,9 +419,9 @@
44
45 TP_fast_assign(
46 tp_assign(dev, bio->bi_bdev->bd_dev)
47- tp_assign(sector, bio->bi_sector)
48- tp_assign(nr_sector, bio->bi_size >> 9)
49- blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
50+ tp_assign(sector, bio->bi_iter.bi_sector)
51+ tp_assign(nr_sector, bio->bi_iter.bi_size >> 9)
52+ blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
53 tp_memcpy(comm, current->comm, TASK_COMM_LEN)
54 ),
55
56@@ -485,9 +485,9 @@
57
58 TP_fast_assign(
59 tp_assign(dev, bio->bi_bdev->bd_dev)
60- tp_assign(sector, bio->bi_sector)
61- tp_assign(nr_sector, bio->bi_size >> 9)
62- blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
63+ tp_assign(sector, bio->bi_iter.bi_sector)
64+ tp_assign(nr_sector, bio->bi_iter.bi_size >> 9)
65+ blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
66 tp_memcpy(comm, current->comm, TASK_COMM_LEN)
67 ),
68
69@@ -513,9 +513,9 @@
70
71 TP_fast_assign(
72 tp_assign(dev, bio->bi_bdev ? bio->bi_bdev->bd_dev : 0)
73- tp_assign(sector, bio->bi_sector)
74- tp_assign(nr_sector, bio->bi_size >> 9)
75- blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
76+ tp_assign(sector, bio->bi_iter.bi_sector)
77+ tp_assign(nr_sector, bio->bi_iter.bi_size >> 9)
78+ blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
79 tp_memcpy(comm, current->comm, TASK_COMM_LEN)
80 ),
81
82@@ -587,10 +587,10 @@
83
84 TP_fast_assign(
85 tp_assign(dev, bio ? bio->bi_bdev->bd_dev : 0)
86- tp_assign(sector, bio ? bio->bi_sector : 0)
87- tp_assign(nr_sector, bio ? bio->bi_size >> 9 : 0)
88+ tp_assign(sector, bio ? bio->bi_iter.bi_sector : 0)
89+ tp_assign(nr_sector, bio ? bio->bi_iter.bi_size >> 9 : 0)
90 blk_fill_rwbs(rwbs, bio ? bio->bi_rw : 0,
91- bio ? bio->bi_size >> 9 : 0)
92+ bio ? bio->bi_iter.bi_size >> 9 : 0)
93 tp_memcpy(comm, current->comm, TASK_COMM_LEN)
94 ),
95
96@@ -759,9 +759,9 @@
97
98 TP_fast_assign(
99 tp_assign(dev, bio->bi_bdev->bd_dev)
100- tp_assign(sector, bio->bi_sector)
101+ tp_assign(sector, bio->bi_iter.bi_sector)
102 tp_assign(new_sector, new_sector)
103- blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
104+ blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
105 tp_memcpy(comm, current->comm, TASK_COMM_LEN)
106 ),
107
108@@ -805,11 +805,11 @@
109
110 TP_fast_assign(
111 tp_assign(dev, bio->bi_bdev->bd_dev)
112- tp_assign(sector, bio->bi_sector)
113- tp_assign(nr_sector, bio->bi_size >> 9)
114+ tp_assign(sector, bio->bi_iter.bi_sector)
115+ tp_assign(nr_sector, bio->bi_iter.bi_size >> 9)
116 tp_assign(old_dev, dev)
117 tp_assign(old_sector, from)
118- blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
119+ blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size)
120 ),
121
122 TP_printk("%d,%d %s %llu + %u <- (%d,%d) %llu",
diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.3.3.bb b/meta/recipes-kernel/lttng/lttng-modules_2.3.3.bb
index 94e18b2622..81a3983c64 100644
--- a/meta/recipes-kernel/lttng/lttng-modules_2.3.3.bb
+++ b/meta/recipes-kernel/lttng/lttng-modules_2.3.3.bb
@@ -15,7 +15,7 @@ PV = "2.3.3"
15 15
16SRC_URI = "git://git.lttng.org/lttng-modules.git;branch=stable-2.3 \ 16SRC_URI = "git://git.lttng.org/lttng-modules.git;branch=stable-2.3 \
17 file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch \ 17 file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch \
18 file://fixup_block_driver.patch \ 18 file://bio-bvec-iter.patch \
19 " 19 "
20 20
21export INSTALL_MOD_DIR="kernel/lttng-modules" 21export INSTALL_MOD_DIR="kernel/lttng-modules"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-12-21 16:42:25 +0000