pldmtool/softoff: Use InstanceId APIs from libpldm
The af-mctp transport does not broadcast the PLDM messages between the
MCTP socket instances. Pldmtool/softoff have to handle get/free
instanceId instead of depending on the pldmd. Update pldmtool/softoff
to use get/free instanceId APIs in libpldm.
Tested.
1. Call more than 32 pldmtool commands to make sure the allocated
InstanceId are free correctly.
2. Repeat calling softoff more than 32 times. Make sure the functional
should work normally.
Signed-off-by: Dung Cao <dung@os.amperecomputing.com>
Signed-off-by: Thu Nguyen <thu@os.amperecomputing.com>
Signed-off-by: Andrew Jeffery <andrew@codeconstruct.com.au>
Change-Id: I7cda124694d95d00c37f4993e22cfe33a980d364
diff --git a/pldmtool/pldm_cmd_helper.cpp b/pldmtool/pldm_cmd_helper.cpp
index 510f6df..db44c5a 100644
--- a/pldmtool/pldm_cmd_helper.cpp
+++ b/pldmtool/pldm_cmd_helper.cpp
@@ -133,28 +133,11 @@
void CommandInterface::exec()
{
- static constexpr auto pldmObjPath = "/xyz/openbmc_project/pldm";
- static constexpr auto pldmRequester = "xyz.openbmc_project.PLDM.Requester";
- auto& bus = pldm::utils::DBusHandler::getBus();
- try
- {
- auto service = pldm::utils::DBusHandler().getService(pldmObjPath,
- pldmRequester);
- auto method = bus.new_method_call(service.c_str(), pldmObjPath,
- pldmRequester, "GetInstanceId");
- method.append(mctp_eid);
- auto reply = bus.call(method, dbusTimeout);
- reply.read(instanceId);
- }
- catch (const std::exception& e)
- {
- std::cerr << "GetInstanceId D-Bus call failed, MCTP id = "
- << (unsigned)mctp_eid << ", error = " << e.what() << "\n";
- return;
- }
+ instanceId = instanceIdDb.next(mctp_eid);
auto [rc, requestMsg] = createRequestMsg();
if (rc != PLDM_SUCCESS)
{
+ instanceIdDb.free(mctp_eid, instanceId);
std::cerr << "Failed to encode request message for " << pldmType << ":"
<< commandName << " rc = " << rc << "\n";
return;
@@ -165,12 +148,14 @@
if (rc != PLDM_SUCCESS)
{
+ instanceIdDb.free(mctp_eid, instanceId);
std::cerr << "pldmSendRecv: Failed to receive RC = " << rc << "\n";
return;
}
auto responsePtr = reinterpret_cast<struct pldm_msg*>(responseMsg.data());
parseResponseMsg(responsePtr, responseMsg.size() - sizeof(pldm_msg_hdr));
+ instanceIdDb.free(mctp_eid, instanceId);
}
int CommandInterface::pldmSendRecv(std::vector<uint8_t>& requestMsg,