Skip to content

Commit

Permalink
Migrate tracepoint instrumentation to TP_FIELDS
Browse files Browse the repository at this point in the history 
At this stage syscall instrumentation is disabled. Will come in a
following commit.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  • Loading branch information
@compudj
compudj committed Apr 10, 2015
1 parent 07dfc1d commit f127e61
Show file tree
Hide file tree
Showing 66 changed files with 3,694 additions and 8,942 deletions.
9 changes: 5 additions & 4 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,16 @@ lttng-tracer-objs := lttng-events.o lttng-abi.o \
lttng-tracker-pid.o \
lttng-filter.o lttng-filter-interpreter.o \
lttng-filter-specialize.o \
lttng-filter-validator.o
lttng-filter-validator.o \
probes/lttng-probe-user.o

obj-m += lttng-statedump.o
lttng-statedump-objs := lttng-statedump-impl.o wrapper/irqdesc.o \
wrapper/fdtable.o

ifneq ($(CONFIG_HAVE_SYSCALL_TRACEPOINTS),)
lttng-tracer-objs += lttng-syscalls.o probes/lttng-probe-user.o
endif # CONFIG_HAVE_SYSCALL_TRACEPOINTS
#ifneq ($(CONFIG_HAVE_SYSCALL_TRACEPOINTS),)
#lttng-tracer-objs += lttng-syscalls.o
#endif # CONFIG_HAVE_SYSCALL_TRACEPOINTS

ifneq ($(CONFIG_PERF_EVENTS),)
lttng-tracer-objs += $(shell \
Expand Down
4 changes: 4 additions & 0 deletions filter-bytecode.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,10 @@ enum filter_op {
FILTER_OP_GET_CONTEXT_REF_S64,
FILTER_OP_GET_CONTEXT_REF_DOUBLE,

/* load userspace field ref */
FILTER_OP_LOAD_FIELD_REF_USER_STRING,
FILTER_OP_LOAD_FIELD_REF_USER_SEQUENCE,

NR_FILTER_OPS,
};

Expand Down
207 changes: 45 additions & 162 deletions instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,47 +7,11 @@
#undef TRACE_SYSTEM
#define TRACE_SYSTEM kvm_mmu

#define KVM_MMU_PAGE_FIELDS \
__field(__u64, gfn) \
__field(__u32, role) \
__field(__u32, root_count) \
__field(bool, unsync)

#define KVM_MMU_PAGE_ASSIGN(sp) \
tp_assign(gfn, sp->gfn) \
tp_assign(role, sp->role.word) \
tp_assign(root_count, sp->root_count) \
tp_assign(unsync, sp->unsync)

#define KVM_MMU_PAGE_PRINTK() ({ \
const char *ret = p->buffer + p->len; \
static const char *access_str[] = { \
"---", "--x", "w--", "w-x", "-u-", "-ux", "wu-", "wux" \
}; \
union kvm_mmu_page_role role; \
\
role.word = __entry->role; \
\
trace_seq_printf(p, "sp gfn %llx %u%s q%u%s %s%s" \
" %snxe root %u %s%c", \
__entry->gfn, role.level, \
role.cr4_pae ? " pae" : "", \
role.quadrant, \
role.direct ? " direct" : "", \
access_str[role.access], \
role.invalid ? " invalid" : "", \
role.nxe ? "" : "!", \
__entry->root_count, \
__entry->unsync ? "unsync" : "sync", 0); \
ret; \
})

#define kvm_mmu_trace_pferr_flags \
{ PFERR_PRESENT_MASK, "P" }, \
{ PFERR_WRITE_MASK, "W" }, \
{ PFERR_USER_MASK, "U" }, \
{ PFERR_RSVD_MASK, "RSVD" }, \
{ PFERR_FETCH_MASK, "F" }
#define LTTNG_KVM_MMU_PAGE_FIELDS \
ctf_integer(__u64, gfn, (sp)->gfn) \
ctf_integer(__u32, role, (sp)->role.word) \
ctf_integer(__u32, root_count, (sp)->root_count) \
ctf_integer(bool, unsync, (sp)->unsync)

/*
* A pagetable walk has started
Expand All @@ -57,18 +21,10 @@ LTTNG_TRACEPOINT_EVENT(
TP_PROTO(u64 addr, u32 pferr),
TP_ARGS(addr, pferr),

TP_STRUCT__entry(
__field(__u64, addr)
__field(__u32, pferr)
),

TP_fast_assign(
tp_assign(addr, addr)
tp_assign(pferr, pferr)
),

TP_printk("addr %llx pferr %x %s", __entry->addr, __entry->pferr,
__print_flags(__entry->pferr, "|", kvm_mmu_trace_pferr_flags))
TP_FIELDS(
ctf_integer(__u64, addr, addr)
ctf_integer(__u32, pferr, pferr)
)
)


Expand All @@ -78,17 +34,10 @@ LTTNG_TRACEPOINT_EVENT(
TP_PROTO(u64 pte, int level),
TP_ARGS(pte, level),

TP_STRUCT__entry(
__field(__u64, pte)
__field(__u32, level)
),

TP_fast_assign(
tp_assign(pte, pte)
tp_assign(level, level)
),

TP_printk("pte %llx level %u", __entry->pte, __entry->level)
TP_FIELDS(
ctf_integer(__u64, pte, pte)
ctf_integer(__u32, level, level)
)
)

LTTNG_TRACEPOINT_EVENT_CLASS(kvm_mmu_set_bit_class,
Expand All @@ -97,16 +46,10 @@ LTTNG_TRACEPOINT_EVENT_CLASS(kvm_mmu_set_bit_class,

TP_ARGS(table_gfn, index, size),

TP_STRUCT__entry(
__field(__u64, gpa)
),

TP_fast_assign(
tp_assign(gpa, ((u64)table_gfn << PAGE_SHIFT)
+ index * size)
),

TP_printk("gpa %llx", __entry->gpa)
TP_FIELDS(
ctf_integer(__u64, gpa,
((u64)table_gfn << PAGE_SHIFT) + index * size)
)
)

/* We set a pte accessed bit */
Expand All @@ -130,51 +73,30 @@ LTTNG_TRACEPOINT_EVENT(
TP_PROTO(u32 pferr),
TP_ARGS(pferr),

TP_STRUCT__entry(
__field(__u32, pferr)
),

TP_fast_assign(
tp_assign(pferr, pferr)
),

TP_printk("pferr %x %s", __entry->pferr,
__print_flags(__entry->pferr, "|", kvm_mmu_trace_pferr_flags))
TP_FIELDS(
ctf_integer(__u32, pferr, pferr)
)
)

LTTNG_TRACEPOINT_EVENT(
kvm_mmu_get_page,
TP_PROTO(struct kvm_mmu_page *sp, bool created),
TP_ARGS(sp, created),

TP_STRUCT__entry(
KVM_MMU_PAGE_FIELDS
__field(bool, created)
),

TP_fast_assign(
KVM_MMU_PAGE_ASSIGN(sp)
tp_assign(created, created)
),

TP_printk("%s %s", KVM_MMU_PAGE_PRINTK(),
__entry->created ? "new" : "existing")
TP_FIELDS(
LTTNG_KVM_MMU_PAGE_FIELDS
ctf_integer(bool, created, created)
)
)

LTTNG_TRACEPOINT_EVENT_CLASS(kvm_mmu_page_class,

TP_PROTO(struct kvm_mmu_page *sp),
TP_ARGS(sp),

TP_STRUCT__entry(
KVM_MMU_PAGE_FIELDS
),

TP_fast_assign(
KVM_MMU_PAGE_ASSIGN(sp)
),

TP_printk("%s", KVM_MMU_PAGE_PRINTK())
TP_FIELDS(
LTTNG_KVM_MMU_PAGE_FIELDS
)
)

