Revision: 9480
Author: [email protected]
Date: Thu Sep 29 05:23:05 2011
Log: Fix leakage of virtual address space on Linux platform.
Ensure that unmap return values are checked in debug mode.
[email protected]
BUG=v8:1701
Review URL: http://codereview.chromium.org/8060052
http://code.google.com/p/v8/source/detail?r=9480
Modified:
/branches/bleeding_edge/src/platform-linux.cc
/branches/bleeding_edge/src/platform-macos.cc
/branches/bleeding_edge/src/platform-openbsd.cc
/branches/bleeding_edge/src/platform-win32.cc
/branches/bleeding_edge/src/platform.h
/branches/bleeding_edge/src/spaces.cc
/branches/bleeding_edge/test/mjsunit/mjsunit.status
=======================================
--- /branches/bleeding_edge/src/platform-linux.cc Mon Sep 19 11:36:47 2011
+++ /branches/bleeding_edge/src/platform-linux.cc Thu Sep 29 05:23:05 2011
@@ -477,7 +477,7 @@
PosixMemoryMappedFile::~PosixMemoryMappedFile() {
- if (memory_) munmap(memory_, size_);
+ if (memory_) OS::Free(memory_, size_);
fclose(file_);
}
@@ -559,7 +559,7 @@
void* addr = mmap(NULL, size, PROT_READ | PROT_EXEC, MAP_PRIVATE,
fileno(f), 0);
ASSERT(addr != MAP_FAILED);
- munmap(addr, size);
+ OS::Free(addr, size);
fclose(f);
}
@@ -621,21 +621,31 @@
kMmapFd,
kMmapFdOffset);
if (reservation == MAP_FAILED) return;
+
Address base = static_cast<Address>(reservation);
Address aligned_base = RoundUp(base, alignment);
- ASSERT(base <= aligned_base);
+ ASSERT_LE(base, aligned_base);
// Unmap extra memory reserved before and after the desired block.
- size_t bytes_prior = static_cast<size_t>(aligned_base - base);
- if (bytes_prior > 0) {
- munmap(base, bytes_prior);
- }
- if (static_cast<size_t>(aligned_base - base) < request_size - size) {
- munmap(aligned_base + size, request_size - size - bytes_prior);
- }
+ if (aligned_base != base) {
+ size_t prefix_size = static_cast<size_t>(aligned_base - base);
+ OS::Free(base, prefix_size);
+ request_size -= prefix_size;
+ }
+
+ size_t aligned_size = RoundUp(size, OS::AllocateAlignment());
+ ASSERT_LE(aligned_size, request_size);
+
+ if (aligned_size != request_size) {
+ size_t suffix_size = request_size - aligned_size;
+ OS::Free(aligned_base + aligned_size, suffix_size);
+ request_size -= suffix_size;
+ }
+
+ ASSERT(aligned_size == request_size);
address_ = static_cast<void*>(aligned_base);
- size_ = size;
+ size_ = aligned_size;
}
=======================================
--- /branches/bleeding_edge/src/platform-macos.cc Mon Sep 19 11:36:47 2011
+++ /branches/bleeding_edge/src/platform-macos.cc Thu Sep 29 05:23:05 2011
@@ -228,7 +228,7 @@
PosixMemoryMappedFile::~PosixMemoryMappedFile() {
- if (memory_) munmap(memory_, size_);
+ if (memory_) OS::Free(memory_, size_);
fclose(file_);
}
@@ -353,21 +353,31 @@
kMmapFd,
kMmapFdOffset);
if (reservation == MAP_FAILED) return;
+
Address base = static_cast<Address>(reservation);
Address aligned_base = RoundUp(base, alignment);
- ASSERT(base <= aligned_base);
+ ASSERT_LE(base, aligned_base);
// Unmap extra memory reserved before and after the desired block.
- size_t bytes_prior = static_cast<size_t>(aligned_base - base);
- if (bytes_prior > 0) {
- munmap(base, bytes_prior);
- }
- if (static_cast<size_t>(aligned_base - base) < request_size - size) {
- munmap(aligned_base + size, request_size - size - bytes_prior);
- }
+ if (aligned_base != base) {
+ size_t prefix_size = static_cast<size_t>(aligned_base - base);
+ OS::Free(base, prefix_size);
+ request_size -= prefix_size;
+ }
+
+ size_t aligned_size = RoundUp(size, OS::AllocateAlignment());
+ ASSERT_LE(aligned_size, request_size);
+
+ if (aligned_size != request_size) {
+ size_t suffix_size = request_size - aligned_size;
+ OS::Free(aligned_base + aligned_size, suffix_size);
+ request_size -= suffix_size;
+ }
+
+ ASSERT(aligned_size == request_size);
address_ = static_cast<void*>(aligned_base);
- size_ = size;
+ size_ = aligned_size;
}
=======================================
--- /branches/bleeding_edge/src/platform-openbsd.cc Wed Jul 13 02:09:04 2011
+++ /branches/bleeding_edge/src/platform-openbsd.cc Thu Sep 29 05:23:05 2011
@@ -245,7 +245,7 @@
PosixMemoryMappedFile::~PosixMemoryMappedFile() {
- if (memory_) munmap(memory_, size_);
+ if (memory_) OS::Free(memory_, size_);
fclose(file_);
}
@@ -342,7 +342,8 @@
VirtualMemory::~VirtualMemory() {
if (IsReserved()) {
- if (0 == munmap(address(), size())) address_ = MAP_FAILED;
+ OS::Free(address(), size());
+ address_ = MAP_FAILED
}
}
=======================================
--- /branches/bleeding_edge/src/platform-win32.cc Wed Sep 28 06:27:20 2011
+++ /branches/bleeding_edge/src/platform-win32.cc Thu Sep 29 05:23:05 2011
@@ -1413,7 +1413,9 @@
if (address == NULL) return;
Address base = RoundUp(static_cast<Address>(address), alignment);
// Try reducing the size by freeing and then reallocating a specific
area.
- ReleaseRegion(address, request_size);
+ bool result = ReleaseRegion(address, request_size);
+ USE(result);
+ ASSERT(result);
address = VirtualAlloc(base, size, MEM_RESERVE, PAGE_NOACCESS);
if (address != NULL) {
request_size = size;
=======================================
--- /branches/bleeding_edge/src/platform.h Mon Sep 19 11:36:47 2011
+++ /branches/bleeding_edge/src/platform.h Thu Sep 29 05:23:05 2011
@@ -351,12 +351,14 @@
void Release() {
ASSERT(IsReserved());
- // Notice: Order is somportant here. The VirtualMemory object might
live
+ // Notice: Order is important here. The VirtualMemory object might live
// inside the allocated region.
void* address = address_;
size_t size = size_;
Reset();
- ReleaseRegion(address, size);
+ bool result = ReleaseRegion(address, size);
+ USE(result);
+ ASSERT(result);
}
// Assign control of the reserved region to a different VirtualMemory
object.
=======================================
--- /branches/bleeding_edge/src/spaces.cc Thu Sep 22 10:10:40 2011
+++ /branches/bleeding_edge/src/spaces.cc Thu Sep 29 05:23:05 2011
@@ -341,7 +341,9 @@
isolate_->code_range()->FreeRawMemory(base, size);
} else {
ASSERT(executable == NOT_EXECUTABLE |
| !isolate_->code_range()->exists());
- VirtualMemory::ReleaseRegion(base, size);
+ bool result = VirtualMemory::ReleaseRegion(base, size);
+ USE(result);
+ ASSERT(result);
}
}
=======================================
--- /branches/bleeding_edge/test/mjsunit/mjsunit.status Wed Sep 28 06:29:00
2011
+++ /branches/bleeding_edge/test/mjsunit/mjsunit.status Thu Sep 29 05:23:05
2011
@@ -35,8 +35,6 @@
regress/regress-1119: FAIL
##############################################################################
-# NewGC: http://code.google.com/p/v8/issues/detail?id=1701
-array-join: SKIP
# NewGC: BUG(1719) slow to collect arrays over several contexts.
regress/regress-524: SKIP
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
