Add support for voq counters in portsorch.#1913
Add support for voq counters in portsorch.#1913skbarista wants to merge 16 commits intosonic-net:masterfrom skbarista:voq-counters
Conversation
1) Add m_voq_ids to SystemPortInfo to maintain the list of queue ids. 2) Add two new tables COUNTERS_SYSTEM_PORT_NAME_MAP and COUNTERS_VOQ_NAME_MAP to enable queuestat to differentiate between Port Tx queues and Voqs. 3) Add a new function initializeVoqs that retrieves the number of voqs for a system port and stores the voq object ids in m_voq_ids 4) Add code to handle queue type SAI_QUEUE_TYPE_UNICAST_VOQ. 5) Initialize voqs and populate COUNTERS_SYSTEM_PORT_NAME_MAP in addSystemPorts function. 6) Update generateQueueMap to generate queue maps for both Txqs and Voq. For PHY ports in a voq system both Txqs and Voqs are instantiated. For Voqs of remote system port, only Voq counters are initialized.
|
|
|
Build dependency on sonic-swss-common/pull/530 |
| } | ||
|
|
||
| void PortsOrch::generateQueueMapPerPort(const Port& port) | ||
| void PortsOrch::generateQueueMapPerPort(const Port& port, bool voq) |
There was a problem hiding this comment.
instead of passing argument, can we generalize this function generateQueueMapPerPort to call initializeVoqs if global switch type is voq
* Added the Route Module to the Debug Dump Utility Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
|
@skbarista, can you fix the conflicts ? |
1 similar comment
|
@skbarista, can you fix the conflicts ? |
|
@arlakshm sorry missed this message. Will do it next week and refresh the pr. Thanks, Sambath |
|
Hi @skbarista, are conflicts resolved |
|
@arlakshm I resolved the conflict and I am looking at some test failures from the build. I see there are some new conflicts. Will resolve them once I fix the test failures. |
@arlakshm sonic-net/sonic-sairedis#1061 fixes the build failure for this pull request. |
|
@skbarista Can you please resolve conflicts and take care of build errors ? |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run |
|
Commenter does not have sufficient privileges for PR 1913 in repo sonic-net/sonic-swss |
|
/azpw run sonic-buildimage |
|
/AzurePipelines run sonic-buildimage |
|
No pipelines are associated with this pull request. |
|
/azp run sonic-net/sonic-swss |
|
No pipelines are associated with this pull request. |
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
@skbarista Can you please update your branch to latest and retry ? |
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
@skbarista is there another PR to replace this one ? Please add comment why it's closed and also link to the other PR? Thanks. |
7 participants
What I did
COUNTERS_VOQ_NAME_MAP to enable queuestat to differentiate between
Port Tx queues and Voqs.
for a system port and stores the voq object ids in m_voq_ids
addSystemPorts function.
For PHY ports in a voq system both Txqs and Voqs are instantiated. For
Voqs of remote system port, only Voq counters are initialized.
Why I did it
Add support for voq counters.
How I verified it
Modified queuestat locally and confirming the counters are populated for Voqs.
Details if related