#include <linux/proc_fs.h>
#include <linux/file.h>
#include <linux/interrupt.h>
+#include <linux/irq.h>
#include <linux/irqnr.h>
-#include <linux/cpu.h>
#include <linux/netdevice.h>
#include <linux/inetdevice.h>
-#include <linux/sched.h>
#include <linux/mm.h>
#include <linux/swap.h>
#include <linux/wait.h>
#include <linux/mutex.h>
#include <linux/device.h>
+#include <linux/blkdev.h>
+
#include <lttng/events.h>
#include <lttng/tracer.h>
+#include <wrapper/cpu.h>
#include <wrapper/irqdesc.h>
#include <wrapper/fdtable.h>
-#include <wrapper/namespace.h>
-#include <wrapper/irq.h>
#include <wrapper/tracepoint.h>
-#include <wrapper/genhd.h>
-#include <wrapper/file.h>
+#include <wrapper/blkdev.h>
#include <wrapper/fdtable.h>
-
-#ifdef CONFIG_LTTNG_HAS_LIST_IRQ
-#include <linux/irq.h>
-#endif
+#include <wrapper/sched.h>
/* Define the tracepoints, but do not build the probes */
#define CREATE_TRACE_POINTS
#include <instrumentation/events/lttng-statedump.h>
LTTNG_DEFINE_TRACE(lttng_statedump_block_device,
- TP_PROTO(struct lttng_session *session,
+ TP_PROTO(struct lttng_kernel_session *session,
dev_t dev, const char *diskname),
TP_ARGS(session, dev, diskname));
LTTNG_DEFINE_TRACE(lttng_statedump_end,
- TP_PROTO(struct lttng_session *session),
+ TP_PROTO(struct lttng_kernel_session *session),
TP_ARGS(session));
LTTNG_DEFINE_TRACE(lttng_statedump_interrupt,
- TP_PROTO(struct lttng_session *session,
+ TP_PROTO(struct lttng_kernel_session *session,
unsigned int irq, const char *chip_name,
struct irqaction *action),
TP_ARGS(session, irq, chip_name, action));
LTTNG_DEFINE_TRACE(lttng_statedump_file_descriptor,
- TP_PROTO(struct lttng_session *session,
+ TP_PROTO(struct lttng_kernel_session *session,
struct files_struct *files,
int fd, const char *filename,
unsigned int flags, fmode_t fmode),
TP_ARGS(session, files, fd, filename, flags, fmode));
LTTNG_DEFINE_TRACE(lttng_statedump_start,
- TP_PROTO(struct lttng_session *session),
+ TP_PROTO(struct lttng_kernel_session *session),
TP_ARGS(session));
LTTNG_DEFINE_TRACE(lttng_statedump_process_state,
- TP_PROTO(struct lttng_session *session,
+ TP_PROTO(struct lttng_kernel_session *session,
struct task_struct *p,
int type, int mode, int submode, int status,
struct files_struct *files),
TP_ARGS(session, p, type, mode, submode, status, files));
LTTNG_DEFINE_TRACE(lttng_statedump_process_pid_ns,
- TP_PROTO(struct lttng_session *session,
+ TP_PROTO(struct lttng_kernel_session *session,
struct task_struct *p,
struct pid_namespace *pid_ns),
TP_ARGS(session, p, pid_ns));
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,6,0))
LTTNG_DEFINE_TRACE(lttng_statedump_process_cgroup_ns,
- TP_PROTO(struct lttng_session *session,
+ TP_PROTO(struct lttng_kernel_session *session,
struct task_struct *p,
struct cgroup_namespace *cgroup_ns),
TP_ARGS(session, p, cgroup_ns));
#endif
LTTNG_DEFINE_TRACE(lttng_statedump_process_ipc_ns,
- TP_PROTO(struct lttng_session *session,
+ TP_PROTO(struct lttng_kernel_session *session,
struct task_struct *p,
struct ipc_namespace *ipc_ns),
TP_ARGS(session, p, ipc_ns));
#ifndef LTTNG_MNT_NS_MISSING_HEADER
LTTNG_DEFINE_TRACE(lttng_statedump_process_mnt_ns,
- TP_PROTO(struct lttng_session *session,
+ TP_PROTO(struct lttng_kernel_session *session,
struct task_struct *p,
struct mnt_namespace *mnt_ns),
TP_ARGS(session, p, mnt_ns));
#endif
LTTNG_DEFINE_TRACE(lttng_statedump_process_net_ns,
- TP_PROTO(struct lttng_session *session,
+ TP_PROTO(struct lttng_kernel_session *session,
struct task_struct *p,
struct net *net_ns),
TP_ARGS(session, p, net_ns));
LTTNG_DEFINE_TRACE(lttng_statedump_process_user_ns,
- TP_PROTO(struct lttng_session *session,
+ TP_PROTO(struct lttng_kernel_session *session,
struct task_struct *p,
struct user_namespace *user_ns),
TP_ARGS(session, p, user_ns));
LTTNG_DEFINE_TRACE(lttng_statedump_process_uts_ns,
- TP_PROTO(struct lttng_session *session,
+ TP_PROTO(struct lttng_kernel_session *session,
struct task_struct *p,
struct uts_namespace *uts_ns),
TP_ARGS(session, p, uts_ns));
LTTNG_DEFINE_TRACE(lttng_statedump_process_time_ns,
- TP_PROTO(struct lttng_session *session,
+ TP_PROTO(struct lttng_kernel_session *session,
struct task_struct *p,
struct time_namespace *time_ns),
TP_ARGS(session, p, time_ns));
LTTNG_DEFINE_TRACE(lttng_statedump_network_interface,
- TP_PROTO(struct lttng_session *session,
+ TP_PROTO(struct lttng_kernel_session *session,
struct net_device *dev, struct in_ifaddr *ifa),
TP_ARGS(session, dev, ifa));
#ifdef LTTNG_HAVE_STATEDUMP_CPU_TOPOLOGY
LTTNG_DEFINE_TRACE(lttng_statedump_cpu_topology,
- TP_PROTO(struct lttng_session *session, struct cpuinfo_x86 *c),
+ TP_PROTO(struct lttng_kernel_session *session, struct cpuinfo_x86 *c),
TP_ARGS(session, c));
#endif
struct lttng_fd_ctx {
char *page;
- struct lttng_session *session;
+ struct lttng_kernel_session *session;
struct files_struct *files;
};
LTTNG_DEAD = 7,
};
+
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,0,0) || \
+ LTTNG_RHEL_KERNEL_RANGE(5,14,0,163,0,0, 5,15,0,0,0,0))
+
+#define LTTNG_PART_STRUCT_TYPE struct block_device
+
+static
+int lttng_get_part_name(struct gendisk *disk, struct block_device *part, char *name_buf)
+{
+ int ret;
+
+ ret = snprintf(name_buf, BDEVNAME_SIZE, "%pg", part);
+ if (ret < 0 || ret >= BDEVNAME_SIZE)
+ return -ENOSYS;
+
+ return 0;
+}
+
+static
+dev_t lttng_get_part_devt(struct block_device *part)
+{
+ return part->bd_dev;
+}
+
+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0))
+
+#define LTTNG_PART_STRUCT_TYPE struct block_device
+
+static
+int lttng_get_part_name(struct gendisk *disk, struct block_device *part, char *name_buf)
+{
+ const char *p;
+
+ p = bdevname(part, name_buf);
+ if (!p)
+ return -ENOSYS;
+
+ return 0;
+}
+
static
-int lttng_enumerate_block_devices(struct lttng_session *session)
+dev_t lttng_get_part_devt(struct block_device *part)
+{
+ return part->bd_dev;
+}
+
+#else
+
+#define LTTNG_PART_STRUCT_TYPE struct hd_struct
+
+static
+int lttng_get_part_name(struct gendisk *disk, struct hd_struct *part, char *name_buf)
+{
+ const char *p;
+ struct block_device bdev;
+
+ /*
+ * Create a partial 'struct blockdevice' to use
+ * 'bdevname()' which is a simple wrapper over
+ * 'disk_name()' but has the honor to be EXPORT_SYMBOL.
+ */
+ bdev.bd_disk = disk;
+ bdev.bd_part = part;
+
+ p = bdevname(&bdev, name_buf);
+ if (!p)
+ return -ENOSYS;
+
+ return 0;
+}
+
+static
+dev_t lttng_get_part_devt(struct hd_struct *part)
+{
+ return part_devt(part);
+}
+#endif
+
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,12,0))
+static
+int lttng_statedump_each_block_device(struct lttng_kernel_session *session, struct gendisk *disk)
+{
+ struct block_device *part;
+ unsigned long idx;
+ int ret = 0;
+
+ /* Include partition 0 */
+ idx = 0;
+
+ rcu_read_lock();
+ xa_for_each(&disk->part_tbl, idx, part) {
+ char name_buf[BDEVNAME_SIZE];
+
+ /* Exclude non-partitions bdev and empty partitions. */
+ if (bdev_is_partition(part) && !bdev_nr_sectors(part))
+ continue;
+
+ if (lttng_get_part_name(disk, part, name_buf) == -ENOSYS) {
+ ret = -ENOSYS;
+ goto end;
+ }
+ trace_lttng_statedump_block_device(session, lttng_get_part_devt(part),
+ name_buf);
+ }
+end:
+ rcu_read_unlock();
+ return ret;
+}
+#else
+static
+int lttng_statedump_each_block_device(struct lttng_kernel_session *session, struct gendisk *disk)
+{
+ struct disk_part_iter piter;
+ LTTNG_PART_STRUCT_TYPE *part;
+
+ disk_part_iter_init(&piter, disk, DISK_PITER_INCL_PART0);
+
+ while ((part = disk_part_iter_next(&piter))) {
+ char name_buf[BDEVNAME_SIZE];
+
+ if (lttng_get_part_name(disk, part, name_buf) == -ENOSYS) {
+ disk_part_iter_exit(&piter);
+ return -ENOSYS;
+ }
+ trace_lttng_statedump_block_device(session, lttng_get_part_devt(part),
+ name_buf);
+ }
+ disk_part_iter_exit(&piter);
+
+ return 0;
+}
+#endif
+
+static
+int lttng_enumerate_block_devices(struct lttng_kernel_session *session)
{
struct class *ptr_block_class;
struct device_type *ptr_disk_type;
struct class_dev_iter iter;
struct device *dev;
+ int ret = 0;
ptr_block_class = wrapper_get_block_class();
- if (!ptr_block_class)
- return -ENOSYS;
+ if (!ptr_block_class) {
+ ret = -ENOSYS;
+ goto end;
+ }
ptr_disk_type = wrapper_get_disk_type();
if (!ptr_disk_type) {
- return -ENOSYS;
+ ret = -ENOSYS;
+ goto end;
}
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;
/*
* Don't show empty devices or things that have been
* suppressed
*/
if (get_capacity(disk) == 0 ||
- (disk->flags & GENHD_FL_SUPPRESS_PARTITION_INFO))
+ (disk->flags & LTTNG_GENHD_FL_HIDDEN))
continue;
- disk_part_iter_init(&piter, disk, DISK_PITER_INCL_PART0);
- while ((part = disk_part_iter_next(&piter))) {
- struct block_device bdev;
- char name_buf[BDEVNAME_SIZE];
- const char *p;
-
- /*
- * Create a partial 'struct blockdevice' to use
- * 'bdevname()' which is a simple wrapper over
- * 'disk_name()' but has the honor to be EXPORT_SYMBOL.
- */
- bdev.bd_disk = disk;
- bdev.bd_part = part;
-
- p = bdevname(&bdev, 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);
+ ret = lttng_statedump_each_block_device(session, disk);
}
class_dev_iter_exit(&iter);
- return 0;
+end:
+ return ret;
}
#ifdef CONFIG_INET
static
-void lttng_enumerate_device(struct lttng_session *session,
+void lttng_enumerate_device(struct lttng_kernel_session *session,
struct net_device *dev)
{
struct in_device *in_dev;
}
}
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,9,0))
static
-int lttng_enumerate_network_ip_interface(struct lttng_session *session)
+int lttng_enumerate_network_ip_interface(struct lttng_kernel_session *session)
+{
+ struct net_device *dev;
+
+ rtnl_lock();
+ for_each_netdev(&init_net, dev)
+ lttng_enumerate_device(session, dev);
+ rtnl_unlock();
+
+ return 0;
+}
+#else
+static
+int lttng_enumerate_network_ip_interface(struct lttng_kernel_session *session)
{
struct net_device *dev;
return 0;
}
+#endif /* (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,9,0)) */
#else /* CONFIG_INET */
static inline
-int lttng_enumerate_network_ip_interface(struct lttng_session *session)
+int lttng_enumerate_network_ip_interface(struct lttng_kernel_session *session)
{
return 0;
}
* 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;
/* Called with task lock held. */
static
-void lttng_enumerate_files(struct lttng_session *session,
+void lttng_enumerate_files(struct lttng_kernel_session *session,
struct files_struct *files,
char *tmp)
{
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
static
-int lttng_enumerate_cpu_topology(struct lttng_session *session)
+int lttng_enumerate_cpu_topology(struct lttng_kernel_session *session)
{
int cpu;
const cpumask_t *cpumask = cpu_possible_mask;
}
#else
static
-int lttng_enumerate_cpu_topology(struct lttng_session *session)
+int lttng_enumerate_cpu_topology(struct lttng_kernel_session *session)
{
return 0;
}
* iteration, but it is not exported to modules.
*/
static
-void lttng_enumerate_task_vm_maps(struct lttng_session *session,
+void lttng_enumerate_task_vm_maps(struct lttng_kernel_session *session,
struct task_struct *p)
{
struct mm_struct *mm;
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);
}
static
-int lttng_enumerate_vm_maps(struct lttng_session *session)
+int lttng_enumerate_vm_maps(struct lttng_kernel_session *session)
{
struct task_struct *p;
}
#endif
-#ifdef CONFIG_LTTNG_HAS_LIST_IRQ
-
static
-int lttng_list_interrupts(struct lttng_session *session)
+int lttng_list_interrupts(struct lttng_kernel_session *session)
{
unsigned int irq;
unsigned long flags = 0;
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
* Called with task lock held.
*/
static
-void lttng_statedump_process_ns(struct lttng_session *session,
+void lttng_statedump_process_ns(struct lttng_kernel_session *session,
struct task_struct *p,
enum lttng_thread_type type,
enum lttng_execution_mode mode,
* 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);
- /*
- * Back and forth on locking strategy within Linux upstream for nsproxy.
- * See Linux upstream commit 728dba3a39c66b3d8ac889ddbe38b5b1c264aec3
- * "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))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_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);
#endif
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(5,6,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,6,0) || \
+ LTTNG_RHEL_KERNEL_RANGE(4,18,0,305,0,0, 4,19,0,0,0,0))
trace_lttng_statedump_process_time_ns(session, p, proxy->time_ns);
#endif
}
-#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
-int lttng_enumerate_process_states(struct lttng_session *session)
+int lttng_enumerate_process_states(struct lttng_kernel_session *session)
{
struct task_struct *g, *p;
char *tmp;
status = LTTNG_ZOMBIE;
else if (p->exit_state == EXIT_DEAD)
status = LTTNG_DEAD;
- else if (p->state == TASK_RUNNING) {
+ else if (lttng_task_is_running(p)) {
/* Is this a forked child that has not run yet? */
if (list_empty(&p->rt.run_list))
status = LTTNG_WAIT_FORK;
* was really running at this time.
*/
status = LTTNG_WAIT_CPU;
- } else if (p->state &
+ } else if (lttng_get_task_state(p) &
(TASK_INTERRUPTIBLE | TASK_UNINTERRUPTIBLE)) {
/* Task is waiting for something to complete */
status = LTTNG_WAIT;
}
static
-int do_lttng_statedump(struct lttng_session *session)
+int do_lttng_statedump(struct lttng_kernel_session *session)
{
int cpu, ret;
* is to guarantee that each CPU has been in a state where is was in
* syscall mode (i.e. not in a trap, an IRQ or a soft IRQ).
*/
- get_online_cpus();
+ lttng_cpus_read_lock();
atomic_set(&kernel_threads_to_run, num_online_cpus());
for_each_online_cpu(cpu) {
INIT_DELAYED_WORK(&cpu_work[cpu], lttng_statedump_work_func);
}
/* Wait for all threads to run */
__wait_event(statedump_wq, (atomic_read(&kernel_threads_to_run) == 0));
- put_online_cpus();
+ lttng_cpus_read_unlock();
/* Our work is done */
trace_lttng_statedump_end(session);
return 0;
/*
* Called with session mutex held.
*/
-int lttng_statedump_start(struct lttng_session *session)
+int lttng_statedump_start(struct lttng_kernel_session *session)
{
return do_lttng_statedump(session);
}
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;
}
projects / lttng-modules.git / blobdiff