diff options
| author | Michael Ellerman <michael@ellerman.id.au> | 2012-06-21 17:50:27 +0000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-06-29 14:35:34 +1000 |
| commit | 7784655acc5a946aac49af423cc1099c5d593d73 (patch) | |
| tree | b59732165b8d4df0cf2f06a3091fdf8ecb76da7f | |
| parent | 9acc7bde23ebb19a704395f76490685e1513e422 (diff) | |
| download | linux-3.10-7784655acc5a946aac49af423cc1099c5d593d73.tar.gz linux-3.10-7784655acc5a946aac49af423cc1099c5d593d73.tar.bz2 linux-3.10-7784655acc5a946aac49af423cc1099c5d593d73.zip | |
powerpc: Fix BPF_JIT code to link with multiple TOCs
If the kernel is big enough (eg. allyesconfig), the linker may need to
switch TOCs when calling from the BPF JIT code out to the external
helpers (skb_copy_bits() & bpf_internal_load_pointer_neg_helper()).
In order to do that we need to leave space after the bl for the linker
to insert a reload of our TOC pointer.
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Acked-by: Matt Evans <matt@ozlabs.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
| -rw-r--r-- | arch/powerpc/net/bpf_jit_64.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/net/bpf_jit_64.S b/arch/powerpc/net/bpf_jit_64.S index 55ba3855a97..7d3a3b5619a 100644 --- a/arch/powerpc/net/bpf_jit_64.S +++ b/arch/powerpc/net/bpf_jit_64.S @@ -105,6 +105,7 @@ sk_load_byte_msh_positive_offset: mr r4, r_addr; \ li r6, SIZE; \ bl skb_copy_bits; \ + nop; \ /* R3 = 0 on success */ \ addi r1, r1, BPF_PPC_SLOWPATH_FRAME; \ ld r0, 16(r1); \ @@ -156,6 +157,7 @@ bpf_slow_path_byte_msh: mr r4, r_addr; \ li r5, SIZE; \ bl bpf_internal_load_pointer_neg_helper; \ + nop; \ /* R3 != 0 on success */ \ addi r1, r1, BPF_PPC_SLOWPATH_FRAME; \ ld r0, 16(r1); \ |