Revert "fix: using canonized addr in xe kmd"

This reverts commit 683d7c7.

Signed-off-by: Compute-Runtime-Validation <[email protected]>

Author: Compute-Runtime-Validation

level_zero/tools/source/debug/linux/debug_session.cpp

@@ -315,7 +315,7 @@ ze_result_t DebugSessionLinux::readGpuMemory(uint64_t vmHandle, char *output, si
 
     int64_t retVal = 0;
     auto gmmHelper = connectedDevice->getNEODevice()->getGmmHelper();
-    gpuVa = gmmHelper->canonize(gpuVa);
+    gpuVa = gmmHelper->decanonize(gpuVa);
     if (flushVmCache(vmDebugFd) != 0) {
         return ZE_RESULT_ERROR_UNKNOWN;
     }
@@ -377,7 +377,7 @@ ze_result_t DebugSessionLinux::writeGpuMemory(uint64_t vmHandle, const char *inp
 
     int64_t retVal = 0;
     auto gmmHelper = connectedDevice->getNEODevice()->getGmmHelper();
-    gpuVa = gmmHelper->canonize(gpuVa);
+    gpuVa = gmmHelper->decanonize(gpuVa);
     if (flushVmCache(vmDebugFd) != 0) {
         return ZE_RESULT_ERROR_UNKNOWN;
     }

level_zero/tools/source/debug/linux/prelim/debug_session.cpp

@@ -641,8 +641,8 @@ bool DebugSessionLinuxi915::handleVmBindEvent(prelim_drm_i915_debug_event_vm_bin
                 std::unique_lock<std::mutex> memLock(asyncThreadMutex);
                 isaMap[vmBind->va_start] = std::move(isa);
 
-                // Expect canonical va_start
-                DEBUG_BREAK_IF(gmmHelper->canonize(vmBind->va_start) != vmBind->va_start);
+                // Expect non canonical va_start
+                DEBUG_BREAK_IF(gmmHelper->decanonize(vmBind->va_start) != vmBind->va_start);
 
                 bool apiEventNeedsAck = (vmBind->base.flags & PRELIM_DRM_I915_DEBUG_EVENT_NEED_ACK);
                 // If ACK flag is not set when triggering MODULE LOAD event, auto-ack immediately

level_zero/tools/source/debug/linux/xe/debug_session.cpp

@@ -466,15 +466,13 @@ bool DebugSessionLinuxXe::handleVmBind(VmBindData &vmBindData) {
             if (vmBindOp.base.flags & euDebugInterface->getParamValue(NEO::EuDebugParam::eventBitCreate)) {
                 {
                     std::lock_guard<std::mutex> lock(asyncThreadMutex);
-
                     if (metaDataEntry.metadata.type == euDebugInterface->getParamValue(NEO::EuDebugParam::metadataSbaArea)) {
                         connection->vmToStateBaseAreaBindInfo[vmBindData.vmBind.vmHandle] = {vmBindOp.addr, vmBindOp.range};
                     }
                     if (metaDataEntry.metadata.type == euDebugInterface->getParamValue(NEO::EuDebugParam::metadataSipArea)) {
                         connection->vmToContextStateSaveAreaBindInfo[vmBindData.vmBind.vmHandle] = {vmBindOp.addr, vmBindOp.range};
                     }
                     if (metaDataEntry.metadata.type == euDebugInterface->getParamValue(NEO::EuDebugParam::metadataModuleArea)) {
-
                         isaAddr = vmBindOp.addr;
                         if (connection->isaMap[tileIndex].find(vmBindOp.addr) == connection->isaMap[tileIndex].end()) {
                             auto &isaMap = connection->isaMap[tileIndex];

shared/source/os_interface/linux/ioctl_helper.h

@@ -7,7 +7,6 @@
 
 #pragma once
 #include "shared/source/command_stream/task_count_helper.h"
-#include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/topology_map.h"
 #include "shared/source/os_interface/linux/drm_allocation.h"
 #include "shared/source/os_interface/linux/drm_debug.h"

shared/source/os_interface/linux/xe/ioctl_helper_xe.cpp

@@ -1341,6 +1341,7 @@ int IoctlHelperXe::createDrmContext(Drm &drm, OsContextLinux &osContext, uint32_
 }
 
 int IoctlHelperXe::xeVmBind(const VmBindParams &vmBindParams, bool isBind) {
+    auto gmmHelper = drm.getRootDeviceEnvironment().getGmmHelper();
     int ret = -1;
     const char *operation = isBind ? "bind" : "unbind";
 
@@ -1352,14 +1353,14 @@ int IoctlHelperXe::xeVmBind(const VmBindParams &vmBindParams, bool isBind) {
                 for (auto i = 0u; i < bindInfo.size(); i++) {
                     if (vmBindParams.userptr == bindInfo[i].userptr) {
                         userptr = bindInfo[i].userptr;
-                        bindInfo[i].addr = vmBindParams.start;
+                        bindInfo[i].addr = gmmHelper->decanonize(vmBindParams.start);
                         break;
                     }
                 }
             }
         } else // unbind
         {
-            auto address = vmBindParams.start;
+            auto address = gmmHelper->decanonize(vmBindParams.start);
             for (auto i = 0u; i < bindInfo.size(); i++) {
                 if (address == bindInfo[i].addr) {
                     userptr = bindInfo[i].userptr;
@@ -1384,10 +1385,7 @@ int IoctlHelperXe::xeVmBind(const VmBindParams &vmBindParams, bool isBind) {
     if (vmBindParams.sharedSystemUsmBind == true) {
         bind.bind.addr = 0;
     } else {
-        // Expect canonical address
-        DEBUG_BREAK_IF(drm.getRootDeviceEnvironment().getGmmHelper()->canonize(vmBindParams.start) != vmBindParams.start);
-
-        bind.bind.addr = vmBindParams.start;
+        bind.bind.addr = gmmHelper->decanonize(vmBindParams.start);
     }
     bind.num_syncs = 1;
     UNRECOVERABLE_IF(vmBindParams.userFence == 0x0);

shared/test/unit_test/os_interface/linux/xe/ioctl_helper_xe_tests.cpp

@@ -2090,41 +2090,6 @@ TEST_F(IoctlHelperXeTest, givenMultipleBindInfosWhenVmBindIsCalledThenProperHand
     ioctlHelper->bindInfo.clear();
 }
 
-TEST_F(IoctlHelperXeTest, whenVmBindIsCalledThenProperCanonicalOrNonCanonicalAddressIsExpectedInVmBindInputsList) {
-    auto executionEnvironment = std::make_unique<MockExecutionEnvironment>();
-    auto drm = DrmMockXe::create(*executionEnvironment->rootDeviceEnvironments[0]);
-    auto ioctlHelper = static_cast<MockIoctlHelperXe *>(drm->getIoctlHelper());
-    unsigned int idx = 0;
-
-    auto testAddress = [&](uint64_t addr) {
-        MockIoctlHelperXe::UserFenceExtension userFence{};
-        userFence.tag = userFence.tagValue;
-        userFence.addr = idx + 1;
-
-        VmBindParams vmBindParams{};
-        vmBindParams.userFence = castToUint64(&userFence);
-        vmBindParams.handle = idx + 1;
-        vmBindParams.userptr = idx + 1;
-        vmBindParams.start = addr;
-
-        auto ret = ioctlHelper->vmBind(vmBindParams);
-        EXPECT_EQ(0, ret);
-
-        auto &list = drm->vmBindInputs;
-        EXPECT_EQ(list.size(), idx + 1);
-
-        if (list.size() == idx + 1) {
-            EXPECT_EQ(list[idx].num_binds, 1u);
-            EXPECT_EQ(list[idx].bind.addr, vmBindParams.start);
-        }
-
-        idx++;
-    };
-
-    testAddress(0xfffff00000000000); // canonical address test
-    testAddress(0xf00000000000);     // non-canonical address test
-}
-
 TEST_F(IoctlHelperXeTest, givenLowPriorityContextWhenSettingPropertiesThenCorrectIndexIsUsedAndReturend) {
     auto executionEnvironment = std::make_unique<MockExecutionEnvironment>();
     auto drm = DrmMockXe::create(*executionEnvironment->rootDeviceEnvironments[0]);