Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e8a4796e authored by Jakub Kicinski's avatar Jakub Kicinski Committed by Alexei Starovoitov
Browse files

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: 9314c442 ("nfp: bpf: move translation prepare to offload.c")
Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: default avatarJiong Wang <jiong.wang@netronome.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent 4b6eca9d

drivers/net/ethernet/netronome/nfp/bpf/jit.c

+5 −1
Original line number Diff line number Diff line
@@ -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++;

	}