WSL validate reserve_gpu_va args in ULTs

Signed-off-by: Jaroslaw Chodor <[email protected]>

Author: jchodor

shared/source/os_interface/windows/wddm/configure_device_address_space_drm_or_wddm.cpp

@@ -155,9 +155,9 @@ bool ensureGpuAddressRangeIsReserved(uint64_t address, size_t size, D3DKMT_HANDL
     if (status != STATUS_SUCCESS) {
         // make sure address range is already reserved
         rangeDesc.BaseAddress = 0;
-        rangeDesc.MinimumAddress = alignDown(address, MemoryConstants::pageSize);
-        rangeDesc.MaximumAddress = alignUp(address + size, MemoryConstants::pageSize);
-        rangeDesc.Size = MemoryConstants::pageSize;
+        rangeDesc.MinimumAddress = alignDown(address, MemoryConstants::pageSize64k);
+        rangeDesc.MaximumAddress = alignUp(address + size, MemoryConstants::pageSize64k);
+        rangeDesc.Size = MemoryConstants::pageSize64k;
         status = gdi.reserveGpuVirtualAddress(&rangeDesc);
         if (status != STATUS_SUCCESS) {
             DEBUG_BREAK_IF(true);

shared/test/unit_test/os_interface/wddm_linux/configure_device_address_space_drm_or_wddm_test.cpp

@@ -130,6 +130,7 @@ NTSTATUS __stdcall reserveDeviceAddressSpaceMock(D3DDDI_RESERVEGPUVIRTUALADDRESS
         bool validArgs = true;
         if (arg->BaseAddress) {
             validArgs = validArgs && isAligned<MemoryConstants::pageSize64k>(arg->BaseAddress);
+            validArgs = validArgs && isAligned<MemoryConstants::pageSize64k>(arg->Size);
             validArgs = validArgs && (0U == arg->MinimumAddress);
             validArgs = validArgs && (0U == arg->MaximumAddress);
         } else {
@@ -138,6 +139,9 @@ NTSTATUS __stdcall reserveDeviceAddressSpaceMock(D3DDDI_RESERVEGPUVIRTUALADDRESS
             validArgs = validArgs && isAligned<MemoryConstants::pageSize64k>(arg->MaximumAddress);
         }
         validArgs = validArgs && isAligned<MemoryConstants::pageSize64k>(arg->Size);
+        if (false == validArgs) {
+            return -1;
+        }
     }
     return gdiMockConfig.reserveGpuVaClb.returnValue;
 }
@@ -238,7 +242,7 @@ TEST_F(WddmLinuxConfigureDeviceAddressSpaceTest, givenSvmAddressSpaceThenReserve
     EXPECT_EQ(this->wddm->getAdapter(), gdiMockConfig.receivedReserveGpuVaArgs.hAdapter);
 }
 
-TEST_F(WddmLinuxConfigureDeviceAddressSpaceTest, givenPreReservedSvmAddressSpaceThenMakeSureWholeGpuVAForUSMIsReserved) {
+TEST_F(WddmLinuxConfigureDeviceAddressSpaceTest, givenPreReservedSvmAddressSpaceThenMakeSureWholeGpuVAForUSMIsReservedAndProperlyAligned) {
     if (NEO::hardwareInfoTable[productFamily]->capabilityTable.gpuAddressSpace < MemoryConstants::max64BitAppAddress) {
         GTEST_SKIP();
     }
@@ -253,7 +257,7 @@ TEST_F(WddmLinuxConfigureDeviceAddressSpaceTest, givenPreReservedSvmAddressSpace
     EXPECT_EQ(0U, gdiMockConfig.receivedReserveGpuVaArgs.BaseAddress);
     EXPECT_EQ(NEO::windowsMinAddress, gdiMockConfig.receivedReserveGpuVaArgs.MinimumAddress);
     EXPECT_EQ(svmSize, gdiMockConfig.receivedReserveGpuVaArgs.MaximumAddress);
-    EXPECT_EQ(MemoryConstants::pageSize, gdiMockConfig.receivedReserveGpuVaArgs.Size);
+    EXPECT_EQ(MemoryConstants::pageSize64k, gdiMockConfig.receivedReserveGpuVaArgs.Size);
     EXPECT_EQ(wddm->getAdapter(), gdiMockConfig.receivedReserveGpuVaArgs.hAdapter);
 }