bd8ac686c7
here is a patch that makes mmiotrace work almost well within the tracing framework. The patch applies on top of my previous patch. I have my own output formatting in place now. Summary of changes: - fix the NULL dereference that was due to not calling tracing_reset() - add print_line() callback into struct tracer - implement print_line() for mmiotrace, producing up-to-spec text - add my output header, but that is not really called in the right place - rewrote the main structs in mmiotrace - added two new trace entry types: TRACE_MMIO_RW and TRACE_MMIO_MAP - made some functions in trace.c non-static - check current==NULL in tracing_generic_entry_update() - fix(?) comparison in trace_seq_printf() Things seem to work fine except a few issues. Markers (text lines injected into mmiotrace log) are missing, I did not feel hacking them in before we have variable length entries. My output header is printed only for 'trace' file, but not 'trace_pipe'. For some reason, despite my quick fix, iter->trace is NULL in print_trace_line() when called from 'trace_pipe' file, which means I don't get proper output formatting. I only tried by loading nouveau.ko, which just detects the card, and that is traced fine. I didn't try further. Map, two reads and unmap. Works perfectly. I am missing the information about overflows, I'd prefer to have a counter for lost events. I didn't try, but I guess currently there is no way of knowning when it overflows? So, not too far from being fully operational, it seems :-) And looking at the diffstat, there also is some 700-900 lines of user space code that just became obsolete. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
92 lines
2.6 KiB
C
92 lines
2.6 KiB
C
#ifndef MMIOTRACE_H
|
|
#define MMIOTRACE_H
|
|
|
|
#include <asm/types.h>
|
|
|
|
#ifdef __KERNEL__
|
|
|
|
#include <linux/list.h>
|
|
|
|
struct kmmio_probe;
|
|
struct pt_regs;
|
|
|
|
typedef void (*kmmio_pre_handler_t)(struct kmmio_probe *,
|
|
struct pt_regs *, unsigned long addr);
|
|
typedef void (*kmmio_post_handler_t)(struct kmmio_probe *,
|
|
unsigned long condition, struct pt_regs *);
|
|
|
|
struct kmmio_probe {
|
|
struct list_head list; /* kmmio internal list */
|
|
unsigned long addr; /* start location of the probe point */
|
|
unsigned long len; /* length of the probe region */
|
|
kmmio_pre_handler_t pre_handler; /* Called before addr is executed. */
|
|
kmmio_post_handler_t post_handler; /* Called after addr is executed */
|
|
void *user_data;
|
|
};
|
|
|
|
/* kmmio is active by some kmmio_probes? */
|
|
static inline int is_kmmio_active(void)
|
|
{
|
|
extern unsigned int kmmio_count;
|
|
return kmmio_count;
|
|
}
|
|
|
|
extern void reference_kmmio(void);
|
|
extern void unreference_kmmio(void);
|
|
extern int register_kmmio_probe(struct kmmio_probe *p);
|
|
extern void unregister_kmmio_probe(struct kmmio_probe *p);
|
|
|
|
/* Called from page fault handler. */
|
|
extern int kmmio_handler(struct pt_regs *regs, unsigned long addr);
|
|
|
|
/* Called from ioremap.c */
|
|
#ifdef CONFIG_MMIOTRACE
|
|
extern void
|
|
mmiotrace_ioremap(unsigned long offset, unsigned long size, void __iomem *addr);
|
|
extern void mmiotrace_iounmap(volatile void __iomem *addr);
|
|
#else
|
|
static inline void
|
|
mmiotrace_ioremap(unsigned long offset, unsigned long size, void __iomem *addr)
|
|
{
|
|
}
|
|
static inline void mmiotrace_iounmap(volatile void __iomem *addr)
|
|
{
|
|
}
|
|
#endif /* CONFIG_MMIOTRACE_HOOKS */
|
|
|
|
enum mm_io_opcode {
|
|
MMIO_READ = 0x1, /* struct mmiotrace_rw */
|
|
MMIO_WRITE = 0x2, /* struct mmiotrace_rw */
|
|
MMIO_PROBE = 0x3, /* struct mmiotrace_map */
|
|
MMIO_UNPROBE = 0x4, /* struct mmiotrace_map */
|
|
MMIO_MARKER = 0x5, /* raw char data */
|
|
MMIO_UNKNOWN_OP = 0x6, /* struct mmiotrace_rw */
|
|
};
|
|
|
|
struct mmiotrace_rw {
|
|
unsigned long phys; /* PCI address of register */
|
|
unsigned long value;
|
|
unsigned long pc; /* optional program counter */
|
|
int map_id;
|
|
unsigned char opcode; /* one of MMIO_{READ,WRITE,UNKNOWN_OP} */
|
|
unsigned char width; /* size of register access in bytes */
|
|
};
|
|
|
|
struct mmiotrace_map {
|
|
unsigned long phys; /* base address in PCI space */
|
|
unsigned long virt; /* base virtual address */
|
|
unsigned long len; /* mapping size */
|
|
int map_id;
|
|
unsigned char opcode; /* MMIO_PROBE or MMIO_UNPROBE */
|
|
};
|
|
|
|
/* in kernel/trace/trace_mmiotrace.c */
|
|
extern void enable_mmiotrace(void);
|
|
extern void disable_mmiotrace(void);
|
|
extern void mmio_trace_rw(struct mmiotrace_rw *rw);
|
|
extern void mmio_trace_mapping(struct mmiotrace_map *map);
|
|
|
|
#endif /* __KERNEL__ */
|
|
|
|
#endif /* MMIOTRACE_H */
|