5 files changed, 19 insertions, 23 deletions

diff --git a/arch/arm/net/bpf_jit_32.c b/arch/arm/net/bpf_jit_32.c
index a0bd8a755bdf..1a643ee8e082 100644
--- a/arch/arm/net/bpf_jit_32.c
+++ b/arch/arm/net/bpf_jit_32.c
@@ -918,9 +918,8 @@ void bpf_jit_compile(struct sk_filter *fp)
 #endif
 
         if (bpf_jit_enable > 1)
-                print_hex_dump(KERN_INFO, "BPF JIT code: ",
-                               DUMP_PREFIX_ADDRESS, 16, 4, ctx.target,
-                               alloc_size, false);
+                /* there are 2 passes here */
+                bpf_jit_dump(fp->len, alloc_size, 2, ctx.target);
 
         fp->bpf_func = (void *)ctx.target;
 out:
diff --git a/arch/powerpc/net/bpf_jit_comp.c b/arch/powerpc/net/bpf_jit_comp.c
index e834f1ec23c8..c427ae36374a 100644
--- a/arch/powerpc/net/bpf_jit_comp.c
+++ b/arch/powerpc/net/bpf_jit_comp.c
@@ -671,16 +671,12 @@ void bpf_jit_compile(struct sk_filter *fp)
         }
 
         if (bpf_jit_enable > 1)
-                pr_info("flen=%d proglen=%u pass=%d image=%p\n",
-                       flen, proglen, pass, image);
+                /* Note that we output the base address of the code_base
+                 * rather than image, since opcodes are in code_base.
+                 */
+                bpf_jit_dump(flen, proglen, pass, code_base);
 
         if (image) {
-                if (bpf_jit_enable > 1)
-                        print_hex_dump(KERN_ERR, "JIT code: ",
-                                       DUMP_PREFIX_ADDRESS,
-                                       16, 1, code_base,
-                                       proglen, false);
-
                 bpf_flush_icache(code_base, code_base + (proglen/4));
                 /* Function descriptor nastiness: Address + TOC */
                 ((u64 *)image)[0] = (u64)code_base;
diff --git a/arch/sparc/net/bpf_jit_comp.c b/arch/sparc/net/bpf_jit_comp.c
index 3109ca684a99..d36a85ebb5e0 100644
--- a/arch/sparc/net/bpf_jit_comp.c
+++ b/arch/sparc/net/bpf_jit_comp.c
@@ -795,13 +795,9 @@ cond_branch:			f_offset = addrs[i + filter[i].jf];
         }
 
         if (bpf_jit_enable > 1)
-                pr_err("flen=%d proglen=%u pass=%d image=%p\n",
-                       flen, proglen, pass, image);
+                bpf_jit_dump(flen, proglen, pass, image);
 
         if (image) {
-                if (bpf_jit_enable > 1)
-                        print_hex_dump(KERN_ERR, "JIT code: ", DUMP_PREFIX_ADDRESS,
-                                       16, 1, image, proglen, false);
                 bpf_flush_icache(image, image + proglen);
                 fp->bpf_func = (void *)image;
         }
diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
index 3cbe45381bbb..f66b54086ce5 100644
--- a/arch/x86/net/bpf_jit_comp.c
+++ b/arch/x86/net/bpf_jit_comp.c
@@ -725,17 +725,12 @@ cond_branch:			f_offset = addrs[i + filter[i].jf] - addrs[i];
                 }
                 oldproglen = proglen;
         }
+
         if (bpf_jit_enable > 1)
-                pr_err("flen=%d proglen=%u pass=%d image=%p\n",
-                       flen, proglen, pass, image);
+                bpf_jit_dump(flen, proglen, pass, image);
 
         if (image) {
-                if (bpf_jit_enable > 1)
-                        print_hex_dump(KERN_ERR, "JIT code: ", DUMP_PREFIX_ADDRESS,
-                                       16, 1, image, proglen, false);
-
                 bpf_flush_icache(image, image + proglen);
-
                 fp->bpf_func = (void *)image;
         }
 out:
diff --git a/include/linux/filter.h b/include/linux/filter.h
index d2059cb4e465..d7d25083130b 100644
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
@@ -50,6 +50,16 @@ extern int sk_get_filter(struct sock *sk, struct sock_filter __user *filter, uns
 #ifdef CONFIG_BPF_JIT
 extern void bpf_jit_compile(struct sk_filter *fp);
 extern void bpf_jit_free(struct sk_filter *fp);
+
+static inline void bpf_jit_dump(unsigned int flen, unsigned int proglen,
+                                u32 pass, void *image)
+{
+        pr_err("flen=%u proglen=%u pass=%u image=%p\n",
+               flen, proglen, pass, image);
+        if (image)
+                print_hex_dump(KERN_ERR, "JIT code: ", DUMP_PREFIX_ADDRESS,
+                               16, 1, image, proglen, false);
+}
 #define SK_RUN_FILTER(FILTER, SKB) (*FILTER->bpf_func)(SKB, FILTER->insns)
 #else
 static inline void bpf_jit_compile(struct sk_filter *fp)