Skip to content

Commit

Permalink
[Cherry-pick #13069,14585,14802] qos_yaml j2C+ changes for new _vsq t…
Browse files Browse the repository at this point in the history 
…hresholds (#15448)

* [QoS]qos_yaml j2C+ changes for new _vsq thresholds (#13069)

What is the motivation for this PR?
The new   MMU settings to enhance performance for RDMA traffic in production.
Hence the qos_params needs to be tweaked according to the set buffer profiles.

However, the existing sonic-mgmt LossyQueueTest  doesn't fairly verify the buffer threshold for headroom for Lossy traffic. As per the new vsq profile setting the XOFF FADT threshold/PG is way lesser than the Nominal headroom, which limits it to not utilize the headroom buffer completely and send pause frames before reaching the MAX headroom limit.
Either the test case needs to be improvised by adding more source ports or a new test case should be added to verify the Lossy queue traffic at PG level

* [Chassis][Voq] Updating J2C+ qos yaml  for 400G and 100G profile _egress_pkt count for lossy profile (#14585)

Since the dynamic_th-alpha changed from 0 to -4 (400g) & 100g port speed for egress lossy profile.
PR #sonic-net/sonic-buildimage#20132
Corresponding changes made in J2C+ qos yaml for t2 -broadcom-dnx

* [Qos]qos_yaml updated for 400G
  • Loading branch information
@ansrajpu-git
ansrajpu-git authored Nov 8, 2024
1 parent 848f979 commit 5cf29e5
Show file tree
Hide file tree
Showing 2 changed files with 76 additions and 74 deletions.
138 changes: 70 additions & 68 deletions tests/qos/files/qos_params.j2c.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,15 +220,15 @@ qos_params:
dscp: 3
ecn: 1
pg: 3
pkts_num_trig_pfc: 35108
pkts_num_trig_ingr_drp: 38619
pkts_num_trig_pfc: 415271
pkts_num_trig_ingr_drp: 418781
pkts_num_margin: 100
xoff_2:
dscp: 4
ecn: 1
pg: 4
pkts_num_trig_pfc: 35108
pkts_num_trig_ingr_drp: 38619
pkts_num_trig_pfc: 415271
pkts_num_trig_ingr_drp: 418781
pkts_num_margin: 100
hdrm_pool_size:
dscps: [ 3, 4 ]
Expand All @@ -237,52 +237,53 @@ qos_params:
src_port_ids: [ 0, 2, 4, 6, 8, 10, 12, 14, 16 ]
dst_port_id: 18
pgs_num: 18
pkts_num_trig_pfc: 35208
pkts_num_hdrm_full: 362
pkts_num_hdrm_partial: 182
pkts_num_trig_pfc: 415271
pkts_num_hdrm_full: 3510
pkts_num_hdrm_partial: 3500
margin: 5
wm_pg_headroom:
dscp: 3
ecn: 1
pg: 3
pkts_num_trig_pfc: 35108
pkts_num_trig_ingr_drp: 38619
pkts_num_trig_pfc: 415271
pkts_num_trig_ingr_drp: 418781
cell_size: 4096
pkts_num_margin: 30
xon_1:
dscp: 3
ecn: 1
pg: 3
pkts_num_trig_pfc: 35108
pkts_num_dismiss_pfc: 200
pkts_num_trig_pfc: 415271
pkts_num_dismiss_pfc: 3243
pkts_num_margin: 150
xon_2:
dscp: 4
ecn: 1
pg: 4
pkts_num_trig_pfc: 35108
pkts_num_dismiss_pfc: 200
pkts_num_trig_pfc: 415271
pkts_num_dismiss_pfc: 3243
pkts_num_margin: 150
lossy_queue_1:
dscp: 7
dscp: 8
ecn: 1
pg: 1
pkts_num_trig_egr_drp: 2396745
pg: 0
pkts_num_trig_egr_drp: 2179900
pkts_num_margin: 200
wm_pg_shared_lossless:
dscp: 3
ecn: 1
pg: 3
pkts_num_fill_min: 51
pkts_num_trig_pfc: 9874
pkts_num_fill_min: 0
pkts_num_trig_pfc: 415271
packet_size: 64
cell_size: 4096
pkts_num_margin: 40
wm_pg_shared_lossy:
dscp: 8
ecn: 1
pg: 0
pkts_num_fill_min: 51
pkts_num_trig_egr_drp: 2396745
pkts_num_fill_min: 0
pkts_num_trig_egr_drp: 2179900
packet_size: 64
cell_size: 4096
pkts_num_margin: 40
Expand All @@ -291,7 +292,7 @@ qos_params:
ecn: 1
queue: 3
pkts_num_fill_min: 0
pkts_num_trig_ingr_drp: 38619
pkts_num_trig_ingr_drp: 418781
cell_size: 4096
wm_buf_pool_lossless:
dscp: 3
Expand All @@ -308,7 +309,7 @@ qos_params:
ecn: 1
queue: 0
pkts_num_fill_min: 0
pkts_num_trig_egr_drp: 2396745
pkts_num_trig_egr_drp: 2179900
cell_size: 4096
wm_buf_pool_lossy:
dscp: 8
Expand All @@ -326,15 +327,15 @@ qos_params:
dscp: 3
ecn: 1
pg: 3
pkts_num_trig_pfc: 37449
pkts_num_trig_ingr_drp: 216064
pkts_num_trig_pfc: 415271
pkts_num_trig_ingr_drp: 593885
pkts_num_margin: 100
xoff_2:
dscp: 4
ecn: 1
pg: 4
pkts_num_trig_pfc: 37449
pkts_num_trig_ingr_drp: 216064
pkts_num_trig_pfc: 415271
pkts_num_trig_ingr_drp: 593885
pkts_num_margin: 100
hdrm_pool_size:
dscps: [ 3, 4 ]
Expand All @@ -343,52 +344,53 @@ qos_params:
src_port_ids: [ 0, 2, 4, 6, 8, 10, 12, 14, 16 ]
dst_port_id: 18
pgs_num: 18
pkts_num_trig_pfc: 37549
pkts_num_hdrm_full: 362
pkts_num_hdrm_partial: 182
pkts_num_trig_pfc: 415271
pkts_num_hdrm_full: 176849
pkts_num_hdrm_partial: 176749
margin: 100
wm_pg_headroom:
dscp: 3
ecn: 1
pg: 3
pkts_num_trig_pfc: 37449
pkts_num_trig_ingr_drp: 216064
pkts_num_trig_pfc: 415271
pkts_num_trig_ingr_drp: 593885
cell_size: 4096
pkts_num_margin: 30
xon_1:
dscp: 3
ecn: 1
pg: 3
pkts_num_trig_pfc: 37449
pkts_num_dismiss_pfc: 200
pkts_num_trig_pfc: 415271
pkts_num_dismiss_pfc: 3245
pkts_num_margin: 150
xon_2:
dscp: 4
ecn: 1
pg: 4
pkts_num_trig_pfc: 37449
pkts_num_dismiss_pfc: 200
pkts_num_trig_pfc: 415271
pkts_num_dismiss_pfc: 3245
pkts_num_margin: 150
lossy_queue_1:
dscp: 7
dscp: 8
ecn: 1
pg: 1
pkts_num_trig_egr_drp: 2396745
pg: 0
pkts_num_trig_egr_drp: 2179900
pkts_num_margin: 200
wm_pg_shared_lossless:
dscp: 3
ecn: 1
pg: 3
pkts_num_fill_min: 51
pkts_num_trig_pfc: 37449
pkts_num_fill_min: 0
pkts_num_trig_pfc: 415271
packet_size: 64
cell_size: 4096
pkts_num_margin: 40
wm_pg_shared_lossy:
dscp: 8
ecn: 1
pg: 0
pkts_num_fill_min: 51
pkts_num_trig_egr_drp: 2396745
pkts_num_fill_min: 0
pkts_num_trig_egr_drp: 2179900
packet_size: 64
cell_size: 4096
pkts_num_margin: 40
Expand All @@ -397,7 +399,7 @@ qos_params:
ecn: 1
queue: 3
pkts_num_fill_min: 0
pkts_num_trig_ingr_drp: 216064
pkts_num_trig_ingr_drp: 593885
cell_size: 4096
wm_buf_pool_lossless:
dscp: 3
Expand All @@ -414,7 +416,7 @@ qos_params:
ecn: 1
queue: 0
pkts_num_fill_min: 0
pkts_num_trig_egr_drp: 2396745
pkts_num_trig_egr_drp: 2179900
cell_size: 4096
wm_buf_pool_lossy:
dscp: 8
Expand All @@ -432,15 +434,15 @@ qos_params:
dscp: 3
ecn: 1
pg: 3
pkts_num_trig_pfc: 37449
pkts_num_trig_ingr_drp: 750848
pkts_num_trig_pfc: 657523
pkts_num_trig_ingr_drp: 1370921
pkts_num_margin: 100
xoff_2:
dscp: 4
ecn: 1
pg: 4
pkts_num_trig_pfc: 37449
pkts_num_trig_ingr_drp: 750848
pkts_num_trig_pfc: 657523
pkts_num_trig_ingr_drp: 1370921
pkts_num_margin: 100
hdrm_pool_size:
dscps: [ 3, 4 ]
Expand All @@ -449,53 +451,53 @@ qos_params:
src_port_ids: [ 0, 2, 4, 6, 8, 10, 12, 14, 16 ]
dst_port_id: 18
pgs_num: 18
pkts_num_trig_pfc: 37549
pkts_num_hdrm_full: 362
pkts_num_hdrm_partial: 182
margin: 1
pkts_num_trig_pfc: 657523
pkts_num_hdrm_full: 622850
pkts_num_hdrm_partial: 622750
margin: 300
wm_pg_headroom:
dscp: 3
ecn: 1
pg: 3
pkts_num_trig_pfc: 37449
pkts_num_trig_ingr_drp: 750848
pkts_num_trig_pfc: 657523
pkts_num_trig_ingr_drp: 1370921
cell_size: 4096
pkts_num_margin: 30
xon_1:
dscp: 3
ecn: 1
pg: 3
pkts_num_trig_pfc: 37449
pkts_num_dismiss_pfc: 200
pkts_num_trig_pfc: 657523
pkts_num_dismiss_pfc: 12985
pkts_num_margin: 150
xon_2:
dscp: 4
ecn: 1
pg: 4
pkts_num_trig_pfc: 37449
pkts_num_dismiss_pfc: 200
pkts_num_trig_pfc: 657523
pkts_num_dismiss_pfc: 12985
pkts_num_margin: 150
lossy_queue_1:
dscp: 7
dscp: 8
ecn: 1
pg: 1
pkts_num_trig_egr_drp: 2396745
pkts_num_margin: 3500
pg: 0
pkts_num_trig_egr_drp: 2179770
pkts_num_margin: 100
wm_pg_shared_lossless:
dscp: 3
ecn: 1
pg: 3
pkts_num_fill_min: 71
pkts_num_trig_pfc: 37449
pkts_num_fill_min: 0
pkts_num_trig_pfc: 657523
packet_size: 64
cell_size: 4096
pkts_num_margin: 40
wm_pg_shared_lossy:
dscp: 8
ecn: 1
pg: 0
pkts_num_fill_min: 71
pkts_num_trig_egr_drp: 2396745
pkts_num_fill_min: 0
pkts_num_trig_egr_drp: 2179770
packet_size: 64
cell_size: 4096
pkts_num_margin: 40
Expand All @@ -504,7 +506,7 @@ qos_params:
ecn: 1
queue: 3
pkts_num_fill_min: 0
pkts_num_trig_ingr_drp: 750848
pkts_num_trig_ingr_drp: 1370921
cell_size: 4096
wm_buf_pool_lossless:
dscp: 3
Expand All @@ -521,7 +523,7 @@ qos_params:
ecn: 1
queue: 0
pkts_num_fill_min: 0
pkts_num_trig_egr_drp: 2396745
pkts_num_trig_egr_drp: 2179770
cell_size: 4096
wm_buf_pool_lossy:
dscp: 8
Expand Down
12 changes: 6 additions & 6 deletions tests/qos/files/qos_params.jr2.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ qos_params:
dscp: 8
ecn: 1
pg: 0
pkts_num_trig_egr_drp: 2396745
pkts_num_trig_egr_drp: 2179900
pkts_num_margin: 200
wm_pg_shared_lossless:
dscp: 3
Expand All @@ -176,7 +176,7 @@ qos_params:
ecn: 1
pg: 0
pkts_num_fill_min: 0
pkts_num_trig_egr_drp: 2396745
pkts_num_trig_egr_drp: 2179900
packet_size: 64
cell_size: 4096
pkts_num_margin: 40
Expand All @@ -202,7 +202,7 @@ qos_params:
ecn: 1
queue: 0
pkts_num_fill_min: 0
pkts_num_trig_egr_drp: 2396745
pkts_num_trig_egr_drp: 2179900
cell_size: 4096
wm_buf_pool_lossy:
dscp: 8
Expand Down Expand Up @@ -266,7 +266,7 @@ qos_params:
dscp: 8
ecn: 1
pg: 0
pkts_num_trig_egr_drp: 2396745
pkts_num_trig_egr_drp: 2179900
pkts_num_margin: 200
wm_pg_shared_lossless:
dscp: 3
Expand All @@ -282,7 +282,7 @@ qos_params:
ecn: 1
pg: 0
pkts_num_fill_min: 0
pkts_num_trig_egr_drp: 2396745
pkts_num_trig_egr_drp: 2179900
packet_size: 64
cell_size: 4096
pkts_num_margin: 40
Expand All @@ -308,7 +308,7 @@ qos_params:
ecn: 1
queue: 0
pkts_num_fill_min: 0
pkts_num_trig_egr_drp: 2396745
pkts_num_trig_egr_drp: 2179900
cell_size: 4096
wm_buf_pool_lossy:
dscp: 8
Expand Down

0 comments on commit 5cf29e5

Please sign in to comment.