Merge tag 'v3.18-rc4' into x86/cleanups, to refresh the tree before pulling new changes.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 74 insertions, 15 deletions

diff --git a/lib/test_bpf.c b/lib/test_bpf.c
index c579e0f58818..23e070bcf72d 100644
--- a/lib/test_bpf.c
+++ b/lib/test_bpf.c
@@ -66,7 +66,7 @@ struct bpf_test {
         const char *descr;
         union {
                 struct sock_filter insns[MAX_INSNS];
-                struct sock_filter_int insns_int[MAX_INSNS];
+                struct bpf_insn insns_int[MAX_INSNS];
         } u;
         __u8 aux;
         __u8 data[MAX_DATA];
@@ -1342,6 +1342,44 @@ static struct bpf_test tests[] = {
                 { { 0, -1 } }
         },
         {
+                "INT: shifts by register",
+                .u.insns_int = {
+                        BPF_MOV64_IMM(R0, -1234),
+                        BPF_MOV64_IMM(R1, 1),
+                        BPF_ALU32_REG(BPF_RSH, R0, R1),
+                        BPF_JMP_IMM(BPF_JEQ, R0, 0x7ffffd97, 1),
+                        BPF_EXIT_INSN(),
+                        BPF_MOV64_IMM(R2, 1),
+                        BPF_ALU64_REG(BPF_LSH, R0, R2),
+                        BPF_MOV32_IMM(R4, -1234),
+                        BPF_JMP_REG(BPF_JEQ, R0, R4, 1),
+                        BPF_EXIT_INSN(),
+                        BPF_ALU64_IMM(BPF_AND, R4, 63),
+                        BPF_ALU64_REG(BPF_LSH, R0, R4), /* R0 <= 46 */
+                        BPF_MOV64_IMM(R3, 47),
+                        BPF_ALU64_REG(BPF_ARSH, R0, R3),
+                        BPF_JMP_IMM(BPF_JEQ, R0, -617, 1),
+                        BPF_EXIT_INSN(),
+                        BPF_MOV64_IMM(R2, 1),
+                        BPF_ALU64_REG(BPF_LSH, R4, R2), /* R4 = 46 << 1 */
+                        BPF_JMP_IMM(BPF_JEQ, R4, 92, 1),
+                        BPF_EXIT_INSN(),
+                        BPF_MOV64_IMM(R4, 4),
+                        BPF_ALU64_REG(BPF_LSH, R4, R4), /* R4 = 4 << 4 */
+                        BPF_JMP_IMM(BPF_JEQ, R4, 64, 1),
+                        BPF_EXIT_INSN(),
+                        BPF_MOV64_IMM(R4, 5),
+                        BPF_ALU32_REG(BPF_LSH, R4, R4), /* R4 = 5 << 5 */
+                        BPF_JMP_IMM(BPF_JEQ, R4, 160, 1),
+                        BPF_EXIT_INSN(),
+                        BPF_MOV64_IMM(R0, -1),
+                        BPF_EXIT_INSN(),
+                },
+                INTERNAL,
+                { },
+                { { 0, -1 } }
+        },
+        {
                 "INT: DIV + ABS",
                 .u.insns_int = {
                         BPF_ALU64_REG(BPF_MOV, R6, R1),
@@ -1697,6 +1735,27 @@ static struct bpf_test tests[] = {
                 { },
                 { { 1, 0 } },
         },
+        {
+                "load 64-bit immediate",
+                .u.insns_int = {
+                        BPF_LD_IMM64(R1, 0x567800001234LL),
+                        BPF_MOV64_REG(R2, R1),
+                        BPF_MOV64_REG(R3, R2),
+                        BPF_ALU64_IMM(BPF_RSH, R2, 32),
+                        BPF_ALU64_IMM(BPF_LSH, R3, 32),
+                        BPF_ALU64_IMM(BPF_RSH, R3, 32),
+                        BPF_ALU64_IMM(BPF_MOV, R0, 0),
+                        BPF_JMP_IMM(BPF_JEQ, R2, 0x5678, 1),
+                        BPF_EXIT_INSN(),
+                        BPF_JMP_IMM(BPF_JEQ, R3, 0x1234, 1),
+                        BPF_EXIT_INSN(),
+                        BPF_ALU64_IMM(BPF_MOV, R0, 1),
+                        BPF_EXIT_INSN(),
+                },
+                INTERNAL,
+                { },
+                { { 0, 1 } }
+        },
 };
 
 static struct net_device dev;
@@ -1761,9 +1820,9 @@ static int probe_filter_length(struct sock_filter *fp)
         return len + 1;
 }
 
-static struct sk_filter *generate_filter(int which, int *err)
+static struct bpf_prog *generate_filter(int which, int *err)
 {
-        struct sk_filter *fp;
+        struct bpf_prog *fp;
         struct sock_fprog_kern fprog;
         unsigned int flen = probe_filter_length(tests[which].u.insns);
         __u8 test_type = tests[which].aux & TEST_TYPE_MASK;
@@ -1773,7 +1832,7 @@ static struct sk_filter *generate_filter(int which, int *err)
                 fprog.filter = tests[which].u.insns;
                 fprog.len = flen;
 
-                *err = sk_unattached_filter_create(&fp, &fprog);
+                *err = bpf_prog_create(&fp, &fprog);
                 if (tests[which].aux & FLAG_EXPECTED_FAIL) {
                         if (*err == -EINVAL) {
                                 pr_cont("PASS\n");
@@ -1798,7 +1857,7 @@ static struct sk_filter *generate_filter(int which, int *err)
                 break;
 
         case INTERNAL:
-                fp = kzalloc(sk_filter_size(flen), GFP_KERNEL);
+                fp = bpf_prog_alloc(bpf_prog_size(flen), 0);
                 if (fp == NULL) {
                         pr_cont("UNEXPECTED_FAIL no memory left\n");
                         *err = -ENOMEM;
@@ -1807,9 +1866,9 @@ static struct sk_filter *generate_filter(int which, int *err)
 
                 fp->len = flen;
                 memcpy(fp->insnsi, tests[which].u.insns_int,
-                       fp->len * sizeof(struct sock_filter_int));
+                       fp->len * sizeof(struct bpf_insn));
 
-                sk_filter_select_runtime(fp);
+                bpf_prog_select_runtime(fp);
                 break;
         }
 
@@ -1817,30 +1876,30 @@ static struct sk_filter *generate_filter(int which, int *err)
         return fp;
 }
 
-static void release_filter(struct sk_filter *fp, int which)
+static void release_filter(struct bpf_prog *fp, int which)
 {
         __u8 test_type = tests[which].aux & TEST_TYPE_MASK;
 
         switch (test_type) {
         case CLASSIC:
-                sk_unattached_filter_destroy(fp);
+                bpf_prog_destroy(fp);
                 break;
         case INTERNAL:
-                sk_filter_free(fp);
+                bpf_prog_free(fp);
                 break;
         }
 }
 
-static int __run_one(const struct sk_filter *fp, const void *data,
+static int __run_one(const struct bpf_prog *fp, const void *data,
                      int runs, u64 *duration)
 {
         u64 start, finish;
-        int ret, i;
+        int ret = 0, i;
 
         start = ktime_to_us(ktime_get());
 
         for (i = 0; i < runs; i++)
-                ret = SK_RUN_FILTER(fp, data);
+                ret = BPF_PROG_RUN(fp, data);
 
         finish = ktime_to_us(ktime_get());
 
@@ -1850,7 +1909,7 @@ static int __run_one(const struct sk_filter *fp, const void *data,
         return ret;
 }
 
-static int run_one(const struct sk_filter *fp, struct bpf_test *test)
+static int run_one(const struct bpf_prog *fp, struct bpf_test *test)
 {
         int err_cnt = 0, i, runs = MAX_TESTRUNS;
 
@@ -1884,7 +1943,7 @@ static __init int test_bpf(void)
         int i, err_cnt = 0, pass_cnt = 0;
 
         for (i = 0; i < ARRAY_SIZE(tests); i++) {
-                struct sk_filter *fp;
+                struct bpf_prog *fp;
                 int err;
 
                 pr_info("#%d %s ", i, tests[i].descr);