bpf: pass translate() as a callback and remove its ndo_bpf subcommand

As part of the transition from ndo_bpf() to callbacks attached to struct
bpf_offload_dev for some of the eBPF offload operations, move the
functions related to code translation to the struct and remove the
subcommand that was used to call them through the NDO.

Signed-off-by: Quentin Monnet <quentin.monnet@netronome.com>
Reviewed-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>

1 files changed, 9 insertions, 5 deletions

diff --git a/drivers/net/netdevsim/bpf.c b/drivers/net/netdevsim/bpf.c
index d045b7d666d9..30c2cd516d1c 100644
--- a/drivers/net/netdevsim/bpf.c
+++ b/drivers/net/netdevsim/bpf.c
@@ -269,6 +269,14 @@ nsim_bpf_verifier_prep(struct net_device *dev, struct bpf_verifier_env *env)
         return nsim_bpf_create_prog(ns, env->prog);
 }
 
+static int nsim_bpf_translate(struct net_device *dev, struct bpf_prog *prog)
+{
+        struct nsim_bpf_bound_prog *state = prog->aux->offload->dev_priv;
+
+        state->state = "xlated";
+        return 0;
+}
+
 static void nsim_bpf_destroy_prog(struct bpf_prog *prog)
 {
         struct nsim_bpf_bound_prog *state;
@@ -285,6 +293,7 @@ static const struct bpf_prog_offload_ops nsim_bpf_dev_ops = {
         .insn_hook      = nsim_bpf_verify_insn,
         .finalize       = nsim_bpf_finalize,
         .prepare        = nsim_bpf_verifier_prep,
+        .translate      = nsim_bpf_translate,
 };
 
 static int nsim_setup_prog_checks(struct netdevsim *ns, struct netdev_bpf *bpf)
@@ -551,11 +560,6 @@ int nsim_bpf(struct net_device *dev, struct netdev_bpf *bpf)
         ASSERT_RTNL();
 
         switch (bpf->command) {
-        case BPF_OFFLOAD_TRANSLATE:
-                state = bpf->offload.prog->aux->offload->dev_priv;
-
-                state->state = "xlated";
-                return 0;
         case BPF_OFFLOAD_DESTROY:
                 nsim_bpf_destroy_prog(bpf->offload.prog);
                 return 0;