File mozjs-support-48bit-va.patch of Package mozjs24

Overview Repositories Revisions Requests Users Attributes Meta

File mozjs-support-48bit-va.patch of Package mozjs24 (Revision 560b64ee28fcacc852550268e465dcc5)

Currently displaying revision 560b64ee28fcacc852550268e465dcc5 , Show latest

# HG changeset patch
# User Zheng Xu <zheng.xu@linaro.org>
# Date 1464657720 -7200
# Node ID dfaafbaaa2919a033c4c0abdd5830f4ea413bed6
# Parent  499f16ca85ec48d1896a1633730715f32bd62140
Bug 1143022 - Manually mmap on arm64 to ensure high 17 bits are clear. r=ehoogeveen

There might be 48-bit VA on arm64 depending on kernel configuration.
Manually mmap heap memory to align with the assumption made by JS engine.

Index: mozjs-24.2.0/js/src/gc/Memory.cpp
===================================================================
--- mozjs-24.2.0.orig/js/src/gc/Memory.cpp
+++ mozjs-24.2.0/js/src/gc/Memory.cpp
@@ -339,11 +339,44 @@ MapMemory(size_t length, int prot, int f
         return MAP_FAILED;
     }
     return region;
+#elif defined(__aarch64__)
+   /*
+    * There might be similar virtual address issue on arm64 which depends on
+    * hardware and kernel configurations. But the work around is slightly
+    * different due to the different mmap behavior.
+    */
+    const uintptr_t start = UINT64_C(0x0000070000000000);
+    const uintptr_t end   = UINT64_C(0x0000800000000000);
+    const uintptr_t step  = ChunkSize;
+   /*
+    * Optimization options if there are too many retries in practice:
+    * 1. Examine /proc/self/maps to find an available address. This file is
+    *    not always available, however. In addition, even if we examine
+    *    /proc/self/maps, we may still need to retry several times due to
+    *    racing with other threads.
+    * 2. Use a global/static variable with lock to track the addresses we have
+    *    allocated or tried.
+    */
+    uintptr_t hint;
+    void* region = MAP_FAILED;
+    for (hint = start; region == MAP_FAILED && hint + length <= end; hint += step) {
+        region = mmap((void*)hint, length, prot, flags, fd, offset);
+        if (region != MAP_FAILED) {
+            if ((uintptr_t(region) + (length - 1)) & 0xffff800000000000) {
+                if (munmap(region, length)) {
+                    MOZ_ASSERT(errno == ENOMEM);
+                }
+                region = MAP_FAILED;
+            }
+        }
+    }
+    return region == MAP_FAILED ? NULL : region;
 #else
     return mmap(NULL, length, prot, flags, fd, offset);
 #endif
 }
 
+
 void *
 gc::MapAlignedPages(JSRuntime *rt, size_t size, size_t alignment)
 {

Places

File mozjs-support-48bit-va.patch of Package mozjs24 (Revision 560b64ee28fcacc852550268e465dcc5)

Places