Update ChangeLog for 2.0-pre11

[lttng-modules.git] / ltt-debugfs-abi.h

diff --git a/ltt-debugfs-abi.h b/ltt-debugfs-abi.h
index d91c52d5f5d368ee1e10ccbc78d74998595ec80a..a018297f7fb513f12951f29103ebbf078eb62999 100644 (file)
--- a/ltt-debugfs-abi.h
+++ b/ltt-debugfs-abi.h
@@ -13,12 +13,23 @@
 
 #include <linux/fs.h>
 
-#define LTTNG_SYM_NAME_LEN     128
+#define LTTNG_SYM_NAME_LEN     256
 
 enum lttng_kernel_instrumentation {
-       LTTNG_KERNEL_TRACEPOINT,
-       LTTNG_KERNEL_KPROBE,
-       LTTNG_KERNEL_FUNCTION,
+       LTTNG_KERNEL_TRACEPOINT = 0,
+       LTTNG_KERNEL_KPROBE     = 1,
+       LTTNG_KERNEL_FUNCTION   = 2,
+       LTTNG_KERNEL_KRETPROBE  = 3,
+       LTTNG_KERNEL_NOOP       = 4,    /* not hooked */
+       LTTNG_KERNEL_SYSCALL    = 5,
+};
+
+/*
+ * LTTng consumer mode
+ */
+enum lttng_kernel_output {
+       LTTNG_KERNEL_SPLICE     = 0,
+       LTTNG_KERNEL_MMAP       = 1,
 };
 
 /*
@@ -31,6 +42,14 @@ struct lttng_kernel_channel {
        uint64_t num_subbuf;
        unsigned int switch_timer_interval;     /* usecs */
        unsigned int read_timer_interval;       /* usecs */
+       enum lttng_kernel_output output;        /* splice, mmap */
+};
+
+struct lttng_kernel_kretprobe {
+       uint64_t addr;
+
+       uint64_t offset;
+       char symbol_name[LTTNG_SYM_NAME_LEN];
 };
 
 /*
@@ -47,11 +66,15 @@ struct lttng_kernel_function_tracer {
        char symbol_name[LTTNG_SYM_NAME_LEN];
 };
 
+/*
+ * For syscall tracing, name = '\0' means "enable all".
+ */
 struct lttng_kernel_event {
        char name[LTTNG_SYM_NAME_LEN];  /* event name */
        enum lttng_kernel_instrumentation instrumentation;
        /* Per instrumentation type configuration */
        union {
+               struct lttng_kernel_kretprobe kretprobe;
                struct lttng_kernel_kprobe kprobe;
                struct lttng_kernel_function_tracer ftrace;
        } u;
@@ -63,17 +86,31 @@ struct lttng_kernel_tracer_version {
        uint32_t sublevel;
 };
 
+enum lttng_kernel_calibrate_type {
+       LTTNG_KERNEL_CALIBRATE_KRETPROBE,
+};
+
+struct lttng_kernel_calibrate {
+       enum lttng_kernel_calibrate_type type;  /* type (input) */
+};
+
 enum lttng_kernel_context_type {
-       LTTNG_KERNEL_CONTEXT_PID,
-       LTTNG_KERNEL_CONTEXT_PERF_COUNTER,
-       LTTNG_KERNEL_CONTEXT_COMM,
-       LTTNG_KERNEL_CONTEXT_PRIO,
-       LTTNG_KERNEL_CONTEXT_NICE,
+       LTTNG_KERNEL_CONTEXT_PID                = 0,
+       LTTNG_KERNEL_CONTEXT_PERF_COUNTER       = 1,
+       LTTNG_KERNEL_CONTEXT_PROCNAME           = 2,
+       LTTNG_KERNEL_CONTEXT_PRIO               = 3,
+       LTTNG_KERNEL_CONTEXT_NICE               = 4,
+       LTTNG_KERNEL_CONTEXT_VPID               = 5,
+       LTTNG_KERNEL_CONTEXT_TID                = 6,
+       LTTNG_KERNEL_CONTEXT_VTID               = 7,
+       LTTNG_KERNEL_CONTEXT_PPID               = 8,
+       LTTNG_KERNEL_CONTEXT_VPPID              = 9,
 };
 
 struct lttng_kernel_perf_counter_ctx {
        uint32_t type;
        uint64_t config;
+       char name[LTTNG_SYM_NAME_LEN];
 };
 
 struct lttng_kernel_context {
@@ -88,6 +125,9 @@ struct lttng_kernel_context {
 #define LTTNG_KERNEL_TRACER_VERSION            \
        _IOR(0xF6, 0x41, struct lttng_kernel_tracer_version)
 #define LTTNG_KERNEL_TRACEPOINT_LIST           _IO(0xF6, 0x42)
+#define LTTNG_KERNEL_WAIT_QUIESCENT            _IO(0xF6, 0x43)
+#define LTTNG_KERNEL_CALIBRATE                 \
+       _IOWR(0xF6, 0x44, struct lttng_kernel_calibrate)
 
 /* Session FD ioctl */
 #define LTTNG_KERNEL_METADATA                  \
@@ -106,4 +146,8 @@ struct lttng_kernel_context {
 #define LTTNG_KERNEL_CONTEXT                   \
        _IOW(0xF6, 0x70, struct lttng_kernel_context)
 
+/* Event, Channel and Session ioctl */
+#define LTTNG_KERNEL_ENABLE                    _IO(0xF6, 0x80)
+#define LTTNG_KERNEL_DISABLE                   _IO(0xF6, 0x81)
+
 #endif /* _LTT_DEBUGFS_ABI_H */