Skip to content

Add ProcessorMetrics endpoint for RAS error counts #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
raja-gade wants to merge 1 commit into
base: integ_sp8
Choose a base branch
from
Open

Add ProcessorMetrics endpoint for RAS error counts #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions include/dbus_utility.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ using DbusVariantType = std::variant<
uint16_t,
uint8_t,
bool,
std::vector<uint64_t>,
std::vector<uint32_t>,
std::vector<uint16_t>,
sdbusplus::message::object_path,
Expand Down
146 changes: 146 additions & 0 deletions redfish-core/lib/processor.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1375,6 +1375,12 @@ inline void requestRoutesProcessor(App& app)
"/redfish/v1/Systems/{}/Processors/{}/Oem/AMD/SocConfiguration/Token",
BMCWEB_REDFISH_SYSTEM_URI_NAME, processorId);

// Add ProcessorMetrics sub-resource link
asyncResp->res.jsonValue["Oem"]["AMD"]["ProcessorMetrics"]
["@odata.id"] = boost::urls::format(
"/redfish/v1/Systems/{}/Processors/{}/Oem/AMD/ProcessorMetrics",
BMCWEB_REDFISH_SYSTEM_URI_NAME, processorId);

getProcessorObject(
asyncResp, processorId,
std::bind_front(getProcessorData, asyncResp, processorId));
Expand Down Expand Up @@ -1553,4 +1559,144 @@ inline void requestRoutesOobErrorInjection(App& app)
});
};

inline void requestRoutesProcessorMetrics(App& app)
{
BMCWEB_ROUTE(
app,
"/redfish/v1/Systems/<str>/Processors/<str>/Oem/AMD/ProcessorMetrics")
.privileges(redfish::privileges::getProcessor)
.methods(
boost::beast::http::verb::
get)([&app](const crow::Request& req,
const std::shared_ptr<bmcweb::AsyncResp>& asyncResp,
const std::string& systemName,
const std::string& processorId) {
if (!redfish::setUpRedfishRoute(app, req, asyncResp))
{
return;
}

if constexpr (BMCWEB_EXPERIMENTAL_REDFISH_MULTI_COMPUTER_SYSTEM)
{
messages::resourceNotFound(asyncResp->res, "ComputerSystem",
systemName);
return;
}

if (systemName != BMCWEB_REDFISH_SYSTEM_URI_NAME)
{
messages::resourceNotFound(asyncResp->res, "ComputerSystem",
systemName);
return;
}

// Determine socket prefix (P0, P1, ...) from processorId.
// processorId is expected to end with a digit, e.g. "cpu0",
// "cpu1", "P0", "P1".
std::string socketNum;
for (auto it = processorId.rbegin(); it != processorId.rend(); ++it)
{
if (std::isdigit(static_cast<unsigned char>(*it)))
{
socketNum.insert(socketNum.begin(), *it);
}
else
{
break;
}
}

if (socketNum.empty())
{
messages::resourceNotFound(asyncResp->res, "Processor",
processorId);
return;
}

std::string prefix = "P" + socketNum;

asyncResp->res.jsonValue["@odata.type"] =
"#AmdProcessorMetrics.AmdProcessorMetrics";
asyncResp->res.jsonValue["@odata.id"] = boost::urls::format(
"/redfish/v1/Systems/{}/Processors/{}/Oem/AMD/ProcessorMetrics",
BMCWEB_REDFISH_SYSTEM_URI_NAME, processorId);
asyncResp->res.jsonValue["Id"] = "ProcessorMetrics";
asyncResp->res.jsonValue["Name"] =
prefix + " Processor Error Metrics";

std::string correctableCpuProp = prefix + "CorrectableCPUErrors";
std::string correctableOtherProp =
prefix + "CorrectableOtherErrors";
std::string noncorrectableCpuProp =
prefix + "NoncorrectableCPUErrors";
std::string noncorrectableOtherProp =
prefix + "NoncorrectableOtherErrors";

std::string rasService = "com.amd.RAS" + socketNum;

crow::connections::systemBus->async_method_call(
[asyncResp, correctableCpuProp, correctableOtherProp,
noncorrectableCpuProp, noncorrectableOtherProp](
const boost::system::error_code& ec,
const dbus::utility::DBusPropertiesMap& properties) {
if (ec)
{
BMCWEB_LOG_ERROR(
"D-Bus error reading RAS ErrorCount: {}", ec);
messages::internalError(asyncResp->res);
return;
}

for (const auto& [propName, propValue] : properties)
{
if (propName == correctableCpuProp)
{
const std::vector<uint64_t>* val =
std::get_if<std::vector<uint64_t>>(&propValue);
if (val != nullptr)
{
asyncResp->res
.jsonValue["CorrectableCPUErrors"] = *val;
}
}
else if (propName == correctableOtherProp)
{
const uint64_t* val =
std::get_if<uint64_t>(&propValue);
if (val != nullptr)
{
asyncResp->res
.jsonValue["CorrectableOtherErrors"] = *val;
}
}
else if (propName == noncorrectableCpuProp)
{
const std::vector<uint64_t>* val =
std::get_if<std::vector<uint64_t>>(&propValue);
if (val != nullptr)
{
asyncResp->res
.jsonValue["NoncorrectableCPUErrors"] =
*val;
}
}
else if (propName == noncorrectableOtherProp)
{
const uint64_t* val =
std::get_if<uint64_t>(&propValue);
if (val != nullptr)
{
asyncResp->res
.jsonValue["NoncorrectableOtherErrors"] =
*val;
}
}
}
},
rasService, "/com/amd/RAS/ErrorCount",
"org.freedesktop.DBus.Properties", "GetAll",
"com.amd.RAS.ErrorCount");
});
}

} // namespace redfish
5 changes: 3 additions & 2 deletions redfish-core/src/redfish.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ RedfishService::RedfishService(App& app)
requestRoutesPprFile(app);

requestRoutesOobErrorInjection(app);
requestRoutesProcessorMetrics(app);

requestRoutesProcessorCollection(app);
requestRoutesProcessor(app);
Expand All @@ -189,14 +190,14 @@ RedfishService::RedfishService(App& app)
requestRoutesDBusEventLogEntryCollection(app);
requestRoutesDBusEventLogEntry(app);
requestRoutesDBusEventLogEntryDownload(app);
requestRoutesDBusEventLogEntryPost(app);
requestRoutesDBusEventLogEntryPost(app);
}
else
{
requestRoutesJournalEventLogEntryCollection(app);
requestRoutesJournalEventLogEntry(app);
requestRoutesJournalEventLogClear(app);
requestRoutesJournalEventLogEntryPost(app);
requestRoutesJournalEventLogEntryPost(app);
}

if constexpr (BMCWEB_REDFISH_HOST_LOGGER)
Expand Down