diff options
Diffstat (limited to 'llvm/lib')
| -rw-r--r-- | llvm/lib/ExecutionEngine/SectionMemoryManager.cpp | 6 | ||||
| -rw-r--r-- | llvm/lib/Support/Unix/Memory.inc | 10 |
2 files changed, 9 insertions, 7 deletions
diff --git a/llvm/lib/ExecutionEngine/SectionMemoryManager.cpp b/llvm/lib/ExecutionEngine/SectionMemoryManager.cpp index 5f542f4304b..ba277796dd5 100644 --- a/llvm/lib/ExecutionEngine/SectionMemoryManager.cpp +++ b/llvm/lib/ExecutionEngine/SectionMemoryManager.cpp @@ -242,7 +242,11 @@ public: allocateMappedMemory(SectionMemoryManager::AllocationPurpose Purpose, size_t NumBytes, const sys::MemoryBlock *const NearBlock, unsigned Flags, std::error_code &EC) override { - return sys::Memory::allocateMappedMemory(NumBytes, NearBlock, Flags, EC); + // allocateMappedMemory calls mmap(2). We round up a request size + // to page size to get extra space for free. + static const size_t PageSize = sys::Process::getPageSize(); + size_t ReqBytes = (NumBytes + PageSize - 1) & ~(PageSize - 1); + return sys::Memory::allocateMappedMemory(ReqBytes, NearBlock, Flags, EC); } std::error_code protectMappedMemory(const sys::MemoryBlock &Block, diff --git a/llvm/lib/Support/Unix/Memory.inc b/llvm/lib/Support/Unix/Memory.inc index c20629c8217..3c4d324a8bb 100644 --- a/llvm/lib/Support/Unix/Memory.inc +++ b/llvm/lib/Support/Unix/Memory.inc @@ -91,9 +91,6 @@ Memory::allocateMappedMemory(size_t NumBytes, if (NumBytes == 0) return MemoryBlock(); - static const size_t PageSize = Process::getPageSize(); - const size_t NumPages = (NumBytes+PageSize-1)/PageSize; - int fd = -1; int MMFlags = MAP_PRIVATE | @@ -113,11 +110,12 @@ Memory::allocateMappedMemory(size_t NumBytes, // Use any near hint and the page size to set a page-aligned starting address uintptr_t Start = NearBlock ? reinterpret_cast<uintptr_t>(NearBlock->base()) + NearBlock->size() : 0; + static const size_t PageSize = Process::getPageSize(); if (Start && Start % PageSize) Start += PageSize - Start % PageSize; - void *Addr = ::mmap(reinterpret_cast<void*>(Start), PageSize*NumPages, - Protect, MMFlags, fd, 0); + void *Addr = ::mmap(reinterpret_cast<void *>(Start), NumBytes, Protect, + MMFlags, fd, 0); if (Addr == MAP_FAILED) { if (NearBlock) //Try again without a near hint return allocateMappedMemory(NumBytes, nullptr, PFlags, EC); @@ -128,7 +126,7 @@ Memory::allocateMappedMemory(size_t NumBytes, MemoryBlock Result; Result.Address = Addr; - Result.Size = NumPages*PageSize; + Result.Size = NumBytes; // Rely on protectMappedMemory to invalidate instruction cache. if (PFlags & MF_EXEC) { |
