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

fix: change error message for GPU page fault

Browse Source 
Change the error message for GPU page fault to match
with the message from gdb output

Related-To: NEO-13093
Signed-off-by: Young Jin Yoon <young.jin.yoon@intel.com>
This commit is contained in:
Young Jin Yoon
2024-10-25 18:28:00 +00:00
committed by Compute-Runtime-Automation
parent 741101551e
commit ebdded1bb9
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
shared/source/os_interface/linux/drm_neo.cpp
View File

@@ -268,7 +268,7 @@ bool Drm::checkResetStatus(OsContext &osContext) {
UNRECOVERABLE_IF(retVal != 0); UNRECOVERABLE_IF(retVal != 0);
if (checkToDisableScratchPage() && ioctlHelper->validPageFault(fault.flags)) { if (checkToDisableScratchPage() && ioctlHelper->validPageFault(fault.flags)) {
bool banned = ((status & ioctlHelper->getStatusForResetStats(true)) != 0); bool banned = ((status & ioctlHelper->getStatusForResetStats(true)) != 0);
IoFunctions::fprintf(stderr, "FATAL: Unexpected page fault from GPU at 0x%llx, ctx_id: %u (%s) type: %d (%s), level: %d (%s), access: %d (%s), banned: %d, aborting.\n", IoFunctions::fprintf(stderr, "Segmentation fault from GPU at 0x%llx, ctx_id: %u (%s) type: %d (%s), level: %d (%s), access: %d (%s), banned: %d, aborting.\n",
fault.addr, fault.addr,
resetStats.contextId, resetStats.contextId,
EngineHelpers::engineTypeToString(osContext.getEngineType()).c_str(), EngineHelpers::engineTypeToString(osContext.getEngineType()).c_str(),
@@ -276,7 +276,7 @@ bool Drm::checkResetStatus(OsContext &osContext) {
fault.level, GpuPageFaultHelpers::faultLevelToString(static_cast<FaultLevel>(fault.level)).c_str(), fault.level, GpuPageFaultHelpers::faultLevelToString(static_cast<FaultLevel>(fault.level)).c_str(),
fault.access, GpuPageFaultHelpers::faultAccessToString(static_cast<FaultAccess>(fault.access)).c_str(), fault.access, GpuPageFaultHelpers::faultAccessToString(static_cast<FaultAccess>(fault.access)).c_str(),
banned); banned);
IoFunctions::fprintf(stdout, "FATAL: Unexpected page fault from GPU at 0x%llx, ctx_id: %u (%s) type: %d (%s), level: %d (%s), access: %d (%s), banned: %d, aborting.\n", IoFunctions::fprintf(stdout, "Segmentation fault from GPU at 0x%llx, ctx_id: %u (%s) type: %d (%s), level: %d (%s), access: %d (%s), banned: %d, aborting.\n",
fault.addr, fault.addr,
resetStats.contextId, resetStats.contextId,
EngineHelpers::engineTypeToString(osContext.getEngineType()).c_str(), EngineHelpers::engineTypeToString(osContext.getEngineType()).c_str(),

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

@@ -1480,7 +1480,7 @@ TEST(DrmDeathTest, GivenResetStatsWithValidFaultWhenIsGpuHangIsCalledThenProcess
drm.ioctlHelper = std::move(ioctlHelper); drm.ioctlHelper = std::move(ioctlHelper);
int strSize = std::snprintf(nullptr, 0, "FATAL: Unexpected page fault from GPU at 0x%llx, ctx_id: %u (%s) type: %d (%s), level: %d (%s), access: %d (%s), banned: %d, aborting.\n", int strSize = std::snprintf(nullptr, 0, "Segmentation fault from GPU at 0x%llx, ctx_id: %u (%s) type: %d (%s), level: %d (%s), access: %d (%s), banned: %d, aborting.\n",
static_cast<long long unsigned int>(resetStatsFaultExpected.addr), static_cast<long long unsigned int>(resetStatsFaultExpected.addr),
resetStatsExpected.contextId, resetStatsExpected.contextId,
EngineHelpers::engineTypeToString(aub_stream::ENGINE_BCS).c_str(), EngineHelpers::engineTypeToString(aub_stream::ENGINE_BCS).c_str(),
@@ -1491,7 +1491,7 @@ TEST(DrmDeathTest, GivenResetStatsWithValidFaultWhenIsGpuHangIsCalledThenProcess
1; 1;
std::unique_ptr<char[]> buf(new char[strSize]); std::unique_ptr<char[]> buf(new char[strSize]);
std::snprintf(buf.get(), strSize, "FATAL: Unexpected page fault from GPU at 0x%llx, ctx_id: %u (%s) type: %d (%s), level: %d (%s), access: %d (%s), banned: %d, aborting.\n", std::snprintf(buf.get(), strSize, "Segmentation fault from GPU at 0x%llx, ctx_id: %u (%s) type: %d (%s), level: %d (%s), access: %d (%s), banned: %d, aborting.\n",
static_cast<long long unsigned int>(resetStatsFaultExpected.addr), static_cast<long long unsigned int>(resetStatsFaultExpected.addr),
resetStatsExpected.contextId, resetStatsExpected.contextId,
EngineHelpers::engineTypeToString(aub_stream::ENGINE_BCS).c_str(), EngineHelpers::engineTypeToString(aub_stream::ENGINE_BCS).c_str(),