WSL - fixing missing GPU VA reservation

Signed-off-by: Jaroslaw Chodor <jaroslaw.chodor@intel.com>

Author: jchodor

shared/source/os_interface/windows/thk_wrapper.h

@@ -96,6 +96,11 @@ class ThkWrapper {
         return *this;
     }
 
+    ThkWrapper &operator=(Func func) {
+        mFunc = func;
+        return *this;
+    }
+
     // This operator overload is for implicit casting ThkWrapper struct to Function Pointer in GetPfn methods like GetEscapePfn() or for comparing against NULL function pointer
     operator Func() const {
         return mFunc;

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

@@ -38,6 +38,15 @@ bool Wddm::configureDeviceAddressSpace() {
                        ? maximumApplicationAddress + 1u
                        : 0u;
 
+    D3DDDI_RESERVEGPUVIRTUALADDRESS svmRangeReservationDesc = {};
+    svmRangeReservationDesc.BaseAddress = MemoryConstants::pageSize64k;
+    svmRangeReservationDesc.MinimumAddress = 0;
+    svmRangeReservationDesc.MaximumAddress = svmSize;
+    svmRangeReservationDesc.Size = svmSize - svmRangeReservationDesc.BaseAddress;
+    svmRangeReservationDesc.hAdapter = getAdapter();
+    NTSTATUS status = getGdi()->reserveGpuVirtualAddress(&svmRangeReservationDesc);
+    UNRECOVERABLE_IF(status != STATUS_SUCCESS);
+
     bool obtainMinAddress = rootDeviceEnvironment.getHardwareInfo()->platform.eRenderCoreFamily == IGFX_GEN12LP_CORE;
     return gmmMemory->configureDevice(getAdapter(), device, getGdi()->escape, svmSize, featureTable->ftrL3IACoherency, minAddress, obtainMinAddress);
 }

shared/test/common/mock_gmm/mock_gmm.cpp

@@ -15,7 +15,7 @@ bool copyInputArgs = false;
 
 namespace GmmInterface {
 GMM_STATUS initialize(GMM_INIT_IN_ARGS *pInArgs, GMM_INIT_OUT_ARGS *pOutArgs) {
-    pOutArgs->pGmmClientContext = reinterpret_cast<GMM_CLIENT_CONTEXT *>(0x01);
+    pOutArgs->pGmmClientContext = reinterpret_cast<GMM_CLIENT_CONTEXT *>(0x08);
     if (pInArgs) {
         if (pInArgs->Platform.eProductFamily == PRODUCT_FAMILY::IGFX_UNKNOWN &&
             pInArgs->Platform.ePCHProductFamily == PCH_PRODUCT_FAMILY::PCH_UNKNOWN) {

shared/test/unit_test/os_interface/wddm_linux/CMakeLists.txt

@@ -0,0 +1,18 @@
+#
+# Copyright (C) 2021 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+#
+
+set(NEO_CORE_OS_INTERFACE_TESTS_WDDM_LINUX
+    ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}/configure_device_address_space_drm_or_wddm_test.cpp
+)
+
+set_property(GLOBAL PROPERTY NEO_CORE_OS_INTERFACE_TESTS_WDDM_LINUX ${NEO_CORE_OS_INTERFACE_TESTS_WDDM_LINUX})
+
+if(UNIX AND NOT DISABLE_WDDM_LINUX)
+  target_sources(${TARGET_NAME} PRIVATE
+                 ${NEO_CORE_OS_INTERFACE_TESTS_WDDM_LINUX}
+  )
+endif()

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

@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2021 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#include "shared/source/os_interface/windows/gdi_interface.h"
+#include "shared/source/os_interface/windows/os_environment_win.h"
+#include "shared/source/os_interface/windows/wddm/wddm.h"
+#include "shared/test/common/helpers/default_hw_info.h"
+#include "shared/test/common/mocks/mock_execution_environment.h"
+#include "shared/test/common/mocks/mock_gmm_client_context.h"
+
+#include "test.h"
+
+#include "gmm_memory.h"
+
+struct MockWddmLinux : NEO::Wddm {
+    MockWddmLinux(std::unique_ptr<NEO::HwDeviceIdWddm> hwDeviceId, NEO::RootDeviceEnvironment &rootDeviceEnvironment)
+        : NEO::Wddm(std::move(hwDeviceId), rootDeviceEnvironment) {
+    }
+
+    using Wddm::gfxPlatform;
+    using Wddm::gmmMemory;
+};
+
+struct MockGmmMemoryWddmLinux : NEO::GmmMemory {
+    MockGmmMemoryWddmLinux(NEO::GmmClientContext *gmmClientContext) : NEO::GmmMemory(gmmClientContext) {
+    }
+
+    bool setDeviceInfo(GMM_DEVICE_INFO *deviceInfo) override {
+        return true;
+    }
+};
+
+NTSTATUS __stdcall closeAdapterMock(CONST D3DKMT_CLOSEADAPTER *arg) {
+    return 0;
+}
+
+template <typename T>
+struct RestorePoint {
+    RestorePoint(T &obj) : obj(obj), prev(obj) {
+    }
+
+    ~RestorePoint() {
+        obj = prev;
+    }
+
+    T &obj;
+    T prev;
+};
+
+D3DDDI_RESERVEGPUVIRTUALADDRESS receivedReserveGpuVaArgs = {};
+
+NTSTATUS __stdcall reserveDeviceAddressSpaceMock(D3DDDI_RESERVEGPUVIRTUALADDRESS *arg) {
+    receivedReserveGpuVaArgs = *arg;
+    return 0;
+}
+
+TEST(WddmLinux, whenConfiguringDeviceAddressSpaceThenReserveGpuVAForUSM) {
+    RestorePoint receivedReserveGpuVaArgsGlobalsRestorer{receivedReserveGpuVaArgs};
+
+    NEO::MockExecutionEnvironment mockExecEnv;
+    NEO::MockRootDeviceEnvironment mockRootDeviceEnvironment{mockExecEnv};
+    std::unique_ptr<NEO::HwDeviceIdWddm> hwDeviceIdIn;
+    auto osEnvironment = std::make_unique<NEO::OsEnvironmentWin>();
+    osEnvironment->gdi->closeAdapter = closeAdapterMock;
+    osEnvironment->gdi->reserveGpuVirtualAddress = reserveDeviceAddressSpaceMock;
+    hwDeviceIdIn.reset(new NEO::HwDeviceIdWddm(NULL_HANDLE, LUID{}, osEnvironment.get(), std::make_unique<NEO::UmKmDataTranslator>()));
+
+    MockWddmLinux wddm{std::move(hwDeviceIdIn), mockRootDeviceEnvironment};
+    auto mockGmmClientContext = NEO::GmmClientContext::create<NEO::MockGmmClientContext>(nullptr, NEO::defaultHwInfo.get());
+    wddm.gmmMemory = std::make_unique<MockGmmMemoryWddmLinux>(mockGmmClientContext.get());
+    *wddm.gfxPlatform = NEO::defaultHwInfo->platform;
+    wddm.configureDeviceAddressSpace();
+
+    auto maximumApplicationAddress = MemoryConstants::max64BitAppAddress;
+    auto productFamily = wddm.gfxPlatform->eProductFamily;
+    auto svmSize = NEO::hardwareInfoTable[productFamily]->capabilityTable.gpuAddressSpace >= MemoryConstants::max64BitAppAddress
+                       ? maximumApplicationAddress + 1u
+                       : 0u;
+
+    EXPECT_EQ(MemoryConstants::pageSize64k, receivedReserveGpuVaArgs.BaseAddress);
+    EXPECT_EQ(0U, receivedReserveGpuVaArgs.MinimumAddress);
+    EXPECT_EQ(svmSize, receivedReserveGpuVaArgs.MaximumAddress);
+    EXPECT_EQ(svmSize - receivedReserveGpuVaArgs.BaseAddress, receivedReserveGpuVaArgs.Size);
+    EXPECT_EQ(wddm.getAdapter(), receivedReserveGpuVaArgs.hAdapter);
+}