fix: If dummy exec failed call evict from outside the lock

Related-To: NEO-12849, HSD-18040201135
Signed-off-by: Maciej Plewka <maciej.plewka@intel.com>
Source: e73e865

Author: MaciejPlewka

shared/source/os_interface/linux/drm_memory_operations_handler_default.cpp

@@ -35,7 +35,13 @@ MemoryOperationsStatus DrmMemoryOperationsHandlerDefault::makeResident(Device *d
     if (!isDummyExecNeeded || ret != MemoryOperationsStatus::success) {
         return ret;
     }
-    return flushDummyExec(device, gfxAllocations);
+    ret = flushDummyExec(device, gfxAllocations);
+    if (ret != MemoryOperationsStatus::success) {
+        for (auto &alloc : gfxAllocations) {
+            evictWithinOsContext(osContext, *alloc);
+        }
+    }
+    return ret;
 }
 
 MemoryOperationsStatus DrmMemoryOperationsHandlerDefault::lock(Device *device, ArrayRef<GraphicsAllocation *> gfxAllocations) {
@@ -104,7 +110,6 @@ MemoryOperationsStatus DrmMemoryOperationsHandlerDefault::evictUnusedAllocations
 
 MemoryOperationsStatus DrmMemoryOperationsHandlerDefault::flushDummyExec(Device *device, ArrayRef<GraphicsAllocation *> gfxAllocations) {
     std::lock_guard<std::mutex> lock(mutex);
-    OsContext *osContext = nullptr;
     auto memoryManager = reinterpret_cast<DrmMemoryManager *>(device->getMemoryManager());
 
     std::vector<BufferObject *> boArray;
@@ -120,9 +125,6 @@ MemoryOperationsStatus DrmMemoryOperationsHandlerDefault::flushDummyExec(Device
 
     auto submissionStatus = memoryManager->emitPinningRequestForBoContainer(boArray.data(), boCount, rootDeviceIndex);
     if (submissionStatus != SubmissionStatus::success) {
-        for (auto &alloc : gfxAllocations) {
-            evictWithinOsContext(osContext, *alloc);
-        }
         return MemoryOperationsStatus::outOfMemory;
     }
     return MemoryOperationsStatus::success;

shared/test/unit_test/os_interface/linux/drm_memory_operations_handler_default_tests.cpp

@@ -195,6 +195,27 @@ TEST_F(DrmMemoryOperationsHandlerBaseTest, givenOperationsHandlerWhenCallingMake
     drmMemoryOperationsHandler->makeResident(nullptr, ArrayRef<GraphicsAllocation *>(&allocationPtr, 1), true);
     EXPECT_EQ(drmMemoryOperationsHandler->flushDummyExecCalled, 1u);
 }
+
+TEST_F(DrmMemoryOperationsHandlerBaseTest, givenOperationsHandlerWhenFlushReturnedOOMThenEvictCalled) {
+    drmMemoryOperationsHandler->flushDummyExecCallBase = false;
+    drmMemoryOperationsHandler->flushDummyExecResult = MemoryOperationsStatus::outOfMemory;
+    drmMemoryOperationsHandler->makeResidentWithinOsContextCallBase = false;
+
+    initializeAllocation(1);
+    drmMemoryOperationsHandler->makeResident(nullptr, ArrayRef<GraphicsAllocation *>(&allocationPtr, 1), true);
+    EXPECT_EQ(drmMemoryOperationsHandler->evictWithinOsContextCalled, 1u);
+}
+
+TEST_F(DrmMemoryOperationsHandlerBaseTest, givenOperationsHandlerWhenFlushReturnedSuccessThenEvictNotcalled) {
+    drmMemoryOperationsHandler->flushDummyExecCallBase = false;
+    drmMemoryOperationsHandler->flushDummyExecResult = MemoryOperationsStatus::success;
+    drmMemoryOperationsHandler->makeResidentWithinOsContextCallBase = false;
+
+    initializeAllocation(1);
+    drmMemoryOperationsHandler->makeResident(nullptr, ArrayRef<GraphicsAllocation *>(&allocationPtr, 1), true);
+    EXPECT_EQ(drmMemoryOperationsHandler->evictWithinOsContextCalled, 0u);
+}
+
 struct DrmMemoryOperationsHandlerBaseTestFlushDummyExec : public DrmMemoryOperationsHandlerBaseTest {
     using BaseClass = DrmMemoryOperationsHandlerBaseTest;
     void SetUp() override {
@@ -236,19 +257,14 @@ TEST_F(DrmMemoryOperationsHandlerBaseTestFlushDummyExec, givenOperationsHandlerW
     EXPECT_EQ(ret, MemoryOperationsStatus::outOfMemory);
 }
 
-TEST_F(DrmMemoryOperationsHandlerBaseTestFlushDummyExec, givenOperationsHandlerWhenEmitPiningRequestReturnFailThenEvictWithinOsContextCalled) {
-    pMemManager->emitPinningRequestForBoContainerResult = SubmissionStatus::outOfMemory;
-    drmMemoryOperationsHandler->flushDummyExec(device.get(), ArrayRef<GraphicsAllocation *>(&allocationPtr, 1));
-    EXPECT_EQ(drmMemoryOperationsHandler->evictWithinOsContextCalled, 1u);
-}
-
 TEST_F(DrmMemoryOperationsHandlerBaseTestFlushDummyExec, givenOperationsHandlerWhenEmitPiningRequestReturnSuccessThenSuccessReturned) {
     pMemManager->emitPinningRequestForBoContainerResult = SubmissionStatus::success;
     auto ret = drmMemoryOperationsHandler->flushDummyExec(device.get(), ArrayRef<GraphicsAllocation *>(&allocationPtr, 1));
     EXPECT_EQ(ret, MemoryOperationsStatus::success);
 }
-TEST_F(DrmMemoryOperationsHandlerBaseTestFlushDummyExec, givenOperationsHandlerWhenEmitPiningRequestReturnSuccessThenEvictWithinOsContextNotCalled) {
-    pMemManager->emitPinningRequestForBoContainerResult = SubmissionStatus::success;
-    drmMemoryOperationsHandler->flushDummyExec(device.get(), ArrayRef<GraphicsAllocation *>(&allocationPtr, 1));
-    EXPECT_EQ(drmMemoryOperationsHandler->evictWithinOsContextCalled, 0u);
+
+TEST_F(DrmMemoryOperationsHandlerBaseTestFlushDummyExec, givenOperationsHandlerWhenEmitPiningRequestReturnOOMThenOOMReturned) {
+    pMemManager->emitPinningRequestForBoContainerResult = SubmissionStatus::outOfMemory;
+    auto ret = drmMemoryOperationsHandler->flushDummyExec(device.get(), ArrayRef<GraphicsAllocation *>(&allocationPtr, 1));
+    EXPECT_EQ(ret, MemoryOperationsStatus::outOfMemory);
 }