aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakub Kicinski <jakub.kicinski@netronome.com>2018-01-16 15:51:49 -0800
committerDaniel Borkmann <daniel@iogearbox.net>2018-01-17 01:15:06 +0100
commit7dfa4d87cfc48f3d4171f4a1b886bbbe4faf5c07 (patch)
treebd85481799b2e5989148571e982918febd218557
parentlibbpf: fix string comparison for guessing eBPF program type (diff)
downloadlinux-dev-7dfa4d87cfc48f3d4171f4a1b886bbbe4faf5c07.tar.xz
linux-dev-7dfa4d87cfc48f3d4171f4a1b886bbbe4faf5c07.zip
nfp: bpf: print map lookup problems into verifier log
Use the verifier log to output error messages if map lookup can't be offloaded. Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com> Acked-by: Quentin Monnet <quentin.monnet@netronome.com> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
-rw-r--r--drivers/net/ethernet/netronome/nfp/bpf/verifier.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/net/ethernet/netronome/nfp/bpf/verifier.c b/drivers/net/ethernet/netronome/nfp/bpf/verifier.c
index 741438896cc7..81dab462456c 100644
--- a/drivers/net/ethernet/netronome/nfp/bpf/verifier.c
+++ b/drivers/net/ethernet/netronome/nfp/bpf/verifier.c
@@ -132,22 +132,24 @@ nfp_bpf_check_call(struct nfp_prog *nfp_prog, struct bpf_verifier_env *env,
case BPF_FUNC_map_lookup_elem:
if (!bpf->helpers.map_lookup) {
- pr_info("map_lookup: not supported by FW\n");
+ pr_vlog(env, "map_lookup: not supported by FW\n");
return -EOPNOTSUPP;
}
if (reg2->type != PTR_TO_STACK) {
- pr_info("map_lookup: unsupported key ptr type %d\n",
+ pr_vlog(env,
+ "map_lookup: unsupported key ptr type %d\n",
reg2->type);
return -EOPNOTSUPP;
}
if (!tnum_is_const(reg2->var_off)) {
- pr_info("map_lookup: variable key pointer\n");
+ pr_vlog(env, "map_lookup: variable key pointer\n");
return -EOPNOTSUPP;
}
off = reg2->var_off.value + reg2->off;
if (-off % 4) {
- pr_info("map_lookup: unaligned stack pointer %lld\n",
+ pr_vlog(env,
+ "map_lookup: unaligned stack pointer %lld\n",
-off);
return -EOPNOTSUPP;
}
@@ -160,7 +162,7 @@ nfp_bpf_check_call(struct nfp_prog *nfp_prog, struct bpf_verifier_env *env,
meta->arg2_var_off |= off != old_off;
if (meta->arg1.map_ptr != reg1->map_ptr) {
- pr_info("map_lookup: called for different map\n");
+ pr_vlog(env, "map_lookup: called for different map\n");
return -EOPNOTSUPP;
}
break;
@@ -263,7 +265,7 @@ nfp_bpf_check_ptr(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta,
if (reg->type == PTR_TO_MAP_VALUE) {
if (is_mbpf_store(meta)) {
- pr_info("map writes not supported\n");
+ pr_vlog(env, "map writes not supported\n");
return -EOPNOTSUPP;
}
}