Browse Source

bpf, x86/sparc: show actual number of passes in bpf_jit_dump

When bpf_jit_compile() got split into two functions via commit
f3c2af7ba17a ("net: filter: x86: split bpf_jit_compile()"), bpf_jit_dump()
was changed to always show 0 as number of compiler passes. Change it to
dump the actual number. Also on sparc, we count passes starting from 0,
so add 1 for the debug dump as well.

Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Alexei Starovoitov <ast@plumgrid.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Daniel Borkmann 10 years ago
parent
commit
485d6511e7
2 changed files with 2 additions and 2 deletions
  1. 1 1
      arch/sparc/net/bpf_jit_comp.c
  2. 1 1
      arch/x86/net/bpf_jit_comp.c

+ 1 - 1
arch/sparc/net/bpf_jit_comp.c

@@ -807,7 +807,7 @@ cond_branch:			f_offset = addrs[i + filter[i].jf];
 	}
 	}
 
 
 	if (bpf_jit_enable > 1)
 	if (bpf_jit_enable > 1)
-		bpf_jit_dump(flen, proglen, pass, image);
+		bpf_jit_dump(flen, proglen, pass + 1, image);
 
 
 	if (image) {
 	if (image) {
 		bpf_flush_icache(image, image + proglen);
 		bpf_flush_icache(image, image + proglen);

+ 1 - 1
arch/x86/net/bpf_jit_comp.c

@@ -1103,7 +1103,7 @@ void bpf_int_jit_compile(struct bpf_prog *prog)
 	}
 	}
 
 
 	if (bpf_jit_enable > 1)
 	if (bpf_jit_enable > 1)
-		bpf_jit_dump(prog->len, proglen, 0, image);
+		bpf_jit_dump(prog->len, proglen, pass + 1, image);
 
 
 	if (image) {
 	if (image) {
 		bpf_flush_icache(header, image + proglen);
 		bpf_flush_icache(header, image + proglen);