Fix: make writeback instrumentation build for 4.3 kernel
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 2/2 Fix: make writeback instrumentation build for 4.3 kernel
The backported patch "Fix: writeback instrumentation update for 4.3 Linux kernel" (ee33121c8ff05b44ab) used a newer definition of LTTNG_TRACEPOINT_EVENT_CLASS which is not available in v2.6.
Note that, while this fixes the build, the global_dirty_limit symbol used by some writeback events is no longer present since the 4.2 kernel, and will result in runtime "lookup failed" warnings if those events are used. This is also the case on current master.
--- instrumentation/events/lttng-module/writeback.h | 153 +++++++++++++++++------ 1 file changed, 113 insertions(+), 40 deletions(-)
instrumentation/events/lttng-module/writeback.h +113 -40
@@ -227,9 +227,15 @@ LTTNG_TRACEPOINT_EVENT_WRITEBACK_WRITE_INODE(writeback_write_inode)LTTNG_TRACEPOINT_EVENT_CLASS (writeback_work_class, TP_PROTO(struct bdi_writeback *wb, struct wb_writeback_work *work),TP_ARGS (wb, work), -TP_FIELDS ( -ctf_array_text (char, name, wb->bdi->dev ?dev_name (wb->bdi->dev) : +TP_STRUCT__entry ( +__array_text (char, name,32 ) + ), +TP_fast_assign ( +tp_memcpy (name, wb->bdi->dev ?dev_name (wb->bdi->dev) :"(unknown)" ,32 ) + ), +TP_printk ("bdi %s" , + __entry->name ) )
@@ -311,9 +317,14 @@ LTTNG_TRACEPOINT_EVENT(writeback_pages_written,LTTNG_TRACEPOINT_EVENT_CLASS (writeback_class, TP_PROTO(struct bdi_writeback *wb),TP_ARGS (wb), -TP_FIELDS ( -ctf_array_text (char, name, -dev_name (wb->bdi->dev),32 ) +TP_STRUCT__entry ( +__array_text (char, name,32 ) + ), +TP_fast_assign ( +tp_memcpy (name,dev_name (wb->bdi->dev),32 ) + ), +TP_printk ("bdi %s" , + __entry->name ) )
@@ -331,9 +342,14 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(writeback_class, name, map, \LTTNG_TRACEPOINT_EVENT (writeback_bdi_register, TP_PROTO(struct backing_dev_info *bdi),TP_ARGS (bdi), -TP_FIELDS ( -ctf_array_text (char, name, -dev_name (bdi->dev),32 ) +TP_STRUCT__entry ( +__array_text (char, name,32 ) + ), +TP_fast_assign ( +tp_memcpy (name,dev_name (bdi->dev),32 ) + ), +TP_printk ("bdi %s" , + __entry->name ) )
@@ -595,15 +611,38 @@ LTTNG_TRACEPOINT_EVENT_MAP(bdi_dirty_ratelimit,TP_ARGS (wb, dirty_rate, task_ratelimit), -TP_FIELDS ( - ctf_array_text(char, bdi, dev_name(wb->bdi->dev), 32) - ctf_integer(unsigned long, write_bw, KBps(wb->bdi->wb.write_bandwidth)) - ctf_integer(unsigned long, avg_write_bw, KBps(wb->bdi->wb.avg_write_bandwidth)) - ctf_integer(unsigned long, dirty_rate, KBps(dirty_rate)) - ctf_integer(unsigned long, dirty_ratelimit, KBps(wb->bdi->wb.dirty_ratelimit)) - ctf_integer(unsigned long, task_ratelimit, KBps(task_ratelimit)) - ctf_integer(unsigned long, balanced_dirty_ratelimit, +TP_STRUCT__entry ( + __array(char, bdi, 32) + __field(unsigned long, write_bw) + __field(unsigned long, avg_write_bw) + __field(unsigned long, dirty_rate) + __field(unsigned long, dirty_ratelimit) + __field(unsigned long, task_ratelimit) + __field(unsigned long, balanced_dirty_ratelimit) + ), + +TP_fast_assign ( + tp_memcpy(bdi, dev_name(wb->bdi->dev), 32) + tp_assign(write_bw, KBps(wb->bdi->wb.write_bandwidth)) + tp_assign(avg_write_bw, KBps(wb->bdi->wb.avg_write_bandwidth)) + tp_assign(dirty_rate, KBps(dirty_rate)) + tp_assign(dirty_ratelimit, KBps(wb->bdi->wb.dirty_ratelimit)) + tp_assign(task_ratelimit, KBps(task_ratelimit)) +tp_assign (balanced_dirty_ratelimit,KBps (wb->bdi->wb.balanced_dirty_ratelimit)) + ), + +TP_printk ("bdi %s: " +"write_bw=%lu awrite_bw=%lu dirty_rate=%lu " +"dirty_ratelimit=%lu task_ratelimit=%lu " +"balanced_dirty_ratelimit=%lu" , + __entry->bdi, + __entry->write_bw,/* write bandwidth */ + __entry->avg_write_bw,/* avg write bandwidth */ + __entry->dirty_rate,/* bdi dirty rate */ + __entry->dirty_ratelimit,/* base ratelimit */ + __entry->task_ratelimit,/* ratelimit with position control */ + __entry->balanced_dirty_ratelimit/* the balanced ratelimit */ ) )
@@ -727,32 +766,66 @@ LTTNG_TRACEPOINT_EVENT_MAP(balance_dirty_pages, dirtied, period, pause, start_time ), -TP_FIELDS ( - ctf_array_text(char, bdi, dev_name(wb->bdi->dev), 32) - ctf_integer(unsigned long, limit, global_dirty_limit) - ctf_integer(unsigned long, setpoint, +TP_STRUCT__entry ( + __array( char, bdi, 32) + __field(unsigned long, limit) + __field(unsigned long, setpoint) + __field(unsigned long, dirty) + __field(unsigned long, bdi_setpoint) + __field(unsigned long, bdi_dirty) + __field(unsigned long, dirty_ratelimit) + __field(unsigned long, task_ratelimit) + __field(unsigned int, dirtied) + __field(unsigned int, dirtied_pause) + __field(unsigned long, paused) + __field( long, pause) + __field(unsigned long, period) +__field ( long, think) + ), + +TP_fast_assign ( + tp_memcpy(bdi, dev_name(wb->bdi->dev), 32) + tp_assign(limit, global_dirty_limit) + tp_assign(setpoint, (global_dirty_limit + (thresh + bg_thresh) / 2) / 2) - ctf_integer(unsigned long, dirty, dirty) - ctf_integer(unsigned long, bdi_setpoint, + tp_assign(dirty, dirty) + tp_assign(bdi_setpoint, ((global_dirty_limit + (thresh + bg_thresh) / 2) / 2) * - bdi_thresh / (thresh + 1)) - ctf_integer(unsigned long, bdi_dirty, bdi_dirty) - ctf_integer(unsigned long, dirty_ratelimit, - KBps(dirty_ratelimit)) - ctf_integer(unsigned long, task_ratelimit, - KBps(task_ratelimit)) - ctf_integer(unsigned int, dirtied, dirtied) - ctf_integer(unsigned int, dirtied_pause, - current->nr_dirtied_pause) - ctf_integer(unsigned long, paused, - (jiffies - start_time) * 1000 / HZ) - ctf_integer(long, pause, pause * 1000 / HZ) - ctf_integer(unsigned long, period, - period * 1000 / HZ) -ctf_integer (long, think, - current->dirty_paused_when ==0 ?0 : - (long )(jiffies - current->dirty_paused_when) *1000 /HZ ) - ) + bdi_thresh / (thresh + 1)) + tp_assign(bdi_dirty, bdi_dirty) + tp_assign(dirty_ratelimit, KBps(dirty_ratelimit)) + tp_assign(task_ratelimit, KBps(task_ratelimit)) + tp_assign(dirtied, dirtied) + tp_assign(dirtied_pause, current->nr_dirtied_pause) + tp_assign(think, current->dirty_paused_when == 0 ? 0 : + (long)(jiffies - current->dirty_paused_when) * 1000/HZ) + tp_assign(period, period * 1000 / HZ) + tp_assign(pause, pause * 1000 / HZ) +tp_assign (paused, (jiffies - start_time) *1000 /HZ ) + ), + + +TP_printk ("bdi %s: " +"limit=%lu setpoint=%lu dirty=%lu " +"bdi_setpoint=%lu bdi_dirty=%lu " +"dirty_ratelimit=%lu task_ratelimit=%lu " +"dirtied=%u dirtied_pause=%u " +"paused=%lu pause=%ld period=%lu think=%ld" , + __entry->bdi, + __entry->limit, + __entry->setpoint, + __entry->dirty, + __entry->bdi_setpoint, + __entry->bdi_dirty, + __entry->dirty_ratelimit, + __entry->task_ratelimit, + __entry->dirtied, + __entry->dirtied_pause, + __entry->paused,/* ms */ + __entry->pause,/* ms */ + __entry->period,/* ms */ + __entry->think/* ms */ + ) ) #else /* #if LINUX_VERSION_CODE >= KERNEL_VERSION(4,3,0)) */
Signature · 1 line
1.7.10.4
Re: [PATCH lttng-modules 2.6 1/2] Fix: make sched instrumentation build for 4.3 kernel
In reply to a message not in the archiveBoth patches merged into stable-2.6, thanks!
Mathieu
Quoted 54 lines · ----- On Oct 26, 2015, at 7:40 AM, Rabin Vincent [email protected] wrote:
The backported patch "Fix: update sched wakeup instrumentation for 4.3 kernel" (
c93180196ea8) used a newer definition ofLTTNG_TRACEPOINT_EVENT_CLASSwhich is not available in v2.6.Signed-off-by Rabin Vincent <[email protected]>---
instrumentation/events/lttng-module/sched.h| 24 +++++++++++++++++++-----1 file changed, 19 insertions(+), 5 deletions(-)instrumentation/events/lttng-module/sched.h +19
-6@@ -142,12 +142,26 @@ LTTNG_TRACEPOINT_EVENT_CLASS(sched_wakeup_template,TP_ARGS (p), - TP_FIELDS( - ctf_array_text(char, comm, p->comm, TASK_COMM_LEN) - ctf_integer(pid_t, tid, p->pid) - ctf_integer(int, prio, p->prio) - ctf_integer(int, target_cpu, task_cpu(p)) +TP_STRUCT__entry ( + __array_text( char, comm, TASK_COMM_LEN ) + __field( pid_t, tid ) + __field( int, prio ) +__field ( int, target_cpu ) + ), + +TP_fast_assign ( + tp_memcpy(comm, p->comm, TASK_COMM_LEN) + tp_assign(tid, p->pid) + tp_assign(prio, p->prio) +tp_assign (target_cpu,task_cpu (p)) ) + TP_perf_assign( + __perf_task(p) + ), + + TP_printk("comm=%s tid=%d prio=%d target_cpu=%03d", + __entry->comm, __entry->tid, __entry->prio, + __entry->target_cpu) )#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,3,0)) */ LTTNG_TRACEPOINT_EVENT_CLASS(sched_wakeup_template, --1.7.10.4
_______________________________________________
lttng-dev mailing list
[email protected]
http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
Signature · 3 lines
Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com