net: filter: improve test case framework

This patch simplifies and refactors the test case code a
bit and also adds a summary of all test that passed or
failed in the kernel log, so that it's easier to spot if
something has failed.

Future work could further extend the test framework to also
support different input 'stimuli' i.e. related structures
to seccomp.

Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Acked-by: Alexei Starovoitov <ast@plumgrid.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 233 insertions, 155 deletions

diff --git a/lib/test_bpf.c b/lib/test_bpf.c
index e03991ea8cc2..da34e337f45b 100644
--- a/lib/test_bpf.c
+++ b/lib/test_bpf.c
@@ -22,12 +22,14 @@
 #include <linux/netdevice.h>
 #include <linux/if_vlan.h>
 
+/* General test specific settings */
 #define MAX_SUBTESTS    3
+#define MAX_TESTRUNS    10000
 #define MAX_DATA        128
 #define MAX_INSNS       512
 #define MAX_K           0xffffFFFF
 
-/* define few constants used to init test 'skb' */
+/* Few constants used to init test 'skb' */
 #define SKB_TYPE        3
 #define SKB_MARK        0x1234aaaa
 #define SKB_HASH        0x1234aaab
@@ -36,18 +38,29 @@
 #define SKB_DEV_IFINDEX 577
 #define SKB_DEV_TYPE    588
 
-/* redefine REGs to make tests less verbose */
-#define R0 BPF_REG_0
-#define R1 BPF_REG_1
-#define R2 BPF_REG_2
-#define R3 BPF_REG_3
-#define R4 BPF_REG_4
-#define R5 BPF_REG_5
-#define R6 BPF_REG_6
-#define R7 BPF_REG_7
-#define R8 BPF_REG_8
-#define R9 BPF_REG_9
-#define R10 BPF_REG_10
+/* Redefine REGs to make tests less verbose */
+#define R0              BPF_REG_0
+#define R1              BPF_REG_1
+#define R2              BPF_REG_2
+#define R3              BPF_REG_3
+#define R4              BPF_REG_4
+#define R5              BPF_REG_5
+#define R6              BPF_REG_6
+#define R7              BPF_REG_7
+#define R8              BPF_REG_8
+#define R9              BPF_REG_9
+#define R10             BPF_REG_10
+
+/* Flags that can be passed to test cases */
+#define FLAG_NO_DATA            BIT(0)
+#define FLAG_EXPECTED_FAIL      BIT(1)
+
+enum {
+        CLASSIC  = BIT(6),      /* Old BPF instructions only. */
+        INTERNAL = BIT(7),      /* Extended instruction set.  */
+};
+
+#define TEST_TYPE_MASK          (CLASSIC | INTERNAL)
 
 struct bpf_test {
         const char *descr;
@@ -55,12 +68,7 @@ struct bpf_test {
                 struct sock_filter insns[MAX_INSNS];
                 struct sock_filter_int insns_int[MAX_INSNS];
         } u;
-        enum {
-                NO_DATA,
-                EXPECTED_FAIL,
-                SKB,
-                SKB_INT
-        } data_type;
+        __u8 aux;
         __u8 data[MAX_DATA];
         struct {
                 int data_size;
@@ -84,7 +92,7 @@ static struct bpf_test tests[] = {
                         BPF_STMT(BPF_LD | BPF_B | BPF_IND, 1),
                         BPF_STMT(BPF_RET | BPF_A, 0)
                 },
-                SKB,
+                CLASSIC,
                 { 10, 20, 30, 40, 50 },
                 { { 2, 10 }, { 3, 20 }, { 4, 30 } },
         },
@@ -96,7 +104,7 @@ static struct bpf_test tests[] = {
                         BPF_STMT(BPF_ALU | BPF_ADD | BPF_X, 0),
                         BPF_STMT(BPF_RET | BPF_A, 0) /* A == len * 2 */
                 },
-                SKB,
+                CLASSIC,
                 { 10, 20, 30, 40, 50 },
                 { { 1, 2 }, { 3, 6 }, { 4, 8 } },
         },
@@ -111,7 +119,7 @@ static struct bpf_test tests[] = {
                         BPF_STMT(BPF_ALU | BPF_MUL | BPF_K, 3),
                         BPF_STMT(BPF_RET | BPF_A, 0)
                 },
-                0,
+                CLASSIC | FLAG_NO_DATA,
                 { },
                 { { 0, 0xfffffffd } }
         },
@@ -129,7 +137,7 @@ static struct bpf_test tests[] = {
                         BPF_STMT(BPF_ALU | BPF_ADD | BPF_X, 0),
                         BPF_STMT(BPF_RET | BPF_A, 0)
                 },
-                0,
+                CLASSIC | FLAG_NO_DATA,
                 { },
                 { { 0, 0x40000001 } }
         },
@@ -145,7 +153,7 @@ static struct bpf_test tests[] = {
                         BPF_STMT(BPF_ALU | BPF_ADD | BPF_X, 0),
                         BPF_STMT(BPF_RET | BPF_A, 0)
                 },
-                0,
+                CLASSIC | FLAG_NO_DATA,
                 { },
                 { { 0, 0x800000ff }, { 1, 0x800000ff } },
         },
@@ -156,7 +164,7 @@ static struct bpf_test tests[] = {
                         BPF_STMT(BPF_LD | BPF_H | BPF_IND, MAX_K),
                         BPF_STMT(BPF_RET | BPF_K, 1)
                 },
-                SKB,
+                CLASSIC,
                 { },
                 { { 1, 0 }, { 10, 0 }, { 60, 0 } },
         },
@@ -166,7 +174,7 @@ static struct bpf_test tests[] = {
                         BPF_STMT(BPF_LD | BPF_W | BPF_ABS, 1000),
                         BPF_STMT(BPF_RET | BPF_K, 1)
                 },
-                SKB,
+                CLASSIC,
                 { },
                 { { 1, 0 }, { 10, 0 }, { 60, 0 } },
         },
@@ -179,7 +187,7 @@ static struct bpf_test tests[] = {
                         BPF_STMT(BPF_ALU | BPF_ADD | BPF_X, 0),
                         BPF_STMT(BPF_RET | BPF_A, 0)
                 },
-                SKB,
+                CLASSIC,
                 { 1, 2, 3 },
                 { { 1, 0 }, { 2, 3 } },
         },
@@ -193,7 +201,7 @@ static struct bpf_test tests[] = {
                         BPF_STMT(BPF_LD | BPF_B | BPF_IND, 0),
                         BPF_STMT(BPF_RET | BPF_A, 0)
                 },
-                SKB,
+                CLASSIC,
                 { 1, 2, 3, 0xff },
                 { { 1, 1 }, { 3, 3 }, { 4, 0xff } },
         },
@@ -206,7 +214,7 @@ static struct bpf_test tests[] = {
                         BPF_STMT(BPF_ALU | BPF_ADD | BPF_X, 0),
                         BPF_STMT(BPF_RET | BPF_A, 0)
                 },
-                SKB,
+                CLASSIC,
                 { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3 },
                 { { 15, 0 }, { 16, 3 } },
         },
@@ -220,7 +228,7 @@ static struct bpf_test tests[] = {
                         BPF_STMT(BPF_LD | BPF_B | BPF_IND, 0),
                         BPF_STMT(BPF_RET | BPF_A, 0)
                 },
-                SKB,
+                CLASSIC,
                 { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3 },
                 { { 14, 0 }, { 15, 1 }, { 17, 3 } },
         },
@@ -241,7 +249,7 @@ static struct bpf_test tests[] = {