Skip to content

Commit

Permalink
powerpc/bpf: Remove classical BPF support for PPC32
Browse files Browse the repository at this point in the history
At the time being, PPC32 has Classical BPF support.

The test_bpf module exhibits some failure:

	test_bpf: torvalds#298 LD_IND byte frag jited:1 ret 202 != 66 FAIL (1 times)
	test_bpf: torvalds#299 LD_IND halfword frag jited:1 ret 51958 != 17220 FAIL (1 times)
	test_bpf: torvalds#301 LD_IND halfword mixed head/frag jited:1 ret 51958 != 1305 FAIL (1 times)
	test_bpf: torvalds#303 LD_ABS byte frag jited:1 ret 202 != 66 FAIL (1 times)
	test_bpf: torvalds#304 LD_ABS halfword frag jited:1 ret 51958 != 17220 FAIL (1 times)
	test_bpf: torvalds#306 LD_ABS halfword mixed head/frag jited:1 ret 51958 != 1305 FAIL (1 times)

	test_bpf: Summary: 371 PASSED, 7 FAILED, [119/366 JIT'ed]

Fixing this is not worth the effort. Instead, remove support for
classical BPF and prepare for adding Extended BPF support instead.

Signed-off-by: Christophe Leroy <[email protected]>
Signed-off-by: Michael Ellerman <[email protected]>
Link: https://lore.kernel.org/r/fbc3e4fcc9c8f6131d6c705212530b2aa50149ee.1616430991.git.christophe.leroy@csgroup.eu
  • Loading branch information
chleroy authored and mpe committed Apr 3, 2021
1 parent c465077 commit 6700dc4
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 1,053 deletions.
1 change: 0 additions & 1 deletion arch/powerpc/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,6 @@ config PPC
select HAVE_ARCH_TRACEHOOK
select HAVE_ASM_MODVERSIONS
select HAVE_C_RECORDMCOUNT
select HAVE_CBPF_JIT if !PPC64
select HAVE_STACKPROTECTOR if PPC64 && $(cc-option,-mstack-protector-guard=tls -mstack-protector-guard-reg=r13)
select HAVE_STACKPROTECTOR if PPC32 && $(cc-option,-mstack-protector-guard=tls -mstack-protector-guard-reg=r2)
select HAVE_CONTEXT_TRACKING if PPC64
Expand Down
4 changes: 0 additions & 4 deletions arch/powerpc/net/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,4 @@
#
# Arch-specific network modules
#
ifdef CONFIG_PPC64
obj-$(CONFIG_BPF_JIT) += bpf_jit_comp64.o
else
obj-$(CONFIG_BPF_JIT) += bpf_jit_asm.o bpf_jit_comp.o
endif
139 changes: 0 additions & 139 deletions arch/powerpc/net/bpf_jit32.h

This file was deleted.

226 changes: 0 additions & 226 deletions arch/powerpc/net/bpf_jit_asm.S

This file was deleted.

Loading

0 comments on commit 6700dc4

Please sign in to comment.