Lorenzo Bianconi wrote:
> Introduce support for the following SEC entries for XDP multi-buff
> property:
> - SEC("xdp_mb/")
> - SEC("xdp_devmap_mb/")
> - SEC("xdp_cpumap_mb/")
>
> Signed-off-by: Lorenzo Bianconi <lorenzo@xxxxxxxxxx>
> ---
> tools/lib/bpf/libbpf.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
> index b59fede08ba7..ddad9eb2826a 100644
> --- a/tools/lib/bpf/libbpf.c
> +++ b/tools/lib/bpf/libbpf.c
> @@ -265,6 +265,8 @@ enum sec_def_flags {
> SEC_SLEEPABLE = 8,
> /* allow non-strict prefix matching */
> SEC_SLOPPY_PFX = 16,
> + /* BPF program support XDP multi-buff */
> + SEC_XDP_MB = 32,
> };
>
> struct bpf_sec_def {
> @@ -6505,6 +6507,9 @@ static int libbpf_preload_prog(struct bpf_program *prog,
> if (def & SEC_SLEEPABLE)
> opts->prog_flags |= BPF_F_SLEEPABLE;
>
> + if (prog->type == BPF_PROG_TYPE_XDP && (def & SEC_XDP_MB))
> + opts->prog_flags |= BPF_F_XDP_MB;
> +
> if ((prog->type == BPF_PROG_TYPE_TRACING ||
> prog->type == BPF_PROG_TYPE_LSM ||
> prog->type == BPF_PROG_TYPE_EXT) && !prog->attach_btf_id) {
> @@ -8468,8 +8473,11 @@ static const struct bpf_sec_def section_defs[] = {
> SEC_DEF("lsm.s/", LSM, BPF_LSM_MAC, SEC_ATTACH_BTF | SEC_SLEEPABLE, attach_lsm),
> SEC_DEF("iter/", TRACING, BPF_TRACE_ITER, SEC_ATTACH_BTF, attach_iter),
> SEC_DEF("syscall", SYSCALL, 0, SEC_SLEEPABLE),
> + SEC_DEF("xdp_devmap_mb/", XDP, BPF_XDP_DEVMAP, SEC_ATTACHABLE | SEC_XDP_MB),
> SEC_DEF("xdp_devmap/", XDP, BPF_XDP_DEVMAP, SEC_ATTACHABLE),
> + SEC_DEF("xdp_cpumap_mb/", XDP, BPF_XDP_CPUMAP, SEC_ATTACHABLE | SEC_XDP_MB),
> SEC_DEF("xdp_cpumap/", XDP, BPF_XDP_CPUMAP, SEC_ATTACHABLE),
> + SEC_DEF("xdp_mb/", XDP, BPF_XDP, SEC_ATTACHABLE_OPT | SEC_SLOPPY_PFX | SEC_XDP_MB),
> SEC_DEF("xdp", XDP, BPF_XDP, SEC_ATTACHABLE_OPT | SEC_SLOPPY_PFX),
> SEC_DEF("perf_event", PERF_EVENT, 0, SEC_NONE | SEC_SLOPPY_PFX),
> SEC_DEF("lwt_in", LWT_IN, 0, SEC_NONE | SEC_SLOPPY_PFX),
> --
> 2.31.1
>
LGTM. Nice to see this got to a good solution.
Acked-by: John Fastabend <john.fastabend@xxxxxxxxx>
