commit ee0a2bf52ec298d6c9b0f93e92332cd091cdcbba
author Paul Lawrence <paullawrence@google.com> Wed Apr 12 14:31:27 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 12 14:31:27 2023 +0000
tree 1e74c3331c14d625f5b7d594ae1d75d02b73157f
parent 15e9b2f3ad5075d77cc2dcf549d355d0330ecb7c
parent 7278162512fc1c78bc09ab132c7d9bd7f7c8a397

Merge "Use kernel sys/fs/fuse/features/fuse_bpf flag to enable fuse_bpf" into udc-dev

Utils.cpp

diff --git a/Utils.cpp b/Utils.cpp
index 157b839..bcde4d2 100644
--- a/Utils.cpp
+++ b/Utils.cpp
@@ -1772,15 +1772,18 @@
 }
 
 bool IsFuseBpfEnabled() {
-    // TODO Once kernel supports flag, trigger off kernel flag unless
-    //      ro.fuse.bpf.enabled is explicitly set to false
     bool enabled;
+    std::string contents;
+
     if (base::GetProperty("ro.fuse.bpf.is_running", "") != "")
         enabled = base::GetBoolProperty("ro.fuse.bpf.is_running", false);
     else if (base::GetProperty("persist.sys.fuse.bpf.override", "") != "")
         enabled = base::GetBoolProperty("persist.sys.fuse.bpf.override", false);
-    else
+    else if (base::GetProperty("ro.fuse.bpf.enabled", "") != "")
         enabled = base::GetBoolProperty("ro.fuse.bpf.enabled", false);
+    else
+        enabled = base::ReadFileToString("/sys/fs/fuse/features/fuse_bpf", &contents) &&
+                  contents == "supported\n";
 
     if (enabled) {
         base::SetProperty("ro.fuse.bpf.is_running", "true");