|
25 | 25 | #include "gc/z/zAddress.inline.hpp" |
26 | 26 | #include "gc/z/zArray.inline.hpp" |
27 | 27 | #include "gc/z/zGlobals.hpp" |
28 | | -#include "gc/z/zLargePages.inline.hpp" |
29 | 28 | #include "gc/z/zList.inline.hpp" |
30 | 29 | #include "gc/z/zNMT.hpp" |
31 | 30 | #include "gc/z/zNUMA.inline.hpp" |
| 31 | +#include "gc/z/zPhysicalMemoryManager.hpp" |
32 | 32 | #include "gc/z/zValue.inline.hpp" |
33 | 33 | #include "logging/log.hpp" |
34 | 34 | #include "runtime/globals.hpp" |
@@ -164,6 +164,7 @@ size_t ZPhysicalMemoryManager::commit(const zoffset* pmem, size_t size, int numa |
164 | 164 |
|
165 | 165 | return segment_size == committed; |
166 | 166 | }); |
| 167 | + |
167 | 168 | // Success |
168 | 169 | return total_committed; |
169 | 170 | } |
@@ -192,35 +193,23 @@ void ZPhysicalMemoryManager::map(zoffset offset, const zoffset* pmem, size_t siz |
192 | 193 | const zaddress_unsafe addr = ZOffset::address_unsafe(offset); |
193 | 194 |
|
194 | 195 | size_t mapped = 0; |
195 | | - |
196 | 196 | for_each_segment_apply(pmem, size >> ZGranuleSizeShift, [&](zoffset segment_start, size_t segment_size) { |
197 | 197 | _backing.map(addr + mapped, segment_size, segment_start); |
198 | 198 | mapped += segment_size; |
199 | 199 | }); |
200 | 200 | 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 | | - } |
209 | 201 | } |
210 | 202 |
|
211 | 203 | // Unmap virtual memory from physical memory |
212 | 204 | void ZPhysicalMemoryManager::unmap(zoffset offset, const zoffset* /* ignored until anon memory support */, size_t size) const { |
213 | 205 | const zaddress_unsafe addr = ZOffset::address_unsafe(offset); |
214 | | - |
215 | 206 | _backing.unmap(addr, size); |
216 | 207 | } |
217 | 208 |
|
218 | 209 | size_t ZPhysicalMemoryManager::count_segments(const zoffset* pmem, size_t size) { |
219 | 210 | size_t count = 0; |
220 | | - |
221 | 211 | for_each_segment_apply(pmem, size >> ZGranuleSizeShift, [&](zoffset, size_t) { |
222 | 212 | count++; |
223 | 213 | }); |
224 | | - |
225 | 214 | return count; |
226 | 215 | } |
0 commit comments