commit b7f3e0f68fb3ea64c89e630fb346006b98842c28
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri May 05 18:08:42 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri May 05 18:08:42 2023 +0000
tree f4da7816fcdd60f25e3b1bfaa1b21b1ce093ef38
parent c500206b187a6340c9ffc658e0b710c8dfdcdee1
parent b7964b2b603fc7a45abdd298100759c2d7119aad

Merge "bpfloader: unconditionally set bpf_jit_enable=1" am: 71e0bc0ada am: f3dc68a39d am: ba3974bf3c am: b7964b2b60

Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2579790

Change-Id: I49e8f0ffc11bc0092bb1e08cf130a0233705ef1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

bpfloader/BpfLoader.cpp

diff --git a/bpfloader/BpfLoader.cpp b/bpfloader/BpfLoader.cpp
index 0da624c..762d6b0 100644
--- a/bpfloader/BpfLoader.cpp
+++ b/bpfloader/BpfLoader.cpp
@@ -283,8 +283,7 @@
     //  kernel does not have CONFIG_BPF_JIT=y)
     // BPF_JIT is required by R VINTF (which means 4.14/4.19/5.4 kernels),
     // but 4.14/4.19 were released with P & Q, and only 5.4 is new in R+.
-    if (writeProcSysFile("/proc/sys/net/core/bpf_jit_enable", "1\n") &&
-        android::bpf::isAtLeastKernelVersion(5, 4, 0)) return 1;
+    if (writeProcSysFile("/proc/sys/net/core/bpf_jit_enable", "1\n")) return 1;
 
     // Enable JIT kallsyms export for privileged users only
     // (Note: this (open) will fail with ENOENT 'No such file or directory' if