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,
struct task_struct *p,
TP_ARGS(session, p, mnt_ns));
#endif
+LTTNG_DEFINE_TRACE(lttng_statedump_process_net_ns,
+ TP_PROTO(struct lttng_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,
+ 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,
+ struct task_struct *p,
+ struct uts_namespace *uts_ns),
+ TP_ARGS(session, p, uts_ns));
+
LTTNG_DEFINE_TRACE(lttng_statedump_network_interface,
TP_PROTO(struct lttng_session *session,
struct net_device *dev, struct in_ifaddr *ifa),
LTTNG_DEAD = 7,
};
+
+#if (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
+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
+
static
int lttng_enumerate_block_devices(struct lttng_session *session)
{
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;
+ LTTNG_PART_STRUCT_TYPE *part;
/*
* Don't show empty devices or things that have been
(disk->flags & GENHD_FL_SUPPRESS_PARTITION_INFO))
continue;
- disk_part_iter_init(&piter, disk, DISK_PITER_INCL_PART0);
- while ((part = disk_part_iter_next(&piter))) {
- struct block_device bdev;
+ /*
+ * 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];
- 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;
+ 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,
- part_devt(part), name_buf);
+ lttng_get_part_devt(part), name_buf);
}
- disk_part_iter_exit(&piter);
+ wrapper_disk_part_iter_exit(&piter);
}
+iter_exit:
class_dev_iter_exit(&iter);
- return 0;
+end:
+ return ret;
}
#ifdef CONFIG_INET
* "namespaces: Use task_lock and not rcu to protect nsproxy"
* for details.
*/
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0) || \
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_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 = 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);
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) || \
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_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))
projects / lttng-modules.git / blobdiff