[PATCH] D113648: Respect pgoff and rely on it for all types of binaries

[Pavel Kosov via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rLNT6b9600075f34: Respect pgoff and rely on it for all types of binaries (authored by kpdev42).

Repository:
  rLNT LNT

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D113648/new/

https://reviews.llvm.org/D113648

Files:
  lnt/testing/profile/cPerf.cpp


Index: lnt/testing/profile/cPerf.cpp
===================================================================
--- lnt/testing/profile/cPerf.cpp
+++ lnt/testing/profile/cPerf.cpp
@@ -132,7 +132,7 @@
 
 // Returns true if the ELF file given by filename
 // is a shared object (DYN).
-bool IsSharedObject(std::string Fname) {
+bool IsSharedObject(char *Fname) {
   // We replicate the first part of an ELF header here
   // so as not to rely on <elf.h>.
   struct PartialElfHeader {
@@ -141,7 +141,7 @@
   };
   const int ET_DYN = 3;
 
-  FILE *stream = fopen(Fname.c_str(), "r");
+  FILE *stream = fopen(Fname, "r");
   if (stream == NULL)
     return false;
 
@@ -213,6 +213,8 @@
   char filename[1];
 };
 
+#define PROT_EXEC 4
+
 struct perf_event_mmap2 {
   struct perf_event_header header;
 
@@ -240,7 +242,7 @@
 //===----------------------------------------------------------------------===//
 
 struct Map {
-  uint64_t Start, End;
+  uint64_t Start, End, Adjust;
   const char *Filename;
 };
 
@@ -544,7 +546,12 @@
   if (E->header.type == PERF_RECORD_MMAP) {
     perf_event_mmap *E = (perf_event_mmap *)Buf;
     auto MapID = Maps.size();
-    Maps.push_back({E->start, E->start + E->extent, E->filename});
+    // EXEC ELF objects aren't relocated. DYN ones are,
+    // so if it's a DYN object adjust by subtracting the
+    // map base.
+    bool IsSO = IsSharedObject(E->filename);
+    Maps.push_back({E->start, E->start + E->extent,
+                    IsSO ? E->start - E->pgoff : 0, E->filename});
 
     // FIXME: use EventLayouts.begin()->second!
     perf_sample_id *ID =
@@ -554,8 +561,15 @@
   }
   if (E->header.type == PERF_RECORD_MMAP2) {
     perf_event_mmap2 *E = (perf_event_mmap2 *)Buf;
+    if (!(E->prot & PROT_EXEC))
+      break;
     auto MapID = Maps.size();
-    Maps.push_back({E->start, E->start + E->extent, E->filename});
+    // EXEC ELF objects aren't relocated. DYN ones are,
+    // so if it's a DYN object adjust by subtracting the
+    // map base.
+    bool IsSO = IsSharedObject(E->filename);
+    Maps.push_back({E->start, E->start + E->extent,
+                    IsSO ? E->start - E->pgoff : 0, E->filename});
 
     // FIXME: use EventLayouts.begin()->second!
     perf_sample_id *ID =
@@ -705,11 +719,7 @@
     if (AllUnderThreshold)
       continue;
 
-    // EXEC ELF objects aren't relocated. DYN ones are,
-    // so if it's a DYN object adjust by subtracting the
-    // map base.
-    bool IsSO = IsSharedObject(Maps[MapID].Filename);
-    uint64_t Adjust = IsSO ? Maps[MapID].Start : 0;
+    uint64_t Adjust = Maps[MapID].Adjust;
 
     NmOutput Syms(Nm, BinaryCacheRoot);
     Syms.reset(&Maps[MapID]);


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D113648.387165.patch
Type: text/x-patch
Size: 2659 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20211115/f63a012a/attachment.bin>