~lttng/lttng-modules/trunk

« back to all changes in this revision

Viewing changes to include/instrumentation/events/lttng-statedump.h

  • Committer: Mathieu Desnoyers
  • Author(s): Kienan Stewart
  • Date: 2023-11-24 15:21:12 UTC
  • Revision ID: git-v1:4f32efe70b618c4721bf197692fc9d709d352528
fix: phys_proc_id and cpu_core_id moved in linux 6.7.0-rc1

See upstream commit:

    commit 02fb601d27a7abf60d52b21bdf5b100a8d63da3f
    Author: Thomas Gleixner <tglx@linutronix.de>
    Date:   Mon Aug 14 10:18:30 2023 +0200

        x86/cpu: Move phys_proc_id into topology info

        Rename it to pkg_id which is the terminology used in the kernel.

        No functional change.

See upstream commit:

    commit e95256335d45cc965cd12c423535002974313340
    Author: Thomas Gleixner <tglx@linutronix.de>
    Date:   Mon Aug 14 10:18:34 2023 +0200

        x86/cpu: Move cpu_core_id into topology info

        Rename it to core_id and stick it to the other ID fields.

        No functional change.

Signed-off-by: Kienan Stewart <kstewart@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: I574b02430210d5bb72c4b9db901d0e3a6dc7bea0

Show diffs side-by-side

added added

removed removed

Lines of Context:
253
253
 
254
254
#define LTTNG_HAVE_STATEDUMP_CPU_TOPOLOGY
255
255
 
 
256
#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,7,0))
 
257
LTTNG_TRACEPOINT_EVENT(lttng_statedump_cpu_topology,
 
258
        TP_PROTO(struct lttng_kernel_session *session, struct cpuinfo_x86 *c),
 
259
        TP_ARGS(session, c),
 
260
        TP_FIELDS(
 
261
                ctf_string(architecture, "x86")
 
262
                ctf_integer(uint16_t, cpu_id, c->cpu_index)
 
263
                ctf_string(vendor, c->x86_vendor_id[0] ? c->x86_vendor_id : "unknown")
 
264
                ctf_integer(uint8_t, family, c->x86)
 
265
                ctf_integer(uint8_t, model, c->x86_model)
 
266
                ctf_string(model_name, c->x86_model_id[0] ? c->x86_model_id : "unknown")
 
267
                ctf_integer(uint16_t, physical_id, c->topo.pkg_id)
 
268
                ctf_integer(uint16_t, core_id, c->topo.core_id)
 
269
                ctf_integer(uint16_t, cores, c->booted_cores)
 
270
        )
 
271
)
 
272
#else
256
273
LTTNG_TRACEPOINT_EVENT(lttng_statedump_cpu_topology,
257
274
        TP_PROTO(struct lttng_kernel_session *session, struct cpuinfo_x86 *c),
258
275
        TP_ARGS(session, c),
268
285
                ctf_integer(uint16_t, cores, c->booted_cores)
269
286
        )
270
287
)
 
288
#endif /* LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,7,0) */
 
289
 
271
290
#endif /* CONFIG_X86_32 || CONFIG_X86_64 */
272
291
 
273
292
#endif /*  LTTNG_TRACE_LTTNG_STATEDUMP_H */