X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=lttng-statedump-impl.c;h=1bf58ad43d126c8bf0d128f089a01619a6dd05a5;hb=0d979364c69ec8df979776c3716f507b4a1d9bc1;hp=bf9457b5351a379f74efdb65e1dc24681d4a00e1;hpb=3247f8bdd114fca353868caaf014f1806241293f;p=lttng-modules.git diff --git a/lttng-statedump-impl.c b/lttng-statedump-impl.c index bf9457b5..1bf58ad4 100644 --- a/lttng-statedump-impl.c +++ b/lttng-statedump-impl.c @@ -45,14 +45,19 @@ #include #include #include +#include #include "lttng-events.h" +#include "lttng-tracer.h" #include "wrapper/irqdesc.h" #include "wrapper/spinlock.h" #include "wrapper/fdtable.h" #include "wrapper/nsproxy.h" +#include "wrapper/irq.h" +#include "wrapper/tracepoint.h" +#include "wrapper/genhd.h" -#ifdef CONFIG_GENERIC_HARDIRQS +#ifdef CONFIG_LTTNG_HAS_LIST_IRQ #include #endif @@ -62,10 +67,19 @@ #define TRACE_INCLUDE_FILE lttng-statedump #include "instrumentation/events/lttng-module/lttng-statedump.h" +DEFINE_TRACE(lttng_statedump_block_device); +DEFINE_TRACE(lttng_statedump_end); +DEFINE_TRACE(lttng_statedump_interrupt); +DEFINE_TRACE(lttng_statedump_file_descriptor); +DEFINE_TRACE(lttng_statedump_start); +DEFINE_TRACE(lttng_statedump_process_state); +DEFINE_TRACE(lttng_statedump_network_interface); + struct lttng_fd_ctx { char *page; struct lttng_session *session; struct task_struct *p; + struct fdtable *fdt; }; /* @@ -105,7 +119,49 @@ enum lttng_process_status { LTTNG_DEAD = 7, }; +static +int lttng_enumerate_block_devices(struct lttng_session *session) +{ + struct class *ptr_block_class; + struct device_type *ptr_disk_type; + struct class_dev_iter iter; + struct device *dev; + + ptr_block_class = wrapper_get_block_class(); + if (!ptr_block_class) + return -ENOSYS; + ptr_disk_type = wrapper_get_disk_type(); + if (!ptr_disk_type) { + return -ENOSYS; + } + class_dev_iter_init(&iter, ptr_block_class, NULL, ptr_disk_type); + while ((dev = class_dev_iter_next(&iter))) { + struct disk_part_iter piter; + struct gendisk *disk = dev_to_disk(dev); + struct hd_struct *part; + + disk_part_iter_init(&piter, disk, DISK_PITER_INCL_PART0); + while ((part = disk_part_iter_next(&piter))) { + char name_buf[BDEVNAME_SIZE]; + char *p; + + p = wrapper_disk_name(disk, part->partno, name_buf); + if (!p) { + disk_part_iter_exit(&piter); + class_dev_iter_exit(&iter); + return -ENOSYS; + } + trace_lttng_statedump_block_device(session, + part_devt(part), name_buf); + } + disk_part_iter_exit(&piter); + } + class_dev_iter_exit(&iter); + return 0; +} + #ifdef CONFIG_INET + static void lttng_enumerate_device(struct lttng_session *session, struct net_device *dev) @@ -154,18 +210,27 @@ int lttng_dump_one_fd(const void *p, struct file *file, unsigned int fd) { const struct lttng_fd_ctx *ctx = p; const char *s = d_path(&file->f_path, ctx->page, PAGE_SIZE); + unsigned int flags = file->f_flags; + /* + * We don't expose kernel internal flags, only userspace-visible + * flags. + */ + flags &= ~FMODE_NONOTIFY; + if (test_bit(fd, ctx->fdt->close_on_exec)) + flags |= O_CLOEXEC; if (IS_ERR(s)) { struct dentry *dentry = file->f_path.dentry; /* Make sure we give at least some info */ spin_lock(&dentry->d_lock); trace_lttng_statedump_file_descriptor(ctx->session, ctx->p, fd, - dentry->d_name.name); + dentry->d_name.name, flags, file->f_mode); spin_unlock(&dentry->d_lock); goto end; } - trace_lttng_statedump_file_descriptor(ctx->session, ctx->p, fd, s); + trace_lttng_statedump_file_descriptor(ctx->session, ctx->p, fd, s, + flags, file->f_mode); end: return 0; } @@ -177,6 +242,7 @@ void lttng_enumerate_task_fd(struct lttng_session *session, struct lttng_fd_ctx ctx = { .page = tmp, .session = session, .p = p }; task_lock(p); + ctx.fdt = files_fdtable(p->files); lttng_iterate_fd(p->files, 0, lttng_dump_one_fd, &ctx); task_unlock(p); } @@ -244,7 +310,7 @@ int lttng_enumerate_vm_maps(struct lttng_session *session) } #endif -#ifdef CONFIG_GENERIC_HARDIRQS +#ifdef CONFIG_LTTNG_HAS_LIST_IRQ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39)) #define irq_desc_get_chip(desc) get_irq_desc_chip(desc) @@ -277,7 +343,7 @@ void lttng_list_interrupts(struct lttng_session *session) } #else static inline -void list_interrupts(struct lttng_session *session) +void lttng_list_interrupts(struct lttng_session *session) { } #endif @@ -381,13 +447,13 @@ int do_lttng_statedump(struct lttng_session *session) { int cpu; - printk(KERN_DEBUG "LTT state dump thread start\n"); trace_lttng_statedump_start(session); lttng_enumerate_process_states(session); lttng_enumerate_file_descriptors(session); /* FIXME lttng_enumerate_vm_maps(session); */ lttng_list_interrupts(session); lttng_enumerate_network_ip_interface(session); + lttng_enumerate_block_devices(session); /* TODO lttng_dump_idt_table(session); */ /* TODO lttng_dump_softirq_vec(session); */ @@ -409,7 +475,6 @@ int do_lttng_statedump(struct lttng_session *session) __wait_event(statedump_wq, (atomic_read(&kernel_threads_to_run) == 0)); put_online_cpus(); /* Our work is done */ - printk(KERN_DEBUG "LTT state dump end\n"); trace_lttng_statedump_end(session); return 0; } @@ -419,11 +484,36 @@ int do_lttng_statedump(struct lttng_session *session) */ int lttng_statedump_start(struct lttng_session *session) { - printk(KERN_DEBUG "LTTng: state dump begin\n"); return do_lttng_statedump(session); } EXPORT_SYMBOL_GPL(lttng_statedump_start); +static +int __init lttng_statedump_init(void) +{ + /* + * Allow module to load even if the fixup cannot be done. This + * will allow seemless transition when the underlying issue fix + * is merged into the Linux kernel, and when tracepoint.c + * "tracepoint_module_notify" is turned into a static function. + */ + (void) wrapper_lttng_fixup_sig(THIS_MODULE); + return 0; +} + +module_init(lttng_statedump_init); + +static +void __exit lttng_statedump_exit(void) +{ +} + +module_exit(lttng_statedump_exit); + MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Jean-Hugues Deschenes"); MODULE_DESCRIPTION("Linux Trace Toolkit Next Generation Statedump"); +MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "." + __stringify(LTTNG_MODULES_MINOR_VERSION) "." + __stringify(LTTNG_MODULES_PATCHLEVEL_VERSION) + LTTNG_MODULES_EXTRAVERSION);