Align with master branch PR, update watermark entries#9057
Merged
wangxin merged 3 commits intosonic-net:202205from Aug 1, 2023
Merged
Align with master branch PR, update watermark entries#9057wangxin merged 3 commits intosonic-net:202205from
wangxin merged 3 commits intosonic-net:202205from
Conversation
…ith master branch Signed-off-by: Zhixin Zhu <[email protected]>
6 tasks
Signed-off-by: Zhixin Zhu <[email protected]>
2566ebf to
5e143de
Compare
Signed-off-by: Zhixin Zhu <[email protected]>
5e143de to
9c415c1
Compare
abdosi
approved these changes
Jul 28, 2023
Contributor
|
@wangxin please help with merge of this. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of PR
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.
Summary:
Fixes # (issue)
Type of change
Back port request
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