bpf: pass prog instead of env to bpf_prog_offload_verifier_prep()

Function bpf_prog_offload_verifier_prep(), called from the kernel BPF
verifier to run a driver-specific callback for preparing for the
verification step for offloaded programs, takes a pointer to a struct
bpf_verifier_env object. However, no driver callback needs the whole
structure at this time: the two drivers supporting this, nfp and
netdevsim, only need a pointer to the struct bpf_prog instance held by
env.

Update the callback accordingly, on kernel side and in these two
drivers.

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>

diff --git a/drivers/net/ethernet/netronome/nfp/bpf/offload.c b/drivers/net/ethernet/netronome/nfp/bpf/offload.c
index 91085cc3c843b61565a10e3e974b9d52d116acdc..e6b26d2f651db26392a63115d9f79c6fc5a84975 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/bpf/offload.c
+++ b/drivers/net/ethernet/netronome/nfp/bpf/offload.c
@@ -183,10 +183,9 @@ static void nfp_prog_free(struct nfp_prog *nfp_prog)
 }
 
 static int
-nfp_bpf_verifier_prep(struct net_device *netdev, struct bpf_verifier_env *env)
+nfp_bpf_verifier_prep(struct net_device *netdev, struct bpf_prog *prog)
 {
        struct nfp_net *nn = netdev_priv(netdev);
-       struct bpf_prog *prog = env->prog;
        struct nfp_app *app = nn->app;
        struct nfp_prog *nfp_prog;
        int ret;

diff --git a/drivers/net/netdevsim/bpf.c b/drivers/net/netdevsim/bpf.c
index 33e3d54c3a0a8341f2a57955b4d9368de05fa2f6..560bdaf1c98b3ce5d1451d5ec43b221681770786 100644 (file)
--- a/drivers/net/netdevsim/bpf.c
+++ b/drivers/net/netdevsim/bpf.c
@@ -259,14 +259,14 @@ static int nsim_bpf_create_prog(struct netdevsim *ns, struct bpf_prog *prog)
 }
 
 static int
-nsim_bpf_verifier_prep(struct net_device *dev, struct bpf_verifier_env *env)
+nsim_bpf_verifier_prep(struct net_device *dev, struct bpf_prog *prog)
 {
        struct netdevsim *ns = netdev_priv(dev);
 
        if (!ns->bpf_bind_accept)
                return -EOPNOTSUPP;
 
-       return nsim_bpf_create_prog(ns, env->prog);
+       return nsim_bpf_create_prog(ns, prog);
 }
 
 static int nsim_bpf_translate(struct net_device *dev, struct bpf_prog *prog)

diff --git a/include/linux/bpf.h b/include/linux/bpf.h
index 867d2801db645db02f55e4f03f04470bf05bfe80..888111350d0e74befafb3c26efe81a2db925456a 100644 (file)
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
@@ -268,7 +268,7 @@ struct bpf_prog_offload_ops {
        int (*insn_hook)(struct bpf_verifier_env *env,
                         int insn_idx, int prev_insn_idx);
        int (*finalize)(struct bpf_verifier_env *env);
-       int (*prepare)(struct net_device *netdev, struct bpf_verifier_env *env);
+       int (*prepare)(struct net_device *netdev, struct bpf_prog *prog);
        int (*translate)(struct net_device *netdev, struct bpf_prog *prog);
        void (*destroy)(struct bpf_prog *prog);
 };

diff --git a/include/linux/bpf_verifier.h b/include/linux/bpf_verifier.h
index d93e89761a8b429c2b5568688b7bf388e5b977d7..11f5df1092d9baddeb8dc902fcee4e2f528a9a07 100644 (file)
--- a/include/linux/bpf_verifier.h
+++ b/include/linux/bpf_verifier.h
@@ -245,7 +245,7 @@ static inline struct bpf_reg_state *cur_regs(struct bpf_verifier_env *env)
        return cur_func(env)->regs;
 }
 
-int bpf_prog_offload_verifier_prep(struct bpf_verifier_env *env);
+int bpf_prog_offload_verifier_prep(struct bpf_prog *prog);
 int bpf_prog_offload_verify_insn(struct bpf_verifier_env *env,
                                 int insn_idx, int prev_insn_idx);
 int bpf_prog_offload_finalize(struct bpf_verifier_env *env);

diff --git a/kernel/bpf/offload.c b/kernel/bpf/offload.c
index d665e75a0ac3ba420a6c6d45f5095fa1ec202ab2..397d206e184b255bcbe36b5cd09f7ee797dbf96b 100644 (file)
--- a/kernel/bpf/offload.c
+++ b/kernel/bpf/offload.c
@@ -123,15 +123,15 @@ err_maybe_put:
        return err;
 }
 
-int bpf_prog_offload_verifier_prep(struct bpf_verifier_env *env)
+int bpf_prog_offload_verifier_prep(struct bpf_prog *prog)
 {
        struct bpf_prog_offload *offload;
        int ret = -ENODEV;
 
        down_read(&bpf_devs_lock);
-       offload = env->prog->aux->offload;
+       offload = prog->aux->offload;
        if (offload)
-               ret = offload->offdev->ops->prepare(offload->netdev, env);
+               ret = offload->offdev->ops->prepare(offload->netdev, prog);
        offload->dev_state = !ret;
        up_read(&bpf_devs_lock);
 

diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
index 75dab40b19a3ecd0fbb32d5a88b69445d6e41356..8d0977980cfa179e397be261fd8b08c4cde13ac1 100644 (file)
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@ -6368,7 +6368,7 @@ int bpf_check(struct bpf_prog **prog, union bpf_attr *attr)
                goto skip_full_check;
 
        if (bpf_prog_is_dev_bound(env->prog->aux)) {
-               ret = bpf_prog_offload_verifier_prep(env);
+               ret = bpf_prog_offload_verifier_prep(env->prog);
                if (ret)
                        goto skip_full_check;
        }