Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bpftool sync 2025-01-21 #180

Merged
merged 3 commits into from
Jan 21, 2025

Conversation

qmonnet
Copy link
Member

@qmonnet qmonnet commented Jan 21, 2025

Pull latest libbpf from mirror and sync bpftool repo with kernel, up to the commits used for libbpf sync. This is an automatic update performed by calling the sync script from this repo:

$ ./scripts/sync-kernel.sh . <path/to/>linux

qmonnet and others added 3 commits January 21, 2025 23:41
Pull latest libbpf from mirror.
Libbpf version: 1.6.0
Libbpf commit:  324f3c3846d99c8a1e1384a55591f893f0ae5de4

Signed-off-by: Quentin Monnet <[email protected]>
If the last instruction of a control flow graph building block is a
BPF_CALL, an incorrect edge with e->dst set to NULL is created and
results in a segfault during graph output.

Ensure that BPF_CALL as last instruction of a building block is handled
correctly and only generates a single edge unlike actual BPF_JUMP*
instructions.

Signed-off-by: Christoph Werle <[email protected]>
Signed-off-by: Andrii Nakryiko <[email protected]>
Tested-by: Quentin Monnet <[email protected]>
Reviewed-by: Quentin Monnet <[email protected]>
Link: https://lore.kernel.org/bpf/[email protected]
Syncing latest bpftool commits from kernel repository.
Baseline bpf-next commit:   f44275e7155dc310d36516fc25be503da099781c
Checkpoint bpf-next commit: 01f3ce5328c405179b2c69ea047c423dad2bfa6d
Baseline bpf commit:        9d89551994a430b50c4fffcb1e617a057fa76e20
Checkpoint bpf commit:      c45323b7560ec87c37c729b703c86ee65f136d75

Christoph Werle (1):
  bpftool: Fix control flow graph segfault during edge creation

 src/cfg.c | 1 +
 1 file changed, 1 insertion(+)

Signed-off-by: Quentin Monnet <[email protected]>
@qmonnet qmonnet merged commit dc95469 into libbpf:main Jan 21, 2025
6 checks passed
@qmonnet qmonnet deleted the bpftool-sync-2025-01-21T23-41-58.260Z branch January 21, 2025 23:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants