stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8296158: Refactor the verification of CDS region checksum

Browse Source 
Reviewed-by: ccheung, matsaave
This commit is contained in:
Ioi Lam 2023-02-17 07:21:26 +00:00
parent 655a71277d
commit 49eb68ba95
3 changed files with 35 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hotspot/share/cds/archiveHeapLoader.cpp
View File

@ -410,7 +410,7 @@ bool ArchiveHeapLoader::load_regions(FileMapInfo* mapinfo, LoadedArchiveHeapRegi
bm.iterate(&patcher);
}
r->set_mapped_base((char*)load_address);
assert(r->mapped_base() == (char*)load_address, "sanity");
load_address += r->used();
}

70
src/hotspot/share/cds/filemap.cpp
View File

@ -1266,7 +1266,7 @@ public:
return false;
}
if (!check_crc()) {
if (!check_header_crc()) {
return false;
}
@ -1290,7 +1290,7 @@ public:
}
private:
bool check_crc() {
bool check_header_crc() const {
if (VerifySharedSpaces) {
FileMapHeader* header = (FileMapHeader*)_header;
int actual_crc = header->compute_crc();
@ -1593,6 +1593,24 @@ BitMapView FileMapRegion::ptrmap_view() {
return bitmap_view(false);
}
bool FileMapRegion::check_region_crc() const {
// This function should be called after the region has been properly
// loaded into memory via FileMapInfo::map_region() or FileMapInfo::read_region().
// I.e., this->mapped_base() must be valid.
size_t sz = used();
if (sz == 0) {
return true;
}
assert(mapped_base() != nullptr, "must be initialized");
int crc = ClassLoader::crc32(0, mapped_base(), (jint)sz);
if (crc != this->crc()) {
FileMapInfo::fail_continue("Checksum verification failed.");
return false;
}
return true;
}
static const char* region_name(int region_index) {
static const char* names[] = {
"rw", "ro", "bm", "ca0", "ca1", "oa0", "oa1"
@ -1848,7 +1866,7 @@ bool FileMapInfo::remap_shared_readonly_as_readwrite() {
if (!open_for_read()) {
return false;
}
char *addr = region_addr(idx);
char *addr = r->mapped_base();
char *base = os::remap_memory(_fd, _full_path, r->file_offset(),
addr, size, false /* !read_only */,
r->allow_exec());
@ -1922,7 +1940,10 @@ bool FileMapInfo::read_region(int i, char* base, size_t size, bool do_commit) {
return false;
}
if (VerifySharedSpaces && !region_crc_check(base, r->used(), r->crc())) {
r->set_mapped_from_file(false);
r->set_mapped_base(base);
if (VerifySharedSpaces && !r->check_region_crc()) {
return false;
}
@ -1960,6 +1981,8 @@ MapArchiveResult FileMapInfo::map_region(int i, intx addr_delta, char* mapped_ba
log_info(cds)("Failed to read %s shared space into reserved space at " INTPTR_FORMAT,
shared_region_name[i], p2i(requested_addr));
return MAP_ARCHIVE_OTHER_FAILURE; // oom or I/O error.
} else {
assert(r->mapped_base() != nullptr, "must be initialized");
}
} else {
// Note that this may either be a "fresh" mapping into unreserved address
@ -1975,10 +1998,10 @@ MapArchiveResult FileMapInfo::map_region(int i, intx addr_delta, char* mapped_ba
return MAP_ARCHIVE_MMAP_FAILURE;
}
r->set_mapped_from_file(true);
}
r->set_mapped_base(requested_addr);
}
if (VerifySharedSpaces && !verify_region_checksum(i)) {
if (VerifySharedSpaces && !r->check_region_crc()) {
return MAP_ARCHIVE_OTHER_FAILURE;
}
@ -2000,7 +2023,8 @@ char* FileMapInfo::map_bitmap_region() {
return nullptr;
}
if (VerifySharedSpaces && !region_crc_check(bitmap_base, r->used(), r->crc())) {
r->set_mapped_base(bitmap_base);
if (VerifySharedSpaces && !r->check_region_crc()) {
log_error(cds)("relocation bitmap CRC error");
if (!os::unmap_memory(bitmap_base, r->used_aligned())) {
fatal("os::unmap_memory of relocation bitmap failed");
@ -2008,7 +2032,6 @@ char* FileMapInfo::map_bitmap_region() {
return nullptr;
}
r->set_mapped_base(bitmap_base);
r->set_mapped_from_file(true);
log_info(cds)("Mapped %s region #%d at base " INTPTR_FORMAT " top " INTPTR_FORMAT " (%s)",
is_static() ? "static " : "dynamic",
@ -2426,14 +2449,13 @@ bool FileMapInfo::map_heap_regions(int first, int max, bool is_open_archive,
return false;
}
if (VerifySharedSpaces && !region_crc_check(addr, regions[i].byte_size(), r->crc())) {
r->set_mapped_base(base);
if (VerifySharedSpaces && !r->check_region_crc()) {
// dealloc the regions from java heap
dealloc_heap_regions(regions, num_regions);
log_info(cds)("UseSharedSpaces: mapped heap regions are corrupt");
return false;
}
r->set_mapped_base(base);
}
cleanup._aborted = false;
@ -2521,26 +2543,6 @@ void FileMapInfo::dealloc_heap_regions(MemRegion* regions, int num) {
}
#endif // INCLUDE_CDS_JAVA_HEAP
bool FileMapInfo::region_crc_check(char* buf, size_t size, int expected_crc) {
int crc = ClassLoader::crc32(0, buf, (jint)size);
if (crc != expected_crc) {
fail_continue("Checksum verification failed.");
return false;
}
return true;
}
bool FileMapInfo::verify_region_checksum(int i) {
assert(VerifySharedSpaces, "sanity");
size_t sz = region_at(i)->used();
if (sz == 0) {
return true; // no data
} else {
return region_crc_check(region_addr(i), sz, region_at(i)->crc());
}
}
void FileMapInfo::unmap_regions(int regions[], int num_regions) {
for (int r = 0; r < num_regions; r++) {
int idx = regions[r];
@ -2636,12 +2638,6 @@ bool FileMapInfo::initialize() {
return true;
}
char* FileMapInfo::region_addr(int idx) {
assert(UseSharedSpaces, "must be");
FileMapRegion* r = region_at(idx);
return r->mapped_base();
}
// The 2 core spaces are RW->RO
FileMapRegion* FileMapInfo::first_core_region() const {
return region_at(MetaspaceShared::rw);

5
src/hotspot/share/cds/filemap.hpp
View File

@ -178,6 +178,7 @@ public:
BitMapView ptrmap_view();
bool has_ptrmap() { return _ptrmap_size_in_bits != 0; }
bool check_region_crc() const;
void print(outputStream* st, int region_index);
};
@ -473,7 +474,6 @@ public:
bool read_region(int i, char* base, size_t size, bool do_commit);
char* map_bitmap_region();
void unmap_region(int i);
bool verify_region_checksum(int i);
void close();
bool is_open() { return _file_open; }
ReservedSpace reserve_shared_memory();
@ -526,8 +526,6 @@ public:
static int get_module_shared_path_index(Symbol* location) NOT_CDS_RETURN_(-1);
char* region_addr(int idx);
// The offset of the first core region in the archive, relative to SharedBaseAddress
size_t mapping_base_offset() const { return first_core_region()->mapping_offset(); }
// The offset of the (exclusive) end of the last core region in this archive, relative to SharedBaseAddress
@ -575,7 +573,6 @@ public:
bool validate_app_class_paths(int shared_app_paths_len) NOT_CDS_RETURN_(false);
bool map_heap_regions(int first, int max, bool is_open_archive,
MemRegion** regions_ret, int* num_regions_ret) NOT_CDS_JAVA_HEAP_RETURN_(false);
bool region_crc_check(char* buf, size_t size, int expected_crc) NOT_CDS_RETURN_(false);
void dealloc_heap_regions(MemRegion* regions, int num) NOT_CDS_JAVA_HEAP_RETURN;
bool can_use_heap_regions();
bool load_heap_regions() NOT_CDS_JAVA_HEAP_RETURN_(false);