filter: bpf_jit_comp: refactor and unify BPF JIT image dump output

If bpf_jit_enable > 1, then we dump the emitted JIT compiled image
after creation. Currently, only SPARC and PowerPC has similar output
as in the reference implementation on x86_64. Make a small helper
function in order to reduce duplicated code and make the dump output
uniform across architectures x86_64, SPARC, PPC, ARM (e.g. on ARM
flen, pass and proglen are currently not shown, but would be
interesting to know as well), also for future BPF JIT implementations
on other archs.

Cc: Mircea Gherzan <[email protected]>
Cc: Matt Evans <[email protected]>
Cc: Eric Dumazet <[email protected]>
Cc: David S. Miller <[email protected]>
Signed-off-by: Daniel Borkmann <[email protected]>
Signed-off-by: David S. Miller <[email protected]>

diff --git a/arch/arm/net/bpf_jit_32.c b/arch/arm/net/bpf_jit_32.c
index a0bd8a755bdfc9616c0515116d37dc41bc16e812..1a643ee8e082464108cf9280266fe73016b982be 100644 (file)
--- 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 e834f1ec23c8a4ad16c67b0d3349565e1813cf83..c427ae36374ab4fa6eb1503c15b07de2926006e6 100644 (file)
--- 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 3109ca684a99f31c3a52613e3ffd2f291d6f185d..d36a85ebb5e027c38929c2a5a8f9e7be772984b9 100644 (file)
--- 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 3cbe45381bbb12de387729b7f070822207b3d6dc..f66b54086ce597562d72f03d5bbaacfb09622005 100644 (file)
--- 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 d2059cb4e465090dec64feb502f0fa2a17ec2cb9..d7d25083130b51b021ffbbfbeeacee3c4e9265b9 100644 (file)
--- 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)