Linux: pass adapter BDF to GmmLib

Resolves: NEO-5785
Signed-off-by: Mateusz Jablonski <[email protected]>

Author: JablonskiMateusz

opencl/source/dll/linux/os_interface.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2020 Intel Corporation
+ * Copyright (C) 2018-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -16,8 +16,8 @@ bool OSInterface::osEnableLocalMemory = true;
 
 void OSInterface::setGmmInputArgs(void *args) {
     auto gmmInArgs = reinterpret_cast<GMM_INIT_IN_ARGS *>(args);
-
-    gmmInArgs->FileDescriptor = this->get()->getDrm()->getFileDescriptor();
+    auto adapterBDF = this->get()->getDrm()->getAdapterBDF();
+    gmmInArgs->FileDescriptor = adapterBDF.Data;
     gmmInArgs->ClientType = GMM_CLIENT::GMM_OCL_VISTA;
 }
 

opencl/test/unit_test/linux/os_interface_linux_tests.cpp

@@ -18,22 +18,27 @@ namespace NEO {
 extern GMM_INIT_IN_ARGS passedInputArgs;
 extern bool copyInputArgs;
 
-TEST(OsInterfaceTest, whenOsInterfaceSetupsGmmInputArgsThenProperFileDescriptorIsSet) {
+TEST(OsInterfaceTest, whenOsInterfaceSetupsGmmInputArgsThenFileDescriptorIsSetWithValueOfAdapterBdf) {
     MockExecutionEnvironment executionEnvironment;
     auto rootDeviceEnvironment = executionEnvironment.rootDeviceEnvironments[0].get();
     auto osInterface = new OSInterface();
     rootDeviceEnvironment->osInterface.reset(osInterface);
 
     auto drm = new DrmMock(fakeFd, *rootDeviceEnvironment);
+    drm->setPciPath("01:23.4");
+
     osInterface->get()->setDrm(drm);
 
     GMM_INIT_IN_ARGS gmmInputArgs = {};
     EXPECT_EQ(0u, gmmInputArgs.FileDescriptor);
     osInterface->setGmmInputArgs(&gmmInputArgs);
     EXPECT_NE(0u, gmmInputArgs.FileDescriptor);
 
-    auto expectedFileDescriptor = drm->getFileDescriptor();
-    EXPECT_EQ(static_cast<uint32_t>(expectedFileDescriptor), gmmInputArgs.FileDescriptor);
+    ADAPTER_BDF expectedAdapterBDF{};
+    expectedAdapterBDF.Bus = 0x1;
+    expectedAdapterBDF.Device = 0x23;
+    expectedAdapterBDF.Function = 0x4;
+    EXPECT_EQ(expectedAdapterBDF.Data, gmmInputArgs.FileDescriptor);
     EXPECT_EQ(GMM_CLIENT::GMM_OCL_VISTA, gmmInputArgs.ClientType);
 }
 

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

@@ -38,6 +38,28 @@ TEST(DrmTest, WhenGettingDeviceIdThenCorrectIdReturned) {
     delete pDrm;
 }
 
+TEST(DrmTest, GivenValidPciPathWhenGettingAdapterBdfThenCorrectValuesAreReturned) {
+    auto executionEnvironment = std::make_unique<ExecutionEnvironment>();
+    executionEnvironment->prepareRootDeviceEnvironments(1);
+    DrmMock drm{*executionEnvironment->rootDeviceEnvironments[0]};
+
+    {
+        drm.setPciPath("ab:cd.e");
+        auto adapterBdf = drm.getAdapterBDF();
+        EXPECT_EQ(0xabu, adapterBdf.Bus);
+        EXPECT_EQ(0xcdu, adapterBdf.Device);
+        EXPECT_EQ(0xeu, adapterBdf.Function);
+    }
+
+    {
+        drm.setPciPath("01:23.4");
+        auto adapterBdf = drm.getAdapterBDF();
+        EXPECT_EQ(0x1u, adapterBdf.Bus);
+        EXPECT_EQ(0x23u, adapterBdf.Device);
+        EXPECT_EQ(0x4u, adapterBdf.Function);
+    }
+}
+
 TEST(DrmTest, GivenInvalidPciPathWhenFrequencyIsQueriedThenReturnError) {
     auto executionEnvironment = std::make_unique<ExecutionEnvironment>();
     executionEnvironment->prepareRootDeviceEnvironments(1);

shared/source/os_interface/linux/drm_neo.cpp

@@ -558,4 +558,21 @@ Drm::~Drm() {
     this->printIoctlStatistics();
 }
 
+ADAPTER_BDF Drm::getAdapterBDF() const {
+
+    ADAPTER_BDF adapterBDF{};
+    constexpr int pciBusInfoTokensNum = 3;
+
+    uint32_t bus, device, function;
+
+    if (std::sscanf(hwDeviceId->getPciPath(), "%02x:%02x.%01x", &bus, &device, &function) != pciBusInfoTokensNum) {
+        return {};
+    }
+    adapterBDF.Bus = bus;
+    adapterBDF.Function = function;
+    adapterBDF.Device = device;
+
+    return adapterBDF;
+}
+
 } // namespace NEO

shared/source/os_interface/linux/drm_neo.h

@@ -6,6 +6,7 @@
  */
 
 #pragma once
+#include "shared/source/gmm_helper/gmm_lib.h"
 #include "shared/source/helpers/basic_math.h"
 #include "shared/source/os_interface/linux/cache_info.h"
 #include "shared/source/os_interface/linux/engine_info.h"
@@ -95,6 +96,7 @@ class Drm {
 
     MOCKABLE_VIRTUAL void checkPreemptionSupport();
     inline int getFileDescriptor() const { return hwDeviceId->getFileDescriptor(); }
+    ADAPTER_BDF getAdapterBDF() const;
     int createDrmVirtualMemory(uint32_t &drmVmId);
     void destroyDrmVirtualMemory(uint32_t drmVmId);
     uint32_t createDrmContext(uint32_t drmVmId, bool isDirectSubmission);