Commit 662c5472 authored by Jiong Wang's avatar Jiong Wang Committed by Daniel Borkmann
Browse files

nfp: bpf: rename umin/umax to umin_src/umax_src 



The two fields are a copy of umin and umax info of bpf_insn->src_reg
generated by verifier.

Rename to make their meaning clear.

Signed-off-by: default avatarJiong Wang <jiong.wang@netronome.com>
Reviewed-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Acked-by: default avatarSong Liu <songliubraving@fb.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent 06ae4826

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

+6 −6
Original line number Diff line number Diff line
@@ -1772,8 +1772,8 @@ static int shl_reg64(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta) 
	u8 dst, src;



	dst = insn->dst_reg * 2;

	umin = meta->umin;

	umax = meta->umax;

	umin = meta->umin_src;

	umax = meta->umax_src;

	if (umin == umax)

		return __shl_imm64(nfp_prog, dst, umin);
@@ -1881,8 +1881,8 @@ static int shr_reg64(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta) 
	u8 dst, src;



	dst = insn->dst_reg * 2;

	umin = meta->umin;

	umax = meta->umax;

	umin = meta->umin_src;

	umax = meta->umax_src;

	if (umin == umax)

		return __shr_imm64(nfp_prog, dst, umin);
@@ -1995,8 +1995,8 @@ static int ashr_reg64(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta) 
	u8 dst, src;



	dst = insn->dst_reg * 2;

	umin = meta->umin;

	umax = meta->umax;

	umin = meta->umin_src;

	umax = meta->umax_src;

	if (umin == umax)

		return __ashr_imm64(nfp_prog, dst, umin);

drivers/net/ethernet/netronome/nfp/bpf/main.h

+5 −5
Original line number Diff line number Diff line
@@ -263,8 +263,8 @@ struct nfp_bpf_reg_state { 
 * @func_id: function id for call instructions

 * @arg1: arg1 for call instructions

 * @arg2: arg2 for call instructions

 * @umin: copy of core verifier umin_value.

 * @umax: copy of core verifier umax_value.

 * @umin_src: copy of core verifier umin_value for src opearnd.

 * @umax_src: copy of core verifier umax_value for src operand.

 * @off: index of first generated machine instruction (in nfp_prog.prog)

 * @n: eBPF instruction number

 * @flags: eBPF instruction extra optimization flags
@@ -301,11 +301,11 @@ struct nfp_insn_meta { 
			struct nfp_bpf_reg_state arg2;

		};

		/* We are interested in range info for some operands,

		 * for example, the shift amount.

		 * for example, the shift amount which is kept in src operand.

		 */

		struct {

			u64 umin;

			u64 umax;

			u64 umin_src;

			u64 umax_src;

		};

	};

	unsigned int off;

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

+1 −1
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ nfp_prog_prepare(struct nfp_prog *nfp_prog, const struct bpf_insn *prog, 
		meta->insn = prog[i];

		meta->n = i;

		if (is_mbpf_indir_shift(meta))

			meta->umin = U64_MAX;

			meta->umin_src = U64_MAX;



		list_add_tail(&meta->l, &nfp_prog->insns);

	}

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

+2 −2
Original line number Diff line number Diff line
@@ -555,8 +555,8 @@ nfp_verify_insn(struct bpf_verifier_env *env, int insn_idx, int prev_insn_idx) 
		const struct bpf_reg_state *sreg =

			cur_regs(env) + meta->insn.src_reg;



		meta->umin = min(meta->umin, sreg->umin_value);

		meta->umax = max(meta->umax, sreg->umax_value);

		meta->umin_src = min(meta->umin_src, sreg->umin_value);

		meta->umax_src = max(meta->umax_src, sreg->umax_value);

	}



	return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE