Add NetBSD support in sanitizer_procmaps_freebsd.cc

[krytarowski]

Summary

This adds NetBSD specific:

• ReadProcMaps()
• MemoryMappingLayout::Next()

This code is largely shared with FreeBSD.

Part of the code inspired by the original work on libsanitizer in GCC 5.4 by Christos Zoulas.

Sponsored by <The NetBSD Foundation>

[vitalybuka]

lib/sanitizer_common/sanitizer_procmaps_netbsd.cc

40 ↗

(On Diff #107072)

MemoryMappingLayout::Next interface was changed

[vitalybuka]

lib/sanitizer_common/sanitizer_procmaps_netbsd.cc

40 ↗

(On Diff #107072)

And entire file looks very similar to sanitizer_procmaps_freebsd.cc

[krytarowski]

lib/sanitizer_common/sanitizer_procmaps_netbsd.cc

40 ↗

(On Diff #107072)

I'm going to rebase it.

Right, FreeBSD is similar.

[fjricci]

lib/sanitizer_common/sanitizer_procmaps_netbsd.cc

40 ↗

(On Diff #107072)

If freebsd is sufficiently similar, it's probably worth it to just combine them and #ifdef any small differences (this is frequently done for Linux+Freebsd).

[filcab]

This should be merged with the FreeBSD one. The differences are minor and it looks like you can cover all of them with two or three simple conditional operators or ifs.

[krytarowski]

@filcab done.

[fjricci]

lib/sanitizer_common/sanitizer_procmaps_freebsd.cc

36

The sanitizers already have a macro for this, ARRAY_SIZE, I believe

[krytarowski]

Use ARRAY_SIZE.

[fjricci]

Please update the commit message and one style comment, otherwise lgtm.

lib/sanitizer_common/sanitizer_procmaps_freebsd.cc

53

Did you run clang-format on this? Looks like a different format from the original array (but I don't know which is correct myself).

[krytarowski]

lib/sanitizer_common/sanitizer_procmaps_freebsd.cc

53

This format was selected by git-clang-format.

[fjricci]

lib/sanitizer_common/sanitizer_procmaps_freebsd.cc

53

Awesome

lib/sanitizer_common/sanitizer_procmaps_freebsd.cc

 //===-- sanitizer_procmaps_freebsd.cc -------------------------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
-// Information about the process mappings (FreeBSD-specific parts).
+// Information about the process mappings (FreeBSD and NetBSD-specific parts).
 //===----------------------------------------------------------------------===//
 
 #include "sanitizer_platform.h"
-#if SANITIZER_FREEBSD
+#if SANITIZER_FREEBSD || SANITIZER_NETBSD
 #include "sanitizer_common.h"
+#if SANITIZER_FREEBSD
 #include "sanitizer_freebsd.h"
+#endif
 #include "sanitizer_procmaps.h"
 
 #include <unistd.h>
 #include <sys/sysctl.h>
+#if SANITIZER_FREEBSD
 #include <sys/user.h>
+#endif
 
 // Fix 'kinfo_vmentry' definition on FreeBSD prior v9.2 in 32-bit mode.
 #if SANITIZER_FREEBSD && (SANITIZER_WORDSIZE == 32)
 # include <osreldate.h>
 # if __FreeBSD_version <= 902001  // v9.2
 #  define kinfo_vmentry xkinfo_vmentry
 # endif
 #endif
 
+#ifndef __arraycount
+#define __arraycount(__x) (sizeof(__x) / sizeof(__x[0]))
+#endif
+
 namespace __sanitizer {
 
 void ReadProcMaps(ProcSelfMapsBuff *proc_maps) {
-  const int Mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_VMMAP, getpid() };
+  const int Mib[] = {
+#if SANITIZER_FREEBSD
+    CTL_KERN,
+    KERN_PROC,
+    KERN_PROC_VMMAP,
+    getpid()
+#else
+    CTL_VM,
+    VM_PROC,
+    VM_PROC_MAP,
+    getpid(),
+    sizeof(struct kinfo_vmentry)
+#endif
+  };
+
   size_t Size = 0;
-  int Err = sysctl(Mib, 4, NULL, &Size, NULL, 0);
+  int Err = sysctl(Mib, __arraycount(Mib), NULL, &Size, NULL, 0);
   CHECK_EQ(Err, 0);
   CHECK_GT(Size, 0);
 
   size_t MmapedSize = Size * 4 / 3;
   void *VmMap = MmapOrDie(MmapedSize, "ReadProcMaps()");
   Size = MmapedSize;
-  Err = sysctl(Mib, 4, VmMap, &Size, NULL, 0);
+  Err = sysctl(Mib, __arraycount(Mib), VmMap, &Size, NULL, 0);
   CHECK_EQ(Err, 0);
 
   proc_maps->data = (char*)VmMap;
   proc_maps->mmaped_size = MmapedSize;
   proc_maps->len = Size;
 }
 
 bool MemoryMappingLayout::Next(MemoryMappedSegment *segment) {
if ((VmEntry->kve_protection & KVME_PROT_EXEC) != 0)
     segment->protection |= kProtectionExecute;
 
   if (segment->filename != NULL && segment->filename_size > 0) {
     internal_snprintf(segment->filename,
                       Min(segment->filename_size, (uptr)PATH_MAX), "%s",
                       VmEntry->kve_path);
   }
 
+#if SANITIZER_FREEBSD
   current_ += VmEntry->kve_structsize;
+#else
+  current_ += sizeof(*VmEntry);
+#endif
 
   return true;
 }
 
 }  // namespace __sanitizer
 
-#endif  // SANITIZER_FREEBSD
+#endif  // SANITIZER_FREEBSD || SANITIZER_NETBSD