ANDROID: 4.9+ R+ - require BPF_JIT=y & BPF_JIT_ALWAYS_ON=y
Ideally we'd turn it on for 4.9+ P+ - but we can't require that.
Note: for CFI enabled kernels there's a series of 3 patches
that are additionally needed:
UPSTREAM: kcm: use BPF_PROG_RUN
ANDROID: bpf: validate bpf_func when BPF_JIT is enabled with CFI
ANDROID: arm64: bpf: implement arch_bpf_jit_check_func
Bug: 140377409
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ieb14cb57c5988d9e7e52a0eb69e4382773b66749
diff --git a/android-4.14/android-base.config b/android-4.14/android-base.config
index 79d81da..154c0c4 100644
--- a/android-4.14/android-base.config
+++ b/android-4.14/android-base.config
@@ -20,6 +20,8 @@
CONFIG_BLK_DEV_INITRD=y
CONFIG_BLK_DEV_LOOP=y
CONFIG_BLOCK=y
+CONFIG_BPF_JIT_ALWAYS_ON=y
+CONFIG_BPF_JIT=y
CONFIG_BPF_SYSCALL=y
CONFIG_CC_STACKPROTECTOR_STRONG=y
CONFIG_CGROUPS=y
diff --git a/android-4.19/android-base.config b/android-4.19/android-base.config
index de3e1a1..46a1823 100644
--- a/android-4.19/android-base.config
+++ b/android-4.19/android-base.config
@@ -19,6 +19,8 @@
CONFIG_BLK_DEV_INITRD=y
CONFIG_BLK_DEV_LOOP=y
CONFIG_BLOCK=y
+CONFIG_BPF_JIT_ALWAYS_ON=y
+CONFIG_BPF_JIT=y
CONFIG_BPF_SYSCALL=y
CONFIG_CGROUPS=y
CONFIG_CGROUP_BPF=y
diff --git a/android-4.9/android-base.config b/android-4.9/android-base.config
index de91a8b..f2e3be7 100644
--- a/android-4.9/android-base.config
+++ b/android-4.9/android-base.config
@@ -21,6 +21,8 @@
CONFIG_BLK_DEV_INITRD=y
CONFIG_BLK_DEV_LOOP=y
CONFIG_BLOCK=y
+CONFIG_BPF_JIT_ALWAYS_ON=y
+CONFIG_BPF_JIT=y
CONFIG_BPF_SYSCALL=y
CONFIG_CC_STACKPROTECTOR_STRONG=y
CONFIG_CGROUPS=y
