Skip to content

BPF PMDA updates and BCC code sync #2377

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.

Sign up for GitHub

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

Closed
wants to merge 12 commits into from
Closed

BPF PMDA updates and BCC code sync #2377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
550a5e3
Squashed 'vendor/github.com/iovisor/bcc/libbpf-tools/' changes from 9…
natoscott Oct 21, 2025
41ebf1a
Merge commit '550a5e3affe2ee0323f0a04e63354d5d7967577a' into bpf-updates
natoscott Oct 21, 2025
10f8a82
pmdabpf: updates to opensnoop and mountsnoop to match kernel
natoscott Oct 21, 2025
8339b49
build: add .gitmodules file for libbpf submodule, clear old content
natoscott Oct 21, 2025
ef57105
Squashed 'vendor/github.com/libbpf/bpftool/' changes from 6eb3e20583.…
natoscott Oct 21, 2025
037fb2a
build: drop non-submodule libbpf/bpftool import
natoscott Oct 21, 2025
3319f77
Squashed 'vendor/github.com/libbpf/bpftool/' content from commit e1bd…
natoscott Oct 21, 2025
862b191
Merge commit '3319f771a9cdbc147c846dafe9dbe23612abe680' as 'vendor/gi…
natoscott Oct 21, 2025
760c80c
build: add bpftool/libbpf submodule file
natoscott Oct 21, 2025
b4b9f15
Squashed 'vendor/github.com/libbpf/usdt/' content from commit f4ea2f524e
natoscott Oct 21, 2025
796ca65
Merge commit 'b4b9f1511357571f1b4d79d4230aedc2ac3e23b0' as 'vendor/gi…
natoscott Oct 21, 2025
4d1aa46
build: add usdt header into include subdir for wider use
natoscott Oct 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "libbpf"]
path = vendor/github.com/libbpf/bpftool/libbpf
url = https://github.com/libbpf/libbpf.git
1 change: 1 addition & 0 deletions src/include/pcp/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ config.h
dict.h
sds.h
sdsalloc.h
usdt.h
ini.h
8 changes: 6 additions & 2 deletions src/include/pcp/GNUmakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ include $(TOPDIR)/src/include/builddefs

INIH_HFILES = ini.h
SDSH_HFILES = sds.h sdsalloc.h
USDT_HFILES = usdt.h
VENDORED_HFILES = $(INIH_HFILES) $(SDSH_HFILES) $(USDT_HFILES)
EXTERNAL_HFILES = dict.h
HFILES = pmapi.h impl.h pmda.h pmtime.h pmdaroot.h pmafm.h \
trace.h trace_dev.h mmv_stats.h mmv_dev.h import.h \
Expand All @@ -35,11 +37,11 @@ endif
GENERATED_HFILES = $(CONFFILES)
NOSHIP_HFILES = libpcp.h sdsalloc.h

LDIRT = $(GENERATED_HFILES) $(INIH_HFILES) $(SDSH_HFILES) $(EXTERNAL_HFILES)
LDIRT = $(GENERATED_HFILES) $(VENDORED_HFILES) $(EXTERNAL_HFILES)

default :: default_pcp

default_pcp : $(HEADERS) $(GENERATED_HFILES) $(INIH_HFILES) $(SDSH_HFILES) $(EXTERNAL_HFILES)
default_pcp : $(HEADERS) $(GENERATED_HFILES) $(VENDORED_HFILES) $(EXTERNAL_HFILES)

include $(BUILDRULES)

Expand All @@ -49,6 +51,8 @@ $(INIH_HFILES):
$(LN_S) -f $(TOPDIR)/vendor/github.com/benhoyt/inih/$@ .
$(SDSH_HFILES):
$(LN_S) -f $(TOPDIR)/vendor/github.com/redis/hiredis/$@ .
$(USDT_HFILES):
$(LN_S) -f $(TOPDIR)/vendor/github.com/libbpf/usdt/$@ .

install :: default_pcp install_pcp

Expand Down
6 changes: 5 additions & 1 deletion src/pmdas/bpf/modules/GNUmakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ COMMON_OBJ = \
trace_helpers.o \
btf_helpers.o \
uprobe_helpers.o \
path_helpers.o \
map_helpers.o \

# ported helper files.
Expand All @@ -21,16 +22,19 @@ HELPERS_H = \
bits.bpf.h \
blk_types.h \
maps.bpf.h \
path_helpers.bpf.h \
core_fixes.bpf.h \
btf_helpers.h \
map_helpers.h \
path_helpers.h \
trace_helpers.h \
uprobe_helpers.h \

HELPERS_C = \
compat.c \
btf_helpers.c \
map_helpers.c \
path_helpers.c \
trace_helpers.c \
uprobe_helpers.c \

Expand Down Expand Up @@ -111,7 +115,7 @@ vmlinux.h: $(PMDABPF_VMLINUXH)
$(LN_S) -f $< $@

%.bpf.o: %.bpf.c vmlinux.h $(APPS_H) $(APPS_H_2) $(APPS_BPF) $(APPS_BPF_2)
$(CLANG) -Wall -g -O2 -target bpf -D__TARGET_ARCH_$(PMDABPF_ARCH) \
$(CLANG) -Wall -Wno-switch -g -O2 -target bpf -D__TARGET_ARCH_$(PMDABPF_ARCH) \
-I. -c $< -o $@
$(LLVM_STRIP) -g $@

Expand Down
Loading
Loading