[PATCH v5 bpf-next 2/6] bpf: propagate poke descriptors to subprograms

[Maciej Fijalkowski]

Previously, there was no need for poke descriptors being present in
subprogram's bpf_prog_aux struct since tailcalls were simply not allowed
in them. Each subprog is JITed independently so in order to enable
JITing such subprograms, simply copy poke descriptors from main program
to subprogram's poke tab.

Add also subprog's aux struct to the BPF map poke_progs list by calling
on it map_poke_track().

In case of any error, call the map_poke_untrack() on subprog's aux
structs that have already been registered to prog array map.

Signed-off-by: Maciej Fijalkowski <maciej.fijalkow...@intel.com>
---
 kernel/bpf/verifier.c | 31 ++++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
index 9a6703bc3f36..f4955b4bf8a6 100644
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@ -9900,6 +9900,7 @@ static int jit_subprogs(struct bpf_verifier_env *env)
 {
        struct bpf_prog *prog = env->prog, **func, *tmp;
        int i, j, subprog_start, subprog_end = 0, len, subprog;
+       struct bpf_map *map_ptr;
        struct bpf_insn *insn;
        void *old_bpf_func;
        int err, num_exentries;
@@ -9967,6 +9968,23 @@ static int jit_subprogs(struct bpf_verifier_env *env)
                func[i]->aux->btf = prog->aux->btf;
                func[i]->aux->func_info = prog->aux->func_info;
 
+               for (j = 0; j < prog->aux->size_poke_tab; j++) {
+                       int ret;
+
+                       ret = bpf_jit_add_poke_descriptor(func[i],
+                                                         
&prog->aux->poke_tab[j]);
+                       if (ret < 0) {
+                               verbose(env, "adding tail call poke descriptor 
failed\n");
+                               goto out_free;
+                       }
+                       map_ptr = func[i]->aux->poke_tab[j].tail_call.map;
+                       ret = map_ptr->ops->map_poke_track(map_ptr, 
func[i]->aux);
+                       if (ret < 0) {
+                               verbose(env, "tracking tail call prog 
failed\n");
+                               goto out_free;
+                       }
+               }
+
                /* Use bpf_prog_F_tag to indicate functions in stack traces.
                 * Long term would need debug info to populate names
                 */
@@ -10060,9 +10078,16 @@ static int jit_subprogs(struct bpf_verifier_env *env)
        bpf_prog_free_unused_jited_linfo(prog);
        return 0;
 out_free:
-       for (i = 0; i < env->subprog_cnt; i++)
-               if (func[i])
-                       bpf_jit_free(func[i]);
+       for (i = 0; i < env->subprog_cnt; i++) {
+               if (!func[i])
+                       continue;
+
+               for (j = 0; j < func[i]->aux->size_poke_tab; j++) {
+                       map_ptr = func[i]->aux->poke_tab[j].tail_call.map;
+                       map_ptr->ops->map_poke_untrack(map_ptr, func[i]->aux);
+               }
+               bpf_jit_free(func[i]);
+       }
        kfree(func);
 out_undo_insn:
        /* cleanup main prog to be interpreted */
-- 
2.20.1