Set context unrecoverable when debugging enabled

Related-To: NEO-6204

Signed-off-by: Mateusz Hoppe <[email protected]>

Author: HoppeMateusz

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

@@ -104,6 +104,10 @@ int DrmMock::ioctl(unsigned long request, void *arg) {
         if (receivedContextParamRequest.param == I915_CONTEXT_PARAM_VM) {
             return this->storedRetVal;
         }
+        if (receivedContextParamRequest.param == I915_CONTEXT_PARAM_RECOVERABLE) {
+            receivedRecoverableContextValue = receivedContextParamRequest.value;
+            return this->storedRetVal;
+        }
     }
 
     if ((request == DRM_IOCTL_I915_GEM_CONTEXT_GETPARAM) && (arg != nullptr)) {

opencl/test/unit_test/os_interface/linux/drm_mock.h

@@ -157,6 +157,7 @@ class DrmMock : public Drm {
 
     uint32_t receivedContextParamRequestCount = 0;
     drm_i915_gem_context_param receivedContextParamRequest = {};
+    uint64_t receivedRecoverableContextValue = std::numeric_limits<uint64_t>::max();
 
     //DRM_IOCTL_I915_GEM_EXECBUFFER2
     drm_i915_gem_execbuffer2 execBuffer = {0};

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

@@ -520,7 +520,7 @@ TEST(DrmTest, givenPerContextVMRequiredWhenCreatingOsContextsThenImplicitVmIdPer
     OsContextLinux osContext(drmMock, 0u, EngineDescriptorHelper::getDefaultDescriptor());
     osContext.ensureContextInitialized();
     EXPECT_EQ(0u, drmMock.receivedCreateContextId);
-    EXPECT_EQ(1u, drmMock.receivedContextParamRequestCount);
+    EXPECT_EQ(2u, drmMock.receivedContextParamRequestCount);
 
     auto &drmVmIds = osContext.getDrmVmIds();
     EXPECT_EQ(32u, drmVmIds.size());
@@ -541,7 +541,7 @@ TEST(DrmTest, givenPerContextVMRequiredWhenCreatingOsContextForSubDeviceThenImpl
     OsContextLinux osContext(drmMock, 0u, EngineDescriptorHelper::getDefaultDescriptor(deviceBitfield));
     osContext.ensureContextInitialized();
     EXPECT_EQ(0u, drmMock.receivedCreateContextId);
-    EXPECT_EQ(1u, drmMock.receivedContextParamRequestCount);
+    EXPECT_EQ(2u, drmMock.receivedContextParamRequestCount);
 
     auto &drmVmIds = osContext.getDrmVmIds();
     EXPECT_EQ(32u, drmVmIds.size());
@@ -565,7 +565,7 @@ TEST(DrmTest, givenPerContextVMRequiredWhenCreatingOsContextsForRootDeviceThenIm
     OsContextLinux osContext(drmMock, 0u, EngineDescriptorHelper::getDefaultDescriptor(deviceBitfield));
     osContext.ensureContextInitialized();
     EXPECT_EQ(0u, drmMock.receivedCreateContextId);
-    EXPECT_EQ(2u, drmMock.receivedContextParamRequestCount);
+    EXPECT_EQ(2 * 2u, drmMock.receivedContextParamRequestCount);
 
     auto &drmVmIds = osContext.getDrmVmIds();
     EXPECT_EQ(32u, drmVmIds.size());
@@ -674,6 +674,23 @@ TEST(DrmTest, givenPrintIoctlDebugFlagNotSetWhenGettingTimestampFrequencyThenCap
     EXPECT_EQ(std::string::npos, outputString.find(expectedString));
 }
 
+TEST(DrmTest, givenProgramDebuggingWhenCreatingContextThenUnrecoverableContextIsSet) {
+    auto executionEnvironment = std::make_unique<ExecutionEnvironment>();
+    executionEnvironment->setDebuggingEnabled();
+    executionEnvironment->prepareRootDeviceEnvironments(1);
+    executionEnvironment->rootDeviceEnvironments[0]->setHwInfo(defaultHwInfo.get());
+    executionEnvironment->calculateMaxOsContextCount();
+    executionEnvironment->rootDeviceEnvironments[0]->osInterface = std::make_unique<OSInterface>();
+
+    DrmMock drm(*executionEnvironment->rootDeviceEnvironments[0]);
+
+    OsContextLinux osContext(drm, 0u, EngineDescriptorHelper::getDefaultDescriptor());
+    osContext.ensureContextInitialized();
+
+    EXPECT_EQ(0u, drm.receivedRecoverableContextValue);
+    EXPECT_EQ(2u, drm.receivedContextParamRequestCount);
+}
+
 TEST(DrmQueryTest, GivenDrmWhenSetupHardwareInfoCalledThenCorrectMaxValuesInGtSystemInfoArePreserved) {
     auto executionEnvironment = std::make_unique<ExecutionEnvironment>();
     executionEnvironment->prepareRootDeviceEnvironments(1);

shared/source/os_interface/linux/drm_neo.cpp

@@ -377,6 +377,16 @@ void Drm::setNonPersistentContext(uint32_t drmContextId) {
     ioctl(DRM_IOCTL_I915_GEM_CONTEXT_SETPARAM, &contextParam);
 }
 
+void Drm::setUnrecoverableContext(uint32_t drmContextId) {
+    drm_i915_gem_context_param contextParam = {};
+    contextParam.ctx_id = drmContextId;
+    contextParam.param = I915_CONTEXT_PARAM_RECOVERABLE;
+    contextParam.value = 0;
+    contextParam.size = 0;
+
+    ioctl(DRM_IOCTL_I915_GEM_CONTEXT_SETPARAM, &contextParam);
+}
+
 uint32_t Drm::createDrmContext(uint32_t drmVmId, bool isSpecialContextRequested) {
     drm_i915_gem_context_create_ext gcc = {};
 

shared/source/os_interface/linux/drm_neo.h

@@ -164,6 +164,8 @@ class Drm : public DriverModel {
     bool isContextDebugSupported() { return contextDebugSupported; }
     MOCKABLE_VIRTUAL void setContextDebugFlag(uint32_t drmContextId);
 
+    void setUnrecoverableContext(uint32_t drmContextId);
+
     void setDirectSubmissionActive(bool value) { this->directSubmissionActive = value; }
     bool isDirectSubmissionActive() { return this->directSubmissionActive; }
 

shared/source/os_interface/linux/os_context_linux.cpp

@@ -53,8 +53,11 @@ void OsContextLinux::initializeContext() {
                 drm.setNonPersistentContext(drmContextId);
             }
 
-            if (drm.getRootDeviceEnvironment().executionEnvironment.isDebuggingEnabled() && !isInternalEngine()) {
-                drm.setContextDebugFlag(drmContextId);
+            if (drm.getRootDeviceEnvironment().executionEnvironment.isDebuggingEnabled()) {
+                drm.setUnrecoverableContext(drmContextId);
+                if (!isInternalEngine()) {
+                    drm.setContextDebugFlag(drmContextId);
+                }
             }
 
             if (drm.isPreemptionSupported() && isLowPriority()) {