diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-08-18 15:26:10 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-08-18 15:26:10 +0200 |
commit | 173657f227d26501d9dd8a09a0f0fd6f4654f6eb (patch) | |
tree | 9dfb27173293b1b42f0307788fbf10e364d88f73 | |
parent | 59e9140b7bbad7ea312890f22129423e44da09fb (diff) | |
parent | c5888337639d8bf59ff5f292302872fed320c2bf (diff) | |
download | kernel-173657f227d26501d9dd8a09a0f0fd6f4654f6eb.tar.gz kernel-173657f227d26501d9dd8a09a0f0fd6f4654f6eb.tar.xz kernel-173657f227d26501d9dd8a09a0f0fd6f4654f6eb.zip |
Merge remote-tracking branch 'origin/f29' into f29-user-thl-vanilla-fedora
-rw-r--r-- | arm-fix-bpf-jit.patch | 25 | ||||
-rw-r--r-- | configs/fedora/generic/arm/armv7/CONFIG_BPF_JIT | 1 | ||||
-rw-r--r-- | configs/fedora/generic/arm/armv7/CONFIG_BPF_JIT_ALWAYS_ON | 1 | ||||
-rw-r--r-- | kernel-armv7hl-debug.config | 4 | ||||
-rw-r--r-- | kernel-armv7hl-lpae-debug.config | 4 | ||||
-rw-r--r-- | kernel-armv7hl-lpae.config | 4 | ||||
-rw-r--r-- | kernel-armv7hl.config | 4 | ||||
-rw-r--r-- | kernel.spec | 5 |
8 files changed, 38 insertions, 10 deletions
diff --git a/arm-fix-bpf-jit.patch b/arm-fix-bpf-jit.patch new file mode 100644 index 000000000..f76af6698 --- /dev/null +++ b/arm-fix-bpf-jit.patch @@ -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 + diff --git a/configs/fedora/generic/arm/armv7/CONFIG_BPF_JIT b/configs/fedora/generic/arm/armv7/CONFIG_BPF_JIT deleted file mode 100644 index 7905dce5c..000000000 --- a/configs/fedora/generic/arm/armv7/CONFIG_BPF_JIT +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_BPF_JIT is not set diff --git a/configs/fedora/generic/arm/armv7/CONFIG_BPF_JIT_ALWAYS_ON b/configs/fedora/generic/arm/armv7/CONFIG_BPF_JIT_ALWAYS_ON deleted file mode 100644 index faae023d4..000000000 --- a/configs/fedora/generic/arm/armv7/CONFIG_BPF_JIT_ALWAYS_ON +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_BPF_JIT_ALWAYS_ON is not set diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 52425111d..320bd0f01 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -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 diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 19736af1c..e63f929e6 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -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 diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 5667b288f..6ec5d8ef2 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -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 diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index f66199799..9e86f4a7d 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -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 diff --git a/kernel.spec b/kernel.spec index c77bda23e..98bfeefa5 100644 --- a/kernel.spec +++ b/kernel.spec @@ -624,6 +624,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 @@ -1924,6 +1926,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 |