12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061 |
- From: Johan Almbladh <[email protected]>
- Date: Tue, 5 Oct 2021 18:54:07 +0200
- Subject: [PATCH] mips: bpf: Enable eBPF JITs
- This patch enables the new eBPF JITs for 32-bit and 64-bit MIPS. It also
- disables the old cBPF JIT to so cBPF programs are converted to use the
- new JIT.
- Workarounds for R4000 CPU errata are not implemented by the JIT, so the
- JIT is disabled if any of those workarounds are configured.
- Signed-off-by: Johan Almbladh <[email protected]>
- ---
- --- a/MAINTAINERS
- +++ b/MAINTAINERS
- @@ -3431,6 +3431,7 @@ S: Supported
- F: arch/arm64/net/
-
- BPF JIT for MIPS (32-BIT AND 64-BIT)
- +M: Johan Almbladh <[email protected]>
- M: Paul Burton <[email protected]>
- L: [email protected]
- L: [email protected]
- --- a/arch/mips/Kconfig
- +++ b/arch/mips/Kconfig
- @@ -57,7 +57,6 @@ config MIPS
- select HAVE_ARCH_TRACEHOOK
- select HAVE_ARCH_TRANSPARENT_HUGEPAGE if CPU_SUPPORTS_HUGEPAGES
- select HAVE_ASM_MODVERSIONS
- - select HAVE_CBPF_JIT if !64BIT && !CPU_MICROMIPS
- select HAVE_CONTEXT_TRACKING
- select HAVE_TIF_NOHZ
- select HAVE_C_RECORDMCOUNT
- @@ -65,7 +64,10 @@ config MIPS
- select HAVE_DEBUG_STACKOVERFLOW
- select HAVE_DMA_CONTIGUOUS
- select HAVE_DYNAMIC_FTRACE
- - select HAVE_EBPF_JIT if 64BIT && !CPU_MICROMIPS && TARGET_ISA_REV >= 2
- + select HAVE_EBPF_JIT if !CPU_MICROMIPS && \
- + !CPU_DADDI_WORKAROUNDS && \
- + !CPU_R4000_WORKAROUNDS && \
- + !CPU_R4400_WORKAROUNDS
- select HAVE_EXIT_THREAD
- select HAVE_FAST_GUP
- select HAVE_FTRACE_MCOUNT_RECORD
- --- a/arch/mips/net/Makefile
- +++ b/arch/mips/net/Makefile
- @@ -2,9 +2,10 @@
- # MIPS networking code
-
- obj-$(CONFIG_MIPS_CBPF_JIT) += bpf_jit.o bpf_jit_asm.o
- +obj-$(CONFIG_MIPS_EBPF_JIT) += bpf_jit_comp.o
-
- ifeq ($(CONFIG_32BIT),y)
- - obj-$(CONFIG_MIPS_EBPF_JIT) += bpf_jit_comp.o bpf_jit_comp32.o
- + obj-$(CONFIG_MIPS_EBPF_JIT) += bpf_jit_comp32.o
- else
- - obj-$(CONFIG_MIPS_EBPF_JIT) += ebpf_jit.o
- + obj-$(CONFIG_MIPS_EBPF_JIT) += bpf_jit_comp64.o
- endif
|