hacky impl for allocation handling of library fcns

PrincetonUniversity · Nov 19, 2023 · 6fb2e32 · 6fb2e32
1 parent 3cd2262
commit 6fb2e32
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 18 deletions.
diff --git a/src/binary-instrumentation/PinTool/buffer_linux.cpp b/src/binary-instrumentation/PinTool/buffer_linux.cpp
@@ -48,8 +48,8 @@ using std::string;
 #define QTYPE uint32_t
 #ifndef QSIZE
 #define QSIZE_BYTES                                                            \
-  (1 << 20) // 1 << 0 - 1 byte; 1 << 10 1KB; 1 << 20 1MB; 1 << 24 16MB; 1 << 26
-// (1 << 27) // 1 << 0 - 1 byte; 1 << 10 1KB; 1 << 20 1MB; 1 << 24 16MB; 1 << 26
+  (1 << 27) // 1 << 0 - 1 byte; 1 << 10 1KB; 1 << 20 1MB; 1 << 24 16MB; 1 << 26
+// (1 << 10) // 1 << 0 - 1 byte; 1 << 10 1KB; 1 << 20 1MB; 1 << 24 16MB; 1 << 26
 // 64MB; 1 << 28 256MB; 1 << 30 1GB
 #define QSIZE (QSIZE_BYTES / sizeof(QTYPE))
 // #define QSIZE (1 << 23)
@@ -263,6 +263,32 @@ VOID Trace(TRACE trace, VOID *v) {
             << RTN_FindNameByAddress(TRACE_Address(trace)) << std::endl;
   // #endif
 
+  // if the function starts with "_dl", "do_lookup_x" or "check_match", don't
+  // instrument
+  auto name = RTN_FindNameByAddress(TRACE_Address(trace));
+  if (name.find("_dl") == 0 || name.find("do_lookup_x") == 0 ||
+      name.find("check_match") == 0) {
+    std::cerr << "trace in dynamic linker" << std::endl;
+    return;
+  }
+
+  // if is "_IO_fgets", don't instrument
+  if (name == "_IO_fgets") {
+    std::cerr << "trace in IO" << std::endl;
+    return;
+  }
+  // not __vfprintf_internal
+  if (name == "__vfprintf_internal") {
+    std::cerr << "trace in IO" << std::endl;
+    return;
+  }
+
+  // not anything with "*alloc"
+  if (name.find("alloc") != std::string::npos) {
+    std::cerr << "trace in alloc" << std::endl;
+    return;
+  }
+
   // if from the main image, don't instrument
   if (TRACE_Address(trace) >= start_image_addr &&
       TRACE_Address(trace) <= end_image_addr) {
@@ -281,8 +307,8 @@ VOID Trace(TRACE trace, VOID *v) {
 
       UINT32 memoryOperands = INS_MemoryOperandCount(ins);
 
-      std::cerr << "Instruction " << INS_Disassemble(ins)
-                << " has memory operands " << memoryOperands << std::endl;
+      // std::cerr << "Instruction " << INS_Disassemble(ins)
+      //           << " has memory operands " << memoryOperands << std::endl;
 
       for (UINT32 memOp = 0; memOp < memoryOperands; memOp++) {
         UINT32 refSize = INS_MemoryOperandSize(ins, memOp);

diff --git a/src/runtime/ProfilingModules/slamp_shadow_mem.h b/src/runtime/ProfilingModules/slamp_shadow_mem.h
@@ -219,23 +219,34 @@ template <uint64_t MASK2_VAL = MASK2> class MemoryMap {
         break;
       }
 
-      // if contains libxxx.so, then allocate
-      if (strstr(name, ".so")) {
+      // FIXME: major HACk
+      // allocate everything as long as it doesn't contain "/dev/shm" and not
+      // "pin"
+      if (!strstr(name, "/dev/shm") && !strstr(name, "pin")) {
         allocate(reinterpret_cast<void *>(start), end - start);
-        after_lib = true;
-        continue;
-      }
-
-      // FIXME: if contain .exe, then allocate
-      if (strstr(name, ".exe")) {
-        allocate(reinterpret_cast<void *>(start), end - start);
-        continue;
+        // if it's  libc*.so, then allocate 0x4000 more
+        if (strstr(name, "libc") && strstr(name, ".so")) {
+          allocate(reinterpret_cast<void *>(end), 0x4000);
+        }
       }
 
-      // locale
-      if (strstr(name, "locale")) {
-        allocate(reinterpret_cast<void *>(start), end - start);
-      }
+      // // if contains libxxx.so, then allocate
+      // if (strstr(name, ".so")) {
+      //   allocate(reinterpret_cast<void *>(start), end - start);
+      //   after_lib = true;
+      //   continue;
+      // }
+
+      // // FIXME: if contain .exe, then allocate
+      // if (strstr(name, ".exe")) {
+      //   allocate(reinterpret_cast<void *>(start), end - start);
+      //   continue;
+      // }
+
+      // // locale
+      // if (strstr(name, "locale")) {
+      //   allocate(reinterpret_cast<void *>(start), end - start);
+      // }
     }
 
     if (!allocated) {