Commit cc0dff6d authored Jun 26, 2018 by Jiong Wang Committed by Daniel Borkmann Jun 27, 2018

nfp: bpf: allow source ptr type be map ptr in memcpy optimization



Map read has been supported on NFP, this patch enables optimization
for memcpy from map to packet.

This patch also fixed one latent bug which will cause copying from
unexpected address once memcpy for map pointer enabled.  The fixed
code path was not exercised before.

Reported-by: Mary Pham <mary.pham@netronome.com>
Reported-by: David Beckett <david.beckett@netronome.com>
Signed-off-by: Jiong Wang <jiong.wang@netronome.com>
Reviewed-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Acked-by: Song Liu <songliubraving@fb.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>

parent b1a5046b

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -670,7 +670,7 @@ static int nfp_cpp_memcpy(struct nfp_prog nfp_prog, struct nfp_insn_meta meta)
		xfer_num = round_up(len, 4) / 4;

		if (src_40bit_addr)
		addr40_offset(nfp_prog, meta->insn.src_reg, off, &src_base,
		addr40_offset(nfp_prog, meta->insn.src_reg * 2, off, &src_base,
		&off);

		/* Setup PREV_ALU fields to override memory read length. */
		@@ -3299,7 +3299,8 @@ curr_pair_is_memcpy(struct nfp_insn_meta *ld_meta,
		if (!is_mbpf_load(ld_meta) \|\| !is_mbpf_store(st_meta))
		return false;

		if (ld_meta->ptr.type != PTR_TO_PACKET)
		if (ld_meta->ptr.type != PTR_TO_PACKET &&
		ld_meta->ptr.type != PTR_TO_MAP_VALUE)
		return false;

		if (st_meta->ptr.type != PTR_TO_PACKET)