< prev index next >
src/share/vm/gc_implementation/g1/g1PageBasedVirtualSpace.cpp
Print this page
rev 7989 : 8058354: SPECjvm2008-Derby -2.7% performance regression on Solaris-X64 starting with 9-b29
Summary: Allow partial use of large pages for auxiliary data structures in G1.
Reviewed-by: jmasa
rev 7990 : imported patch 8058354-stefank-review
rev 7991 : imported patch 8058354-more-stefank-review
rev 7992 : imported patch 8058354-more-more-stefank-review
rev 7993 : imported patch per-comments
*** 1,7 ****
/*
! * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
--- 1,7 ----
/*
! * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*** 42,82 ****
#ifdef TARGET_OS_FAMILY_bsd
# include "os_bsd.inline.hpp"
#endif
#include "utilities/bitMap.inline.hpp"
! G1PageBasedVirtualSpace::G1PageBasedVirtualSpace() : _low_boundary(NULL),
! _high_boundary(NULL), _committed(), _page_size(0), _special(false),
_dirty(), _executable(false) {
}
! bool G1PageBasedVirtualSpace::initialize_with_granularity(ReservedSpace rs, size_t page_size) {
! if (!rs.is_reserved()) {
! return false; // Allocation failed.
! }
! assert(_low_boundary == NULL, "VirtualSpace already initialized");
! assert(page_size > 0, "Granularity must be non-zero.");
_low_boundary = rs.base();
! _high_boundary = _low_boundary + rs.size();
_special = rs.special();
_executable = rs.executable();
_page_size = page_size;
! assert(_committed.size() == 0, "virtual space initialized more than once");
! uintx size_in_bits = rs.size() / page_size;
! _committed.resize(size_in_bits, /* in_resource_area */ false);
if (_special) {
! _dirty.resize(size_in_bits, /* in_resource_area */ false);
}
-
- return true;
}
-
G1PageBasedVirtualSpace::~G1PageBasedVirtualSpace() {
release();
}
void G1PageBasedVirtualSpace::release() {
--- 42,88 ----
#ifdef TARGET_OS_FAMILY_bsd
# include "os_bsd.inline.hpp"
#endif
#include "utilities/bitMap.inline.hpp"
! G1PageBasedVirtualSpace::G1PageBasedVirtualSpace(ReservedSpace rs, size_t used_size, size_t page_size) :
! _low_boundary(NULL), _high_boundary(NULL), _committed(), _page_size(0), _special(false),
_dirty(), _executable(false) {
+ initialize_with_page_size(rs, used_size, page_size);
}
! void G1PageBasedVirtualSpace::initialize_with_page_size(ReservedSpace rs, size_t used_size, size_t page_size) {
! guarantee(rs.is_reserved(), "Given reserved space must have been reserved already.");
!
! vmassert(_low_boundary == NULL, "VirtualSpace already initialized");
! vmassert(page_size > 0, "Page size must be non-zero.");
!
! guarantee(is_ptr_aligned(rs.base(), page_size),
! err_msg("Reserved space base " PTR_FORMAT " is not aligned to requested page size " SIZE_FORMAT, p2i(rs.base()), page_size));
! guarantee(is_size_aligned(used_size, os::vm_page_size()),
! err_msg("Given used reserved space size needs to be OS page size aligned (%d bytes) but is " SIZE_FORMAT, os::vm_page_size(), used_size));
! guarantee(used_size <= rs.size(),
! err_msg("Used size of reserved space " SIZE_FORMAT " bytes is smaller than reservation at " SIZE_FORMAT " bytes", used_size, rs.size()));
! guarantee(is_size_aligned(rs.size(), page_size),
! err_msg("Expected that the virtual space is size aligned, but " SIZE_FORMAT " is not aligned to page size " SIZE_FORMAT, rs.size(), page_size));
_low_boundary = rs.base();
! _high_boundary = _low_boundary + used_size;
_special = rs.special();
_executable = rs.executable();
_page_size = page_size;
! vmassert(_committed.size() == 0, "virtual space initialized more than once");
! BitMap::idx_t size_in_pages = rs.size() / page_size;
! _committed.resize(size_in_pages, /* in_resource_area */ false);
if (_special) {
! _dirty.resize(size_in_pages, /* in_resource_area */ false);
}
}
G1PageBasedVirtualSpace::~G1PageBasedVirtualSpace() {
release();
}
void G1PageBasedVirtualSpace::release() {
*** 90,169 ****
_committed.resize(0, false);
_dirty.resize(0, false);
}
size_t G1PageBasedVirtualSpace::committed_size() const {
! return _committed.count_one_bits() * _page_size;
}
size_t G1PageBasedVirtualSpace::reserved_size() const {
return pointer_delta(_high_boundary, _low_boundary, sizeof(char));
}
size_t G1PageBasedVirtualSpace::uncommitted_size() const {
return reserved_size() - committed_size();
}
! uintptr_t G1PageBasedVirtualSpace::addr_to_page_index(char* addr) const {
return (addr - _low_boundary) / _page_size;
}
! bool G1PageBasedVirtualSpace::is_area_committed(uintptr_t start, size_t size_in_pages) const {
! uintptr_t end = start + size_in_pages;
return _committed.get_next_zero_offset(start, end) >= end;
}
! bool G1PageBasedVirtualSpace::is_area_uncommitted(uintptr_t start, size_t size_in_pages) const {
! uintptr_t end = start + size_in_pages;
return _committed.get_next_one_offset(start, end) >= end;
}
! char* G1PageBasedVirtualSpace::page_start(uintptr_t index) {
return _low_boundary + index * _page_size;
}
! size_t G1PageBasedVirtualSpace::byte_size_for_pages(size_t num) {
! return num * _page_size;
}
! bool G1PageBasedVirtualSpace::commit(uintptr_t start, size_t size_in_pages) {
// We need to make sure to commit all pages covered by the given area.
guarantee(is_area_uncommitted(start, size_in_pages), "Specified area is not uncommitted");
bool zero_filled = true;
! uintptr_t end = start + size_in_pages;
if (_special) {
// Check for dirty pages and update zero_filled if any found.
! if (_dirty.get_next_one_offset(start,end) < end) {
zero_filled = false;
_dirty.clear_range(start, end);
}
} else {
! os::commit_memory_or_exit(page_start(start), byte_size_for_pages(size_in_pages), _executable,
! err_msg("Failed to commit pages from "SIZE_FORMAT" of length "SIZE_FORMAT, start, size_in_pages));
}
_committed.set_range(start, end);
if (AlwaysPreTouch) {
! os::pretouch_memory(page_start(start), page_start(end));
}
return zero_filled;
}
! void G1PageBasedVirtualSpace::uncommit(uintptr_t start, size_t size_in_pages) {
guarantee(is_area_committed(start, size_in_pages), "checking");
if (_special) {
// Mark that memory is dirty. If committed again the memory might
// need to be cleared explicitly.
! _dirty.set_range(start, start + size_in_pages);
} else {
! os::uncommit_memory(page_start(start), byte_size_for_pages(size_in_pages));
}
! _committed.clear_range(start, start + size_in_pages);
}
bool G1PageBasedVirtualSpace::contains(const void* p) const {
return _low_boundary <= (const char*) p && (const char*) p < _high_boundary;
}
--- 96,250 ----
_committed.resize(0, false);
_dirty.resize(0, false);
}
size_t G1PageBasedVirtualSpace::committed_size() const {
! size_t result = _committed.count_one_bits() * _page_size;
! // The last page might not be in full.
! if (_committed.at(_committed.size() - 1)) {
! char* aligned_high_boundary = (char*)align_ptr_up(_high_boundary, _page_size);
! result -= pointer_delta(aligned_high_boundary, _high_boundary, sizeof(char));
! }
! return result;
}
size_t G1PageBasedVirtualSpace::reserved_size() const {
return pointer_delta(_high_boundary, _low_boundary, sizeof(char));
}
size_t G1PageBasedVirtualSpace::uncommitted_size() const {
return reserved_size() - committed_size();
}
! size_t G1PageBasedVirtualSpace::addr_to_page_index(char* addr) const {
return (addr - _low_boundary) / _page_size;
}
! bool G1PageBasedVirtualSpace::is_area_committed(size_t start, size_t size_in_pages) const {
! size_t end = start + size_in_pages;
return _committed.get_next_zero_offset(start, end) >= end;
}
! bool G1PageBasedVirtualSpace::is_area_uncommitted(size_t start, size_t size_in_pages) const {
! size_t end = start + size_in_pages;
return _committed.get_next_one_offset(start, end) >= end;
}
! char* G1PageBasedVirtualSpace::page_start(size_t index) {
return _low_boundary + index * _page_size;
}
! bool G1PageBasedVirtualSpace::is_after_last_page(size_t index) {
! guarantee(index <= _committed.size(),
! err_msg("Given boundary page " SIZE_FORMAT " is beyond managed page count " SIZE_FORMAT, index, _committed.size()));
! return index == _committed.size();
! }
!
! void G1PageBasedVirtualSpace::commit_full_pages(size_t start, size_t num_pages) {
! vmassert(num_pages > 0, "No full pages to commit");
! vmassert(start + num_pages <= _committed.size(),
! err_msg("Tried to commit area from page " SIZE_FORMAT " to page " SIZE_FORMAT " "
! "that is outside of managed space of " SIZE_FORMAT " pages",
! start, start + num_pages, _committed.size()));
!
! char* start_addr = page_start(start);
! size_t size = num_pages * _page_size;
!
! os::commit_memory_or_exit(start_addr, size, _page_size, _executable,
! err_msg("Failed to commit area from " PTR_FORMAT " to " PTR_FORMAT " of length " SIZE_FORMAT ".",
! p2i(start_addr), p2i(start_addr + size), size));
! }
!
! void G1PageBasedVirtualSpace::commit_tail() {
! char* const aligned_end_address = (char*)align_ptr_down(_high_boundary, _page_size);
! size_t const tail_size = pointer_delta(_high_boundary, aligned_end_address, sizeof(char));
!
! os::commit_memory_or_exit(aligned_end_address, tail_size, os::vm_page_size(), _executable,
! err_msg("Failed to commit tail area from " PTR_FORMAT " to " PTR_FORMAT " of length " SIZE_FORMAT ".",
! p2i(aligned_end_address), p2i(_high_boundary), tail_size));
! }
!
! void G1PageBasedVirtualSpace::commit_internal(size_t start_page, size_t end_page) {
! guarantee(start_page < end_page,
! err_msg("Given start page " SIZE_FORMAT " is larger or equal to end page " SIZE_FORMAT, start_page, end_page));
! guarantee(end_page <= _committed.size(),
! err_msg("Given end page " SIZE_FORMAT " is beyond end of managed page amount of " SIZE_FORMAT, end_page, _committed.size()));
!
! size_t pages = end_page - start_page;
! bool need_to_commit_tail = is_after_last_page(end_page) && is_last_page_partial();
!
! // If we have to commit some (partial) tail area, decrease the amount of pages to avoid
! // committing that in the full-page commit code.
! if (need_to_commit_tail) {
! pages--;
! }
!
! if (pages > 0) {
! commit_full_pages(start_page, pages);
! }
!
! if (need_to_commit_tail) {
! commit_tail();
! }
}
! char* G1PageBasedVirtualSpace::bounded_end_addr(size_t end_page) {
! return MIN2(_high_boundary, page_start(end_page));
! }
!
! void G1PageBasedVirtualSpace::pretouch_internal(size_t start_page, size_t end_page) {
! guarantee(start_page < end_page,
! err_msg("Given start page " SIZE_FORMAT " is larger or equal to end page " SIZE_FORMAT, start_page, end_page));
!
! os::pretouch_memory(page_start(start_page), bounded_end_addr(end_page));
! }
!
! bool G1PageBasedVirtualSpace::commit(size_t start, size_t size_in_pages) {
// We need to make sure to commit all pages covered by the given area.
guarantee(is_area_uncommitted(start, size_in_pages), "Specified area is not uncommitted");
bool zero_filled = true;
! size_t end = start + size_in_pages;
if (_special) {
// Check for dirty pages and update zero_filled if any found.
! if (_dirty.get_next_one_offset(start, end) < end) {
zero_filled = false;
_dirty.clear_range(start, end);
}
} else {
! commit_internal(start, end);
}
_committed.set_range(start, end);
if (AlwaysPreTouch) {
! pretouch_internal(start, end);
}
return zero_filled;
}
! void G1PageBasedVirtualSpace::uncommit_internal(size_t start_page, size_t end_page) {
! guarantee(start_page < end_page,
! err_msg("Given start page " SIZE_FORMAT " is larger or equal to end page " SIZE_FORMAT, start_page, end_page));
!
! char* start_addr = page_start(start_page);
! os::uncommit_memory(start_addr, pointer_delta(bounded_end_addr(end_page), start_addr, sizeof(char)));
! }
!
! void G1PageBasedVirtualSpace::uncommit(size_t start, size_t size_in_pages) {
guarantee(is_area_committed(start, size_in_pages), "checking");
+ size_t end = start + size_in_pages;
if (_special) {
// Mark that memory is dirty. If committed again the memory might
// need to be cleared explicitly.
! _dirty.set_range(start, end);
} else {
! uncommit_internal(start, end);
}
! _committed.clear_range(start, end);
}
bool G1PageBasedVirtualSpace::contains(const void* p) const {
return _low_boundary <= (const char*) p && (const char*) p < _high_boundary;
}
*** 173,183 ****
out->print ("Virtual space:");
if (_special) out->print(" (pinned in memory)");
out->cr();
out->print_cr(" - committed: " SIZE_FORMAT, committed_size());
out->print_cr(" - reserved: " SIZE_FORMAT, reserved_size());
! out->print_cr(" - [low_b, high_b]: [" INTPTR_FORMAT ", " INTPTR_FORMAT "]", p2i(_low_boundary), p2i(_high_boundary));
}
void G1PageBasedVirtualSpace::print() {
print_on(tty);
}
--- 254,265 ----
out->print ("Virtual space:");
if (_special) out->print(" (pinned in memory)");
out->cr();
out->print_cr(" - committed: " SIZE_FORMAT, committed_size());
out->print_cr(" - reserved: " SIZE_FORMAT, reserved_size());
! out->print_cr(" - preferred page size: " SIZE_FORMAT, _page_size);
! out->print_cr(" - [low_b, high_b]: [" PTR_FORMAT ", " PTR_FORMAT "]", p2i(_low_boundary), p2i(_high_boundary));
}
void G1PageBasedVirtualSpace::print() {
print_on(tty);
}
< prev index next >