libbpf: Change the order of data and text relocations.

In order to be able to generate loader program in the later
patches change the order of data and text relocations.
Also improve the test to include data relos.

If the kernel supports "FD array" the map_fd relocations can be processed
before text relos since generated loader program won't need to manually
patch ld_imm64 insns with map_fd.
But ksym and kfunc relocations can only be processed after all calls
are relocated, since loader program will consist of a sequence
of calls to bpf_btf_find_by_name_kind() followed by patching of btf_id
and btf_obj_fd into corresponding ld_imm64 insns. The locations of those
ld_imm64 insns are specified in relocations.
Hence process all data relocations (maps, ksym, kfunc) together after call relos.

Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20210514003623.28033-12-alexei.starovoitov@gmail.com

diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
index 05315048dd10432b307cd830c669103f84916d26..669400a0b676dc4daac00003c82014098e8a8b79 100644 (file)
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@ -6419,11 +6419,15 @@ bpf_object__relocate_data(struct bpf_object *obj, struct bpf_program *prog)
                        insn[0].imm = ext->ksym.kernel_btf_id;
                        break;
                case RELO_SUBPROG_ADDR:
-                       insn[0].src_reg = BPF_PSEUDO_FUNC;
-                       /* will be handled as a follow up pass */
+                       if (insn[0].src_reg != BPF_PSEUDO_FUNC) {
+                               pr_warn("prog '%s': relo #%d: bad insn\n",
+                                       prog->name, i);
+                               return -EINVAL;
+                       }
+                       /* handled already */
                        break;
                case RELO_CALL:
-                       /* will be handled as a follow up pass */
+                       /* handled already */
                        break;
                default:
                        pr_warn("prog '%s': relo #%d: bad relo type %d\n",
@@ -6592,6 +6596,30 @@ static struct reloc_desc *find_prog_insn_relo(const struct bpf_program *prog, si
                       sizeof(*prog->reloc_desc), cmp_relo_by_insn_idx);
 }
 
+static int append_subprog_relos(struct bpf_program *main_prog, struct bpf_program *subprog)
+{
+       int new_cnt = main_prog->nr_reloc + subprog->nr_reloc;
+       struct reloc_desc *relos;
+       int i;
+
+       if (main_prog == subprog)
+               return 0;
+       relos = libbpf_reallocarray(main_prog->reloc_desc, new_cnt, sizeof(*relos));
+       if (!relos)
+               return -ENOMEM;
+       memcpy(relos + main_prog->nr_reloc, subprog->reloc_desc,
+              sizeof(*relos) * subprog->nr_reloc);
+
+       for (i = main_prog->nr_reloc; i < new_cnt; i++)
+               relos[i].insn_idx += subprog->sub_insn_off;
+       /* After insn_idx adjustment the 'relos' array is still sorted
+        * by insn_idx and doesn't break bsearch.
+        */
+       main_prog->reloc_desc = relos;
+       main_prog->nr_reloc = new_cnt;
+       return 0;
+}
+
 static int
 bpf_object__reloc_code(struct bpf_object *obj, struct bpf_program *main_prog,
                       struct bpf_program *prog)
