Media/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-09-15 13:01:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix fabric ras errors accumulated to all devices

Browse Source 
This patch fixes the issue that fabric ras errors
from all devies are reported for all devices.

Related-To: LOCI-3548

Signed-off-by: Joshua Santosh Ranjan <joshua.santosh.ranjan@intel.com>
This commit is contained in:
Joshua Santosh Ranjan
2022-11-09 11:51:03 +00:00
committed by Compute-Runtime-Automation
parent d942660b20
commit 7c050291bf
2 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
level_zero/tools/source/sysman/ras/linux/os_ras_imp_fabric.cpp
View File

@ -17,7 +17,7 @@
#include <regex>
namespace L0 {
void LinuxRasSourceFabric::getNodes(std::vector<std::string> &nodes, uint32_t subdeviceId, FsAccess *fsAccess, const zes_ras_error_type_t &type) {
void LinuxRasSourceFabric::getNodes(std::vector<std::string> &nodes, uint32_t subdeviceId, LinuxSysmanImp *pSysmanImp, const zes_ras_error_type_t &type) {
const uint32_t minBoardStrappedNumber = 0;
const uint32_t maxBoardStrappedNumber = 31;
const uint32_t minPortId = 1;
@ -28,10 +28,15 @@ void LinuxRasSourceFabric::getNodes(std::vector<std::string> &nodes, uint32_t su
const std::string iafPathStringAuxillary("/sys/module/iaf/drivers/auxiliary:iaf/");
std::string iafPathString("");
if (fsAccess->directoryExists(iafPathStringMfd)) {
iafPathString = iafPathStringMfd + "iaf.";
} else if (fsAccess->directoryExists(iafPathStringAuxillary)) {
iafPathString = iafPathStringAuxillary + "i915.iaf.";
if (pSysmanImp->getSysfsAccess().getRealPath("device/", iafPathString) != ZE_RESULT_SUCCESS) {
return;
}
auto &fsAccess = pSysmanImp->getFsAccess();
if (fsAccess.directoryExists(iafPathStringMfd)) {
iafPathString = iafPathString + "/iaf.";
} else if (fsAccess.directoryExists(iafPathStringAuxillary)) {
iafPathString = iafPathString + "/i915.iaf.";
} else {
return;
}
@ -39,7 +44,7 @@ void LinuxRasSourceFabric::getNodes(std::vector<std::string> &nodes, uint32_t su
for (auto boardStrappedNumber = minBoardStrappedNumber; boardStrappedNumber <= maxBoardStrappedNumber; boardStrappedNumber++) {
const auto boardStrappedString(iafPathString + std::to_string(boardStrappedNumber));
if (!fsAccess->directoryExists(boardStrappedString)) {
if (!fsAccess.directoryExists(boardStrappedString)) {
continue;
}
const auto subDeviceString(boardStrappedString + "/sd." + std::to_string(subdeviceId));
@ -59,7 +64,7 @@ void LinuxRasSourceFabric::getNodes(std::vector<std::string> &nodes, uint32_t su
}
for (auto &subDeviceErrorNode : subDeviceErrorNodes) {
if (ZE_RESULT_SUCCESS == fsAccess->canRead(subDeviceErrorNode)) {
if (ZE_RESULT_SUCCESS == fsAccess.canRead(subDeviceErrorNode)) {
nodes.push_back(subDeviceErrorNode);
}
}
@ -73,11 +78,11 @@ ze_result_t LinuxRasSourceFabric::getSupportedRasErrorTypes(std::set<zes_ras_err
uint32_t subDeviceIndex = 0;
SysmanDeviceImp::getSysmanDeviceInfo(deviceHandle, subDeviceIndex, onSubDevice);
std::vector<std::string> nodes;
getNodes(nodes, subDeviceIndex, &pLinuxSysmanImp->getFsAccess(), ZES_RAS_ERROR_TYPE_UNCORRECTABLE);
getNodes(nodes, subDeviceIndex, pLinuxSysmanImp, ZES_RAS_ERROR_TYPE_UNCORRECTABLE);
if (nodes.size()) {
errorType.insert(ZES_RAS_ERROR_TYPE_UNCORRECTABLE);
}
getNodes(nodes, subDeviceIndex, &pLinuxSysmanImp->getFsAccess(), ZES_RAS_ERROR_TYPE_CORRECTABLE);
getNodes(nodes, subDeviceIndex, pLinuxSysmanImp, ZES_RAS_ERROR_TYPE_CORRECTABLE);
if (nodes.size()) {
errorType.insert(ZES_RAS_ERROR_TYPE_CORRECTABLE);
}
@ -87,15 +92,16 @@ ze_result_t LinuxRasSourceFabric::getSupportedRasErrorTypes(std::set<zes_ras_err
LinuxRasSourceFabric::LinuxRasSourceFabric(OsSysman *pOsSysman, zes_ras_error_type_t type, uint32_t subDeviceId) {
fsAccess = &static_cast<LinuxSysmanImp *>(pOsSysman)->getFsAccess();
getNodes(errorNodes, subDeviceId, fsAccess, type);
pLinuxSysmanImp = static_cast<LinuxSysmanImp *>(pOsSysman);
getNodes(errorNodes, subDeviceId, pLinuxSysmanImp, type);
}
uint64_t LinuxRasSourceFabric::getComputeErrorCount() {
uint64_t currentErrorCount = 0;
auto &fsAccess = pLinuxSysmanImp->getFsAccess();
for (const auto &node : errorNodes) {
uint64_t errorCount = 0;
fsAccess->read(node, errorCount);
fsAccess.read(node, errorCount);
currentErrorCount += errorCount;
}
return currentErrorCount;

4
level_zero/tools/source/sysman/ras/linux/os_ras_imp_prelim.h
View File

@ -99,11 +99,11 @@ class LinuxRasSourceFabric : public LinuxRasSources {
ze_result_t osRasGetState(zes_ras_state_t &state, ze_bool_t clear) override;
private:
FsAccess *fsAccess = nullptr;
LinuxSysmanImp *pLinuxSysmanImp = nullptr;
std::vector<std::string> errorNodes = {};
uint64_t baseComputeErrorCount = 0;
uint64_t getComputeErrorCount();
static void getNodes(std::vector<std::string> &nodes, uint32_t subdeviceId, FsAccess *fsAccess, const zes_ras_error_type_t &type);
static void getNodes(std::vector<std::string> &nodes, uint32_t subdeviceId, LinuxSysmanImp *pSysmanImp, const zes_ras_error_type_t &type);
};
class LinuxRasSourceHbm : public LinuxRasSources {