diff options
| author | Jakub Kicinski <jakub.kicinski@netronome.com> | 2019-01-23 09:45:29 +0300 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2019-01-24 04:35:32 +0300 |
| commit | 9a06927e778bc4e805acc8fa03573bbf7e597cc5 (patch) | |
| tree | 28a991a3a4afc3b0116f559f139c94e473044499 /drivers/net/ethernet/netronome/nfp/bpf/offload.c | |
| parent | a32014b351662fd67c7e0f807855f527d0834d00 (diff) | |
| download | linux-9a06927e778bc4e805acc8fa03573bbf7e597cc5.tar.xz | |
nfp: bpf: support removing dead code
Add a verifier callback to the nfp JIT to remove the instructions
the verifier deemed to be dead.
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Quentin Monnet <quentin.monnet@netronome.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/netronome/nfp/bpf/offload.c')
| -rw-r--r-- | drivers/net/ethernet/netronome/nfp/bpf/offload.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/ethernet/netronome/nfp/bpf/offload.c b/drivers/net/ethernet/netronome/nfp/bpf/offload.c index 877c1b8f95e2..55c7dbf8b421 100644 --- a/drivers/net/ethernet/netronome/nfp/bpf/offload.c +++ b/drivers/net/ethernet/netronome/nfp/bpf/offload.c @@ -220,6 +220,10 @@ static int nfp_bpf_translate(struct bpf_prog *prog) unsigned int max_instr; int err; + /* We depend on dead code elimination succeeding */ + if (prog->aux->offload->opt_failed) + return -EINVAL; + max_instr = nn_readw(nn, NFP_NET_CFG_BPF_MAX_LEN); nfp_prog->__prog_alloc_len = max_instr * sizeof(u64); @@ -593,6 +597,7 @@ const struct bpf_prog_offload_ops nfp_bpf_dev_ops = { .insn_hook = nfp_verify_insn, .finalize = nfp_bpf_finalize, .replace_insn = nfp_bpf_opt_replace_insn, + .remove_insns = nfp_bpf_opt_remove_insns, .prepare = nfp_bpf_verifier_prep, .translate = nfp_bpf_translate, .destroy = nfp_bpf_destroy, |