Skip to content

Commit ebdded1

Browse files
fix: change error message for GPU page fault
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 <[email protected]>
1 parent 7411015 commit ebdded1

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

shared/source/os_interface/linux/drm_neo.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,15 +268,15 @@ bool Drm::checkResetStatus(OsContext &osContext) {
268268
UNRECOVERABLE_IF(retVal != 0);
269269
if (checkToDisableScratchPage() && ioctlHelper->validPageFault(fault.flags)) {
270270
bool banned = ((status & ioctlHelper->getStatusForResetStats(true)) != 0);
271-
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",
271+
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",
272272
fault.addr,
273273
resetStats.contextId,
274274
EngineHelpers::engineTypeToString(osContext.getEngineType()).c_str(),
275275
fault.type, GpuPageFaultHelpers::faultTypeToString(static_cast<FaultType>(fault.type)).c_str(),
276276
fault.level, GpuPageFaultHelpers::faultLevelToString(static_cast<FaultLevel>(fault.level)).c_str(),
277277
fault.access, GpuPageFaultHelpers::faultAccessToString(static_cast<FaultAccess>(fault.access)).c_str(),
278278
banned);
279-
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",
279+
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",
280280
fault.addr,
281281
resetStats.contextId,
282282
EngineHelpers::engineTypeToString(osContext.getEngineType()).c_str(),

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1480,7 +1480,7 @@ TEST(DrmDeathTest, GivenResetStatsWithValidFaultWhenIsGpuHangIsCalledThenProcess
14801480

14811481
drm.ioctlHelper = std::move(ioctlHelper);
14821482

1483-
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",
1483+
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",
14841484
static_cast<long long unsigned int>(resetStatsFaultExpected.addr),
14851485
resetStatsExpected.contextId,
14861486
EngineHelpers::engineTypeToString(aub_stream::ENGINE_BCS).c_str(),
@@ -1491,7 +1491,7 @@ TEST(DrmDeathTest, GivenResetStatsWithValidFaultWhenIsGpuHangIsCalledThenProcess
14911491
1;
14921492

14931493
std::unique_ptr<char[]> buf(new char[strSize]);
1494-
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",
1494+
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",
14951495
static_cast<long long unsigned int>(resetStatsFaultExpected.addr),
14961496
resetStatsExpected.contextId,
14971497
EngineHelpers::engineTypeToString(aub_stream::ENGINE_BCS).c_str(),

0 commit comments

Comments
 (0)