nfp: hand over to BPF offload app at coarser granularity

Instead of having an app callback per message type hand off
all offload-related handling to apps with one "rest of ndo_bpf"
callback.

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

5 files changed, 34 insertions, 61 deletions

diff --git a/drivers/net/ethernet/netronome/nfp/bpf/main.c b/drivers/net/ethernet/netronome/nfp/bpf/main.c
index 9ed76ccdd3c1..e8cfe300c8c4 100644
--- a/drivers/net/ethernet/netronome/nfp/bpf/main.c
+++ b/drivers/net/ethernet/netronome/nfp/bpf/main.c
@@ -345,9 +345,6 @@ const struct nfp_app_type app_bpf = {
 
         .setup_tc       = nfp_bpf_setup_tc,
         .tc_busy        = nfp_bpf_tc_busy,
+        .bpf            = nfp_ndo_bpf,
         .xdp_offload    = nfp_bpf_xdp_offload,
-
-        .bpf_verifier_prep      = nfp_bpf_verifier_prep,
-        .bpf_translate          = nfp_bpf_translate,
-        .bpf_destroy            = nfp_bpf_destroy,
 };
diff --git a/drivers/net/ethernet/netronome/nfp/bpf/main.h b/drivers/net/ethernet/netronome/nfp/bpf/main.h
index 8d02c39b9b10..66381afee2a9 100644
--- a/drivers/net/ethernet/netronome/nfp/bpf/main.h
+++ b/drivers/net/ethernet/netronome/nfp/bpf/main.h
@@ -256,15 +256,11 @@ struct netdev_bpf;
 struct nfp_app;
 struct nfp_net;
 
+int nfp_ndo_bpf(struct nfp_app *app, struct nfp_net *nn,
+                struct netdev_bpf *bpf);
 int nfp_net_bpf_offload(struct nfp_net *nn, struct bpf_prog *prog,
                         bool old_prog);
 
-int nfp_bpf_verifier_prep(struct nfp_app *app, struct nfp_net *nn,
-                          struct netdev_bpf *bpf);
-int nfp_bpf_translate(struct nfp_app *app, struct nfp_net *nn,
-                      struct bpf_prog *prog);
-int nfp_bpf_destroy(struct nfp_app *app, struct nfp_net *nn,
-                    struct bpf_prog *prog);
 struct nfp_insn_meta *
 nfp_bpf_goto_meta(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta,
                   unsigned int insn_idx, unsigned int n_insns);
diff --git a/drivers/net/ethernet/netronome/nfp/bpf/offload.c b/drivers/net/ethernet/netronome/nfp/bpf/offload.c
index f63560550753..320b2250d29a 100644
--- a/drivers/net/ethernet/netronome/nfp/bpf/offload.c
+++ b/drivers/net/ethernet/netronome/nfp/bpf/offload.c
@@ -87,8 +87,9 @@ static void nfp_prog_free(struct nfp_prog *nfp_prog)
         kfree(nfp_prog);
 }
 
-int nfp_bpf_verifier_prep(struct nfp_app *app, struct nfp_net *nn,
-                          struct netdev_bpf *bpf)
+static int
+nfp_bpf_verifier_prep(struct nfp_app *app, struct nfp_net *nn,
+                      struct netdev_bpf *bpf)
 {
         struct bpf_prog *prog = bpf->verifier.prog;
         struct nfp_prog *nfp_prog;
@@ -118,8 +119,7 @@ err_free:
         return ret;
 }
 
