On Wed, Nov 29, 2023 at 08:52:36PM +0100, Dmitrii Dolgov wrote:
> Currently, it's not allowed to attach an fentry/fexit prog to another
> one of the same type. At the same time it's not uncommon to see a
> tracing program with lots of logic in use, and the attachment limitation
> prevents usage of fentry/fexit for performance analysis (e.g. with
> "bpftool prog profile" command) in this case. An example could be
> falcosecurity libs project that uses tp_btf tracing programs.
>
> Following the corresponding discussion [1], the reason for that is to
> avoid tracing progs call cycles without introducing more complex
> solutions. Relax "no same type" requirement to "no progs that are
> already an attach target themselves" for the tracing type. In this way
> only a standalone tracing program (without any other progs attached to
> it) could be attached to another one, and no cycle could be formed. To
> implement, add a new field into bpf_prog_aux to track the number of
> attachments to the target prog.
>
> As a side effect of this change alone, one could create an unbounded
> chain of tracing progs attached to each other. Similar issues between
> fentry/fexit and extend progs are addressed via forbidding certain
> combinations that could lead to similar chains. Introduce an
> attach_depth field to limit the attachment chain, and display it in
> bpftool.
>
> Note, that currently, due to various limitations, it's actually not
> possible to form such an attachment cycle the original implementation
> was prohibiting. It seems that the idea was to make this part robust
> even in the view of potential future changes.
SNIP
> diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
> index 8e7b6072e3f4..31ffcffb7198 100644
> --- a/kernel/bpf/verifier.c
> +++ b/kernel/bpf/verifier.c
> @@ -20109,6 +20109,12 @@ int bpf_check_attach_target(struct bpf_verifier_log *log,
> if (tgt_prog) {
> struct bpf_prog_aux *aux = tgt_prog->aux;
>
> + if (aux->attach_depth >= 32) {
> + bpf_log(log, "Target program attach depth is %d. Too large\n",
> + aux->attach_depth);
> + return -EINVAL;
> + }
IIUC the use case you have is to be able to attach fentry program on
another fentry program.. do you have use case that needs more than
that?
could we allow just single nesting? that might perhaps endup in easier
code while still allowing your use case?
> +
> if (bpf_prog_is_dev_bound(prog->aux) &&
> !bpf_prog_dev_bound_match(prog, tgt_prog)) {
> bpf_log(log, "Target program bound device mismatch");
> @@ -20147,9 +20153,16 @@ int bpf_check_attach_target(struct bpf_verifier_log *log,
> bpf_log(log, "Can attach to only JITed progs\n");
> return -EINVAL;
> }
> - if (tgt_prog->type == prog->type) {
> - /* Cannot fentry/fexit another fentry/fexit program.
> - * Cannot attach program extension to another extension.
> + if (tgt_prog->type == prog->type &&
> + (prog_extension || prog->aux->follower_cnt > 0)) {
> + /*
> + * To avoid potential call chain cycles, prevent attaching programs
> + * of the same type. The only exception is standalone fentry/fexit
> + * programs that themselves are not attachment targets.
> + * That means:
> + * - Cannot attach followed fentry/fexit to another
> + * fentry/fexit program.
> + * - Cannot attach program extension to another extension.
> * It's ok to attach fentry/fexit to extension program.
next condition below denies extension on fentry/fexit and the reason
is the possibility:
"... to create long call chain * fentry->extension->fentry->extension
beyond reasonable stack size ..."
that might be problem also here with 32 allowed nesting
also the the comment mentions that it's not possible to attach fentry/fexit
on themselfs, so it should be updated
jirka
> */
> bpf_log(log, "Cannot recursively attach\n");
> diff --git a/tools/bpf/bpftool/prog.c b/tools/bpf/bpftool/prog.c
> index feb8e305804f..83f999f5505d 100644
> --- a/tools/bpf/bpftool/prog.c
> +++ b/tools/bpf/bpftool/prog.c
> @@ -558,6 +558,9 @@ static void print_prog_plain(struct bpf_prog_info *info, int fd, bool orphaned)
> if (orphaned)
> printf(" orphaned");
>
> + if (info->attach_depth)
> + printf(" attach depth %d", info->attach_depth);
> +
> if (info->nr_map_ids)
> show_prog_maps(fd, info->nr_map_ids);
>
> diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h
> index e88746ba7d21..9cf45ad914f1 100644
> --- a/tools/include/uapi/linux/bpf.h
> +++ b/tools/include/uapi/linux/bpf.h
> @@ -6468,6 +6468,7 @@ struct bpf_prog_info {
> __u32 verified_insns;
> __u32 attach_btf_obj_id;
> __u32 attach_btf_id;
> + __u32 attach_depth;
> } __attribute__((aligned(8)));
>
> struct bpf_map_info {
> --
> 2.41.0
>
