nfp: bpf: move program prepare and free into offload.c

Most of offload/translation prepare logic will be moved to
offload.c.  To help git generate more reasonable diffs
move nfp_prog_prepare() and nfp_prog_free() functions
there as a first step.

Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Quentin Monnet <quentin.monnet@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/netronome/nfp/bpf/jit.c b/drivers/net/ethernet/netronome/nfp/bpf/jit.c
index ff150c27f411f7229edad7d15e9731a3cc96f8cf..2eddbb45fd60c2ca7ded0bf86274bd62055e95ee 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/bpf/jit.c
+++ b/drivers/net/ethernet/netronome/nfp/bpf/jit.c
@@ -77,17 +77,6 @@ nfp_meta_has_prev(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta)
        return meta->l.prev != &nfp_prog->insns;
 }
 
-static void nfp_prog_free(struct nfp_prog *nfp_prog)
-{
-       struct nfp_insn_meta *meta, *tmp;
-
-       list_for_each_entry_safe(meta, tmp, &nfp_prog->insns, l) {
-               list_del(&meta->l);
-               kfree(meta);
-       }
-       kfree(nfp_prog);
-}
-
 static void nfp_prog_push(struct nfp_prog *nfp_prog, u64 insn)
 {
        if (nfp_prog->__prog_alloc_len == nfp_prog->prog_len) {
@@ -2127,28 +2116,6 @@ static int nfp_translate(struct nfp_prog *nfp_prog)
        return nfp_fixup_branches(nfp_prog);
 }
 
-static int
-nfp_prog_prepare(struct nfp_prog *nfp_prog, const struct bpf_insn *prog,
-                unsigned int cnt)
-{
-       unsigned int i;
-
-       for (i = 0; i < cnt; i++) {
-               struct nfp_insn_meta *meta;
-
-               meta = kzalloc(sizeof(*meta), GFP_KERNEL);
-               if (!meta)
-                       return -ENOMEM;
-
-               meta->insn = prog[i];
-               meta->n = i;
-
-               list_add_tail(&meta->l, &nfp_prog->insns);
-       }
-
-       return 0;
-}
-
 /* --- Optimizations --- */
 static void nfp_bpf_opt_reg_init(struct nfp_prog *nfp_prog)
 {

diff --git a/drivers/net/ethernet/netronome/nfp/bpf/main.h b/drivers/net/ethernet/netronome/nfp/bpf/main.h
index df56f40fea7c9d2c65ee15a0da5e1f896f82f9f9..b77231a134b92d4365a9a02bd9326bc01183f8f5 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/bpf/main.h
+++ b/drivers/net/ethernet/netronome/nfp/bpf/main.h
@@ -173,6 +173,11 @@ struct nfp_bpf_result {
        unsigned int n_instr;
 };
 
+int
+nfp_prog_prepare(struct nfp_prog *nfp_prog, const struct bpf_insn *prog,
+                unsigned int cnt);
+void nfp_prog_free(struct nfp_prog *nfp_prog);
+
 int
 nfp_bpf_jit(struct bpf_prog *filter, void *prog,
            unsigned int prog_start, unsigned int prog_done,

diff --git a/drivers/net/ethernet/netronome/nfp/bpf/offload.c b/drivers/net/ethernet/netronome/nfp/bpf/offload.c
index f4b9a46c844dfd988e3b878252ff3f2f9df39b6e..3eeee200051eb56259c222520ac1499098f3f3ea 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/bpf/offload.c
+++ b/drivers/net/ethernet/netronome/nfp/bpf/offload.c
@@ -51,6 +51,39 @@
 #include "../nfp_net_ctrl.h"
 #include "../nfp_net.h"
 
+int
+nfp_prog_prepare(struct nfp_prog *nfp_prog, const struct bpf_insn *prog,
+                unsigned int cnt)
+{
+       unsigned int i;
+
+       for (i = 0; i < cnt; i++) {
+               struct nfp_insn_meta *meta;
+
+               meta = kzalloc(sizeof(*meta), GFP_KERNEL);
+               if (!meta)
+                       return -ENOMEM;
+
+               meta->insn = prog[i];
+               meta->n = i;
+
+               list_add_tail(&meta->l, &nfp_prog->insns);
+       }
+
+       return 0;
+}
+
+void nfp_prog_free(struct nfp_prog *nfp_prog)
+{
+       struct nfp_insn_meta *meta, *tmp;
+
+       list_for_each_entry_safe(meta, tmp, &nfp_prog->insns, l) {
+               list_del(&meta->l);
+               kfree(meta);
+       }
+       kfree(nfp_prog);
+}
+
 static int
 nfp_net_bpf_offload_prepare(struct nfp_net *nn, struct bpf_prog *prog,
                            struct nfp_bpf_result *res,