Skip to contentSkip to conversation

Fix: writeback instrumentation for 4.2 kernels

PATCH Mathieu Desnoyers 1 participant 1 message Aug 21, 2015 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

I picked up your patch into master and stable-2.7, but did the following modif on top:

commit c7d89a6dc97f72013851ae94478a4c92e77e1f56

Author: Mathieu Desnoyers <[email protected]>
Date:   Fri Aug 21 09:28:44 2015 -0700

Cleanup: split bdi_dirty_ratelimit with ifdef into separate macros

Makes the code easier to maintain in the long run.

Thanks!

Mathieu

Quoted 49 lines · ----- On Aug 20, 2015, at 7:23 PM, Michael Jeanson [email protected] wrote:

Bandwidth related fields were moved by this commit:

commit a88a341a73be4ef035ca26170c849f002797da27

Author: Tejun Heo <[email protected]>
Date:   Fri, 22 May 2015 17:13:28 -0400

writeback: move bandwidth related fields from backing_dev_info into bdi_writeback

---
instrumentation/events/lttng-module/writeback.h | 14 ++++++++++++++

1 file changed, 14 insertions(+)
instrumentation/events/lttng-module/writeback.h +14 -1
index 88b7aa4..b55d15e 100644
@@ -363,13 +363,27 @@ LTTNG_TRACEPOINT_EVENT_MAP(bdi_dirty_ratelimit,
 
 	TP_FIELDS(
 		ctf_array_text(char, bdi, dev_name(bdi->dev), 32)
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0))
+		ctf_integer(unsigned long, write_bw, KBps(bdi->wb.write_bandwidth))
+		ctf_integer(unsigned long, avg_write_bw, KBps(bdi->wb.avg_write_bandwidth))
+#else
 		ctf_integer(unsigned long, write_bw, KBps(bdi->write_bandwidth))
 		ctf_integer(unsigned long, avg_write_bw, KBps(bdi->avg_write_bandwidth))
+#endif
 		ctf_integer(unsigned long, dirty_rate, KBps(dirty_rate))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0))
+		ctf_integer(unsigned long, dirty_ratelimit, KBps(bdi->wb.dirty_ratelimit))
+#else
 		ctf_integer(unsigned long, dirty_ratelimit, KBps(bdi->dirty_ratelimit))
+#endif
 		ctf_integer(unsigned long, task_ratelimit, KBps(task_ratelimit))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0))
+		ctf_integer(unsigned long, balanced_dirty_ratelimit,
+					KBps(bdi->wb.balanced_dirty_ratelimit))
+#else
 		ctf_integer(unsigned long, balanced_dirty_ratelimit,
 					KBps(bdi->balanced_dirty_ratelimit))
+#endif
 	)
 )
 
--

1.9.1

Signature · 3 lines
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com