diff options
| author | Jakub Kicinski | 2017-10-09 06:04:17 +0200 |
|---|---|---|
| committer | David S. Miller | 2017-10-09 18:51:03 +0200 |
| commit | 2de1be1db25d3285f514920230790be20db92887 (patch) | |
| tree | 08850a7dcc34653c0dfc574cd3bd818016f2ff45 /drivers/net/ethernet/netronome | |
| parent | nfp: bpf: byte swap the instructions (diff) | |
| download | kernel-qcow2-linux-2de1be1db25d3285f514920230790be20db92887.tar.gz kernel-qcow2-linux-2de1be1db25d3285f514920230790be20db92887.tar.xz kernel-qcow2-linux-2de1be1db25d3285f514920230790be20db92887.zip | |
nfp: bpf: pass dst register to ld_field instruction
ld_field instruction is a bit special because the encoding uses
two source registers and one of them becomes the output. We do
need to pass the dst register to our encoding helpers though,
otherwise the "write both banks" flag will not be observed.
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Simon Horman <simon.horman@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/netronome')
| -rw-r--r-- | drivers/net/ethernet/netronome/nfp/bpf/jit.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/netronome/nfp/bpf/jit.c b/drivers/net/ethernet/netronome/nfp/bpf/jit.c index f68052367db7..13148f30fc4c 100644 --- a/drivers/net/ethernet/netronome/nfp/bpf/jit.c +++ b/drivers/net/ethernet/netronome/nfp/bpf/jit.c @@ -408,7 +408,8 @@ emit_ld_field_any(struct nfp_prog *nfp_prog, enum shf_sc sc, u8 shift, struct nfp_insn_re_regs reg; int err; - err = swreg_to_restricted(reg_none(), dst, src, ®, true); + /* Note: ld_field is special as it uses one of the src regs as dst */ + err = swreg_to_restricted(dst, dst, src, ®, true); if (err) { nfp_prog->error = err; return; |