Skip to content

Add support for voq counters in portsorch. #1913

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

Closed
skbarista wants to merge 16 commits into from
Closed

Add support for voq counters in portsorch. #1913

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
08e8cea
Add support for voq counters in portsorch.
skbarista Sep 17, 2021
503489d
Merge branch 'Azure:master' into voq-counters
skbarista Nov 16, 2021
4c91195
Merge branch 'Azure:master' into voq-counters
skbarista Dec 3, 2021
5f4651c
Merge remote-tracking branch 'origin' into voq-counters
skbarista May 24, 2022
8dc421f
Fix build issue
skbarista May 24, 2022
b2478d0
Merge branch 'master' into voq-counters
skbarista Sep 22, 2022
20178e9
Fix compile issue.
skbarista Sep 22, 2022
89f6ec7
Fix compile issue.
skbarista Sep 22, 2022
91ca497
Fix compile error.
skbarista Sep 22, 2022
be7a3d6
Merge branch 'master' into voq-counters
skbarista Sep 23, 2022
cc5f0fd
Fix build.
skbarista Sep 23, 2022
9c669e4
Merge branch 'sonic-net:master' into voq-counters
skbarista Sep 23, 2022
21a9c08
Merge branch 'sonic-net:master' into voq-counters
skbarista Sep 26, 2022
632f6b0
Merge branch 'sonic-net:master' into voq-counters
skbarista Oct 3, 2022
f816208
Move the m_voq_ids to the parent class
skbarista Oct 4, 2022
b95f725
Merge branch 'sonic-net:master' into voq-counters
skbarista Oct 4, 2022
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
2 changes: 1 addition & 1 deletion orchagent/p4orch/tests/fake_portorch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,7 @@ bool PortsOrch::getQueueTypeAndIndex(sai_object_id_t queue_id, string &type, uin
return true;
}

void PortsOrch::generateQueueMapPerPort(const Port &port)
void PortsOrch::generateQueueMapPerPort(const Port &port, bool voq)
{
}

