4 files changed, 27 insertions, 13 deletions

diff --git a/tools/net/bpf_exp.l b/tools/net/bpf_exp.l
index bf7be77ddd62..833a96611da6 100644
--- a/tools/net/bpf_exp.l
+++ b/tools/net/bpf_exp.l
@@ -92,6 +92,7 @@ extern void yyerror(const char *str);
 "#"?("cpu")     { return K_CPU; }
 "#"?("vlan_tci") { return K_VLANT; }
 "#"?("vlan_pr") { return K_VLANP; }
+"#"?("rand")    { return K_RAND; }
 
 ":"             { return ':'; }
 ","             { return ','; }
diff --git a/tools/net/bpf_exp.y b/tools/net/bpf_exp.y
index d15efc989ef5..e6306c51c26f 100644
--- a/tools/net/bpf_exp.y
+++ b/tools/net/bpf_exp.y
@@ -56,7 +56,7 @@ static void bpf_set_jmp_label(char *label, enum jmp_type type);
 %token OP_LDXI
 
 %token K_PKT_LEN K_PROTO K_TYPE K_NLATTR K_NLATTR_NEST K_MARK K_QUEUE K_HATYPE
-%token K_RXHASH K_CPU K_IFIDX K_VLANT K_VLANP K_POFF
+%token K_RXHASH K_CPU K_IFIDX K_VLANT K_VLANP K_POFF K_RAND
 
 %token ':' ',' '[' ']' '(' ')' 'x' 'a' '+' 'M' '*' '&' '#' '%'
 
@@ -164,6 +164,9 @@ ldb
         | OP_LDB K_POFF {
                 bpf_set_curr_instr(BPF_LD | BPF_B | BPF_ABS, 0, 0,
                                    SKF_AD_OFF + SKF_AD_PAY_OFFSET); }
+        | OP_LDB K_RAND {
+                bpf_set_curr_instr(BPF_LD | BPF_B | BPF_ABS, 0, 0,
+                                   SKF_AD_OFF + SKF_AD_RANDOM); }
         ;
 
 ldh
@@ -212,6 +215,9 @@ ldh
         | OP_LDH K_POFF {
                 bpf_set_curr_instr(BPF_LD | BPF_H | BPF_ABS, 0, 0,
                                    SKF_AD_OFF + SKF_AD_PAY_OFFSET); }
+        | OP_LDH K_RAND {
+                bpf_set_curr_instr(BPF_LD | BPF_H | BPF_ABS, 0, 0,
+                                   SKF_AD_OFF + SKF_AD_RANDOM); }
         ;
 
 ldi
@@ -265,6 +271,9 @@ ld
         | OP_LD K_POFF {
                 bpf_set_curr_instr(BPF_LD | BPF_W | BPF_ABS, 0, 0,
                                    SKF_AD_OFF + SKF_AD_PAY_OFFSET); }
+        | OP_LD K_RAND {
+                bpf_set_curr_instr(BPF_LD | BPF_W | BPF_ABS, 0, 0,
+                                   SKF_AD_OFF + SKF_AD_RANDOM); }
         | OP_LD 'M' '[' number ']' {
                 bpf_set_curr_instr(BPF_LD | BPF_MEM, 0, 0, $4); }
         | OP_LD '[' 'x' '+' number ']' {
diff --git a/tools/net/bpf_jit_disasm.c b/tools/net/bpf_jit_disasm.c
index cfe0cdcda3de..c5baf9c591b7 100644
--- a/tools/net/bpf_jit_disasm.c
+++ b/tools/net/bpf_jit_disasm.c
@@ -43,8 +43,7 @@ static void get_exec_path(char *tpath, size_t size)
         free(path);
 }
 
-static void get_asm_insns(uint8_t *image, size_t len, unsigned long base,
-                          int opcodes)
+static void get_asm_insns(uint8_t *image, size_t len, int opcodes)
 {
         int count, i, pc = 0;
         char tpath[256];
@@ -107,13 +106,13 @@ static void put_klog_buff(char *buff)
 }
 
 static int get_last_jit_image(char *haystack, size_t hlen,
-                              uint8_t *image, size_t ilen,
-                              unsigned long *base)
+                              uint8_t *image, size_t ilen)
 {
         char *ptr, *pptr, *tmp;
         off_t off = 0;
         int ret, flen, proglen, pass, ulen = 0;
         regmatch_t pmatch[1];
+        unsigned long base;
         regex_t regex;
 
         if (hlen == 0)
@@ -136,7 +135,7 @@ static int get_last_jit_image(char *haystack, size_t hlen,
 
         ptr = haystack + off - (pmatch[0].rm_eo - pmatch[0].rm_so);
         ret = sscanf(ptr, "flen=%d proglen=%d pass=%d image=%lx",
-                     &flen, &proglen, &pass, base);
+                     &flen, &proglen, &pass, &base);
         if (ret != 4)
                 return 0;
 
@@ -162,7 +161,7 @@ static int get_last_jit_image(char *haystack, size_t hlen,
         assert(ulen == proglen);
         printf("%d bytes emitted from JIT compiler (pass:%d, flen:%d)\n",
                proglen, pass, flen);
-        printf("%lx + <x>:\n", *base);
+        printf("%lx + <x>:\n", base);
 
         regfree(&regex);
         return ulen;
@@ -172,8 +171,7 @@ int main(int argc, char **argv)
 {
         int len, klen, opcodes = 0;
         char *kbuff;
-        unsigned long base;
-        uint8_t image[4096];
+        static uint8_t image[32768];
 
         if (argc > 1) {
                 if (!strncmp("-o", argv[argc - 1], 2)) {
@@ -189,9 +187,9 @@ int main(int argc, char **argv)
 
         kbuff = get_klog_buff(&klen);
 
-        len = get_last_jit_image(kbuff, klen, image, sizeof(image), &base);
-        if (len > 0 && base > 0)
-                get_asm_insns(image, len, base, opcodes);
+        len = get_last_jit_image(kbuff, klen, image, sizeof(image));
+        if (len > 0)
+                get_asm_insns(image, len, opcodes);
 
         put_klog_buff(kbuff);
 
diff --git a/tools/testing/selftests/net/Makefile b/tools/testing/selftests/net/Makefile
index 750512ba2c88..c7493b8f9b0e 100644
--- a/tools/testing/selftests/net/Makefile
+++ b/tools/testing/selftests/net/Makefile
@@ -14,6 +14,12 @@ all: $(NET_PROGS)
 run_tests: all
         @/bin/sh ./run_netsocktests || echo "sockettests: [FAIL]"
         @/bin/sh ./run_afpackettests || echo "afpackettests: [FAIL]"
-
+        @if /sbin/modprobe test_bpf ; then \
+                /sbin/rmmod test_bpf; \
+                echo "test_bpf: ok"; \
+        else \
+                echo "test_bpf: [FAIL]"; \
+                exit 1; \
+        fi
 clean:
         $(RM) $(NET_PROGS)