@@ -6612,6 +6640,11 @@ bpf_object__reloc_code(struct bpf_object *obj, struct bpf_program *main_prog,
                        continue;
 
                relo = find_prog_insn_relo(prog, insn_idx);
+               if (relo && relo->type == RELO_EXTERN_FUNC)
+                       /* kfunc relocations will be handled later
+                        * in bpf_object__relocate_data()
+                        */
+                       continue;
                if (relo && relo->type != RELO_CALL && relo->type != RELO_SUBPROG_ADDR) {
                        pr_warn("prog '%s': unexpected relo for insn #%zu, type %d\n",
                                prog->name, insn_idx, relo->type);
@@ -6686,6 +6719,10 @@ bpf_object__reloc_code(struct bpf_object *obj, struct bpf_program *main_prog,
                        pr_debug("prog '%s': added %zu insns from sub-prog '%s'\n",
                                 main_prog->name, subprog->insns_cnt, subprog->name);
 
+                       /* The subprog insns are now appended. Append its relos too. */
+                       err = append_subprog_relos(main_prog, subprog);
+                       if (err)
+                               return err;
                        err = bpf_object__reloc_code(obj, main_prog, subprog);
                        if (err)
                                return err;
@@ -6819,7 +6856,7 @@ static int
 bpf_object__relocate(struct bpf_object *obj, const char *targ_btf_path)
 {
        struct bpf_program *prog;
-       size_t i;
+       size_t i, j;
        int err;
 
        if (obj->btf_ext) {
@@ -6830,23 +6867,32 @@ bpf_object__relocate(struct bpf_object *obj, const char *targ_btf_path)
                        return err;
                }
        }
-       /* relocate data references first for all programs and sub-programs,
-        * as they don't change relative to code locations, so subsequent
-        * subprogram processing won't need to re-calculate any of them
+
+       /* Before relocating calls pre-process relocations and mark
+        * few ld_imm64 instructions that points to subprogs.
+        * Otherwise bpf_object__reloc_code() later would have to consider
+        * all ld_imm64 insns as relocation candidates. That would
+        * reduce relocation speed, since amount of find_prog_insn_relo()
+        * would increase and most of them will fail to find a relo.
         */
        for (i = 0; i < obj->nr_programs; i++) {
                prog = &obj->programs[i];
-               err = bpf_object__relocate_data(obj, prog);
-               if (err) {
-                       pr_warn("prog '%s': failed to relocate data references: %d\n",
-                               prog->name, err);
-                       return err;
+               for (j = 0; j < prog->nr_reloc; j++) {
+                       struct reloc_desc *relo = &prog->reloc_desc[j];
+                       struct bpf_insn *insn = &prog->insns[relo->insn_idx];
+
+                       /* mark the insn, so it's recognized by insn_is_pseudo_func() */
+                       if (relo->type == RELO_SUBPROG_ADDR)
+                               insn[0].src_reg = BPF_PSEUDO_FUNC;
                }
        }
-       /* now relocate subprogram calls and append used subprograms to main
+
+       /* relocate subprogram calls and append used subprograms to main
         * programs; each copy of subprogram code needs to be relocated
         * differently for each main program, because its code location might
-        * have changed
+        * have changed.
+        * Append subprog relos to main programs to allow data relos to be
+        * processed after text is completely relocated.
         */
        for (i = 0; i < obj->nr_programs; i++) {
                prog = &obj->programs[i];
@@ -6863,6 +6909,18 @@ bpf_object__relocate(struct bpf_object *obj, const char *targ_btf_path)
                        return err;
                }
        }
+       /* Process data relos for main programs */
+       for (i = 0; i < obj->nr_programs; i++) {
+               prog = &obj->programs[i];
+               if (prog_is_subprog(obj, prog))
+                       continue;
+               err = bpf_object__relocate_data(obj, prog);
+               if (err) {
+                       pr_warn("prog '%s': failed to relocate data references: %d\n",
+                               prog->name, err);
+                       return err;
+               }
+       }
        /* free up relocation descriptors */
        for (i = 0; i < obj->nr_programs; i++) {
                prog = &obj->programs[i];

diff --git a/tools/testing/selftests/bpf/progs/test_subprogs.c b/tools/testing/selftests/bpf/progs/test_subprogs.c
index d3c5673c0218acd35a22a3271800fb5788194121..b7c37ca09544de96a3a6a207c3491685f9af547e 100644 (file)
--- a/tools/testing/selftests/bpf/progs/test_subprogs.c
+++ b/tools/testing/selftests/bpf/progs/test_subprogs.c
@@ -4,8 +4,18 @@
 
 const char LICENSE[] SEC("license") = "GPL";
 
+struct {
+       __uint(type, BPF_MAP_TYPE_ARRAY);
+       __uint(max_entries, 1);
+       __type(key, __u32);
+       __type(value, __u64);
+} array SEC(".maps");
+
 __noinline int sub1(int x)
 {
+       int key = 0;
+
+       bpf_map_lookup_elem(&array, &key);
        return x + 1;
 }
 
@@ -23,6 +33,9 @@ static __noinline int sub3(int z)
 
 static __noinline int sub4(int w)
 {
+       int key = 0;
+
+       bpf_map_lookup_elem(&array, &key);
        return w + sub3(5) + sub1(6);
 }