Skip to content

Commit 7d8f5d0

Browse files
committed
Remove NUMA interleaving from zPhysicalMemoryManager
1 parent 21eeb3e commit 7d8f5d0

File tree

1 file changed

+2
-13
lines changed

1 file changed

+2
-13
lines changed

src/hotspot/share/gc/z/zPhysicalMemoryManager.cpp

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
#include "gc/z/zAddress.inline.hpp"
2626
#include "gc/z/zArray.inline.hpp"
2727
#include "gc/z/zGlobals.hpp"
28-
#include "gc/z/zLargePages.inline.hpp"
2928
#include "gc/z/zList.inline.hpp"
3029
#include "gc/z/zNMT.hpp"
3130
#include "gc/z/zNUMA.inline.hpp"
31+
#include "gc/z/zPhysicalMemoryManager.hpp"
3232
#include "gc/z/zValue.inline.hpp"
3333
#include "logging/log.hpp"
3434
#include "runtime/globals.hpp"
@@ -164,6 +164,7 @@ size_t ZPhysicalMemoryManager::commit(const zoffset* pmem, size_t size, int numa
164164

165165
return segment_size == committed;
166166
});
167+
167168
// Success
168169
return total_committed;
169170
}
@@ -192,35 +193,23 @@ void ZPhysicalMemoryManager::map(zoffset offset, const zoffset* pmem, size_t siz
192193
const zaddress_unsafe addr = ZOffset::address_unsafe(offset);
193194

194195
size_t mapped = 0;
195-
196196
for_each_segment_apply(pmem, size >> ZGranuleSizeShift, [&](zoffset segment_start, size_t segment_size) {
197197
_backing.map(addr + mapped, segment_size, segment_start);
198198
mapped += segment_size;
199199
});
200200
postcond(mapped == size);
201-
202-
// Setup NUMA interleaving for large pages
203-
if (ZNUMA::is_enabled() && ZLargePages::is_explicit()) {
204-
// To get granule-level NUMA interleaving when using large pages,
205-
// we simply let the kernel interleave the memory for us at page
206-
// fault time.
207-
os::numa_make_global((char*)addr, size);
208-
}
209201
}
210202

211203
// Unmap virtual memory from physical memory
212204
void ZPhysicalMemoryManager::unmap(zoffset offset, const zoffset* /* ignored until anon memory support */, size_t size) const {
213205
const zaddress_unsafe addr = ZOffset::address_unsafe(offset);
214-
215206
_backing.unmap(addr, size);
216207
}
217208

218209
size_t ZPhysicalMemoryManager::count_segments(const zoffset* pmem, size_t size) {
219210
size_t count = 0;
220-
221211
for_each_segment_apply(pmem, size >> ZGranuleSizeShift, [&](zoffset, size_t) {
222212
count++;
223213
});
224-
225214
return count;
226215
}

0 commit comments

Comments
 (0)