On Sun, Jun 24, 2018 at 8:54 PM, Jakub Kicinski
<jakub.kicin...@netronome.com> wrote:
> From: Jiong Wang <jiong.w...@netronome.com>
>
> 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: Jiong Wang <jiong.w...@netronome.com>
> Reviewed-by: Jakub Kicinski <jakub.kicin...@netronome.com>
Acked-by: Song Liu <songliubrav...@fb.com>
> ---
> drivers/net/ethernet/netronome/nfp/bpf/jit.c | 12 ++++++------
> drivers/net/ethernet/netronome/nfp/bpf/main.h | 10 +++++-----
> drivers/net/ethernet/netronome/nfp/bpf/offload.c | 2 +-
> drivers/net/ethernet/netronome/nfp/bpf/verifier.c | 4 ++--
> 4 files changed, 14 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/net/ethernet/netronome/nfp/bpf/jit.c
> b/drivers/net/ethernet/netronome/nfp/bpf/jit.c
> index 33111739b210..4a629e9b5c0f 100644
> --- a/drivers/net/ethernet/netronome/nfp/bpf/jit.c
> +++ b/drivers/net/ethernet/netronome/nfp/bpf/jit.c
> @@ -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);
>
> diff --git a/drivers/net/ethernet/netronome/nfp/bpf/main.h
> b/drivers/net/ethernet/netronome/nfp/bpf/main.h
> index 654fe7823e5e..5975a19c28cb 100644
> --- a/drivers/net/ethernet/netronome/nfp/bpf/main.h
> +++ b/drivers/net/ethernet/netronome/nfp/bpf/main.h
> @@ -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;
> diff --git a/drivers/net/ethernet/netronome/nfp/bpf/offload.c
> b/drivers/net/ethernet/netronome/nfp/bpf/offload.c
> index 7eae4c0266f8..856a0003bb75 100644
> --- a/drivers/net/ethernet/netronome/nfp/bpf/offload.c
> +++ b/drivers/net/ethernet/netronome/nfp/bpf/offload.c
> @@ -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);
> }
> diff --git a/drivers/net/ethernet/netronome/nfp/bpf/verifier.c
> b/drivers/net/ethernet/netronome/nfp/bpf/verifier.c
> index 4bfeba7b21b2..e862b739441f 100644
> --- a/drivers/net/ethernet/netronome/nfp/bpf/verifier.c
> +++ b/drivers/net/ethernet/netronome/nfp/bpf/verifier.c
> @@ -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;
> --
> 2.17.1
>
