diff options
| author | Jakub Kicinski | 2019-01-23 07:45:28 +0100 |
|---|---|---|
| committer | Alexei Starovoitov | 2019-01-24 02:35:32 +0100 |
| commit | a32014b351662fd67c7e0f807855f527d0834d00 (patch) | |
| tree | df4010a54481e94a3beda90fedf65f315e7517b0 /drivers/net/ethernet/netronome/nfp/bpf/main.h | |
| parent | nfp: bpf: save original program length (diff) | |
| download | kernel-qcow2-linux-a32014b351662fd67c7e0f807855f527d0834d00.tar.gz kernel-qcow2-linux-a32014b351662fd67c7e0f807855f527d0834d00.tar.xz kernel-qcow2-linux-a32014b351662fd67c7e0f807855f527d0834d00.zip | |
nfp: bpf: support optimizing dead branches
Verifier will now optimize out branches to dead code, implement
the replace_insn callback to take advantage of that optimization.
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/main.h')
| -rw-r--r-- | drivers/net/ethernet/netronome/nfp/bpf/main.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/net/ethernet/netronome/nfp/bpf/main.h b/drivers/net/ethernet/netronome/nfp/bpf/main.h index 07879eee3d46..a33aa7df1979 100644 --- a/drivers/net/ethernet/netronome/nfp/bpf/main.h +++ b/drivers/net/ethernet/netronome/nfp/bpf/main.h @@ -412,6 +412,17 @@ static inline bool is_mbpf_div(const struct nfp_insn_meta *meta) return is_mbpf_alu(meta) && mbpf_op(meta) == BPF_DIV; } +static inline bool is_mbpf_cond_jump(const struct nfp_insn_meta *meta) +{ + u8 op; + + if (BPF_CLASS(meta->insn.code) != BPF_JMP) + return false; + + op = BPF_OP(meta->insn.code); + return op != BPF_JA && op != BPF_EXIT && op != BPF_CALL; +} + static inline bool is_mbpf_helper_call(const struct nfp_insn_meta *meta) { struct bpf_insn insn = meta->insn; @@ -520,6 +531,9 @@ int nfp_verify_insn(struct bpf_verifier_env *env, int insn_idx, int prev_insn_idx); int nfp_bpf_finalize(struct bpf_verifier_env *env); +int nfp_bpf_opt_replace_insn(struct bpf_verifier_env *env, u32 off, + struct bpf_insn *insn); + extern const struct bpf_prog_offload_ops nfp_bpf_dev_ops; struct netdev_bpf; |