TP_ARGS(session, p, ipc_ns),
TP_FIELDS(
ctf_integer(pid_t, tid, p->pid)
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0))
ctf_integer(unsigned int, ns_inum, ipc_ns ? ipc_ns->ns.inum : 0)
-#endif
)
)
TP_ARGS(session, p, mnt_ns),
TP_FIELDS(
ctf_integer(pid_t, tid, p->pid)
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0))
ctf_integer(unsigned int, ns_inum, mnt_ns ? mnt_ns->ns.inum : 0)
-#endif
)
)
#endif
TP_ARGS(session, p, net_ns),
TP_FIELDS(
ctf_integer(pid_t, tid, p->pid)
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0))
ctf_integer(unsigned int, ns_inum, net_ns ? net_ns->ns.inum : 0)
-#endif
)
)
ret;
}))
ctf_integer(int, ns_level, pid_ns ? pid_ns->level : 0)
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0))
ctf_integer(unsigned int, ns_inum, pid_ns ? pid_ns->ns.inum : 0)
-#endif
)
)
ctf_integer(pid_t, tid, p->pid)
ctf_integer(uid_t, vuid, user_ns ? from_kuid_munged(user_ns, task_cred_xxx(p, uid)) : 0)
ctf_integer(gid_t, vgid, user_ns ? from_kgid_munged(user_ns, task_cred_xxx(p, gid)) : 0)
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,11,0))
ctf_integer(int, ns_level, user_ns ? user_ns->level : 0)
-#endif
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0))
ctf_integer(unsigned int, ns_inum, user_ns ? user_ns->ns.inum : 0)
-#endif
)
)
TP_ARGS(session, p, uts_ns),
TP_FIELDS(
ctf_integer(pid_t, tid, p->pid)
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0))
ctf_integer(unsigned int, ns_inum, uts_ns ? uts_ns->ns.inum : 0)
-#endif
)
)
#define LTTNG_HAVE_STATEDUMP_CPU_TOPOLOGY
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,7,0) || \
+ LTTNG_RHEL_KERNEL_RANGE(5,14,0,452,0,0, 5,15,0,0,0,0))
+LTTNG_TRACEPOINT_EVENT(lttng_statedump_cpu_topology,
+ TP_PROTO(struct lttng_kernel_session *session, struct cpuinfo_x86 *c),
+ TP_ARGS(session, c),
+ TP_FIELDS(
+ ctf_string(architecture, "x86")
+ ctf_integer(uint16_t, cpu_id, c->cpu_index)
+ ctf_string(vendor, c->x86_vendor_id[0] ? c->x86_vendor_id : "unknown")
+ ctf_integer(uint8_t, family, c->x86)
+ ctf_integer(uint8_t, model, c->x86_model)
+ ctf_string(model_name, c->x86_model_id[0] ? c->x86_model_id : "unknown")
+ ctf_integer(uint16_t, physical_id, c->topo.pkg_id)
+ ctf_integer(uint16_t, core_id, c->topo.core_id)
+ ctf_integer(uint16_t, cores, c->booted_cores)
+ )
+)
+#else
LTTNG_TRACEPOINT_EVENT(lttng_statedump_cpu_topology,
TP_PROTO(struct lttng_kernel_session *session, struct cpuinfo_x86 *c),
TP_ARGS(session, c),
ctf_integer(uint16_t, cores, c->booted_cores)
)
)
+#endif /* LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,7,0) */
+
#endif /* CONFIG_X86_32 || CONFIG_X86_64 */
#endif /* LTTNG_TRACE_LTTNG_STATEDUMP_H */