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

Commit 74957cbf authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf 



Daniel Borkman says:

====================
pull-request: bpf 2018-03-29

The following pull-request contains BPF updates for your *net* tree.

The main changes are:

1) Fix nfp to properly check max insn count while emitting
   instructions in the JIT which was wrongly comparing bytes
   against number of instructions before, from Jakub.

2) Fix for bpftool to avoid usage of hex numbers in JSON
   output since JSON doesn't accept hex numbers with 0x
   prefix, also from Jakub.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents d65026c6 e8a4796e

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++;

	}

tools/bpf/bpftool/map.c

+1 −1
Original line number Diff line number Diff line
@@ -428,7 +428,7 @@ static int show_map_close_json(int fd, struct bpf_map_info *info) 
		jsonw_string_field(json_wtr, "name", info->name);



	jsonw_name(json_wtr, "flags");

	jsonw_printf(json_wtr, "%#x", info->map_flags);

	jsonw_printf(json_wtr, "%d", info->map_flags);



	print_dev_json(info->ifindex, info->netns_dev, info->netns_ino);