Make IoctlHelper member of Drm

Related-To: NEO-6575

This is needed to fix accessing IoctlHelper
after driver detach.
This way we are also reducing accessing
sysfs file in Drm::getPrelimVersion

Signed-off-by: Szymon Morek <szymon.morek@intel.com>

Author: smorek-intel

level_zero/tools/test/unit_tests/sources/sysman/engine/linux/mock_engine.h

@@ -32,6 +32,7 @@ struct MockMemoryManagerInEngineSysman : public MemoryManagerMock {
 class EngineNeoDrm : public Drm {
   public:
     using Drm::getEngineInfo;
+    using Drm::setupIoctlHelper;
     const int mockFd = 0;
     EngineNeoDrm(RootDeviceEnvironment &rootDeviceEnvironment) : Drm(std::make_unique<HwDeviceIdDrm>(mockFd, ""), rootDeviceEnvironment) {}
 };

level_zero/tools/test/unit_tests/sources/sysman/engine/linux/test_zes_engine.cpp

@@ -50,6 +50,7 @@ class ZesEngineFixture : public SysmanDeviceFixture {
 
         EngineHandleContext *pEngineHandleContext = pSysmanDeviceImp->pEngineHandleContext;
         pDrm = std::make_unique<NiceMock<Mock<EngineNeoDrm>>>(const_cast<NEO::RootDeviceEnvironment &>(neoDevice->getRootDeviceEnvironment()));
+        pDrm->setupIoctlHelper();
         pPmuInterface = std::make_unique<NiceMock<Mock<MockPmuInterfaceImp>>>(pLinuxSysmanImp);
         pOriginalDrm = pLinuxSysmanImp->pDrm;
         pOriginalPmuInterface = pLinuxSysmanImp->pPmuInterface;

level_zero/tools/test/unit_tests/sources/sysman/linux/mock_sysman_fixture.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -31,7 +31,9 @@ namespace ult {
 constexpr int mockFd = 0;
 class SysmanMockDrm : public Drm {
   public:
-    SysmanMockDrm(RootDeviceEnvironment &rootDeviceEnvironment) : Drm(std::make_unique<HwDeviceIdDrm>(mockFd, ""), rootDeviceEnvironment) {}
+    SysmanMockDrm(RootDeviceEnvironment &rootDeviceEnvironment) : Drm(std::make_unique<HwDeviceIdDrm>(mockFd, ""), rootDeviceEnvironment) {
+        setupIoctlHelper();
+    }
 };
 
 class PublicLinuxSysmanImp : public L0::LinuxSysmanImp {

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

@@ -40,6 +40,7 @@ class DrmCommandStreamTest : public ::testing::Test {
 
         auto hwInfo = executionEnvironment.rootDeviceEnvironments[0]->getHardwareInfo();
         mock->createVirtualMemoryAddressSpace(HwHelper::getSubDevicesCount(hwInfo));
+        mock->setupIoctlHelper();
         osContext = std::make_unique<OsContextLinux>(*mock, 0u,
                                                      EngineDescriptorHelper::getDefaultDescriptor(HwHelper::get(hwInfo->platform.eRenderCoreFamily).getGpgpuEngineInstances(*hwInfo)[0],
                                                                                                   PreemptionHelper::getDefaultPreemptionMode(*hwInfo)));

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

@@ -79,7 +79,7 @@ TEST(EngineInfoTest, whenCreateEngineInfoWithCcsThenCorrectHwInfoSet) {
 
     auto hwInfo = *defaultHwInfo.get();
     std::vector<EngineCapabilities> engines(2);
-    uint16_t ccsClass = IoctlHelper::get(drm.get())->getComputeEngineClass();
+    uint16_t ccsClass = drm->getIoctlHelper()->getComputeEngineClass();
     engines[0].engine = {ccsClass, 0};
     engines[0].capabilities = 0;
     engines[1].engine = {I915_ENGINE_CLASS_COPY, 0};

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -20,6 +20,7 @@ class DrmTipMock : public DrmMock {
     DrmTipMock(RootDeviceEnvironment &rootDeviceEnvironment) : DrmTipMock(rootDeviceEnvironment, defaultHwInfo.get()) {}
     DrmTipMock(RootDeviceEnvironment &rootDeviceEnvironment, const HardwareInfo *inputHwInfo) : DrmMock(rootDeviceEnvironment) {
         rootDeviceEnvironment.setHwInfo(inputHwInfo);
+        setupIoctlHelper();
     }
 
     uint32_t i915QuerySuccessCount = std::numeric_limits<uint32_t>::max();

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

@@ -719,7 +719,7 @@ TEST(DrmTest, whenImmediateVmBindExtIsEnabledThenUseVmBindImmediate) {
     }
 }
 
-TEST(DrmQueryTest, GivenDrmWhenSetupHardwareInfoCalledThenCorrectMaxValuesInGtSystemInfoArePreserved) {
+TEST(DrmQueryTest, GivenDrmWhenSetupHardwareInfoCalledThenCorrectMaxValuesInGtSystemInfoArePreservedAndIoctlHelperSet) {
     auto executionEnvironment = std::make_unique<ExecutionEnvironment>();
     executionEnvironment->prepareRootDeviceEnvironments(1);
 
@@ -737,7 +737,7 @@ TEST(DrmQueryTest, GivenDrmWhenSetupHardwareInfoCalledThenCorrectMaxValuesInGtSy
     DeviceDescriptor device = {0, hwInfo, setupHardwareInfo};
 
     drm.setupHardwareInfo(&device, false);
-
+    EXPECT_NE(nullptr, drm.getIoctlHelper());
     EXPECT_EQ(NEO::defaultHwInfo->gtSystemInfo.MaxSlicesSupported, hwInfo->gtSystemInfo.MaxSlicesSupported);
     EXPECT_EQ(NEO::defaultHwInfo->gtSystemInfo.MaxSubSlicesSupported, hwInfo->gtSystemInfo.MaxSubSlicesSupported);
     EXPECT_EQ(NEO::defaultHwInfo->gtSystemInfo.MaxEuPerSubSlice, hwInfo->gtSystemInfo.MaxEuPerSubSlice);
@@ -941,6 +941,11 @@ TEST(DrmQueryTest, givenUapiPrelimVersionWithInvalidPathThenReturnEmptyString) {
     EXPECT_TRUE(prelimVersion.empty());
 }
 
+TEST(DrmTest, givenInvalidUapiPrelimVersionThenFallbackToBasePrelim) {
+    std::unique_ptr<IoctlHelper> ioctlHelper(IoctlHelper::get(defaultHwInfo.get(), "-1"));
+    EXPECT_NE(nullptr, ioctlHelper.get());
+}
+
 TEST(DrmTest, GivenCompletionFenceDebugFlagWhenCreatingDrmObjectThenExpectCorrectSetting) {
     DebugManagerStateRestore restore;
     DebugManager.flags.UseVmBind.set(1);
@@ -1116,4 +1121,15 @@ TEST(DrmTest, GivenBatchPendingGreaterThanZeroResetStatsWhenIsGpuHangIsCalledThe
     EXPECT_TRUE(isGpuHangDetected);
 
     memoryManagerRaw->registeredEngines.clear();
-}
+}
+
+TEST(DrmTest, givenSetupIoctlHelperThenIoctlHelperNotNull) {
+    auto executionEnvironment = std::make_unique<ExecutionEnvironment>();
+    executionEnvironment->prepareRootDeviceEnvironments(1);
+    DrmMock drm{*executionEnvironment->rootDeviceEnvironments[0]};
+
+    drm.ioctlHelper.reset(nullptr);
+    drm.setupIoctlHelper();
+
+    EXPECT_NE(nullptr, drm.ioctlHelper.get());
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -23,7 +23,7 @@ DG1TEST_F(IoctlHelperTestsDg1, givenDg1WhenCreateGemExtThenReturnCorrectValue) {
     executionEnvironment->prepareRootDeviceEnvironments(1);
     auto drm = std::make_unique<DrmTipMock>(*executionEnvironment->rootDeviceEnvironments[0]);
 
-    auto ioctlHelper = IoctlHelper::get(drm.get());
+    auto ioctlHelper = drm->getIoctlHelper();
     uint32_t handle = 0;
     std::vector<MemoryClassInstance> memClassInstance = {{I915_MEMORY_CLASS_DEVICE, 0}};
     auto ret = ioctlHelper->createGemExt(drm.get(), memClassInstance, 1024, handle);
@@ -44,7 +44,7 @@ DG1TEST_F(IoctlHelperTestsDg1, givenDg1WithDrmTipWhenCreateGemExtWithDebugFlagTh
     auto drm = std::make_unique<DrmTipMock>(*executionEnvironment->rootDeviceEnvironments[0]);
 
     testing::internal::CaptureStdout();
-    auto ioctlHelper = IoctlHelper::get(drm.get());
+    auto ioctlHelper = drm->getIoctlHelper();
     uint32_t handle = 0;
     std::vector<MemoryClassInstance> memClassInstance = {{I915_MEMORY_CLASS_DEVICE, 0}};
     auto ret = ioctlHelper->createGemExt(drm.get(), memClassInstance, 1024, handle);
@@ -65,7 +65,7 @@ DG1TEST_F(IoctlHelperTestsDg1, givenDg1WhenCreateGemExtWithDebugFlagThenPrintDeb
     auto drm = std::make_unique<DrmMockProdDg1>(*executionEnvironment->rootDeviceEnvironments[0]);
 
     testing::internal::CaptureStdout();
-    auto ioctlHelper = IoctlHelper::get(drm.get());
+    auto ioctlHelper = drm->getIoctlHelper();
     uint32_t handle = 0;
     std::vector<MemoryClassInstance> memClassInstance = {{I915_MEMORY_CLASS_DEVICE, 0}};
     auto ret = ioctlHelper->createGemExt(drm.get(), memClassInstance, 1024, handle);