Merge branch 'support-alu32_arsh'

Jiong Wang says:

====================
BPF_ALU | BPF_ARSH | BPF_* were rejected by commit: 7891a87efc71
("bpf: arsh is not supported in 32 bit alu thus reject it"). As explained
in the commit message, this is due to there is no complete support for them
on interpreter and various JIT compilation back-ends.

This patch set is a follow-up which completes the missing bits. This also
pave the way for running bpf program compiled with ALU32 instruction
enabled by specifing -mattr=+alu32 to LLVM for which case there is likely
to have more BPF_ALU | BPF_ARSH insns that will trigger the rejection code.

test_verifier.c is updated accordingly.

I have tested this patch set on x86-64 and NFP, I need help of review and
test on the arch changes (mips/ppc/s390).

Note, there might be merge confict on mips change which is better to be
applied on top of:

  commit: 20b880a05f06 ("mips: bpf: fix encoding bug for mm_srlv32_op"),

which is on mips-fixes branch at the moment.

Thanks.

v1->v2:
 - Fix ppc implementation bug. Should zero high bits explicitly.
====================

Signed-off-by: Alexei Starovoitov <ast@kernel.org>

1 files changed, 30 insertions, 22 deletions

diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c
index 628b3970a49b..a5b223ef7131 100644
--- a/kernel/bpf/core.c
+++ b/kernel/bpf/core.c
@@ -933,32 +933,34 @@ EXPORT_SYMBOL_GPL(__bpf_call_base);
 #define BPF_INSN_MAP(INSN_2, INSN_3)            \
         /* 32 bit ALU operations. */            \
         /*   Register based. */                 \
-        INSN_3(ALU, ADD, X),                    \
-        INSN_3(ALU, SUB, X),                    \
-        INSN_3(ALU, AND, X),                    \
-        INSN_3(ALU, OR,  X),                    \
-        INSN_3(ALU, LSH, X),                    \
-        INSN_3(ALU, RSH, X),                    \
-        INSN_3(ALU, XOR, X),                    \
-        INSN_3(ALU, MUL, X),                    \
-        INSN_3(ALU, MOV, X),                    \
-        INSN_3(ALU, DIV, X),                    \
-        INSN_3(ALU, MOD, X),                    \
+        INSN_3(ALU, ADD,  X),                   \
+        INSN_3(ALU, SUB,  X),                   \
+        INSN_3(ALU, AND,  X),                   \
+        INSN_3(ALU, OR,   X),                   \
+        INSN_3(ALU, LSH,  X),                   \
+        INSN_3(ALU, RSH,  X),                   \
+        INSN_3(ALU, XOR,  X),                   \
+        INSN_3(ALU, MUL,  X),                   \
+        INSN_3(ALU, MOV,  X),                   \
+        INSN_3(ALU, ARSH, X),                   \
+        INSN_3(ALU, DIV,  X),                   \
+        INSN_3(ALU, MOD,  X),                   \
         INSN_2(ALU, NEG),                       \
         INSN_3(ALU, END, TO_BE),                \
         INSN_3(ALU, END, TO_LE),                \
         /*   Immediate based. */                \
-        INSN_3(ALU, ADD, K),                    \
-        INSN_3(ALU, SUB, K),                    \
-        INSN_3(ALU, AND, K),                    \
-        INSN_3(ALU, OR,  K),                    \
-        INSN_3(ALU, LSH, K),                    \
-        INSN_3(ALU, RSH, K),                    \
-        INSN_3(ALU, XOR, K),                    \
-        INSN_3(ALU, MUL, K),                    \
-        INSN_3(ALU, MOV, K),                    \
-        INSN_3(ALU, DIV, K),                    \
-        INSN_3(ALU, MOD, K),                    \
+        INSN_3(ALU, ADD,  K),                   \
+        INSN_3(ALU, SUB,  K),                   \
+        INSN_3(ALU, AND,  K),                   \
+        INSN_3(ALU, OR,   K),                   \
+        INSN_3(ALU, LSH,  K),                   \
+        INSN_3(ALU, RSH,  K),                   \
+        INSN_3(ALU, XOR,  K),                   \
+        INSN_3(ALU, MUL,  K),                   \
+        INSN_3(ALU, MOV,  K),                   \
+        INSN_3(ALU, ARSH, K),                   \
+        INSN_3(ALU, DIV,  K),                   \
+        INSN_3(ALU, MOD,  K),                   \
         /* 64 bit ALU operations. */            \
         /*   Register based. */                 \
         INSN_3(ALU64, ADD,  X),                 \
@@ -1137,6 +1139,12 @@ select_insn:
                 DST = (u64) (u32) insn[0].imm | ((u64) (u32) insn[1].imm) << 32;
                 insn++;
                 CONT;
+        ALU_ARSH_X:
+                DST = (u64) (u32) ((*(s32 *) &DST) >> SRC);
+                CONT;
+        ALU_ARSH_K:
+                DST = (u64) (u32) ((*(s32 *) &DST) >> IMM);
+                CONT;
         ALU64_ARSH_X:
                 (*(s64 *) &DST) >>= SRC;
                 CONT;