fix: fallback path while creating drm context

- if create VM ioctl fails, fallback to query VM from created context - in fallback path context's VM will not have flags applied Related-To: NEO-7813 Signed-off-by: Mateusz Hoppe <mateusz.hoppe@intel.com>
intel · Jul 9, 2024 · c660784 · c660784
1 parent 778645c
commit c660784
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 7 deletions.
diff --git a/shared/source/os_interface/linux/os_context_linux.cpp b/shared/source/os_interface/linux/os_context_linux.cpp
@@ -60,10 +60,10 @@ bool OsContextLinux::initializeContext(bool allocateInterrupt) {
                 [[maybe_unused]] auto ret = drm.createDrmVirtualMemory(drmVmId);
                 DEBUG_BREAK_IF(drmVmId == 0);
                 DEBUG_BREAK_IF(ret != 0);
+
                 if (ret != 0) {
-                    return false;
+                    drmVmId = 0;
                 }
-
                 UNRECOVERABLE_IF(this->drmVmIds.size() <= deviceIndex);
                 this->drmVmIds[deviceIndex] = drmVmId;
             }
@@ -73,6 +73,15 @@ bool OsContextLinux::initializeContext(bool allocateInterrupt) {
                 return false;
             }
 
+            if (drm.isPerContextVMRequired() && this->drmVmIds[deviceIndex] == 0) {
+                drmVmId = 0;
+                [[maybe_unused]] auto ret = drm.queryVmId(drmContextId, drmVmId);
+                DEBUG_BREAK_IF(drmVmId == 0);
+                DEBUG_BREAK_IF(ret != 0);
+
+                this->drmVmIds[deviceIndex] = drmVmId;
+            }
+
             this->drmContextIds.push_back(drmContextId);
         }
     }

diff --git a/shared/test/common/mocks/linux/mock_os_context_linux.h b/shared/test/common/mocks/linux/mock_os_context_linux.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Intel Corporation
+ * Copyright (C) 2023-2024 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -12,6 +12,7 @@ namespace NEO {
 class MockOsContextLinux : public OsContextLinux {
   public:
     using OsContextLinux::drmContextIds;
+    using OsContextLinux::drmVmIds;
     using OsContextLinux::fenceVal;
     using OsContextLinux::pagingFence;
 

diff --git a/shared/test/unit_test/os_interface/linux/drm_tests.cpp b/shared/test/unit_test/os_interface/linux/drm_tests.cpp
@@ -26,12 +26,12 @@
 #include "shared/test/common/libult/linux/drm_mock.h"
 #include "shared/test/common/mocks/linux/mock_drm_memory_manager.h"
 #include "shared/test/common/mocks/linux/mock_ioctl_helper.h"
+#include "shared/test/common/mocks/linux/mock_os_context_linux.h"
 #include "shared/test/common/mocks/mock_execution_environment.h"
 #include "shared/test/common/mocks/mock_memory_manager.h"
 #include "shared/test/common/mocks/mock_product_helper.h"
 #include "shared/test/common/os_interface/linux/sys_calls_linux_ult.h"
 #include "shared/test/common/test_macros/hw_test.h"
-#include "shared/test/unit_test/mocks/linux/mock_os_context_linux.h"
 
 #include "gtest/gtest.h"
 
@@ -728,9 +728,11 @@ TEST(DrmTest, givenPerContextVMRequiredWhenCreatingOsContextsThenExplicitVmIsCre
     EXPECT_EQ(0u, drmMock.receivedGemVmControl.vmId);
     EXPECT_EQ(drmMock.latestCreatedVmId, drmVmIds[0]);
     EXPECT_EQ(1, drmMock.createDrmVmCalled);
+
+    EXPECT_EQ(0, drmMock.ioctlCount.contextGetParam);
 }
 
-TEST(DrmTest, givenPerContextVMRequiredWhenVmIdCreationFailsThenContextInitializationReturnsFalse) {
+TEST(DrmTest, givenPerContextVMRequiredWhenVmIdCreationFailsThenQueryVmIsCalled) {
     MockExecutionEnvironment executionEnvironment{};
     auto &rootEnv = *executionEnvironment.rootDeviceEnvironments[0];
 
@@ -739,12 +741,16 @@ TEST(DrmTest, givenPerContextVMRequiredWhenVmIdCreationFailsThenContextInitializ
 
     drmMock.storedRetValForVmCreate = -1;
 
-    OsContextLinux osContext(drmMock, 0, 0u, EngineDescriptorHelper::getDefaultDescriptor());
+    MockOsContextLinux osContext(drmMock, 0, 0u, EngineDescriptorHelper::getDefaultDescriptor());
     drmMock.createDrmVmCalled = 0;
+    auto vmId = static_cast<uint32_t>(drmMock.storedRetValForVmId);
+
     auto status = osContext.ensureContextInitialized(false);
     EXPECT_EQ(1, drmMock.createDrmVmCalled);
+    EXPECT_EQ(1, drmMock.ioctlCount.contextGetParam);
+    EXPECT_EQ(osContext.drmVmIds[0], vmId);
 
-    EXPECT_FALSE(status);
+    EXPECT_TRUE(status);
 }
 
 TEST(DrmTest, givenPerContextVMRequiredWhenCreatingOsContextForSubDeviceThenVmIdPerContextIsCreateddAndStoredAtSubDeviceIndex) {