diff options
| author | Jakub Kicinski <jakub.kicinski@netronome.com> | 2018-03-23 20:00:13 -0700 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2018-03-24 10:41:24 -0700 |
| commit | e8a4796ee2954db9f7e9b52e5fbc66ef876752f6 (patch) | |
| tree | ccd1d428ff372ff42d8abf3a53d24a6e6b6b37e4 | |
| parent | 4b6eca9d6817e58ae9b3342a5974e8fd9285279e (diff) | |
| download | linux-e8a4796ee2954db9f7e9b52e5fbc66ef876752f6.tar.gz linux-e8a4796ee2954db9f7e9b52e5fbc66ef876752f6.tar.bz2 linux-e8a4796ee2954db9f7e9b52e5fbc66ef876752f6.zip | |
nfp: bpf: fix check of program max insn count
NFP program allocation length is in bytes and NFP program length
is in instructions, fix the comparison of the two.
Fixes: 9314c442d7dd ("nfp: bpf: move translation prepare to offload.c")
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Jiong Wang <jiong.wang@netronome.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
| -rw-r--r-- | drivers/net/ethernet/netronome/nfp/bpf/jit.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/ethernet/netronome/nfp/bpf/jit.c b/drivers/net/ethernet/netronome/nfp/bpf/jit.c index 56451edf01c2..ecd7c33baf3c 100644 --- a/drivers/net/ethernet/netronome/nfp/bpf/jit.c +++ b/drivers/net/ethernet/netronome/nfp/bpf/jit.c @@ -74,7 +74,9 @@ nfp_meta_has_prev(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta) static void nfp_prog_push(struct nfp_prog *nfp_prog, u64 insn) { - if (nfp_prog->__prog_alloc_len == nfp_prog->prog_len) { + if (nfp_prog->__prog_alloc_len / sizeof(u64) == nfp_prog->prog_len) { + pr_warn("instruction limit reached (%u NFP instructions)\n", + nfp_prog->prog_len); nfp_prog->error = -ENOSPC; return; } @@ -2463,6 +2465,8 @@ static int nfp_translate(struct nfp_prog *nfp_prog) err = cb(nfp_prog, meta); if (err) return err; + if (nfp_prog->error) + return nfp_prog->error; nfp_prog->n_translated++; } |