]> git.baikalelectronics.ru Git - kernel.git/commit
nfp: bpf: fix static check error through tightening shift amount adjustment
authorJiong Wang <jiong.wang@netronome.com>
Tue, 7 May 2019 16:41:30 +0000 (17:41 +0100)
committerAlexei Starovoitov <ast@kernel.org>
Thu, 9 May 2019 22:54:30 +0000 (15:54 -0700)
commit330d2fca1e1d2e2acf98d1ddc005494414aec3d0
treed5c7fd423bf370b2ac75da54ce0cbe0e5f4eea60
parentdbb60b0887d8bbb896c91a9cc1152f125bd12c24
nfp: bpf: fix static check error through tightening shift amount adjustment

NFP shift instruction has something special. If shift direction is left
then shift amount of 1 to 31 is specified as 32 minus the amount to shift.

But no need to do this for indirect shift which has shift amount be 0. Even
after we do this subtraction, shift amount 0 will be turned into 32 which
will eventually be encoded the same as 0 because only low 5 bits are
encoded, but shift amount be 32 will fail the FIELD_PREP check done later
on shift mask (0x1f), due to 32 is out of mask range. Such error has been
observed when compiling nfp/bpf/jit.c using gcc 8.3 + O3.

This issue has started when indirect shift support added after which the
incoming shift amount to __emit_shf could be 0, therefore it is at that
time shift amount adjustment inside __emit_shf should have been tightened.

Fixes: f279859ab66c ("nfp: bpf: support logic indirect shifts (BPF_[L|R]SH | BPF_X)")
Reported-by: Oleksandr Natalenko <oleksandr@natalenko.name>
Reported-by: Pablo Cascón <pablo.cascon@netronome.com
Reviewed-by: Quentin Monnet <quentin.monnet@netronome.com>
Reviewed-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: Jiong Wang <jiong.wang@netronome.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
drivers/net/ethernet/netronome/nfp/bpf/jit.c