LTTNG_TRACEPOINT_EVENT_INSTANCE(kvm_mmu_page_class, kvm_mmu_sync_page,
Expand Down Expand Up @@ -203,20 +125,11 @@ LTTNG_TRACEPOINT_EVENT_MAP(
TP_PROTO(u64 *sptep, gfn_t gfn, unsigned access),
TP_ARGS(sptep, gfn, access),

TP_STRUCT__entry(
__field(void *, sptep)
__field(gfn_t, gfn)
__field(unsigned, access)
),

TP_fast_assign(
tp_assign(sptep, sptep)
tp_assign(gfn, gfn)
tp_assign(access, access)
),

TP_printk("sptep:%p gfn %llx access %x", __entry->sptep, __entry->gfn,
__entry->access)
TP_FIELDS(
ctf_integer(void *, sptep, sptep)
ctf_integer(gfn_t, gfn, gfn)
ctf_integer(unsigned, access, access)
)
)

LTTNG_TRACEPOINT_EVENT_MAP(
Expand All @@ -227,25 +140,13 @@ LTTNG_TRACEPOINT_EVENT_MAP(
TP_PROTO(u64 addr, gfn_t gfn, unsigned access),
TP_ARGS(addr, gfn, access),

TP_STRUCT__entry(
__field(u64, addr)
__field(gfn_t, gfn)
__field(unsigned, access)
),

TP_fast_assign(
tp_assign(addr, addr)
tp_assign(gfn, gfn)
tp_assign(access, access)
),

TP_printk("addr:%llx gfn %llx access %x", __entry->addr, __entry->gfn,
__entry->access)
TP_FIELDS(
ctf_integer(u64, addr, addr)
ctf_integer(gfn_t, gfn, gfn)
ctf_integer(unsigned, access, access)
)
)

#define __spte_satisfied(__spte) \
(__entry->retry && is_writable_pte(__entry->__spte))

LTTNG_TRACEPOINT_EVENT_MAP(
fast_page_fault,

Expand All @@ -255,32 +156,14 @@ LTTNG_TRACEPOINT_EVENT_MAP(
u64 *sptep, u64 old_spte, bool retry),
TP_ARGS(vcpu, gva, error_code, sptep, old_spte, retry),

TP_STRUCT__entry(
__field(int, vcpu_id)
__field(gva_t, gva)
__field(u32, error_code)
__field(u64 *, sptep)
__field(u64, old_spte)
__field(u64, new_spte)
__field(bool, retry)
),

TP_fast_assign(
tp_assign(vcpu_id, vcpu->vcpu_id)
tp_assign(gva, gva)
tp_assign(error_code, error_code)
tp_assign(sptep, sptep)
tp_assign(old_spte, old_spte)
tp_assign(new_spte, *sptep)
tp_assign(retry, retry)
),

TP_printk("vcpu %d gva %lx error_code %s sptep %p old %#llx"
" new %llx spurious %d fixed %d", __entry->vcpu_id,
__entry->gva, __print_flags(__entry->error_code, "|",
kvm_mmu_trace_pferr_flags), __entry->sptep,
__entry->old_spte, __entry->new_spte,
__spte_satisfied(old_spte), __spte_satisfied(new_spte)
TP_FIELDS(
ctf_integer(int, vcpu_id, vcpu->vcpu_id)
ctf_integer(gva_t, gva, gva)
ctf_integer(u32, error_code, error_code)
ctf_integer(u64 *, sptep, sptep)
ctf_integer(u64, old_spte, old_spte)
ctf_integer(u64, new_spte, *sptep)
ctf_integer(bool, retry, retry)
)
)
#endif /* LTTNG_TRACE_KVM_MMU_H */
Expand Down
Loading

0 comments on commit f127e61

Please sign in to comment.