intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-03 14:55:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: Fail device init if kernel debugging is misconfigured

Browse Source 
Also print error to stderr

Related-to: GSD-10780

Signed-off-by: Brandon Yates <brandon.yates@intel.com>
This commit is contained in:
Brandon Yates
2025-03-07 13:45:49 +00:00
committed by Compute-Runtime-Automation
parent 75119f1887
commit c122bc51f9
7 changed files with 44 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
shared/test/unit_test/device/neo_device_tests.cpp
View File

@@ -2094,7 +2094,7 @@ TEST_F(DeviceTests, GivenDebuggingEnabledWhenDeviceIsInitializedThenL0DebuggerIs
EXPECT_NE(nullptr, device->getL0Debugger());
}
TEST_F(DeviceTests, givenDebuggerRequestedByUserAndNotAvailableWhenDeviceIsInitializedThenErrorIsPrintedButNotReturned) {
TEST_F(DeviceTests, givenDebuggerRequestedByUserAndNotAvailableWhenDeviceIsInitializedThenDeviceIsNullAndErrorIsPrinted) {
extern bool forceCreateNullptrDebugger;
VariableBackup backupForceCreateNullptrDebugger{&forceCreateNullptrDebugger, true};
@@ -2109,7 +2109,7 @@ TEST_F(DeviceTests, givenDebuggerRequestedByUserAndNotAvailableWhenDeviceIsIniti
auto output = testing::internal::GetCapturedStderr();
EXPECT_EQ(std::string("Debug mode is not enabled in the system.\n"), output);
EXPECT_EQ(nullptr, device->getL0Debugger());
EXPECT_EQ(nullptr, device);
}
TEST_F(DeviceTests, givenDebuggerRequestedByUserWhenDeviceWithSubDevicesCreatedThenInitializeDebuggerOncePerRootDevice) {

19
shared/test/unit_test/os_interface/linux/drm_tests.cpp
View File

@@ -2269,6 +2269,23 @@ TEST(DrmTest, GivenProductSpecificIoctlHelperAvailableAndDebugFlagToIgnoreIsSetW
EXPECT_EQ(0u, customFuncCalled);
}
TEST(DrmTest, GivenSysFsPciPathWhenCallinggetSysFsPciPathBaseNameThenResultIsCorrect) {
auto executionEnvironment = std::make_unique<MockExecutionEnvironment>();
class DrmMockPciPath : public DrmMock {
public:
DrmMockPciPath(RootDeviceEnvironment &rootDeviceEnvironment) : DrmMock(rootDeviceEnvironment) {}
std::string mockSysFsPciPath = "/sys/devices/pci0000:00/0000:00:02.0/drm/card0";
std::string getSysFsPciPath() override { return mockSysFsPciPath; }
};
DrmMockPciPath drm{*executionEnvironment->rootDeviceEnvironments[0]};
EXPECT_STREQ("card0", drm.getSysFsPciPathBaseName().c_str());
drm.mockSysFsPciPath = "/sys/devices/pci0000:00/0000:00:02.0/drm/card7";
EXPECT_STREQ("card7", drm.getSysFsPciPathBaseName().c_str());
drm.mockSysFsPciPath = "card8";
EXPECT_STREQ("card8", drm.getSysFsPciPathBaseName().c_str());
}
using DrmHwTest = ::testing::Test;
HWTEST_F(DrmHwTest, GivenDrmWhenSetupHardwareInfoCalledThenGfxCoreHelperIsInitializedFromProductHelper) {
DebugManagerStateRestore restore;
@@ -2291,4 +2308,4 @@ HWTEST_F(DrmHwTest, GivenDrmWhenSetupHardwareInfoCalledThenGfxCoreHelperIsInitia
drm.setupHardwareInfo(&device, false);
EXPECT_TRUE(raii.mockGfxCoreHelper->initFromProductHelperCalled);
}
}