#include <linux/file.h>
#include <linux/interrupt.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 <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/genhd.h>
#include <wrapper/file.h>
#include <wrapper/fdtable.h>
+#include <wrapper/sched.h>
#ifdef CONFIG_LTTNG_HAS_LIST_IRQ
#include <linux/irq.h>
#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 (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;
};
}
#endif
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,12,0))
static
-int lttng_enumerate_block_devices(struct lttng_session *session)
+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;
}
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);
- LTTNG_PART_STRUCT_TYPE *part;
/*
* Don't show empty devices or things that have been
(disk->flags & GENHD_FL_SUPPRESS_PARTITION_INFO))
continue;
- /*
- * The original 'disk_part_iter_init' returns void, but our
- * wrapper can fail to lookup the original symbol.
- */
- if (wrapper_disk_part_iter_init(&piter, disk, DISK_PITER_INCL_PART0) < 0) {
- ret = -ENOSYS;
- goto iter_exit;
- }
-
- while ((part = wrapper_disk_part_iter_next(&piter))) {
- char name_buf[BDEVNAME_SIZE];
-
- if (lttng_get_part_name(disk, part, name_buf) == -ENOSYS) {
- wrapper_disk_part_iter_exit(&piter);
- ret = -ENOSYS;
- goto iter_exit;
- }
- trace_lttng_statedump_block_device(session,
- lttng_get_part_devt(part), name_buf);
- }
- wrapper_disk_part_iter_exit(&piter);
+ ret = lttng_statedump_each_block_device(session, disk);
}
-iter_exit:
class_dev_iter_exit(&iter);
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;
}
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;
}
#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;
}
/* 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)
{
#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;
}
static
-int lttng_enumerate_vm_maps(struct lttng_session *session)
+int lttng_enumerate_vm_maps(struct lttng_kernel_session *session)
{
struct task_struct *p;
#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;
}
#else
static inline
-int lttng_list_interrupts(struct lttng_session *session)
+int lttng_list_interrupts(struct lttng_kernel_session *session)
{
return 0;
}
* 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,
#endif
trace_lttng_statedump_process_net_ns(session, p, proxy->net_ns);
trace_lttng_statedump_process_uts_ns(session, p, proxy->uts_ns);
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_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
}
}
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);
}