Skip to content

Commit

Permalink
[PFCWD + Asym PFC]: Allow PFCWD to detect PFC storm on all priorities…
Browse files Browse the repository at this point in the history 
… when Asym PFC is enabled

Signed-off-by: Volodymyr Samotiy <volodymyrs@mellanox.com>
  • Loading branch information
Volodymyr Samotiy committed Aug 12, 2020
1 parent a9479e6 commit 0f3e9f3
Show file tree
Hide file tree
Showing 7 changed files with 116 additions and 75 deletions.
14 changes: 8 additions & 6 deletions orchagent/countercheckorch.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ void CounterCheckOrch::mcCounterCheck()
{
auto oid = i.first;
auto mcCounters = i.second;
uint8_t pfcMask = 0;
uint8_t pfcTxMask = 0;
uint8_t pfcRxMask = 0;

Port port;
if (!gPortsOrch->getPort(oid, port))
Expand All @@ -68,15 +69,15 @@ void CounterCheckOrch::mcCounterCheck()

auto newMcCounters = getQueueMcCounters(port);

if (!gPortsOrch->getPortPfc(port.m_port_id, &pfcMask))
if (!gPortsOrch->getPortPfc(port.m_port_id, &pfcTxMask, &pfcRxMask))
{
SWSS_LOG_ERROR("Failed to get PFC mask on port %s", port.m_alias.c_str());
continue;
}

for (size_t prio = 0; prio != mcCounters.size(); prio++)
{
bool isLossy = ((1 << prio) & pfcMask) == 0;
bool isLossy = ((1 << prio) & pfcRxMask) == 0;
if (newMcCounters[prio] == numeric_limits<uint64_t>::max())
{
SWSS_LOG_WARN("Could not retreive MC counters on queue %zu port %s",
Expand Down Expand Up @@ -105,7 +106,8 @@ void CounterCheckOrch::pfcFrameCounterCheck()
auto oid = i.first;
auto counters = i.second;
auto newCounters = getPfcFrameCounters(oid);
uint8_t pfcMask = 0;
uint8_t pfcTxMask = 0;
uint8_t pfcRxMask = 0;

Port port;
if (!gPortsOrch->getPort(oid, port))
Expand All @@ -114,15 +116,15 @@ void CounterCheckOrch::pfcFrameCounterCheck()
continue;
}

if (!gPortsOrch->getPortPfc(port.m_port_id, &pfcMask))
if (!gPortsOrch->getPortPfc(port.m_port_id, &pfcTxMask, &pfcRxMask))
{
SWSS_LOG_ERROR("Failed to get PFC mask on port %s", port.m_alias.c_str());
continue;
}

for (size_t prio = 0; prio != counters.size(); prio++)
{
bool isLossy = ((1 << prio) & pfcMask) == 0;
bool isLossy = ((1 << prio) & pfcRxMask) == 0;
if (newCounters[prio] == numeric_limits<uint64_t>::max())
{
SWSS_LOG_WARN("Could not retreive PFC frame count on queue %zu port %s",
Expand Down
20 changes: 12 additions & 8 deletions orchagent/pfcactionhandler.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -331,16 +331,18 @@ PfcWdLossyHandler::PfcWdLossyHandler(sai_object_id_t port, sai_object_id_t queue
{
SWSS_LOG_ENTER();

uint8_t pfcMask = 0;
uint8_t pfcTxMask = 0;
uint8_t pfcRxMask = 0;

if (!gPortsOrch->getPortPfc(port, &pfcMask))
if (!gPortsOrch->getPortPfc(port, &pfcTxMask, &pfcRxMask))
{
SWSS_LOG_ERROR("Failed to get PFC mask on port 0x%" PRIx64, port);
}

pfcMask = static_cast<uint8_t>(pfcMask & ~(1 << queueId));
pfcTxMask = static_cast<uint8_t>(pfcTxMask & ~(1 << queueId));
pfcRxMask = static_cast<uint8_t>(pfcRxMask & ~(1 << queueId));

if (!gPortsOrch->setPortPfc(port, pfcMask))
if (!gPortsOrch->setPortPfc(port, pfcTxMask, pfcRxMask))
{
SWSS_LOG_ERROR("Failed to set PFC mask on port 0x%" PRIx64, port);
}
Expand All @@ -350,16 +352,18 @@ PfcWdLossyHandler::~PfcWdLossyHandler(void)
{
SWSS_LOG_ENTER();

uint8_t pfcMask = 0;
uint8_t pfcTxMask = 0;
uint8_t pfcRxMask = 0;

if (!gPortsOrch->getPortPfc(getPort(), &pfcMask))
if (!gPortsOrch->getPortPfc(getPort(), &pfcTxMask, &pfcRxMask))
{
SWSS_LOG_ERROR("Failed to get PFC mask on port 0x%" PRIx64, getPort());
}

pfcMask = static_cast<uint8_t>(pfcMask | (1 << getQueueId()));
pfcTxMask = static_cast<uint8_t>(pfcTxMask | (1 << getQueueId()));
pfcRxMask = static_cast<uint8_t>(pfcRxMask | (1 << getQueueId()));

if (!gPortsOrch->setPortPfc(getPort(), pfcMask))
if (!gPortsOrch->setPortPfc(getPort(), pfcTxMask, pfcRxMask))
{
SWSS_LOG_ERROR("Failed to set PFC mask on port 0x%" PRIx64, getPort());
}
Expand Down
21 changes: 12 additions & 9 deletions orchagent/pfcwdorch.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -384,15 +384,16 @@ void PfcWdSwOrch<DropHandler, ForwardHandler>::enableBigRedSwitchMode()
for (auto &it: allPorts)
{
Port port = it.second;
uint8_t pfcMask = 0;
uint8_t pfcTxMask = 0;
uint8_t pfcRxMask = 0;

if (port.m_type != Port::PHY)
{
SWSS_LOG_INFO("Skip non-phy port %s", port.m_alias.c_str());
continue;
}

if (!gPortsOrch->getPortPfc(port.m_port_id, &pfcMask))
if (!gPortsOrch->getPortPfc(port.m_port_id, &pfcTxMask, &pfcRxMask))
{
SWSS_LOG_ERROR("Failed to get PFC mask on port %s", port.m_alias.c_str());
return;
Expand All @@ -401,7 +402,7 @@ void PfcWdSwOrch<DropHandler, ForwardHandler>::enableBigRedSwitchMode()
for (uint8_t i = 0; i < PFC_WD_TC_MAX; i++)
{
sai_object_id_t queueId = port.m_queue_ids[i];
if ((pfcMask & (1 << i)) == 0 && m_entryMap.find(queueId) == m_entryMap.end())
if ((pfcRxMask & (1 << i)) == 0 && m_entryMap.find(queueId) == m_entryMap.end())
{
continue;
}
Expand All @@ -428,23 +429,24 @@ void PfcWdSwOrch<DropHandler, ForwardHandler>::enableBigRedSwitchMode()
for (auto & it: allPorts)
{
Port port = it.second;
uint8_t pfcMask = 0;
uint8_t pfcTxMask = 0;
uint8_t pfcRxMask = 0;

if (port.m_type != Port::PHY)
{
SWSS_LOG_INFO("Skip non-phy port %s", port.m_alias.c_str());
continue;
}

if (!gPortsOrch->getPortPfc(port.m_port_id, &pfcMask))
if (!gPortsOrch->getPortPfc(port.m_port_id, &pfcTxMask, &pfcRxMask))
{
SWSS_LOG_ERROR("Failed to get PFC mask on port %s", port.m_alias.c_str());
return;
}

for (uint8_t i = 0; i < PFC_WD_TC_MAX; i++)
{
if ((pfcMask & (1 << i)) == 0)
if ((pfcRxMask & (1 << i)) == 0)
{
continue;
}
Expand Down Expand Up @@ -480,9 +482,10 @@ bool PfcWdSwOrch<DropHandler, ForwardHandler>::registerInWdDb(const Port& port,
{
SWSS_LOG_ENTER();

uint8_t pfcMask = 0;
uint8_t pfcTxMask = 0;
uint8_t pfcRxMask = 0;

if (!gPortsOrch->getPortPfc(port.m_port_id, &pfcMask))
if (!gPortsOrch->getPortPfc(port.m_port_id, &pfcTxMask, &pfcRxMask))
{
SWSS_LOG_ERROR("Failed to get PFC mask on port %s", port.m_alias.c_str());
return false;
Expand All @@ -491,7 +494,7 @@ bool PfcWdSwOrch<DropHandler, ForwardHandler>::registerInWdDb(const Port& port,
set<uint8_t> losslessTc;
for (uint8_t i = 0; i < PFC_WD_TC_MAX; i++)
{
if ((pfcMask & (1 << i)) == 0)
if ((pfcRxMask & (1 << i)) == 0)
{
continue;
}
Expand Down
10 changes: 8 additions & 2 deletions orchagent/port.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,13 @@ struct VlanInfo
sai_vlan_id_t vlan_id = 0;
};

struct PfcInfo
{
sai_port_priority_flow_control_mode_t pfc_mode = SAI_PORT_PRIORITY_FLOW_CONTROL_MODE_COMBINED;
uint8_t pfc_tx_bitmask = 0;
uint8_t pfc_rx_bitmask = 0;
};

class Port
{
public:
Expand Down Expand Up @@ -98,8 +105,7 @@ class Port
std::set<std::string> m_child_ports;
std::vector<sai_object_id_t> m_queue_ids;
std::vector<sai_object_id_t> m_priority_group_ids;
sai_port_priority_flow_control_mode_t m_pfc_asym = SAI_PORT_PRIORITY_FLOW_CONTROL_MODE_COMBINED;
uint8_t m_pfc_bitmask = 0;
PfcInfo m_pfc_info;
uint32_t m_nat_zone_id = 0;

/*
Expand Down
119 changes: 72 additions & 47 deletions orchagent/portsorch.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -841,7 +841,7 @@ bool PortsOrch::setPortFec(Port &port, sai_port_fec_mode_t mode)
return true;
}

bool PortsOrch::getPortPfc(sai_object_id_t portId, uint8_t *pfc_bitmask)
bool PortsOrch::getPortPfc(sai_object_id_t portId, uint8_t *pfc_tx_bitmask, uint8_t *pfc_rx_bitmask)
{
SWSS_LOG_ENTER();

Expand All @@ -853,12 +853,13 @@ bool PortsOrch::getPortPfc(sai_object_id_t portId, uint8_t *pfc_bitmask)
return false;
}

*pfc_bitmask = p.m_pfc_bitmask;
*pfc_tx_bitmask = p.m_pfc_info.pfc_tx_bitmask;
*pfc_rx_bitmask = p.m_pfc_info.pfc_rx_bitmask;

return true;
}

bool PortsOrch::setPortPfc(sai_object_id_t portId, uint8_t pfc_bitmask)
bool PortsOrch::setPortPfc(sai_object_id_t portId, uint8_t pfc_tx_bitmask, uint8_t pfc_rx_bitmask)
{
SWSS_LOG_ENTER();

Expand All @@ -871,34 +872,60 @@ bool PortsOrch::setPortPfc(sai_object_id_t portId, uint8_t pfc_bitmask)
return false;
}

if (p.m_pfc_asym == SAI_PORT_PRIORITY_FLOW_CONTROL_MODE_COMBINED)
if (p.m_pfc_info.pfc_mode == SAI_PORT_PRIORITY_FLOW_CONTROL_MODE_COMBINED)
{
if (pfc_tx_bitmask != pfc_rx_bitmask)
{
SWSS_LOG_ERROR("Cannot set unequal Tx 0x%x and Rx 0x%x PFC bitmasks "
"for the port 0x%" PRIx64 " with disabled \"asymmetric\" PFC mode",
pfc_tx_bitmask, pfc_rx_bitmask, portId);
return false;
}

attr.id = SAI_PORT_ATTR_PRIORITY_FLOW_CONTROL;
attr.value.u8 = pfc_tx_bitmask;

sai_status_t status = sai_port_api->set_port_attribute(portId, &attr);
if (status != SAI_STATUS_SUCCESS)
{
SWSS_LOG_ERROR("Failed to set PFC bitmask 0x%x for the port 0x%" PRIx64 " (rc:%d)",
attr.value.u8, portId, status);
return false;
}
}
else if (p.m_pfc_asym == SAI_PORT_PRIORITY_FLOW_CONTROL_MODE_SEPARATE)
else if (p.m_pfc_info.pfc_mode == SAI_PORT_PRIORITY_FLOW_CONTROL_MODE_SEPARATE)
{
attr.id = SAI_PORT_ATTR_PRIORITY_FLOW_CONTROL_TX;
}
else
{
SWSS_LOG_ERROR("Incorrect asymmetric PFC mode: %u", p.m_pfc_asym);
return false;
}
attr.value.u8 = pfc_tx_bitmask;

attr.value.u8 = pfc_bitmask;
sai_status_t status = sai_port_api->set_port_attribute(portId, &attr);
if (status != SAI_STATUS_SUCCESS)
{
SWSS_LOG_ERROR("Failed to set Tx PFC bitmask 0x%x for the port 0x%" PRIx64 " (rc:%d)",
attr.value.u8, portId, status);
return false;
}

sai_status_t status = sai_port_api->set_port_attribute(portId, &attr);
if (status != SAI_STATUS_SUCCESS)
attr.id = SAI_PORT_ATTR_PRIORITY_FLOW_CONTROL_RX;
attr.value.u8 = pfc_rx_bitmask;

status = sai_port_api->set_port_attribute(portId, &attr);
if (status != SAI_STATUS_SUCCESS)
{
SWSS_LOG_ERROR("Failed to set Rx PFC bitmask 0x%x for the port 0x%" PRIx64 " (rc:%d)",
attr.value.u8, portId, status);
return false;
}
}
else
{
SWSS_LOG_ERROR("Failed to set PFC 0x%x to port id 0x%" PRIx64 " (rc:%d)", attr.value.u8, portId, status);
SWSS_LOG_ERROR("Incorrect PFC mode %u for the port 0x%" PRIx64, p.m_pfc_info.pfc_mode, portId);
return false;
}

if (p.m_pfc_bitmask != pfc_bitmask)
{
p.m_pfc_bitmask = pfc_bitmask;
m_portList[p.m_alias] = p;
}
p.m_pfc_info.pfc_tx_bitmask = pfc_tx_bitmask;
p.m_pfc_info.pfc_rx_bitmask = pfc_rx_bitmask;
m_portList[p.m_alias] = p;

return true;
}
Expand All @@ -908,59 +935,57 @@ bool PortsOrch::setPortPfcAsym(Port &port, string pfc_asym)
SWSS_LOG_ENTER();

sai_attribute_t attr;
uint8_t pfc = 0;
uint8_t pfc_tx_bitmask = 0;
uint8_t pfc_rx_bitmask = 0;

if (!getPortPfc(port.m_port_id, &pfc))
if (pfc_asym_map.find(pfc_asym) == pfc_asym_map.end())
{
SWSS_LOG_ERROR("Incorrect asymmetric PFC mode: %s", pfc_asym.c_str());
return false;
}

auto found = pfc_asym_map.find(pfc_asym);
if (found == pfc_asym_map.end())
if (port.m_pfc_info.pfc_mode == pfc_asym_map[pfc_asym])
{
SWSS_LOG_NOTICE("Asymmetric PFC mode is alredy set to \"%s\" for the port 0x%" PRIx64,
pfc_asym.c_str(), port.m_port_id);
return true;
}

if (!getPortPfc(port.m_port_id, &pfc_tx_bitmask, &pfc_rx_bitmask))
{
SWSS_LOG_ERROR("Incorrect asymmetric PFC mode: %s", pfc_asym.c_str());
return false;
}

auto new_pfc_asym = found->second;
if (port.m_pfc_asym == new_pfc_asym)
if (pfc_asym_map[pfc_asym] == SAI_PORT_PRIORITY_FLOW_CONTROL_MODE_SEPARATE)
{
SWSS_LOG_NOTICE("Already set asymmetric PFC mode: %s", pfc_asym.c_str());
return true;
pfc_rx_bitmask = static_cast<uint8_t>(0xff);
}
else
{
pfc_rx_bitmask = pfc_tx_bitmask;
}

port.m_pfc_asym = new_pfc_asym;
port.m_pfc_info.pfc_mode = pfc_asym_map[pfc_asym];
m_portList[port.m_alias] = port;

attr.id = SAI_PORT_ATTR_PRIORITY_FLOW_CONTROL_MODE;
attr.value.s32 = (int32_t) port.m_pfc_asym;
attr.value.s32 = static_cast<int32_t>(port.m_pfc_info.pfc_mode);

sai_status_t status = sai_port_api->set_port_attribute(port.m_port_id, &attr);
if (status != SAI_STATUS_SUCCESS)
{
SWSS_LOG_ERROR("Failed to set PFC mode %d to port id 0x%" PRIx64 " (rc:%d)", port.m_pfc_asym, port.m_port_id, status);
SWSS_LOG_ERROR("Failed to set PFC mode %d for the port 0x%" PRIx64 " (rc:%d)",
port.m_pfc_info.pfc_mode, port.m_port_id, status);
return false;
}

if (!setPortPfc(port.m_port_id, pfc))
if (!setPortPfc(port.m_port_id, pfc_tx_bitmask, pfc_rx_bitmask))
{
return false;
}

if (port.m_pfc_asym == SAI_PORT_PRIORITY_FLOW_CONTROL_MODE_SEPARATE)
{
attr.id = SAI_PORT_ATTR_PRIORITY_FLOW_CONTROL_RX;
attr.value.u8 = static_cast<uint8_t>(0xff);

sai_status_t status = sai_port_api->set_port_attribute(port.m_port_id, &attr);
if (status != SAI_STATUS_SUCCESS)
{
SWSS_LOG_ERROR("Failed to set RX PFC 0x%x to port id 0x%" PRIx64 " (rc:%d)", attr.value.u8, port.m_port_id, status);
return false;
}
}

SWSS_LOG_INFO("Set asymmetric PFC %s to port id 0x%" PRIx64, pfc_asym.c_str(), port.m_port_id);
SWSS_LOG_INFO("Set asymmetric PFC mode to \"%s\" for the port id 0x%" PRIx64,
pfc_asym.c_str(), port.m_port_id);

return true;
}
Expand Down
Loading

0 comments on commit 0f3e9f3

Please sign in to comment.