diff options
| author | Maciej Żenczykowski <maze@google.com> | 2020-06-15 12:52:31 -0700 |
|---|---|---|
| committer | Maciej Żenczykowski <maze@google.com> | 2020-06-15 13:07:39 -0700 |
| commit | 038e011df10fc3451b26591c3504b4ae11549716 (patch) | |
| tree | 36fe0dd462e07682e8aad5ab9322fe6d62ca0632 /r | |
| parent | 2d61e820929cbf287c007b56b9cd6fd0cd430513 (diff) | |
| download | configs-038e011df10fc3451b26591c3504b4ae11549716.tar.gz | |
R: do not require CONFIG_BPF_JIT_ALWAYS_ON=y on arm32
Unfortunately it looks like this security/performance feature
doesn't quite work right on 32-bit arm kernels.
(we really should just drop support for 32-bit arm...
but obviously not yet...)
(Note: skipped S+ portion during cherrypick to rvc-dev)
Bug: 158987567
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Merged-In: I4bb60bff327c5d68581e41cc4f9a17434ac4652a
Change-Id: I4bb60bff327c5d68581e41cc4f9a17434ac4652a
Diffstat (limited to 'r')
| -rw-r--r-- | r/android-4.14/android-base-conditional.xml | 8 | ||||
| -rw-r--r-- | r/android-4.14/android-base.config | 1 | ||||
| -rw-r--r-- | r/android-4.19/android-base-conditional.xml | 8 | ||||
| -rw-r--r-- | r/android-4.19/android-base.config | 1 | ||||
| -rw-r--r-- | r/android-5.4/android-base-conditional.xml | 8 | ||||
| -rw-r--r-- | r/android-5.4/android-base.config | 1 |
6 files changed, 24 insertions, 3 deletions
diff --git a/r/android-4.14/android-base-conditional.xml b/r/android-4.14/android-base-conditional.xml index ada11e7..3102224 100644 --- a/r/android-4.14/android-base-conditional.xml +++ b/r/android-4.14/android-base-conditional.xml @@ -63,6 +63,10 @@ <key>CONFIG_SWP_EMULATION</key> <value type="bool">y</value> </config> + <config> + <key>CONFIG_BPF_JIT_ALWAYS_ON</key> + <value type="bool">y</value> + </config> </group> <!-- x86 base requirements --> @@ -85,6 +89,10 @@ <key>CONFIG_RETPOLINE</key> <value type="bool">y</value> </config> + <config> + <key>CONFIG_BPF_JIT_ALWAYS_ON</key> + <value type="bool">y</value> + </config> </group> <!-- CONFIG_ACPI || CONFIG_OF --> diff --git a/r/android-4.14/android-base.config b/r/android-4.14/android-base.config index c2d90d7..635c71f 100644 --- a/r/android-4.14/android-base.config +++ b/r/android-4.14/android-base.config @@ -25,7 +25,6 @@ CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLOCK=y CONFIG_BPF_JIT=y -CONFIG_BPF_JIT_ALWAYS_ON=y CONFIG_BPF_SYSCALL=y CONFIG_CC_STACKPROTECTOR_STRONG=y CONFIG_CGROUPS=y diff --git a/r/android-4.19/android-base-conditional.xml b/r/android-4.19/android-base-conditional.xml index 3bc4d5c..7ea3405 100644 --- a/r/android-4.19/android-base-conditional.xml +++ b/r/android-4.19/android-base-conditional.xml @@ -63,6 +63,10 @@ <key>CONFIG_SWP_EMULATION</key> <value type="bool">y</value> </config> + <config> + <key>CONFIG_BPF_JIT_ALWAYS_ON</key> + <value type="bool">y</value> + </config> </group> <!-- x86 base requirements --> @@ -85,6 +89,10 @@ <key>CONFIG_RETPOLINE</key> <value type="bool">y</value> </config> + <config> + <key>CONFIG_BPF_JIT_ALWAYS_ON</key> + <value type="bool">y</value> + </config> </group> <!-- CONFIG_ACPI || CONFIG_OF --> diff --git a/r/android-4.19/android-base.config b/r/android-4.19/android-base.config index 7959b32..e45f551 100644 --- a/r/android-4.19/android-base.config +++ b/r/android-4.19/android-base.config @@ -27,7 +27,6 @@ CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLOCK=y CONFIG_BPF_JIT=y -CONFIG_BPF_JIT_ALWAYS_ON=y CONFIG_BPF_SYSCALL=y CONFIG_CGROUPS=y CONFIG_CGROUP_BPF=y diff --git a/r/android-5.4/android-base-conditional.xml b/r/android-5.4/android-base-conditional.xml index ad79744..72889f1 100644 --- a/r/android-5.4/android-base-conditional.xml +++ b/r/android-5.4/android-base-conditional.xml @@ -67,6 +67,10 @@ <key>CONFIG_SWP_EMULATION</key> <value type="bool">y</value> </config> + <config> + <key>CONFIG_BPF_JIT_ALWAYS_ON</key> + <value type="bool">y</value> + </config> </group> <!-- x86 base requirements --> @@ -89,6 +93,10 @@ <key>CONFIG_RETPOLINE</key> <value type="bool">y</value> </config> + <config> + <key>CONFIG_BPF_JIT_ALWAYS_ON</key> + <value type="bool">y</value> + </config> </group> <!-- CONFIG_ACPI || CONFIG_OF --> diff --git a/r/android-5.4/android-base.config b/r/android-5.4/android-base.config index 37a8d07..a580796 100644 --- a/r/android-5.4/android-base.config +++ b/r/android-5.4/android-base.config @@ -27,7 +27,6 @@ CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLOCK=y CONFIG_BPF_JIT=y -CONFIG_BPF_JIT_ALWAYS_ON=y CONFIG_BPF_SYSCALL=y CONFIG_CFI_CLANG=y CONFIG_CGROUPS=y |