nfp: bpf: move jump resolution to jit.c

Jump target resolution should be in jit.c not offload.c.
No functional changes.

Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Jiong Wang <jiong.wang@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 0de59f04da84fef85e0b3387d33b2a64005c6513..9caff3a7505a9f67390c991e0714bf79028f0890 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/bpf/jit.c
+++ b/drivers/net/ethernet/netronome/nfp/bpf/jit.c
@@ -2742,3 +2742,26 @@ int nfp_bpf_jit(struct nfp_prog *nfp_prog)
 
        return nfp_bpf_ustore_calc(nfp_prog, (__force __le64 *)nfp_prog->prog);
 }
+
+void nfp_bpf_jit_prepare(struct nfp_prog *nfp_prog, unsigned int cnt)
+{
+       struct nfp_insn_meta *meta;
+
+       /* Another pass to record jump information. */
+       list_for_each_entry(meta, &nfp_prog->insns, l) {
+               u64 code = meta->insn.code;
+
+               if (BPF_CLASS(code) == BPF_JMP && BPF_OP(code) != BPF_EXIT &&
+                   BPF_OP(code) != BPF_CALL) {
+                       struct nfp_insn_meta *dst_meta;
+                       unsigned short dst_indx;
+
+                       dst_indx = meta->n + 1 + meta->insn.off;
+                       dst_meta = nfp_bpf_goto_meta(nfp_prog, meta, dst_indx,
+                                                    cnt);
+
+                       meta->jmp_dst = dst_meta;
+                       dst_meta->flags |= FLAG_INSN_IS_JUMP_DST;
+               }
+       }
+}

diff --git a/drivers/net/ethernet/netronome/nfp/bpf/main.h b/drivers/net/ethernet/netronome/nfp/bpf/main.h
index 89a9b6393882bd80f3fd16b21e002de61e37722d..0b1347f2afd1a04d13db60acc0164780b9fbfef9 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/bpf/main.h
+++ b/drivers/net/ethernet/netronome/nfp/bpf/main.h
@@ -236,6 +236,7 @@ struct nfp_bpf_vnic {
        struct bpf_prog *tc_prog;
 };
 
+void nfp_bpf_jit_prepare(struct nfp_prog *nfp_prog, unsigned int cnt);
 int nfp_bpf_jit(struct nfp_prog *prog);
 
 extern const struct bpf_prog_offload_ops nfp_bpf_analyzer_ops;

diff --git a/drivers/net/ethernet/netronome/nfp/bpf/offload.c b/drivers/net/ethernet/netronome/nfp/bpf/offload.c
index 8dbf13450bab6aa8f994cf06b0e1eccd55476016..0ca6faaacc5804826068259602899439b9ede156 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/bpf/offload.c
+++ b/drivers/net/ethernet/netronome/nfp/bpf/offload.c
@@ -70,23 +70,7 @@ nfp_prog_prepare(struct nfp_prog *nfp_prog, const struct bpf_insn *prog,
                list_add_tail(&meta->l, &nfp_prog->insns);
        }
 
-       /* Another pass to record jump information. */
-       list_for_each_entry(meta, &nfp_prog->insns, l) {
-               u64 code = meta->insn.code;
-
-               if (BPF_CLASS(code) == BPF_JMP && BPF_OP(code) != BPF_EXIT &&
-                   BPF_OP(code) != BPF_CALL) {
-                       struct nfp_insn_meta *dst_meta;
-                       unsigned short dst_indx;
-
-                       dst_indx = meta->n + 1 + meta->insn.off;
-                       dst_meta = nfp_bpf_goto_meta(nfp_prog, meta, dst_indx,
-                                                    cnt);
-
-                       meta->jmp_dst = dst_meta;
-                       dst_meta->flags |= FLAG_INSN_IS_JUMP_DST;
-               }
-       }
+       nfp_bpf_jit_prepare(nfp_prog, cnt);
 
        return 0;
 }