leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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 <mgherzan@gmail.com>
Cc: Matt Evans <matt@ozlabs.org>
Cc: Eric Dumazet <eric.dumazet@google.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Daniel Borkmann 2013-03-21 22:22:03 +01:00 committed by David S. Miller
parent d5e07e6921
commit 79617801ea
5 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/net/bpf_jit_32.c
View File

@ -918,9 +918,8 @@ void bpf_jit_compile(struct sk_filter *fp)
#endif #endif
if (bpf_jit_enable > 1) if (bpf_jit_enable > 1)
print_hex_dump(KERN_INFO, "BPF JIT code: ", /* there are 2 passes here */
DUMP_PREFIX_ADDRESS, 16, 4, ctx.target, bpf_jit_dump(fp->len, alloc_size, 2, ctx.target);
alloc_size, false);
fp->bpf_func = (void *)ctx.target; fp->bpf_func = (void *)ctx.target;
out: out:

12
arch/powerpc/net/bpf_jit_comp.c
View File

@ -671,16 +671,12 @@ void bpf_jit_compile(struct sk_filter *fp)
} }
if (bpf_jit_enable > 1) if (bpf_jit_enable > 1)
pr_info("flen=%d proglen=%u pass=%d image=%p\n", /* Note that we output the base address of the code_base
flen, proglen, pass, image); * rather than image, since opcodes are in code_base.
*/
bpf_jit_dump(flen, proglen, pass, code_base);
if (image) { 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)); bpf_flush_icache(code_base, code_base + (proglen/4));
/* Function descriptor nastiness: Address + TOC */ /* Function descriptor nastiness: Address + TOC */
((u64 *)image)[0] = (u64)code_base; ((u64 *)image)[0] = (u64)code_base;

6
arch/sparc/net/bpf_jit_comp.c
View File

@ -795,13 +795,9 @@ cond_branch: f_offset = addrs[i + filter[i].jf];
} }
if (bpf_jit_enable > 1) if (bpf_jit_enable > 1)
pr_err("flen=%d proglen=%u pass=%d image=%p\n", bpf_jit_dump(flen, proglen, pass, image);
flen, proglen, pass, image);
if (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); bpf_flush_icache(image, image + proglen);
fp->bpf_func = (void *)image; fp->bpf_func = (void *)image;
} }

9
arch/x86/net/bpf_jit_comp.c
View File

@ -725,17 +725,12 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i];
} }
oldproglen = proglen; oldproglen = proglen;
} }
if (bpf_jit_enable > 1) if (bpf_jit_enable > 1)
pr_err("flen=%d proglen=%u pass=%d image=%p\n", bpf_jit_dump(flen, proglen, pass, image);
flen, proglen, pass, image);
if (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); bpf_flush_icache(image, image + proglen);
fp->bpf_func = (void *)image; fp->bpf_func = (void *)image;
} }
out: out:

10
include/linux/filter.h
View File

@ -50,6 +50,16 @@ extern int sk_get_filter(struct sock *sk, struct sock_filter __user *filter, uns
#ifdef CONFIG_BPF_JIT #ifdef CONFIG_BPF_JIT
extern void bpf_jit_compile(struct sk_filter *fp); extern void bpf_jit_compile(struct sk_filter *fp);
extern void bpf_jit_free(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) #define SK_RUN_FILTER(FILTER, SKB) (*FILTER->bpf_func)(SKB, FILTER->insns)
#else #else
static inline void bpf_jit_compile(struct sk_filter *fp) static inline void bpf_jit_compile(struct sk_filter *fp)