On Mon, Nov 02, 2020 at 08:41:09AM -0700, David Ahern wrote:
>
> I would prefer to have these #ifdef .. #endif checks consolidated in the
> lib code. Create a bpf_compat file for these. e.g.,
>
> int bpf_program_load(enum bpf_prog_type type, const struct bpf_insn *insns,
> size_t size_insns, const char *license, char *log,
> size_t size_log)
> {
> +#ifdef HAVE_LIBBPF
> + return bpf_load_program(BPF_PROG_TYPE_CGROUP_SOCK, prog, sizeof(prog),
> + "GPL", 0, bpf_log_buf, sizeof(bpf_log_buf));
> +#else
> return bpf_prog_load_buf(BPF_PROG_TYPE_CGROUP_SOCK, prog, sizeof(prog),
> "GPL", bpf_log_buf, sizeof(bpf_log_buf));
> +#endif
> }
>
> Similarly for bpf_program_attach.
>
> I think even the includes can be done once in bpf_util.h with a single
> +#ifdef HAVE_LIBBPF
> +#include <bpf/bpf.h>
> +#include <bpf/libbpf.h>
> +#endif
> +
>
> The iproute2_* functions added later in this patch can be in the compat
> file as well.
The iproute2_* functions need access static struct bpf_elf_ctx __ctx;
We need move the struct bpf_elf_ctx to another header file if add the
iproute2_* functions to compat file. Do you still want this?
Thanks
Hangbin
