Pass preferred base address to OSMemory::reserveCpuAddressRange()

Related-To: NEO-4525

Change-Id: I6d97ae41af1a0fba31993683bfc669f79aa5b77b
Signed-off-by: Igor Venevtsev <igor.venevtsev@intel.com>

Author: ivvenevt

opencl/test/unit_test/os_interface/linux/drm_os_memory_tests.cpp

@@ -55,4 +55,28 @@ TEST(OSMemoryLinux, givenOSMemoryLinuxWhenReserveCpuAddressRangeIsCalledThenMinu
     mockOSMemoryLinux->releaseCpuAddressRange(reservedCpuRange);
 }
 
+TEST(OSMemoryLinux, givenOSMemoryLinuxWhenReserveCpuAddressRangeIsCalledAndBaseAddressIsSpecifiedThenCorrectValueIsPassedToMmapAsAddrParam) {
+    auto mockOSMemoryLinux = MockOSMemoryLinux::create();
+
+    EXPECT_CALL(*mockOSMemoryLinux, mmapWrapper(reinterpret_cast<void *>(0x10000000), _, _, _, -1, _));
+
+    auto reservedCpuRange = mockOSMemoryLinux->reserveCpuAddressRange(reinterpret_cast<void *>(0x10000000), MemoryConstants::pageSize, MemoryConstants::pageSize64k);
+
+    EXPECT_CALL(*mockOSMemoryLinux, munmapWrapper(reservedCpuRange.originalPtr, reservedCpuRange.actualReservedSize));
+
+    mockOSMemoryLinux->releaseCpuAddressRange(reservedCpuRange);
+}
+
+TEST(OSMemoryLinux, givenOSMemoryLinuxWhenReserveCpuAddressRangeIsCalledAndBaseAddressIsNotSpecifiedThenoZeroIsPassedToMmapAsAddrParam) {
+    auto mockOSMemoryLinux = MockOSMemoryLinux::create();
+
+    EXPECT_CALL(*mockOSMemoryLinux, mmapWrapper(nullptr, _, _, _, -1, _));
+
+    auto reservedCpuRange = mockOSMemoryLinux->reserveCpuAddressRange(MemoryConstants::pageSize, MemoryConstants::pageSize64k);
+
+    EXPECT_CALL(*mockOSMemoryLinux, munmapWrapper(reservedCpuRange.originalPtr, reservedCpuRange.actualReservedSize));
+
+    mockOSMemoryLinux->releaseCpuAddressRange(reservedCpuRange);
+}
+
 }; // namespace NEO

shared/source/os_interface/linux/os_memory_linux.cpp

@@ -13,8 +13,8 @@ std::unique_ptr<OSMemory> OSMemory::create() {
     return std::make_unique<OSMemoryLinux>();
 }
 
-void *OSMemoryLinux::osReserveCpuAddressRange(size_t sizeToReserve) {
-    return mmapWrapper(0, sizeToReserve, PROT_NONE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE, -1, 0);
+void *OSMemoryLinux::osReserveCpuAddressRange(void *baseAddress, size_t sizeToReserve) {
+    return mmapWrapper(baseAddress, sizeToReserve, PROT_NONE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE, -1, 0);
 }
 
 void OSMemoryLinux::osReleaseCpuAddressRange(void *reservedCpuAddressRange, size_t reservedSize) {

shared/source/os_interface/linux/os_memory_linux.h

@@ -17,7 +17,7 @@ class OSMemoryLinux : public OSMemory {
     OSMemoryLinux() = default;
 
   protected:
-    void *osReserveCpuAddressRange(size_t sizeToReserve) override;
+    void *osReserveCpuAddressRange(void *baseAddress, size_t sizeToReserve) override;
     void osReleaseCpuAddressRange(void *reservedCpuAddressRange, size_t reservedSize) override;
 
     MOCKABLE_VIRTUAL void *mmapWrapper(void *, size_t, int, int, int, off_t);

shared/source/os_interface/os_memory.cpp

@@ -12,13 +12,17 @@
 namespace NEO {
 
 OSMemory::ReservedCpuAddressRange OSMemory::reserveCpuAddressRange(size_t sizeToReserve, size_t alignment) {
+    return reserveCpuAddressRange(0, sizeToReserve, alignment);
+}
+
+OSMemory::ReservedCpuAddressRange OSMemory::reserveCpuAddressRange(void *baseAddress, size_t sizeToReserve, size_t alignment) {
     UNRECOVERABLE_IF(0 == alignment);
     UNRECOVERABLE_IF(0 != (alignment & (alignment - 1)));
 
     ReservedCpuAddressRange reservedCpuAddressRange;
 
     reservedCpuAddressRange.actualReservedSize = sizeToReserve + alignment;
-    reservedCpuAddressRange.originalPtr = this->osReserveCpuAddressRange(reservedCpuAddressRange.actualReservedSize);
+    reservedCpuAddressRange.originalPtr = this->osReserveCpuAddressRange(baseAddress, reservedCpuAddressRange.actualReservedSize);
     reservedCpuAddressRange.alignedPtr = alignUp(reservedCpuAddressRange.originalPtr, alignment);
 
     return reservedCpuAddressRange;

shared/source/os_interface/os_memory.h

@@ -25,10 +25,11 @@ struct OSMemory {
     virtual ~OSMemory() = default;
 
     MOCKABLE_VIRTUAL ReservedCpuAddressRange reserveCpuAddressRange(size_t sizeToReserve, size_t alignment);
+    MOCKABLE_VIRTUAL ReservedCpuAddressRange reserveCpuAddressRange(void *baseAddress, size_t sizeToReserve, size_t alignment);
     MOCKABLE_VIRTUAL void releaseCpuAddressRange(const ReservedCpuAddressRange &reservedCpuAddressRange);
 
   protected:
-    virtual void *osReserveCpuAddressRange(size_t sizeToReserve) = 0;
+    virtual void *osReserveCpuAddressRange(void *baseAddress, size_t sizeToReserve) = 0;
     virtual void osReleaseCpuAddressRange(void *reservedCpuAddressRange, size_t reservedSize) = 0;
 };
 

shared/source/os_interface/windows/os_memory_win.cpp

@@ -13,8 +13,8 @@ std::unique_ptr<OSMemory> OSMemory::create() {
     return std::make_unique<OSMemoryWindows>();
 }
 
-void *OSMemoryWindows::osReserveCpuAddressRange(size_t sizeToReserve) {
-    return virtualAllocWrapper(0, sizeToReserve, MEM_RESERVE, PAGE_READWRITE);
+void *OSMemoryWindows::osReserveCpuAddressRange(void *baseAddress, size_t sizeToReserve) {
+    return virtualAllocWrapper(baseAddress, sizeToReserve, MEM_RESERVE, PAGE_READWRITE);
 }
 
 void OSMemoryWindows::osReleaseCpuAddressRange(void *reservedCpuAddressRange, size_t /* reservedSize */) {

shared/source/os_interface/windows/os_memory_win.h

@@ -16,7 +16,7 @@ class OSMemoryWindows : public OSMemory {
     OSMemoryWindows() = default;
 
   protected:
-    void *osReserveCpuAddressRange(size_t sizeToReserve) override;
+    void *osReserveCpuAddressRange(void *baseAddress, size_t sizeToReserve) override;
     void osReleaseCpuAddressRange(void *reservedCpuAddressRange, size_t reservedSize) override;
 
     MOCKABLE_VIRTUAL LPVOID virtualAllocWrapper(LPVOID, SIZE_T, DWORD, DWORD);