nfp: bpf: fix return address from register-saving subroutine to callee

On performing a BPF-to-BPF call, we first jump to a subroutine that
pushes callee-saved registers (R6~R9) to the stack, and from there we
goes to the start of the callee next. In order to do so, the caller must
pass to the subroutine the address of the NFP instruction to jump to at
the end of that subroutine. This cannot be reliably implemented when
translated the caller, as we do not always know the start offset of the
callee yet.

This patch implement the required fixup step for passing the start
offset in the callee via the register used by the subroutine to hold its
return address.

Signed-off-by: Quentin Monnet <quentin.monnet@netronome.com>
Reviewed-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>

diff --git a/drivers/net/ethernet/netronome/nfp/bpf/jit.c b/drivers/net/ethernet/netronome/nfp/bpf/jit.c
index e8b03d8f54f784c0f475b5645a7da51c96e68c92..74423d3e714d2af62b9f0426db1ef77bb0a530ef 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/bpf/jit.c
+++ b/drivers/net/ethernet/netronome/nfp/bpf/jit.c
@@ -3340,10 +3340,25 @@ static const instr_cb_t instr_cb[256] = {
 };
 
 /* --- Assembler logic --- */
+static int
+nfp_fixup_immed_relo(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta,
+                    struct nfp_insn_meta *jmp_dst, u32 br_idx)
+{
+       if (immed_get_value(nfp_prog->prog[br_idx + 1])) {
+               pr_err("BUG: failed to fix up callee register saving\n");
+               return -EINVAL;
+       }
+
+       immed_set_value(&nfp_prog->prog[br_idx + 1], jmp_dst->off);
+
+       return 0;
+}
+
 static int nfp_fixup_branches(struct nfp_prog *nfp_prog)
 {
        struct nfp_insn_meta *meta, *jmp_dst;
        u32 idx, br_idx;
+       int err;
 
        list_for_each_entry(meta, &nfp_prog->insns, l) {
                if (meta->skip)
@@ -3380,7 +3395,7 @@ static int nfp_fixup_branches(struct nfp_prog *nfp_prog)
 
                /* Leave special branches for later */
                if (FIELD_GET(OP_RELO_TYPE, nfp_prog->prog[br_idx]) !=
-                   RELO_BR_REL)
+                   RELO_BR_REL && !is_mbpf_pseudo_call(meta))
                        continue;
 
                if (!meta->jmp_dst) {
@@ -3395,6 +3410,17 @@ static int nfp_fixup_branches(struct nfp_prog *nfp_prog)
                        return -ELOOP;
                }
 
+               if (is_mbpf_pseudo_call(meta)) {
+                       err = nfp_fixup_immed_relo(nfp_prog, meta,
+                                                  jmp_dst, br_idx);
+                       if (err)
+                               return err;
+               }
+
+               if (FIELD_GET(OP_RELO_TYPE, nfp_prog->prog[br_idx]) !=
+                   RELO_BR_REL)
+                       continue;
+
                for (idx = meta->off; idx <= br_idx; idx++) {
                        if (!nfp_is_br(nfp_prog->prog[idx]))
                                continue;