mirror of
https://github.com/torvalds/linux.git
synced 2024-11-17 09:31:50 +00:00
d6c8e949a3
Systemtap 4.2 is unable to correctly interpret the "u32 (*missed_ppm)[2]"
argument of the iocost_ioc_vrate_adj trace entry defined in
include/trace/events/iocost.h leading to the following error:
/tmp/stapAcz0G0/stap_c89c58b83cea1724e26395efa9ed4939_6321_aux_6.c:78:8:
error: expected ‘;’, ‘,’ or ‘)’ before ‘*’ token
, u32[]* __tracepoint_arg_missed_ppm
That argument type is indeed rather complex and hard to read. Looking
at block/blk-iocost.c. It is just a 2-entry u32 array. By simplifying
the argument to a simple "u32 *missed_ppm" and adjusting the trace
entry accordingly, the compilation error was gone.
Fixes: 7caa47151a ("blkcg: implement blk-iocost")
Acked-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Acked-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Waiman Long <longman@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
179 lines
4.9 KiB
C
179 lines
4.9 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#undef TRACE_SYSTEM
|
|
#define TRACE_SYSTEM iocost
|
|
|
|
struct ioc;
|
|
struct ioc_now;
|
|
struct ioc_gq;
|
|
|
|
#if !defined(_TRACE_BLK_IOCOST_H) || defined(TRACE_HEADER_MULTI_READ)
|
|
#define _TRACE_BLK_IOCOST_H
|
|
|
|
#include <linux/tracepoint.h>
|
|
|
|
TRACE_EVENT(iocost_iocg_activate,
|
|
|
|
TP_PROTO(struct ioc_gq *iocg, const char *path, struct ioc_now *now,
|
|
u64 last_period, u64 cur_period, u64 vtime),
|
|
|
|
TP_ARGS(iocg, path, now, last_period, cur_period, vtime),
|
|
|
|
TP_STRUCT__entry (
|
|
__string(devname, ioc_name(iocg->ioc))
|
|
__string(cgroup, path)
|
|
__field(u64, now)
|
|
__field(u64, vnow)
|
|
__field(u64, vrate)
|
|
__field(u64, last_period)
|
|
__field(u64, cur_period)
|
|
__field(u64, last_vtime)
|
|
__field(u64, vtime)
|
|
__field(u32, weight)
|
|
__field(u32, inuse)
|
|
__field(u64, hweight_active)
|
|
__field(u64, hweight_inuse)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__assign_str(devname, ioc_name(iocg->ioc));
|
|
__assign_str(cgroup, path);
|
|
__entry->now = now->now;
|
|
__entry->vnow = now->vnow;
|
|
__entry->vrate = now->vrate;
|
|
__entry->last_period = last_period;
|
|
__entry->cur_period = cur_period;
|
|
__entry->last_vtime = iocg->last_vtime;
|
|
__entry->vtime = vtime;
|
|
__entry->weight = iocg->weight;
|
|
__entry->inuse = iocg->inuse;
|
|
__entry->hweight_active = iocg->hweight_active;
|
|
__entry->hweight_inuse = iocg->hweight_inuse;
|
|
),
|
|
|
|
TP_printk("[%s:%s] now=%llu:%llu vrate=%llu "
|
|
"period=%llu->%llu vtime=%llu->%llu "
|
|
"weight=%u/%u hweight=%llu/%llu",
|
|
__get_str(devname), __get_str(cgroup),
|
|
__entry->now, __entry->vnow, __entry->vrate,
|
|
__entry->last_period, __entry->cur_period,
|
|
__entry->last_vtime, __entry->vtime,
|
|
__entry->inuse, __entry->weight,
|
|
__entry->hweight_inuse, __entry->hweight_active
|
|
)
|
|
);
|
|
|
|
DECLARE_EVENT_CLASS(iocg_inuse_update,
|
|
|
|
TP_PROTO(struct ioc_gq *iocg, const char *path, struct ioc_now *now,
|
|
u32 old_inuse, u32 new_inuse,
|
|
u64 old_hw_inuse, u64 new_hw_inuse),
|
|
|
|
TP_ARGS(iocg, path, now, old_inuse, new_inuse,
|
|
old_hw_inuse, new_hw_inuse),
|
|
|
|
TP_STRUCT__entry (
|
|
__string(devname, ioc_name(iocg->ioc))
|
|
__string(cgroup, path)
|
|
__field(u64, now)
|
|
__field(u32, old_inuse)
|
|
__field(u32, new_inuse)
|
|
__field(u64, old_hweight_inuse)
|
|
__field(u64, new_hweight_inuse)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__assign_str(devname, ioc_name(iocg->ioc));
|
|
__assign_str(cgroup, path);
|
|
__entry->now = now->now;
|
|
__entry->old_inuse = old_inuse;
|
|
__entry->new_inuse = new_inuse;
|
|
__entry->old_hweight_inuse = old_hw_inuse;
|
|
__entry->new_hweight_inuse = new_hw_inuse;
|
|
),
|
|
|
|
TP_printk("[%s:%s] now=%llu inuse=%u->%u hw_inuse=%llu->%llu",
|
|
__get_str(devname), __get_str(cgroup), __entry->now,
|
|
__entry->old_inuse, __entry->new_inuse,
|
|
__entry->old_hweight_inuse, __entry->new_hweight_inuse
|
|
)
|
|
);
|
|
|
|
DEFINE_EVENT(iocg_inuse_update, iocost_inuse_takeback,
|
|
|
|
TP_PROTO(struct ioc_gq *iocg, const char *path, struct ioc_now *now,
|
|
u32 old_inuse, u32 new_inuse,
|
|
u64 old_hw_inuse, u64 new_hw_inuse),
|
|
|
|
TP_ARGS(iocg, path, now, old_inuse, new_inuse,
|
|
old_hw_inuse, new_hw_inuse)
|
|
);
|
|
|
|
DEFINE_EVENT(iocg_inuse_update, iocost_inuse_giveaway,
|
|
|
|
TP_PROTO(struct ioc_gq *iocg, const char *path, struct ioc_now *now,
|
|
u32 old_inuse, u32 new_inuse,
|
|
u64 old_hw_inuse, u64 new_hw_inuse),
|
|
|
|
TP_ARGS(iocg, path, now, old_inuse, new_inuse,
|
|
old_hw_inuse, new_hw_inuse)
|
|
);
|
|
|
|
DEFINE_EVENT(iocg_inuse_update, iocost_inuse_reset,
|
|
|
|
TP_PROTO(struct ioc_gq *iocg, const char *path, struct ioc_now *now,
|
|
u32 old_inuse, u32 new_inuse,
|
|
u64 old_hw_inuse, u64 new_hw_inuse),
|
|
|
|
TP_ARGS(iocg, path, now, old_inuse, new_inuse,
|
|
old_hw_inuse, new_hw_inuse)
|
|
);
|
|
|
|
TRACE_EVENT(iocost_ioc_vrate_adj,
|
|
|
|
TP_PROTO(struct ioc *ioc, u64 new_vrate, u32 *missed_ppm,
|
|
u32 rq_wait_pct, int nr_lagging, int nr_shortages,
|
|
int nr_surpluses),
|
|
|
|
TP_ARGS(ioc, new_vrate, missed_ppm, rq_wait_pct, nr_lagging, nr_shortages,
|
|
nr_surpluses),
|
|
|
|
TP_STRUCT__entry (
|
|
__string(devname, ioc_name(ioc))
|
|
__field(u64, old_vrate)
|
|
__field(u64, new_vrate)
|
|
__field(int, busy_level)
|
|
__field(u32, read_missed_ppm)
|
|
__field(u32, write_missed_ppm)
|
|
__field(u32, rq_wait_pct)
|
|
__field(int, nr_lagging)
|
|
__field(int, nr_shortages)
|
|
__field(int, nr_surpluses)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__assign_str(devname, ioc_name(ioc));
|
|
__entry->old_vrate = atomic64_read(&ioc->vtime_rate);;
|
|
__entry->new_vrate = new_vrate;
|
|
__entry->busy_level = ioc->busy_level;
|
|
__entry->read_missed_ppm = missed_ppm[READ];
|
|
__entry->write_missed_ppm = missed_ppm[WRITE];
|
|
__entry->rq_wait_pct = rq_wait_pct;
|
|
__entry->nr_lagging = nr_lagging;
|
|
__entry->nr_shortages = nr_shortages;
|
|
__entry->nr_surpluses = nr_surpluses;
|
|
),
|
|
|
|
TP_printk("[%s] vrate=%llu->%llu busy=%d missed_ppm=%u:%u rq_wait_pct=%u lagging=%d shortages=%d surpluses=%d",
|
|
__get_str(devname), __entry->old_vrate, __entry->new_vrate,
|
|
__entry->busy_level,
|
|
__entry->read_missed_ppm, __entry->write_missed_ppm,
|
|
__entry->rq_wait_pct, __entry->nr_lagging, __entry->nr_shortages,
|
|
__entry->nr_surpluses
|
|
)
|
|
);
|
|
|
|
#endif /* _TRACE_BLK_IOCOST_H */
|
|
|
|
/* This part must be outside protection */
|
|
#include <trace/define_trace.h>
|