Let atrace HAL look with tracefs in /sys/kernel/tracing as well.

With this change, atrace HAL will look for tracefs in
/sys/kernel/tracing first and /sys/kernel/debug/tracing second.

Bug: 185427606
Test: systrace
Change-Id: I5ba8d299fa7173b4c6861518bae93618a77be81a

3 files changed, 53 insertions, 23 deletions

diff --git a/atrace/AtraceDevice.cpp b/atrace/AtraceDevice.cpp
index 6c9330d..5f8b9cd 100644
--- a/atrace/AtraceDevice.cpp
+++ b/atrace/AtraceDevice.cpp
@@ -16,6 +16,7 @@
 
 #include <android-base/file.h>
 #include <android-base/logging.h>
+#include <android-base/stringprintf.h>
 
 #include "AtraceDevice.h"
 
@@ -34,45 +35,39 @@ struct TracingConfig {
     std::vector<std::pair<std::string, bool>> paths;
 };
 
-// This is a map stores categories and their sysfs paths with required flags
+// This is a map stores categories and their tracefs event name with required flags
 const std::map<std::string, TracingConfig> kTracingMap = {
         {
                 "gfx",
                 {"Graphics",
-                 {{"/sys/kernel/debug/tracing/events/mdss/enable", false},
-                  {"/sys/kernel/debug/tracing/events/sde/enable", false},
-                  {"/sys/kernel/debug/tracing/events/dpu/enable", false},
-                  {"/sys/kernel/debug/tracing/events/g2d/enable", false},
-                  {"/sys/kernel/debug/tracing/events/mali/enable", false}}},
+                 {{"mdss", false},
+                  {"sde", false},
+                  {"dpu", false},
+                  {"g2d", false},
+                  {"mali", false}}},
         },
         {
                 "memory",
-                {"Memory",
-                 {{"/sys/kernel/debug/tracing/events/fastrpc/fastrpc_dma_stat/enable", false},
-                  {"/sys/kernel/tracing/events/dmabuf_heap/enable", false}}},
+                {"Memory", {{"fastrpc/fastrpc_dma_stat", false}, {"dmabuf_heap", false}}},
         },
         {
                 "ion",
-                {"ION Allocation",
-                 {{"/sys/kernel/debug/tracing/events/kmem/ion_alloc_buffer_start/enable", false}}},
+                {"ION Allocation", {{"kmem/ion_alloc_buffer_start", false}}},
         },
         {
                 "sched",
-                {"CPU Scheduling and Trustzone",
-                 {{"/sys/kernel/debug/tracing/events/scm/enable", false},
-                  {"/sys/kernel/debug/tracing/events/systrace/enable", false}}},
+                {"CPU Scheduling and Trustzone", {{"scm", false}, {"systrace", false}}},
         },
         {
                 "freq",
-                {"CPU Frequency and System Clock",
-                 {{"/sys/kernel/debug/tracing/events/msm_bus/enable", false}}},
+                {"CPU Frequency and System Clock", {{"msm_bus", false}}},
         },
         {
                 "thermal_tj",
                 {"Tj power limits and frequency",
-                 {{"/sys/kernel/debug/tracing/events/lmh/lmh_dcvs_freq/enable", false},
-                  {"/sys/kernel/debug/tracing/events/thermal_exynos/enable", false},
-                  {"/sys/kernel/debug/tracing/events/thermal_exynos_gpu/enable", false}}},
+                 {{"lmh/lmh_dcvs_freq", false},
+                  {"thermal_exynos", false},
+                  {"thermal_exynos_gpu", false}}},
         },
 };
 
@@ -90,16 +85,31 @@ Return<void> AtraceDevice::listCategories(listCategories_cb _hidl_cb) {
     return Void();
 }
 
+AtraceDevice::AtraceDevice() {
+    struct stat st;
+
+    mTracefsEventRoot = "/sys/kernel/tracing/events/";
+    if (stat(mTracefsEventRoot.c_str(), &st) != 0) {
+        mTracefsEventRoot = "/sys/kernel/debug/tracing/events/";
+        CHECK(stat(mTracefsEventRoot.c_str(), &st) == 0) << "tracefs must be mounted at either"
+                                                            "/sys/kernel/tracing or "
+                                                            "/sys/kernel/debug/tracing";
+    }
+}
+
 Return<::android::hardware::atrace::V1_0::Status> AtraceDevice::enableCategories(
         const hidl_vec<hidl_string> &categories) {
     if (!categories.size()) {
         return Status::ERROR_INVALID_ARGUMENT;
     }
+
     for (auto &c : categories) {
         if (kTracingMap.count(c)) {
             for (auto &p : kTracingMap.at(c).paths) {
-                if (!android::base::WriteStringToFile("1", p.first)) {
-                    LOG(ERROR) << "Failed to enable tracing on: " << p.first;
+                std::string tracefs_event_enable_path = android::base::StringPrintf(
+                        "%s%s/enable", mTracefsEventRoot.c_str(), p.first.c_str());
+                if (!android::base::WriteStringToFile("1", tracefs_event_enable_path)) {
+                    LOG(ERROR) << "Failed to enable tracing on: " << tracefs_event_enable_path;
                     if (p.second) {
                         // disable before return
                         disableAllCategories();
@@ -116,10 +126,13 @@ Return<::android::hardware::atrace::V1_0::Status> AtraceDevice::enableCategories
 
 Return<::android::hardware::atrace::V1_0::Status> AtraceDevice::disableAllCategories() {
     auto ret = Status::SUCCESS;
+
     for (auto &c : kTracingMap) {
         for (auto &p : c.second.paths) {
-            if (!android::base::WriteStringToFile("0", p.first)) {
-                LOG(ERROR) << "Failed to disable tracing on: " << p.first;
+            std::string tracefs_event_enable_path = android::base::StringPrintf(
+                    "%s%s/enable", mTracefsEventRoot.c_str(), p.first.c_str());
+            if (!android::base::WriteStringToFile("0", tracefs_event_enable_path)) {
+                LOG(ERROR) << "Failed to disable tracing on: " << tracefs_event_enable_path;
                 if (p.second) {
                     ret = Status::ERROR_TRACING_POINT;
                 }
diff --git a/atrace/AtraceDevice.h b/atrace/AtraceDevice.h
index a15cd6c..2863cd3 100644
--- a/atrace/AtraceDevice.h
+++ b/atrace/AtraceDevice.h
@@ -34,12 +34,15 @@ using ::android::hardware::Return;
 using ::android::hardware::Void;
 
 struct AtraceDevice : public IAtraceDevice {
+    AtraceDevice();
     // Methods from ::android::hardware::atrace::V1_0::IAtraceDevice follow.
     Return<void> listCategories(listCategories_cb _hidl_cb) override;
     Return<::android::hardware::atrace::V1_0::Status> enableCategories(
             const hidl_vec<hidl_string> &categories) override;
     Return<::android::hardware::atrace::V1_0::Status> disableAllCategories() override;
 
+  private:
+    std::string mTracefsEventRoot;
     // Methods from ::android::hidl::base::V1_0::IBase follow.
 };
 
diff --git a/atrace/android.hardware.atrace@1.0-service.pixel.rc b/atrace/android.hardware.atrace@1.0-service.pixel.rc
index 659fac4..353c073 100644
--- a/atrace/android.hardware.atrace@1.0-service.pixel.rc
+++ b/atrace/android.hardware.atrace@1.0-service.pixel.rc
@@ -1,27 +1,41 @@
 on late-init
     # vendor graphics trace points
     chmod 0666 /sys/kernel/debug/tracing/events/sde/enable
+    chmod 0666 /sys/kernel/tracing/events/sde/enable
     chmod 0666 /sys/kernel/debug/tracing/events/mdss/enable
+    chmod 0666 /sys/kernel/tracing/events/mdss/enable
     chmod 0666 /sys/kernel/debug/tracing/events/dpu/enable
+    chmod 0666 /sys/kernel/tracing/events/dpu/enable
     chmod 0666 /sys/kernel/debug/tracing/events/g2d/enable
+    chmod 0666 /sys/kernel/tracing/events/g2d/enable
     chmod 0666 /sys/kernel/debug/tracing/events/mali/enable
+    chmod 0666 /sys/kernel/tracing/events/mali/enable
+
     # ion allocation trace point
     chmod 0666 /sys/kernel/debug/tracing/events/kmem/ion_alloc_buffer_start/enable
+    chmod 0666 /sys/kernel/tracing/events/kmem/ion_alloc_buffer_start/enable
     # scm trace point
     chmod 0666 /sys/kernel/debug/tracing/events/scm/enable
+    chmod 0666 /sys/kernel/tracing/events/scm/enable
     # system bus clk trace point
     chmod 0666 /sys/kernel/debug/tracing/events/msm_bus/enable
+    chmod 0666 /sys/kernel/tracing/events/msm_bus/enable
     # legacy systrace point
     chmod 0666 /sys/kernel/debug/tracing/events/systrace/enable
+    chmod 0666 /sys/kernel/tracing/events/systrace/enable
     # qct hw lmh-dcvs
     chmod 0666 /sys/kernel/debug/tracing/events/lmh/lmh_dcvs_freq/enable
+    chmod 0666 /sys/kernel/tracing/events/lmh/lmh_dcvs_freq/enable
     # qct fastrpc dma buffers
     chmod 0666 /sys/kernel/debug/tracing/events/fastrpc/fastrpc_dma_stat/enable
+    chmod 0666 /sys/kernel/tracing/events/fastrpc/fastrpc_dma_stat/enable
     # dmabuf heap stats
     chmod 0666 /sys/kernel/tracing/events/dmabuf_heap/enable
     # Tj pid control loop trace points
     chmod 0666 /sys/kernel/debug/tracing/events/thermal_exynos/enable
+    chmod 0666 /sys/kernel/tracing/events/thermal_exynos/enable
     chmod 0666 /sys/kernel/debug/tracing/events/thermal_exynos_gpu/enable
+    chmod 0666 /sys/kernel/tracing/events/thermal_exynos_gpu/enable
 
 service vendor.atrace-hal-1-0 /vendor/bin/hw/android.hardware.atrace@1.0-service.pixel
     interface android.hardware.atrace@1.0::IAtraceDevice default