Add fix and re-enable BPF JIT on ARMv7
This commit is contained in:
parent
00a29628e2
commit
c588833763
|
@ -0,0 +1,25 @@
|
|||
From 06a5c5fa1f0675523d573c210d4350b775b2c679 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Fri, 17 Aug 2018 15:35:18 +0100
|
||||
Subject: [PATCH] test arm bpf jit
|
||||
|
||||
---
|
||||
arch/arm/net/bpf_jit_32.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arch/arm/net/bpf_jit_32.c b/arch/arm/net/bpf_jit_32.c
|
||||
index f6a62ae44a65b..c864f6b045ba5 100644
|
||||
--- a/arch/arm/net/bpf_jit_32.c
|
||||
+++ b/arch/arm/net/bpf_jit_32.c
|
||||
@@ -238,7 +238,7 @@ static void jit_fill_hole(void *area, unsigned int size)
|
||||
#define STACK_SIZE ALIGN(_STACK_SIZE, STACK_ALIGNMENT)
|
||||
|
||||
/* Get the offset of eBPF REGISTERs stored on scratch space. */
|
||||
-#define STACK_VAR(off) (STACK_SIZE - off)
|
||||
+#define STACK_VAR(off) (STACK_SIZE - off - 4)
|
||||
|
||||
#if __LINUX_ARM_ARCH__ < 7
|
||||
|
||||
--
|
||||
2.17.1
|
||||
|
|
@ -1 +0,0 @@
|
|||
# CONFIG_BPF_JIT is not set
|
|
@ -1 +0,0 @@
|
|||
# CONFIG_BPF_JIT_ALWAYS_ON is not set
|
|
@ -684,8 +684,8 @@ CONFIG_BONDING=m
|
|||
CONFIG_BOOT_PRINTK_DELAY=y
|
||||
CONFIG_BOUNCE=y
|
||||
# CONFIG_BPFILTER is not set
|
||||
# CONFIG_BPF_JIT_ALWAYS_ON is not set
|
||||
# CONFIG_BPF_JIT is not set
|
||||
CONFIG_BPF_JIT_ALWAYS_ON=y
|
||||
CONFIG_BPF_JIT=y
|
||||
CONFIG_BPF_KPROBE_OVERRIDE=y
|
||||
CONFIG_BPF_STREAM_PARSER=y
|
||||
CONFIG_BPF_SYSCALL=y
|
||||
|
|
|
@ -659,8 +659,8 @@ CONFIG_BONDING=m
|
|||
CONFIG_BOOT_PRINTK_DELAY=y
|
||||
CONFIG_BOUNCE=y
|
||||
# CONFIG_BPFILTER is not set
|
||||
# CONFIG_BPF_JIT_ALWAYS_ON is not set
|
||||
# CONFIG_BPF_JIT is not set
|
||||
CONFIG_BPF_JIT_ALWAYS_ON=y
|
||||
CONFIG_BPF_JIT=y
|
||||
CONFIG_BPF_KPROBE_OVERRIDE=y
|
||||
CONFIG_BPF_STREAM_PARSER=y
|
||||
CONFIG_BPF_SYSCALL=y
|
||||
|
|
|
@ -658,8 +658,8 @@ CONFIG_BONDING=m
|
|||
CONFIG_BOOT_PRINTK_DELAY=y
|
||||
CONFIG_BOUNCE=y
|
||||
# CONFIG_BPFILTER is not set
|
||||
# CONFIG_BPF_JIT_ALWAYS_ON is not set
|
||||
# CONFIG_BPF_JIT is not set
|
||||
CONFIG_BPF_JIT_ALWAYS_ON=y
|
||||
CONFIG_BPF_JIT=y
|
||||
# CONFIG_BPF_KPROBE_OVERRIDE is not set
|
||||
CONFIG_BPF_STREAM_PARSER=y
|
||||
CONFIG_BPF_SYSCALL=y
|
||||
|
|
|
@ -683,8 +683,8 @@ CONFIG_BONDING=m
|
|||
CONFIG_BOOT_PRINTK_DELAY=y
|
||||
CONFIG_BOUNCE=y
|
||||
# CONFIG_BPFILTER is not set
|
||||
# CONFIG_BPF_JIT_ALWAYS_ON is not set
|
||||
# CONFIG_BPF_JIT is not set
|
||||
CONFIG_BPF_JIT_ALWAYS_ON=y
|
||||
CONFIG_BPF_JIT=y
|
||||
# CONFIG_BPF_KPROBE_OVERRIDE is not set
|
||||
CONFIG_BPF_STREAM_PARSER=y
|
||||
CONFIG_BPF_SYSCALL=y
|
||||
|
|
|
@ -607,6 +607,8 @@ Patch334: drm-vc4-Fix-the-no-scaling-case-on-multi-planar-YUV-formats.patch
|
|||
Patch350: arm64-arch_timer-Workaround-for-Allwinner-A64-timer-instability.patch
|
||||
Patch351: arm64-dts-allwinner-a64-Enable-A64-timer-workaround.patch
|
||||
|
||||
Patch399: arm-fix-bpf-jit.patch
|
||||
|
||||
# 400 - IBM (ppc/s390x) patches
|
||||
|
||||
# 500 - Temp fixes/CVEs etc
|
||||
|
@ -1904,6 +1906,9 @@ fi
|
|||
#
|
||||
#
|
||||
%changelog
|
||||
* Fri Aug 17 2018 Peter Robinson <pbrobinson@fedoraproject.org>
|
||||
- Add fix and re-enable BPF JIT on ARMv7
|
||||
|
||||
* Thu Aug 16 2018 Laura Abbott <labbott@redhat.com> - 4.18.1-300
|
||||
- Linux v4.18.1
|
||||
|
||||
|
|
Loading…
Reference in New Issue