#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 <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/blkdev.h>
#include <wrapper/file.h>
#include <wrapper/fdtable.h>
+#include <wrapper/sched.h>
#ifdef CONFIG_LTTNG_HAS_LIST_IRQ
#include <linux/irq.h>
}
#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)
{
}
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
* suppressed
*/
if (get_capacity(disk) == 0 ||
- (disk->flags & GENHD_FL_SUPPRESS_PARTITION_INFO))
+ (disk->flags & LTTNG_GENHD_FL_HIDDEN))
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;
#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
}
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;
* 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;
projects / lttng-modules.git / blobdiff