diff options
| author | Jakub Kicinski | 2018-01-12 05:29:16 +0100 |
|---|---|---|
| committer | Daniel Borkmann | 2018-01-14 23:36:30 +0100 |
| commit | 3dd43c3319cb0ba17cec9a989124176b409da326 (patch) | |
| tree | 94fa9c4440ff21803f24d286611b09650a405602 /drivers/net/ethernet/netronome/nfp/bpf/verifier.c | |
| parent | nfp: bpf: add verification and codegen for map lookups (diff) | |
| download | kernel-qcow2-linux-3dd43c3319cb0ba17cec9a989124176b409da326.tar.gz kernel-qcow2-linux-3dd43c3319cb0ba17cec9a989124176b409da326.tar.xz kernel-qcow2-linux-3dd43c3319cb0ba17cec9a989124176b409da326.zip | |
nfp: bpf: add support for reading map memory
Map memory needs to use 40 bit addressing. Add handling of such
accesses. Since 40 bit addresses are formed by using both 32 bit
operands we need to pre-calculate the actual address instead of
adding in the offset inside the instruction, like we did in 32 bit
mode.
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Quentin Monnet <quentin.monnet@netronome.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Diffstat (limited to 'drivers/net/ethernet/netronome/nfp/bpf/verifier.c')
| -rw-r--r-- | drivers/net/ethernet/netronome/nfp/bpf/verifier.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/ethernet/netronome/nfp/bpf/verifier.c b/drivers/net/ethernet/netronome/nfp/bpf/verifier.c index f867577cc315..741438896cc7 100644 --- a/drivers/net/ethernet/netronome/nfp/bpf/verifier.c +++ b/drivers/net/ethernet/netronome/nfp/bpf/verifier.c @@ -249,6 +249,7 @@ nfp_bpf_check_ptr(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta, if (reg->type != PTR_TO_CTX && reg->type != PTR_TO_STACK && + reg->type != PTR_TO_MAP_VALUE && reg->type != PTR_TO_PACKET) { pr_vlog(env, "unsupported ptr type: %d\n", reg->type); return -EINVAL; @@ -260,6 +261,13 @@ nfp_bpf_check_ptr(struct nfp_prog *nfp_prog, struct nfp_insn_meta *meta, return err; } + if (reg->type == PTR_TO_MAP_VALUE) { + if (is_mbpf_store(meta)) { + pr_info("map writes not supported\n"); + return -EOPNOTSUPP; + } + } + if (meta->ptr.type != NOT_INIT && meta->ptr.type != reg->type) { pr_vlog(env, "ptr type changed for instruction %d -> %d\n", meta->ptr.type, reg->type); |