[1/2] Add flavor-specific log codegen callback by yaakov-stein · Pull Request #486 · facebook/bpfilter

yaakov-stein · 2026-03-20T22:22:25Z

Gave stack-pr a try, but it doesn't allow for multi-commit PR's :(

Stack:

Summary

The main goal here is to add a callback that gives flavors the ability to more finely control the logging process. This will enable us to easily use a new CGROUP_SOCK_ADDR elf-stub.

Notes

Moves cgen/matcher/packet.{c,h} to cgen/packet.{c,h}. It was a mistake to put this here in the first place as packet-based flavors can share more than matcher codegen. We correct the placement now.
Once again, no functional change. This moves a file around and add a callback.

github-actions · 2026-03-20T22:22:34Z

Claude is re-reviewing this PR… (workflow run)

Claude review was cancelled — see workflow run for details.

src/libbpfilter/cgen/program.c

src/libbpfilter/include/bpfilter/runtime.h

src/libbpfilter/include/bpfilter/flavor.h

src/libbpfilter/rule.c

src/libbpfilter/include/bpfilter/runtime.h

src/libbpfilter/include/bpfilter/rule.h

src/bfcli/print.c

src/libbpfilter/include/bpfilter/runtime.h

src/libbpfilter/cgen/cgroup_sock_addr.c

tests/unit/libbpfilter/rule.c

src/libbpfilter/include/bpfilter/runtime.h

src/libbpfilter/bpf/pkt_log.bpf.c

src/libbpfilter/cgen/cgroup_sock_addr.c

src/libbpfilter/include/bpfilter/runtime.h

src/libbpfilter/CMakeLists.txt

github-actions · 2026-03-30T21:07:15Z

src/libbpfilter/include/bpfilter/runtime.h

 #define static_assert _Static_assert
 #endif

+#include <linux/in6.h>


Claude: suggestion: <linux/in6.h> is needed only for sizeof(struct in6_addr) in struct bf_log_sock_addr, which has no producers or consumers yet (part 2/2). It widens the include set for all BPF stubs and all files that include runtime.h. Consider using __u8 saddr[16] / __u8 daddr[16] instead to avoid pulling in the header.

Also, <linux/in6.h> and <asm/types.h> are both system headers but are separated by a blank line, breaking the include-group convention from the style guide.

src/libbpfilter/cgen/cgroup_sock_addr.c

src/libbpfilter/include/bpfilter/runtime.h

src/libbpfilter/include/bpfilter/rule.h

src/bfcli/print.c

src/libbpfilter/bpf/pkt_log.bpf.c

Rename the packet logging ELF stub from `log` to `pkt_log` to establish naming symmetry with the upcoming `sock_log` stub for socket-based hooks.

Restructure bf_log as a tagged union with packet and socket address variants, discriminated by bf_log_type.

Move packet.c/h from cgen/matcher/ to cgen/ and rename bf_matcher_generate_packet() to bf_packet_gen_inline_matcher(). This file provides shared codegen utilities for all packet-based flavors, not a matcher implementation, and will host additional shared packet codegen like bf_packet_gen_inline_log() in subsequent commits.

meta-cla bot added the cla signed label Mar 20, 2026

yaakov-stein changed the title ~~[1/2][`CGROUP_SOCK_ADDR Logging] Extract log codegen callback~~ [1/2][CGROUP_SOCK_ADDR Logging] Extract log codegen callback Mar 20, 2026

yaakov-stein changed the title ~~[1/2][CGROUP_SOCK_ADDR Logging] Extract log codegen callback~~ [1/2][CGROUP_SOCK_ADDR Logging] Add flavor-specific log codegen callback Mar 20, 2026

github-actions bot reviewed Mar 20, 2026

View reviewed changes

src/libbpfilter/cgen/program.c Show resolved Hide resolved

github-actions bot reviewed Mar 20, 2026

View reviewed changes

src/libbpfilter/include/bpfilter/runtime.h Outdated Show resolved Hide resolved

github-actions bot reviewed Mar 20, 2026

View reviewed changes

src/libbpfilter/include/bpfilter/flavor.h Show resolved Hide resolved

yaakov-stein force-pushed the extract-log-codegen-callback branch from 86913cd to 219c17e Compare March 27, 2026 19:10