linux-kernel-markers-architecture-independant-code-flags
PATCH 1/1 linux-kernel-markers-architecture-independant-code-flags
linux-kernel-markers-architecture-independant-code-flags
- GEN_MARK changed for MARK_GENERIC is now declared in linux/marker.h
- Adds the MF_* flags than can be used by the _MARK macro MF_OPTIMIZED (Use optimized markers)
MF_LOCKDEP (Can call lockdep)
MF_PRINTK (vprintk can be called in the probe)
- The MARK marcro calls _MARK with a default set of flags (_MF_DEFAULT)
- Verification of flag compatibility at probe connexion
Signed-off-by Mathieu Desnoyers <[email protected]>
include/linux/marker.h +62 -51
@@ -6,29 +6,7 @@* * Code markup for dynamic and static tracing. * -* Example : -* -* MARK(subsystem_event, "%d %s %p[struct task_struct]", -* someint, somestring, current); -* Where : -* - Subsystem is the name of your subsystem. -* - event is the name of the event to mark. -* - "%d %s %p[struct task_struct]" is the formatted string for printk. -* - someint is an integer. -* - somestring is a char pointer. -* - current is a pointer to a struct task_struct. -* -* - Dynamically overridable function call based on marker mechanism -* from Frank Ch. Eigler <[email protected]>. -* - Thanks to Jeremy Fitzhardinge <[email protected]> for his constructive -* criticism about gcc optimization related issues. -* -* The marker mechanism supports multiple instances of the same marker. -* Markers can be put in inline functions, inlined static functions and -* unrolled loops. -* -* Note : It is safe to put markers within preempt-safe code : preempt_enable() -* will not call the scheduler due to the tests in preempt_schedule(). +* See Documentation/marker.txt. * * (C) Copyright 2006 Mathieu Desnoyers <[email protected]> *
@@ -36,17 +14,15 @@* See the file COPYING for more details. */ -#ifndef __ASSEMBLY__ +#ifdef __KERNEL__typedef void marker_probe_func (const char *fmt, ...); -enum marker_type {MARKER_GENERIC ,MARKER_OPTIMIZED }; -struct __mark_marker_c {const char *name;marker_probe_func **call;const char *format; -enum marker_type type; +int flags; } __attribute__((packed)); struct __mark_marker {
@@ -54,32 +30,64 @@ struct __mark_marker {void *enable; } __attribute__((packed)); -#ifdef CONFIG_MARKERS_ENABLE_OPTIMIZATION -#include <asm/marker.h> -#endif - -#include <asm-generic/marker.h> - -#define MARK_NOARGS " " -#define MARK_MAX_FORMAT_LEN 1024 - -#ifndef CONFIG_MARKERS -#define GEN_MARK(name, format, args...) \ +/* Generic marker flavor always available */ +#ifdef CONFIG_MARKERS + +#define MF_OPTIMIZED 1/* Use optimized markers */ +#define MF_LOCKDEP 2/* Can call lockdep */ +#define MF_PRINTK 3/* vprintk can be called in the probe */ + +#define _MF_OPTIMIZED (1 << MF_OPTIMIZED) +#define _MF_LOCKDEP (1 << MF_LOCKDEP) +#define _MF_PRINTK (1 << MF_PRINTK) + +#define MARK_GENERIC(flags, name, format, args...) \ + do { \ + static marker_probe_func *__mark_call_##name = \ + __mark_empty_function; \ + static char __marker_enable_##name = 0; \ + static const struct __mark_marker_c __mark_c_##name \ + __attribute__((section(".markers.c"))) = \ + { #name, &__mark_call_##name, format, \ + (flags) | ~_MF_OPTIMIZED } ; \ + static const struct __mark_marker __mark_##name \ + __attribute__((section(".markers"))) = \ + { &__mark_c_##name, &__marker_enable_##name } ; \ + asm volatile ( "" : : "i" (&__mark_##name)); \ + __mark_check_format(format, ## args); \ + if (unlikely(__marker_enable_##name)) { \ + preempt_disable(); \ + (*__mark_call_##name)(format, ## args); \ + preempt_enable(); \ + } \ + } while (0) + +#define MARK_GENERIC_ENABLE_IMMEDIATE_OFFSET 0 +#define MARK_GENERIC_ENABLE_TYPE char +/* Dereference enable as lvalue from a pointer to its instruction */ +#define MARK_GENERIC_ENABLE (a) \ + *(MARK_GENERIC_ENABLE_TYPE*) \ + ((char*)a+MARK_GENERIC_ENABLE_IMMEDIATE_OFFSET) + +static inline int marker_generic_set_enable (void *address,char enable) +{ +MARK_GENERIC_ENABLE (address) = enable; +return 0 ; +} + +#else /* !CONFIG_MARKERS */ +#define MARK_GENERIC(flags, name, format, args...) \ __mark_check_format(format, ## args) -#endif +#endif /* CONFIG_MARKERS */ -#ifndef MARK -#define MARK GEN_MARK -#define MARK_ENABLE_TYPE GEN_MARK_ENABLE_TYPE -#define MARK_ENABLE_IMMEDIATE_OFFSET GEN_MARK_ENABLE_IMMEDIATE_OFFSET +#ifdef CONFIG_MARKERS_ENABLE_OPTIMIZATION +#include <asm/marker.h> /* optimized marker flavor */ +#else +#include <asm-generic/marker.h> /* fallback on generic markers */ #endif -/* Dereference enable as lvalue from a pointer to its instruction */ -#define MARK_ENABLE (a) \ - *(MARK_ENABLE_TYPE*)((char*)a+MARK_ENABLE_IMMEDIATE_OFFSET) - -#define GEN_MARK_ENABLE (a) \ - *(GEN_MARK_ENABLE_TYPE*)((char*)a+GEN_MARK_ENABLE_IMMEDIATE_OFFSET) +#define MARK_MAX_FORMAT_LEN 1024 +#define MARK_NOARGS " "static inline __attribute__ ((format (printf,1 ,2 )))void __mark_check_format (const char *fmt, ...)
@@ -87,11 +95,14 @@ void __mark_check_format(const char *fmt, ...)extern marker_probe_func __mark_empty_function; -extern int marker_set_probe (const char *name,const char *format, +extern int _marker_set_probe (int flags,const char *name,const char *format,marker_probe_func *probe); +#define marker_set_probe (name, format, probe) \ + _marker_set_probe(_MF_DEFAULT, name, format, probe) +extern int marker_remove_probe (marker_probe_func *probe);extern int marker_list_probe (marker_probe_func *probe); -#endif +#endif /* __KERNEL__ */ #endif
kernel/module.c +32 -45
142 lines not on this page · raw message
Signature · 3 lines
Mathieu Desnoyers Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68