-int nfp_bpf_translate(struct nfp_app *app, struct nfp_net *nn,
-                      struct bpf_prog *prog)
+static int nfp_bpf_translate(struct nfp_net *nn, struct bpf_prog *prog)
 {
         struct nfp_prog *nfp_prog = prog->aux->offload->dev_priv;
         unsigned int stack_size;
@@ -143,8 +143,7 @@ int nfp_bpf_translate(struct nfp_app *app, struct nfp_net *nn,
         return nfp_bpf_jit(nfp_prog);
 }
 
-int nfp_bpf_destroy(struct nfp_app *app, struct nfp_net *nn,
-                    struct bpf_prog *prog)
+static int nfp_bpf_destroy(struct nfp_net *nn, struct bpf_prog *prog)
 {
         struct nfp_prog *nfp_prog = prog->aux->offload->dev_priv;
 
@@ -154,6 +153,20 @@ int nfp_bpf_destroy(struct nfp_app *app, struct nfp_net *nn,
         return 0;
 }
 
+int nfp_ndo_bpf(struct nfp_app *app, struct nfp_net *nn, struct netdev_bpf *bpf)
+{
+        switch (bpf->command) {
+        case BPF_OFFLOAD_VERIFIER_PREP:
+                return nfp_bpf_verifier_prep(app, nn, bpf);
+        case BPF_OFFLOAD_TRANSLATE:
+                return nfp_bpf_translate(nn, bpf->offload.prog);
+        case BPF_OFFLOAD_DESTROY:
+                return nfp_bpf_destroy(nn, bpf->offload.prog);
+        default:
+                return -EINVAL;
+        }
+}
+
 static int nfp_net_bpf_load(struct nfp_net *nn, struct bpf_prog *prog)
 {
         struct nfp_prog *nfp_prog = prog->aux->offload->dev_priv;
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_app.h b/drivers/net/ethernet/netronome/nfp/nfp_app.h
index e6b59c28c4ca..32ff46a00f70 100644
--- a/drivers/net/ethernet/netronome/nfp/nfp_app.h
+++ b/drivers/net/ethernet/netronome/nfp/nfp_app.h
@@ -89,10 +89,8 @@ extern const struct nfp_app_type app_flower;
  * @ctrl_msg_rx:    control message handler
  * @setup_tc:   setup TC ndo
  * @tc_busy:    TC HW offload busy (rules loaded)
+ * @bpf:        BPF ndo offload-related calls
  * @xdp_offload:    offload an XDP program
- * @bpf_verifier_prep:  verifier prep for dev-specific BPF programs
- * @bpf_translate:      translate call for dev-specific BPF programs
- * @bpf_destroy:        destroy for dev-specific BPF programs
  * @eswitch_mode_get:    get SR-IOV eswitch mode
  * @sriov_enable: app-specific sriov initialisation
  * @sriov_disable: app-specific sriov clean-up
@@ -133,14 +131,10 @@ struct nfp_app_type {
         int (*setup_tc)(struct nfp_app *app, struct net_device *netdev,
                         enum tc_setup_type type, void *type_data);
         bool (*tc_busy)(struct nfp_app *app, struct nfp_net *nn);
+        int (*bpf)(struct nfp_app *app, struct nfp_net *nn,
+                   struct netdev_bpf *xdp);
         int (*xdp_offload)(struct nfp_app *app, struct nfp_net *nn,
                            struct bpf_prog *prog);
-        int (*bpf_verifier_prep)(struct nfp_app *app, struct nfp_net *nn,
-                                 struct netdev_bpf *bpf);
-        int (*bpf_translate)(struct nfp_app *app, struct nfp_net *nn,
-                             struct bpf_prog *prog);
-        int (*bpf_destroy)(struct nfp_app *app, struct nfp_net *nn,
-                           struct bpf_prog *prog);
 
         int (*sriov_enable)(struct nfp_app *app, int num_vfs);
         void (*sriov_disable)(struct nfp_app *app);
@@ -316,6 +310,14 @@ static inline int nfp_app_setup_tc(struct nfp_app *app,
         return app->type->setup_tc(app, netdev, type, type_data);
 }
 
+static inline int nfp_app_bpf(struct nfp_app *app, struct nfp_net *nn,
+                              struct netdev_bpf *bpf)
+{
+        if (!app || !app->type->bpf)
+                return -EINVAL;
+        return app->type->bpf(app, nn, bpf);
+}
+
 static inline int nfp_app_xdp_offload(struct nfp_app *app, struct nfp_net *nn,
                                       struct bpf_prog *prog)
 {
@@ -324,33 +326,6 @@ static inline int nfp_app_xdp_offload(struct nfp_app *app, struct nfp_net *nn,
         return app->type->xdp_offload(app, nn, prog);
 }
 
-static inline int
-nfp_app_bpf_verifier_prep(struct nfp_app *app, struct nfp_net *nn,
-                          struct netdev_bpf *bpf)
-{
-        if (!app || !app->type->bpf_verifier_prep)
-                return -EOPNOTSUPP;
-        return app->type->bpf_verifier_prep(app, nn, bpf);
-}
-
-static inline int
-nfp_app_bpf_translate(struct nfp_app *app, struct nfp_net *nn,
-                      struct bpf_prog *prog)
-{
-        if (!app || !app->type->bpf_translate)
-                return -EOPNOTSUPP;
-        return app->type->bpf_translate(app, nn, prog);
-}
-
-static inline int
-nfp_app_bpf_destroy(struct nfp_app *app, struct nfp_net *nn,
-                    struct bpf_prog *prog)
-{
-        if (!app || !app->type->bpf_destroy)
-                return -EOPNOTSUPP;
-        return app->type->bpf_destroy(app, nn, prog);
-}
-
 static inline bool nfp_app_ctrl_tx(struct nfp_app *app, struct sk_buff *skb)
 {
         trace_devlink_hwmsg(priv_to_devlink(app->pf), false, 0,
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
index 33cbb9b35e68..caee147fce04 100644
--- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
@@ -3414,16 +3414,8 @@ static int nfp_net_xdp(struct net_device *netdev, struct netdev_bpf *xdp)
                 xdp->prog_id = nn->xdp_prog ? nn->xdp_prog->aux->id : 0;
                 xdp->prog_flags = nn->xdp_prog ? nn->xdp_flags : 0;
                 return 0;
-        case BPF_OFFLOAD_VERIFIER_PREP:
-                return nfp_app_bpf_verifier_prep(nn->app, nn, xdp);
-        case BPF_OFFLOAD_TRANSLATE:
-                return nfp_app_bpf_translate(nn->app, nn,
-                                             xdp->offload.prog);
-        case BPF_OFFLOAD_DESTROY:
-                return nfp_app_bpf_destroy(nn->app, nn,
-                                           xdp->offload.prog);
         default:
-                return -EINVAL;
+                return nfp_app_bpf(nn->app, nn, xdp);
         }
 }