X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-statedump-impl.c;h=4635feb05becab0a9d232f3a2bb8ade394836631;hb=9598166dce563b1287e05f0b1af96f9329e102c4;hp=9dc0eb199f90c4c61048223ba58dff651a815e47;hpb=b7cdc18250880cc44edeef4a4b42c8ac7a135a6d;p=lttng-modules.git diff --git a/lttng-statedump-impl.c b/lttng-statedump-impl.c index 9dc0eb19..4635feb0 100644 --- a/lttng-statedump-impl.c +++ b/lttng-statedump-impl.c @@ -32,21 +32,12 @@ #include #include #include +#include +#include +#include #include #include -#include -#include -#include -#include -#include -#include -#include -#include - -#ifdef CONFIG_LTTNG_HAS_LIST_IRQ -#include -#endif /* Define the tracepoints, but do not build the probes */ #define CREATE_TRACE_POINTS @@ -62,9 +53,7 @@ DEFINE_TRACE(lttng_statedump_file_descriptor); DEFINE_TRACE(lttng_statedump_start); DEFINE_TRACE(lttng_statedump_process_state); DEFINE_TRACE(lttng_statedump_process_pid_ns); -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0)) DEFINE_TRACE(lttng_statedump_process_cgroup_ns); -#endif DEFINE_TRACE(lttng_statedump_process_ipc_ns); #ifndef LTTNG_MNT_NS_MISSING_HEADER DEFINE_TRACE(lttng_statedump_process_mnt_ns); @@ -123,19 +112,11 @@ enum lttng_process_status { 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); + class_dev_iter_init(&iter, gendisk_block_class(), NULL, + gendisk_device_type()); while ((dev = class_dev_iter_next(&iter))) { struct disk_part_iter piter; struct gendisk *disk = dev_to_disk(dev); @@ -154,7 +135,7 @@ int lttng_enumerate_block_devices(struct lttng_session *session) char name_buf[BDEVNAME_SIZE]; char *p; - p = wrapper_disk_name(disk, part->partno, name_buf); + p = gendisk_name(disk, part->partno, name_buf); if (!p) { disk_part_iter_exit(&piter); class_dev_iter_exit(&iter); @@ -237,7 +218,7 @@ int lttng_dump_one_fd(const void *p, struct file *file, unsigned int fd) * the lock is taken, but we are not aware whether this is * guaranteed or not, so play safe. */ - if (fd < fdt->max_fds && lttng_close_on_exec(fd, fdt)) + if (fd < fdt->max_fds && close_on_exec(fd, fdt)) flags |= O_CLOEXEC; if (IS_ERR(s)) { struct dentry *dentry = file->f_path.dentry; @@ -264,7 +245,7 @@ void lttng_enumerate_files(struct lttng_session *session, { struct lttng_fd_ctx ctx = { .page = tmp, .session = session, .files = files, }; - lttng_iterate_fd(files, 0, lttng_dump_one_fd, &ctx); + iterate_fd(files, 0, lttng_dump_one_fd, &ctx); } #ifdef LTTNG_HAVE_STATEDUMP_CPU_TOPOLOGY @@ -313,7 +294,7 @@ void lttng_enumerate_task_vm_maps(struct lttng_session *session, down_read(&mm->mmap_sem); while (map) { if (map->vm_file) - ino = map->vm_file->lttng_f_dentry->d_inode->i_ino; + ino = map->vm_file->f_path.dentry->d_inode->i_ino; else ino = 0; trace_lttng_statedump_vm_map(session, p, map, ino); @@ -337,8 +318,6 @@ int lttng_enumerate_vm_maps(struct lttng_session *session) } #endif -#ifdef CONFIG_LTTNG_HAS_LIST_IRQ - static int lttng_list_interrupts(struct lttng_session *session) { @@ -346,7 +325,6 @@ int lttng_list_interrupts(struct lttng_session *session) unsigned long flags = 0; struct irq_desc *desc; -#define irq_to_desc wrapper_irq_to_desc /* needs irq_desc */ for_each_irq_desc(irq, desc) { struct irqaction *action; @@ -363,15 +341,7 @@ int lttng_list_interrupts(struct lttng_session *session) local_irq_restore(flags); } return 0; -#undef irq_to_desc -} -#else -static inline -int lttng_list_interrupts(struct lttng_session *session) -{ - return 0; } -#endif /* * Statedump the task's namespaces using the proc filesystem inode number as @@ -416,7 +386,7 @@ void lttng_statedump_process_ns(struct lttng_session *session, * paranoid behavior of * trace_lttng_statedump_process_user_ns(). */ - user_ns = user_ns ? user_ns->lttng_user_ns_parent : NULL; + user_ns = user_ns ? user_ns->parent : NULL; } while (user_ns); /* @@ -425,19 +395,9 @@ void lttng_statedump_process_ns(struct lttng_session *session, * "namespaces: Use task_lock and not rcu to protect nsproxy" * for details. */ -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0) || \ - LTTNG_UBUNTU_KERNEL_RANGE(3,13,11,36, 3,14,0,0) || \ - LTTNG_UBUNTU_KERNEL_RANGE(3,16,1,11, 3,17,0,0) || \ - LTTNG_RHEL_KERNEL_RANGE(3,10,0,229,13,0, 3,11,0,0,0,0)) proxy = p->nsproxy; -#else - rcu_read_lock(); - proxy = task_nsproxy(p); -#endif if (proxy) { -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0)) trace_lttng_statedump_process_cgroup_ns(session, p, proxy->cgroup_ns); -#endif trace_lttng_statedump_process_ipc_ns(session, p, proxy->ipc_ns); #ifndef LTTNG_MNT_NS_MISSING_HEADER trace_lttng_statedump_process_mnt_ns(session, p, proxy->mnt_ns); @@ -445,14 +405,6 @@ void lttng_statedump_process_ns(struct lttng_session *session, trace_lttng_statedump_process_net_ns(session, p, proxy->net_ns); trace_lttng_statedump_process_uts_ns(session, p, proxy->uts_ns); } -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0) || \ - LTTNG_UBUNTU_KERNEL_RANGE(3,13,11,36, 3,14,0,0) || \ - LTTNG_UBUNTU_KERNEL_RANGE(3,16,1,11, 3,17,0,0) || \ - LTTNG_RHEL_KERNEL_RANGE(3,10,0,229,13,0, 3,11,0,0,0,0)) - /* (nothing) */ -#else - rcu_read_unlock(); -#endif } static @@ -619,13 +571,6 @@ 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; }