Skip to content

qos.yml update for gb topo-t2 and longlink#9036

Merged
wangxin merged 3 commits intosonic-net:masterfrom
zhixzhu:qos_yml_update-master
Aug 16, 2023
Merged

qos.yml update for gb topo-t2 and longlink#9036
wangxin merged 3 commits intosonic-net:masterfrom
zhixzhu:qos_yml_update-master

Conversation

@zhixzhu
Copy link
Copy Markdown
Contributor

@zhixzhu zhixzhu commented Jul 19, 2023

Description of PR

qos.yml update for gb topo-t2 and longlink
Summary:
Fixes # (issue)

Type of change

  • Bug fix
  • Testbed and Framework(new/improvement)
  • Test case(new/improvement)

Back port request

  • 201911
  • 202012
  • 202205

Approach

What is the motivation for this PR?

How did you do it?

How did you verify/test it?

Any platform specific information?

Supported testbed topology if it's a new test case?

Documentation

wsycqyz
wsycqyz previously approved these changes Jul 20, 2023
Copy link
Copy Markdown
Contributor

@wsycqyz wsycqyz left a comment

Choose a reason for hiding this comment

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

LGTM

@abdosi
Copy link
Copy Markdown
Contributor

abdosi commented Jul 20, 2023

is this change already in 202205 ?

@zhixzhu
Copy link
Copy Markdown
Contributor Author

zhixzhu commented Jul 20, 2023

is this change already in 202205 ?

Opened PR #9057 for 202205, make the file same as master.

Signed-off-by: Zhixin Zhu <zhixzhu@cisco.com>
@zhixzhu zhixzhu force-pushed the qos_yml_update-master branch 2 times, most recently from 3dd304c to 82aa8a1 Compare July 27, 2023 20:32
Signed-off-by: Zhixin Zhu <zhixzhu@cisco.com>
@zhixzhu zhixzhu force-pushed the qos_yml_update-master branch from 82aa8a1 to 6847db0 Compare July 28, 2023 17:25
wangxin pushed a commit that referenced this pull request Aug 1, 2023
This PR is to replace 202205 PR #8629 for wm_q_wm_all_ports entries and wm_q_shared_lossless update, and refine some entries to align with master PR #9036.

1, Adjusted the order of some entries to align with master branch.

2, Added wm_q_wm_all_ports entries for gb long-link.
Packet size 6144 is used for long-link test, 1 packet occupies 1 hbm block. Queue watermark margin is updated since new voq_hbm_threshold, congestion level 11 watermark is 1x1024x6144, level 12 watermark is 20x1024x6144, so set the pkts_num_margin to 19*1024=19456.
pkt_count 855 is for multi-asic scenario, it is the packet number to trigger pfc in 200G backplane port. This case tests queue watermark in egress asic.

3, Updated wm_q_shared_lossless pkts_num in topo-t2 section.
In multi-asic, this case tests queue watermark in egress asic.
The maximum packets in voq is related with 200G backplane port which is ingress port in egress asic, not related with ingress port in ingress asic.

4, Updated wm_pg_shared_lossless for longlink, the pkts_num_trig_pfc in this case is actually used for maximum cells in the voq, so it is cell number to trigger ingress drop -1. Each 8156B packet occupy 2 cells, 6404 packets trigger ingress drop, so pkts_num_trig_pfc = 6404*2-1=12807.

5, Updated wm_pg_shared_lossy for longlink, although lossy queue is using SMS, the SQ buffer counter is HBM based, so using packet size 8156B for this case. Each 8156B packet occupies 22 SMS buffers, so pkts_num_trig_egr_drp is ceiling(16000/22)=ceiling(727.2)=728

6, Updated wm_buf_pool_lossless for longlink, original packet size 6144B has too higher uncertainty for SQ buffer counter statistical accounting, changed to use packet size 8140B, and updated the pkts number accordingly.

7, Updated pg_drop for longlink, calculated pkts_num_margin proportionally according to the value of 100G_300m. In 100G_300m, SQ buffer counter update probability is 25%, margin percentage is 375/14819=0.0253. In 100G_120km, SQ buffer counter update probability is (64+36)/8192=1.22%, so set margin percentage to 25%/1.22%x0.0253=0.51844, pkts_num_margin = 524,288x0.51844 = 271,813. The case will take much longer time in longlink scenario since the pkts number increased, lower the iterations to 30.

Signed-off-by: Zhixin Zhu <zhixzhu@cisco.com>
@wangxin wangxin merged commit eafa1b2 into sonic-net:master Aug 16, 2023
wangxin pushed a commit that referenced this pull request Aug 16, 2023
Double commit gb qos yml file to 202305.
Original PR #9036

Signed-off-by: Zhixin Zhu <zhixzhu@cisco.com>
AharonMalkin pushed a commit to AharonMalkin/sonic-mgmt that referenced this pull request Jan 25, 2024
qos.yml update for gb topo-t2 and longlink

Signed-off-by: Zhixin Zhu <zhixzhu@cisco.com>
kazinator-arista pushed a commit to kazinator-arista/sonic-mgmt that referenced this pull request Mar 4, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants