Merge pull request #12788 from tvegas1/sshmem_start_addr_fix_v4

oshmem/shmem: Fix sshmem start address and warn if inside data region - v4.1.x

Author: jsquyres

oshmem/mca/memheap/base/memheap_base_static.c

@@ -14,6 +14,7 @@
 #include "oshmem/proc/proc.h"
 #include "oshmem/mca/memheap/memheap.h"
 #include "oshmem/mca/memheap/base/base.h"
+#include "oshmem/mca/sshmem/base/base.h"
 #include "oshmem/util/oshmem_util.h"
 
 #include <stdio.h>
@@ -51,6 +52,14 @@ int mca_memheap_base_static_init(mca_memheap_map_t *map)
         return OSHMEM_ERROR;
     }
 
+#ifdef __linux__
+    extern unsigned _end;
+    if (mca_sshmem_base_start_address < (uintptr_t)&_end) {
+        MEMHEAP_WARN("sshmem base start address is inside data region"
+                     " (%p < %p)", mca_sshmem_base_start_address, &_end);
+    }
+#endif
+
     while (NULL != fgets(line, sizeof(line), fp)) {
         if (3 > sscanf(line,
                "%llx-%llx %s %llx %s %llx %s",

oshmem/mca/sshmem/base/sshmem_base_open.c

@@ -37,6 +37,8 @@
  */
 #if UINTPTR_MAX == 0xFFFFFFFF
 void *mca_sshmem_base_start_address = (void*)0;
+#elif defined(__aarch64__)
+void* mca_sshmem_base_start_address = (void*)0xAB0000000000;
 #else
 void* mca_sshmem_base_start_address = (void*)0xFF000000;
 #endif