Expand Down
1 change: 1 addition & 0 deletions orchagent/port.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ class Port
std::set<std::string> m_members;
std::set<std::string> m_child_ports;
std::vector<sai_object_id_t> m_queue_ids;
std::vector<sai_object_id_t> m_voq_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; // PFC enable bit mask
Expand Down
121 changes: 112 additions & 9 deletions orchagent/portsorch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,6 +369,8 @@ PortsOrch::PortsOrch(DBConnector *db, DBConnector *stateDb, vector<table_name_wi
/* Initialize counter table */
m_counter_db = shared_ptr<DBConnector>(new DBConnector("COUNTERS_DB", 0));
m_counterTable = unique_ptr<Table>(new Table(m_counter_db.get(), COUNTERS_PORT_NAME_MAP));
m_counterSysPortTable = unique_ptr<Table>(
new Table(m_counter_db.get(), COUNTERS_SYSTEM_PORT_NAME_MAP));
m_counterLagTable = unique_ptr<Table>(new Table(m_counter_db.get(), COUNTERS_LAG_NAME_MAP));
FieldValueTuple tuple("", "");
vector<FieldValueTuple> defaultLagFv;
Expand All @@ -383,6 +385,7 @@ PortsOrch::PortsOrch(DBConnector *db, DBConnector *stateDb, vector<table_name_wi

/* Initialize queue tables */
m_queueTable = unique_ptr<Table>(new Table(m_counter_db.get(), COUNTERS_QUEUE_NAME_MAP));
m_voqTable = unique_ptr<Table>(new Table(m_counter_db.get(), COUNTERS_VOQ_NAME_MAP));
m_queuePortTable = unique_ptr<Table>(new Table(m_counter_db.get(), COUNTERS_QUEUE_PORT_MAP));
m_queueIndexTable = unique_ptr<Table>(new Table(m_counter_db.get(), COUNTERS_QUEUE_INDEX_MAP));
m_queueTypeTable = unique_ptr<Table>(new Table(m_counter_db.get(), COUNTERS_QUEUE_TYPE_MAP));
Expand Down Expand Up @@ -2465,6 +2468,9 @@ bool PortsOrch::getQueueTypeAndIndex(sai_object_id_t queue_id, string &type, uin
case SAI_QUEUE_TYPE_MULTICAST:
type = "SAI_QUEUE_TYPE_MULTICAST";
break;
case SAI_QUEUE_TYPE_UNICAST_VOQ:
type = "SAI_QUEUE_TYPE_UNICAST_VOQ";
break;
default:
SWSS_LOG_ERROR("Got unsupported queue type %d for %" PRIu64 " queue", attr[0].value.s32, queue_id);
throw runtime_error("Got unsupported queue type");
Expand Down Expand Up @@ -2797,7 +2803,7 @@ bool PortsOrch::initPort(const string &alias, const string &role, const int inde
/* when a port is added and queue map counter is enabled --> we need to add queue map counter for it */
if (m_isQueueMapGenerated)
{
generateQueueMapPerPort(p);
generateQueueMapPerPort(p, false);
}

PortUpdate update = { p, true };
Expand Down Expand Up @@ -4512,6 +4518,51 @@ void PortsOrch::doTask(Consumer &consumer)
}
}

void PortsOrch::initializeVoqs(Port &port)
{
SWSS_LOG_ENTER();

sai_attribute_t attr;
attr.id = SAI_SYSTEM_PORT_ATTR_QOS_NUMBER_OF_VOQS;
sai_status_t status = sai_system_port_api->get_system_port_attribute(
port.m_system_port_oid, 1, &attr);
if (status != SAI_STATUS_SUCCESS)
{
SWSS_LOG_ERROR("Failed to get number of voqs for port %s rv:%d", port.m_alias.c_str(), status);
task_process_status handle_status = handleSaiGetStatus(SAI_API_PORT, status);
if (handle_status != task_process_status::task_success)
{
throw runtime_error("PortsOrch initialization failure.");
}
}
SWSS_LOG_INFO("Get %d voq for port %s", attr.value.u32, port.m_alias.c_str());

port.m_voq_ids.resize(attr.value.u32);

if (attr.value.u32 == 0)
{
return;
}

attr.id = SAI_SYSTEM_PORT_ATTR_QOS_VOQ_LIST;
attr.value.objlist.count = (uint32_t)port.m_voq_ids.size();
attr.value.objlist.list = port.m_voq_ids.data();

status = sai_system_port_api->get_system_port_attribute(
port.m_system_port_oid, 1, &attr);
if (status != SAI_STATUS_SUCCESS)
{
SWSS_LOG_ERROR("Failed to get voq list for port %s rv:%d", port.m_alias.c_str(), status);
task_process_status handle_status = handleSaiGetStatus(SAI_API_PORT, status);
if (handle_status != task_process_status::task_success)
{
throw runtime_error("PortsOrch initialization failure.");
}
}

SWSS_LOG_INFO("Get voqs for port %s", port.m_alias.c_str());
}

void PortsOrch::initializeQueues(Port &port)
{
SWSS_LOG_ENTER();
Expand Down Expand Up @@ -5981,8 +6032,17 @@ void PortsOrch::generateQueueMap()
{
if (it.second.m_type == Port::PHY)
{
generateQueueMapPerPort(it.second);
generateQueueMapPerPort(it.second, false);
if (gMySwitchType == "voq")
{
generateQueueMapPerPort(it.second, true);
}
}

if (it.second.m_type == Port::SYSTEM)
{
generateQueueMapPerPort(it.second, true);
}
}

m_isQueueMapGenerated = true;
Expand Down Expand Up @@ -6026,40 +6086,69 @@ void PortsOrch::removeQueueMapPerPort(const Port& port)
CounterCheckOrch::getInstance().removePort(port);
}

void PortsOrch::generateQueueMapPerPort(const Port& port)
void PortsOrch::generateQueueMapPerPort(const Port& port, bool voq)
Copy link
Contributor

@abdosi abdosi Sep 22, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

instead of passing argument, can we generalize this function generateQueueMapPerPort to call initializeVoqs if global switch type is voq

{
/* Create the Queue map in the Counter DB */
/* Add stat counters to flex_counter */
vector<FieldValueTuple> queueVector;
vector<FieldValueTuple> queuePortVector;
vector<FieldValueTuple> queueIndexVector;
vector<FieldValueTuple> queueTypeVector;
std::vector<sai_object_id_t> queue_ids;
if (voq)
{
queue_ids = port.m_voq_ids;
}
else
{
queue_ids = port.m_queue_ids;
}

for (size_t queueIndex = 0; queueIndex < port.m_queue_ids.size(); ++queueIndex)
for (size_t queueIndex = 0; queueIndex < queue_ids.size(); ++queueIndex)
{
std::ostringstream name;
name << port.m_alias << ":" << queueIndex;
if (voq)
{
name << port.m_system_port_info.alias << ":" << queueIndex;
}
else
{
name << port.m_alias << ":" << queueIndex;
}

const auto id = sai_serialize_object_id(port.m_queue_ids[queueIndex]);
const auto id = sai_serialize_object_id(queue_ids[queueIndex]);

queueVector.emplace_back(name.str(), id);
queuePortVector.emplace_back(id, sai_serialize_object_id(port.m_port_id));

string queueType;
uint8_t queueRealIndex = 0;
if (getQueueTypeAndIndex(port.m_queue_ids[queueIndex], queueType, queueRealIndex))
if (getQueueTypeAndIndex(queue_ids[queueIndex], queueType, queueRealIndex))
{
queueTypeVector.emplace_back(id, queueType);
queueIndexVector.emplace_back(id, to_string(queueRealIndex));
}

if (voq)
{
queuePortVector.emplace_back(id, sai_serialize_object_id(port.m_system_port_oid));
}
else
{
queuePortVector.emplace_back(id, sai_serialize_object_id(port.m_port_id));
}

// Install a flex counter for this queue to track stats
std::unordered_set<string> counter_stats;
for (const auto& it: queue_stat_ids)
{
counter_stats.emplace(sai_serialize_queue_stat(it));
}
queue_stat_manager.setCounterIdList(port.m_queue_ids[queueIndex], CounterType::QUEUE, counter_stats);
queue_stat_manager.setCounterIdList(queue_ids[queueIndex], CounterType::QUEUE, counter_stats);

if (voq) {
continue;
}

/* add watermark queue counters */
string key = getQueueWatermarkFlexCounterTableKey(id);
Expand All @@ -6078,7 +6167,14 @@ void PortsOrch::generateQueueMapPerPort(const Port& port)
m_flexCounterTable->set(key, fieldValues);
}

m_queueTable->set("", queueVector);
if (voq)
{
m_voqTable->set("", queueVector);
}
else
{
m_queueTable->set("", queueVector);
}
m_queuePortTable->set("", queuePortVector);
m_queueIndexTable->set("", queueIndexVector);
m_queueTypeTable->set("", queueTypeVector);
Expand Down Expand Up @@ -7361,7 +7457,14 @@ bool PortsOrch::addSystemPorts()
port.m_system_port_info.speed = attrs[1].value.sysportconfig.speed;
port.m_system_port_info.num_voq = attrs[1].value.sysportconfig.num_voq;

initializeVoqs( port );
setPort(port.m_alias, port);
/* Add system port name map to counter table */
FieldValueTuple tuple(port.m_system_port_info.alias,
sai_serialize_object_id(system_port_oid));
vector<FieldValueTuple> fields;
fields.push_back(tuple);
m_counterSysPortTable->set("", fields);
if(m_port_ref_count.find(port.m_alias) == m_port_ref_count.end())
{
m_port_ref_count[port.m_alias] = 0;
Expand Down
5 changes: 4 additions & 1 deletion orchagent/portsorch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,10 +182,12 @@ class PortsOrch : public Orch, public Subject

private:
unique_ptr<Table> m_counterTable;
unique_ptr<Table> m_counterSysPortTable;
unique_ptr<Table> m_counterLagTable;
unique_ptr<Table> m_portTable;
unique_ptr<Table> m_gearboxTable;
unique_ptr<Table> m_queueTable;
unique_ptr<Table> m_voqTable;
unique_ptr<Table> m_queuePortTable;
unique_ptr<Table> m_queueIndexTable;
unique_ptr<Table> m_queueTypeTable;
Expand Down Expand Up @@ -288,6 +290,7 @@ class PortsOrch : public Orch, public Subject
void initializePriorityGroups(Port &port);
void initializePortBufferMaximumParameters(Port &port);
void initializeQueues(Port &port);
void initializeVoqs(Port &port);

bool addHostIntfs(Port &port, string alias, sai_object_id_t &host_intfs_id);
bool setHostIntfsStripTag(Port &port, sai_hostif_vlan_tag_t strip);
Expand Down Expand Up @@ -344,7 +347,7 @@ class PortsOrch : public Orch, public Subject
bool getQueueTypeAndIndex(sai_object_id_t queue_id, string &type, uint8_t &index);

bool m_isQueueMapGenerated = false;
void generateQueueMapPerPort(const Port& port);
void generateQueueMapPerPort(const Port& port, bool voq);
void removeQueueMapPerPort(const Port& port);

bool m_isPriorityGroupMapGenerated = false;
Expand Down