Skip to contentSkip to conversation

rtla: Define _GNU_SOURCE in timerlat_bpf.c

PATCH In review Tomas Glozar 2 participants 4 messages Apr 30, 2025 – May 27, 2025

Subsystems (2)
lore
Share & tools
lore

Tomas Glozar

author maintainer
#0 lore raw

PATCH 1/1 rtla: Define _GNU_SOURCE in timerlat_bpf.c

Newer versions of glibc include a definition of struct sched_attr in bits/sched.h (included through sched.h which is included by rtla). Commit 0eecee340672 ("tools/rtla: fix collision with glibc sched_attr/sched_set_attr") has modified the definition of struct sched_attr in utils.h, so that it is only applied with older versions of glibc that do not define it, in order to prevent build failure.

The definition in bits/sched.h depends on _GNU_SOURCE. timerlat_bpf.c does not define _GNU_SOURCE, making it fall back to the definition in utils.h. The latter has two fields less, leading to shifted offsets of struct timerlat_params in timerlat_bpf_init.

Because of the shift, timerlat_bpf_init incorrectly reads params->entries as 0 for timerlat-hist and disables the creation of histogram maps, causing breakage in BPF sample collection mode:

$ rtla timerlat hist -d 1s
Error pulling BPF data

Fix the issue by also defining _GNU_SOURCE in timerlat_bpf.c.

Fixes e34293ddcebd ("rtla/timerlat: Add BPF skeleton to collect samples")
---
 tools/tracing/rtla/src/timerlat_bpf.c | 1 +
 1 file changed, 1 insertion(+)
tools/tracing/rtla/src/timerlat_bpf.c +1 -0
index 5abee884037a..0bc44ce5d69b 100644
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 #ifdef HAVE_BPF_SKEL
+#define _GNU_SOURCE
 #include "timerlat.h"
 #include "timerlat_bpf.h"
 #include "timerlat.skel.h"
Signature · 1 line
2.49.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 33 lines · Tomas Glozar

Newer versions of glibc include a definition of struct sched_attr in bits/sched.h (included through sched.h which is included by rtla). Commit 0eecee340672 ("tools/rtla: fix collision with glibc sched_attr/sched_set_attr") has modified the definition of struct sched_attr in utils.h, so that it is only applied with older versions of glibc that do not define it, in order to prevent build failure.

The definition in bits/sched.h depends on _GNU_SOURCE. timerlat_bpf.c does not define _GNU_SOURCE, making it fall back to the definition in utils.h. The latter has two fields less, leading to shifted offsets of struct timerlat_params in timerlat_bpf_init.

Because of the shift, timerlat_bpf_init incorrectly reads params->entries as 0 for timerlat-hist and disables the creation of histogram maps, causing breakage in BPF sample collection mode:

$ rtla timerlat hist -d 1s
Error pulling BPF data

Fix the issue by also defining _GNU_SOURCE in timerlat_bpf.c.

Fixes e34293ddcebd ("rtla/timerlat: Add BPF skeleton to collect samples")
---
 tools/tracing/rtla/src/timerlat_bpf.c | 1 +
 1 file changed, 1 insertion(+)
tools/tracing/rtla/src/timerlat_bpf.c +0 -0
index 5abee884037a..0bc44ce5d69b 100644

tools/tracing/rtla/src/timerlat_bpf.c line 6

Quoted 6 lines
tools/tracing/rtla/src/timerlat_bpf.c +1 -0
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 #ifdef HAVE_BPF_SKEL
+#define _GNU_SOURCE
 #include "timerlat.h"
 #include "timerlat_bpf.h"
 #include "timerlat.skel.h"

This works, and we need it, so

--
Question for Tomas, should we spend sometime to make this work for older versions of glibc without a definition of struct sched_attr?

author maintainer
#2 lore raw

so 17. 5. 2025 v 0:22 odesílatel John Kacur <[email protected]> napsal:

Quoted 2 lines

Question for Tomas, should we spend sometime to make this work for older versions of glibc without a definition of struct sched_attr?

Older versions of glibc without a definition for struct sched_attr use the one in utils.h:

#ifndef SCHED_ATTR_SIZE_VER0

struct sched_attr {
    uint32_t size;
    uint32_t sched_policy;
    uint64_t sched_flags;
    int32_t sched_nice;
    uint32_t sched_priority;
    uint64_t sched_runtime;
    uint64_t sched_deadline;
    uint64_t sched_period;
};

#endif /* SCHED_ATTR_SIZE_VER0 */

In fact, this one works fine in timerlat_bpf.c, if you build rtla on older glibc, it will work even without this patch. It's the glibc one which is not defined without _GNU_SOURCE.

Tomas

author maintainer
#3 lore raw
In reply to Tomas Glozar

st 30. 4. 2025 v 16:47 odesílatel Tomas Glozar <[email protected]> napsal:

Quoted 7 lines

Because of the shift, timerlat_bpf_init incorrectly reads params->entries as 0 for timerlat-hist and disables the creation of histogram maps, causing breakage in BPF sample collection mode:

$ rtla timerlat hist -d 1s
Error pulling BPF data

Linux 6.15 was released with broken rtla on systems with latest glibc due to this patch not being merged:

$ rtla --version
rtla version 6.15.0
...
$ rtla timerlat hist -d 1s
Error pulling BPF data

Please have a look at this as soon as possible, so the fix can get into 6.16 and stable.

Thanks,
Tomas