mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-13 22:25:03 +00:00
nfp: bpf: refactor nfp_bpf_check_ptr()
nfp_bpf_check_ptr() mostly looks at the pointer register. Add a temporary variable to shorten the code. While at it make sure we print error messages if translation fails to help users identify the problem (to be carried in ext_ack in due course). Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com> Reviewed-by: Quentin Monnet <quentin.monnet@netronome.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
ff42bb9fe3
commit
70c78fc138
1 changed files with 13 additions and 7 deletions
|
@ -113,17 +113,23 @@ nfp_bpf_check_exit(struct nfp_prog *nfp_prog,
|
||||||
|
|
||||||
static int
|
static int
|
||||||
nfp_bpf_check_ptr(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta,
|
nfp_bpf_check_ptr(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta,
|
||||||
const struct bpf_verifier_env *env, u8 reg)
|
const struct bpf_verifier_env *env, u8 reg_no)
|
||||||
{
|
{
|
||||||
if (env->cur_state.regs[reg].type != PTR_TO_CTX &&
|
const struct bpf_reg_state *reg = &env->cur_state.regs[reg_no];
|
||||||
env->cur_state.regs[reg].type != PTR_TO_PACKET)
|
|
||||||
return -EINVAL;
|
|
||||||
|
|
||||||
if (meta->ptr.type != NOT_INIT &&
|
if (reg->type != PTR_TO_CTX &&
|
||||||
meta->ptr.type != env->cur_state.regs[reg].type)
|
reg->type != PTR_TO_PACKET) {
|
||||||
|
pr_info("unsupported ptr type: %d\n", reg->type);
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
}
|
||||||
|
|
||||||
meta->ptr = env->cur_state.regs[reg];
|
if (meta->ptr.type != NOT_INIT && meta->ptr.type != reg->type) {
|
||||||
|
pr_info("ptr type changed for instruction %d -> %d\n",
|
||||||
|
meta->ptr.type, reg->type);
|
||||||
|
return -EINVAL;
|
||||||
|
}
|
||||||
|
|
||||||
|
meta->ptr = *reg;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue