commit abe920f0df1135231b9d93dc6a641f3a573df452
author Yabin Cui <yabinc@google.com> Wed Aug 05 18:14:14 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Aug 05 18:14:14 2020 +0000
tree 8ccff6660c9817f0921712f7af41cd12b6c76161
parent 3eb0e555d742b60ef2922ae61ebdb837ef4aa305
parent 9ca6083d362792e8a127883f9683ea7c79333d41

Merge "simpleperf: enable kernel addr filter test."

simpleperf/cmd_record_test.cpp

diff --git a/simpleperf/cmd_record_test.cpp b/simpleperf/cmd_record_test.cpp
index 0c67e21..097f94b 100644
--- a/simpleperf/cmd_record_test.cpp
+++ b/simpleperf/cmd_record_test.cpp
@@ -1033,21 +1033,18 @@
   filter = StringPrintf("filter 0x%" PRIx64 "-0x%" PRIx64 "@%s", addr, addr + 4,
                         sleep_exec_path.c_str());
   ASSERT_TRUE(RunRecordCmd({"-e", "cs-etm", "--addr-filter", filter}));
-  // TODO: enable kernel addr test after getting "perf/core: Fix crash when using HW tracing kernel
-  // filters" to android kernel 4.14.
-  if (false) {
-    // kernel start
-    uint64_t fake_kernel_addr = (1ULL << 63);
-    filter = StringPrintf("start 0x%" PRIx64, fake_kernel_addr);
-    ASSERT_TRUE(RunRecordCmd({"-e", "cs-etm", "--addr-filter", filter}));
-    // kernel stop
-    filter = StringPrintf("stop 0x%" PRIx64, fake_kernel_addr);
-    ASSERT_TRUE(RunRecordCmd({"-e", "cs-etm", "--addr-filter", filter}));
-    // kernel range
-    filter =
-        StringPrintf("filter 0x%" PRIx64 "-0x%" PRIx64, fake_kernel_addr, fake_kernel_addr + 4);
-    ASSERT_TRUE(RunRecordCmd({"-e", "cs-etm", "--addr-filter", filter}));
-  }
+  // If kernel panic, try backporting "perf/core: Fix crash when using HW tracing kernel
+  // filters".
+  // kernel start
+  uint64_t fake_kernel_addr = (1ULL << 63);
+  filter = StringPrintf("start 0x%" PRIx64, fake_kernel_addr);
+  ASSERT_TRUE(RunRecordCmd({"-e", "cs-etm", "--addr-filter", filter}));
+  // kernel stop
+  filter = StringPrintf("stop 0x%" PRIx64, fake_kernel_addr);
+  ASSERT_TRUE(RunRecordCmd({"-e", "cs-etm", "--addr-filter", filter}));
+  // kernel range
+  filter = StringPrintf("filter 0x%" PRIx64 "-0x%" PRIx64, fake_kernel_addr, fake_kernel_addr + 4);
+  ASSERT_TRUE(RunRecordCmd({"-e", "cs-etm", "--addr-filter", filter}));
 }
 
 TEST(record_cmd, pmu_event_option) {