Skip to content

Qos config change #2505

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

Merged
lguohan merged 9 commits into from
Jan 31, 2019
Merged

Qos config change #2505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
876fd22
QoS config change: 1) DSCP mapping; 2) link pg/queue 6 to lossy buffer;
wendani Jan 30, 2019
bd04b7d
Add scheduling weight to queue 2
wendani Jan 30, 2019
378f573
Link pg/queue 2 to lossy buffer
wendani Jan 30, 2019
f8a0d4c
Update the pg headroom for a7060-D48C8 50G
wendani Jan 30, 2019
6a520fa
Update config gen test for qos
wendani Jan 30, 2019
538dc27
Update pg headroom size, and update egress lossy pool size accordingly
wendani Jan 30, 2019
5ae55bb
Update headroom pool size; Update ingress service pool and egress lossy
wendani Jan 30, 2019
f7bba46
a7260: update headroom pool size; Update ingress service pool and egr…
wendani Jan 30, 2019
f87bda7
Update config gen test for buffer
wendani Jan 30, 2019
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 device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t0.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"mode": "static"
},
"egress_lossy_pool": {
"size": "7582515",
"size": "7326924",
"type": "egress",
"mode": "dynamic"
}
Expand Down
2 changes: 1 addition & 1 deletion device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t1.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"mode": "static"
},
"egress_lossy_pool": {
"size": "7582515",
"size": "7326924",
"type": "egress",
"mode": "dynamic"
}
Expand Down
18 changes: 9 additions & 9 deletions device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/pg_profile_lookup.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# PG lossless profiles.
# speed cable size xon xoff threshold xon_offset
40000 5m 41808 18432 40560 -3 2496
50000 5m 41808 18432 40560 -3 2496
100000 5m 41808 18432 40560 -3 2496
40000 40m 51376 18432 50128 -3 2496
50000 40m 51376 18432 50128 -3 2496
100000 40m 51376 18432 50128 -3 2496
40000 300m 51376 18432 50128 -3 2496
50000 300m 51376 18432 50128 -3 2496
100000 300m 51376 18432 50128 -3 2496
40000 5m 55120 18432 56368 -3 2496
50000 5m 55120 18432 56368 -3 2496
100000 5m 55120 18432 56368 -3 2496
40000 40m 55120 18432 56368 -3 2496
50000 40m 55120 18432 56368 -3 2496
100000 40m 55120 18432 56368 -3 2496
40000 300m 55120 18432 56368 -3 2496
50000 300m 55120 18432 56368 -3 2496
100000 300m 55120 18432 56368 -3 2496
2 changes: 1 addition & 1 deletion device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/buffers_defaults_t0.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"mode": "static"
},
"egress_lossy_pool": {
"size": "7582515",
"size": "7326924",
"type": "egress",
"mode": "dynamic"
}
Expand Down
2 changes: 1 addition & 1 deletion device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/buffers_defaults_t1.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"mode": "static"
},
"egress_lossy_pool": {
"size": "7582515",
"size": "7326924",
"type": "egress",
"mode": "dynamic"
}
Expand Down
18 changes: 9 additions & 9 deletions device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/pg_profile_lookup.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# PG lossless profiles.
# speed cable size xon xoff threshold xon_offset
40000 5m 41808 18432 40560 -3 2496
50000 5m 41808 18432 40560 -3 2496
100000 5m 41808 18432 40560 -3 2496
40000 40m 51376 18432 50128 -3 2496
50000 40m 51376 18432 50128 -3 2496
100000 40m 51376 18432 50128 -3 2496
40000 300m 51376 18432 50128 -3 2496
50000 300m 51376 18432 50128 -3 2496
100000 300m 51376 18432 50128 -3 2496
40000 5m 55120 18432 56368 -3 2496
50000 5m 55120 18432 56368 -3 2496
100000 5m 55120 18432 56368 -3 2496
40000 40m 55120 18432 56368 -3 2496
50000 40m 55120 18432 56368 -3 2496
100000 40m 55120 18432 56368 -3 2496
40000 300m 55120 18432 56368 -3 2496
50000 300m 55120 18432 56368 -3 2496
100000 300m 55120 18432 56368 -3 2496
6 changes: 3 additions & 3 deletions device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/buffers_defaults_t0.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
{%- macro generate_buffer_pool_and_profiles() %}
"BUFFER_POOL": {
"ingress_lossless_pool": {
"size": "11213696",
"size": "10875072",
"type": "ingress",
"mode": "dynamic",
"xoff": "3855488"
"xoff": "4194112"
},
"egress_lossy_pool": {
"size": "9532224",
"size": "9243812",
"type": "egress",
"mode": "dynamic"
},
Expand Down
6 changes: 3 additions & 3 deletions device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/buffers_defaults_t1.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
{%- macro generate_buffer_pool_and_profiles() %}
"BUFFER_POOL": {
"ingress_lossless_pool": {
"size": "10443264",
"size": "10875072",
"type": "ingress",
"mode": "dynamic",
"xoff": "4625920"
"xoff": "4194112"
},
"egress_lossy_pool": {
"size": "8877440",
"size": "9243812",
"type": "egress",
"mode": "dynamic"
},
Expand Down
6 changes: 3 additions & 3 deletions device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/buffers_defaults_t0.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@
{%- macro generate_buffer_pool_and_profiles() %}
"BUFFER_POOL": {
"ingress_lossless_pool": {
"size": "11213696",
"size": "10875072",
"type": "ingress",
"mode": "dynamic",
"xoff": "3855488"
"xoff": "4194112"
},
"egress_lossy_pool": {
"size": "9532224",
"size": "9243812",
"type": "egress",
"mode": "dynamic"
},
Expand Down
2 changes: 1 addition & 1 deletion device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/pg_profile_lookup.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@
10000 300m 1248 2288 46176 -3 2288
25000 300m 1248 2288 79040 -3 2288
40000 300m 1248 2288 108160 -3 2288
50000 300m 1248 2288 131456 -3 2288
50000 300m 1248 2288 141856 -3 2288
100000 300m 1248 2288 268736 -3 2288
6 changes: 3 additions & 3 deletions device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/buffers_defaults_t0.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
{%- macro generate_buffer_pool_and_profiles() %}
"BUFFER_POOL": {
"ingress_lossless_pool": {
"size": "11213696",
"size": "10875072",
"type": "ingress",
"mode": "dynamic",
"xoff": "3855488"
"xoff": "4194112"
},
"egress_lossy_pool": {
"size": "9532224",
"size": "9243812",
"type": "egress",
"mode": "dynamic"
},
Expand Down
6 changes: 3 additions & 3 deletions device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/buffers_defaults_t1.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
{%- macro generate_buffer_pool_and_profiles() %}
"BUFFER_POOL": {
"ingress_lossless_pool": {
"size": "10443264",
"size": "10875072",
"type": "ingress",
"mode": "dynamic",
"xoff": "4625920"
"xoff": "4194112"
},
"egress_lossy_pool": {
"size": "8877440",
"size": "9243812",
"type": "egress",
"mode": "dynamic"
},
Expand Down
6 changes: 3 additions & 3 deletions device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_defaults_t0.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@
{%- macro generate_buffer_pool_and_profiles() %}
"BUFFER_POOL": {
"ingress_lossless_pool": {
"size": "32799936",
"size": "33329088",
"type": "ingress",
"mode": "dynamic",
"xoff": "8356608"
"xoff": "7827456"
},
"egress_lossy_pool": {
"size": "26240448",
"size": "26663272",
"type": "egress",
"mode": "dynamic"
},
Expand Down
2 changes: 1 addition & 1 deletion device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t0.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"mode": "static"
},
"egress_lossy_pool": {
"size": "7582515",
"size": "7326924",
"type": "egress",
"mode": "dynamic"
}
Expand Down
2 changes: 1 addition & 1 deletion device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t1.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"mode": "static"
},
"egress_lossy_pool": {
"size": "7582515",
"size": "7326924",
"type": "egress",
"mode": "dynamic"
}
Expand Down
18 changes: 9 additions & 9 deletions device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/pg_profile_lookup.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# PG lossless profiles.
# speed cable size xon xoff threshold xon_offset
40000 5m 41808 18432 40560 -3 2496
50000 5m 41808 18432 40560 -3 2496
100000 5m 41808 18432 40560 -3 2496
40000 40m 51376 18432 50128 -3 2496
50000 40m 51376 18432 50128 -3 2496
100000 40m 51376 18432 50128 -3 2496
40000 300m 51376 18432 50128 -3 2496
50000 300m 51376 18432 50128 -3 2496
100000 300m 51376 18432 50128 -3 2496
40000 5m 55120 18432 56368 -3 2496
50000 5m 55120 18432 56368 -3 2496
100000 5m 55120 18432 56368 -3 2496
40000 40m 55120 18432 56368 -3 2496
50000 40m 55120 18432 56368 -3 2496
100000 40m 55120 18432 56368 -3 2496
40000 300m 55120 18432 56368 -3 2496
50000 300m 55120 18432 56368 -3 2496
100000 300m 55120 18432 56368 -3 2496
6 changes: 3 additions & 3 deletions device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/buffers_defaults_t0.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
{%- macro generate_buffer_pool_and_profiles() %}
"BUFFER_POOL": {
"ingress_lossless_pool": {
"size": "11213696",
"size": "10875072",
"type": "ingress",
"mode": "dynamic",
"xoff": "3855488"
"xoff": "4194112"
},
"egress_lossy_pool": {
"size": "9532224",
"size": "9243812",
"type": "egress",
"mode": "dynamic"
},
Expand Down
6 changes: 3 additions & 3 deletions device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/buffers_defaults_t1.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
{%- macro generate_buffer_pool_and_profiles() %}
"BUFFER_POOL": {
"ingress_lossless_pool": {
"size": "10443264",
"size": "10875072",
"type": "ingress",
"mode": "dynamic",
"xoff": "4625920"
"xoff": "4194112"
},
"egress_lossy_pool": {
"size": "8877440",
"size": "9243812",
"type": "egress",
"mode": "dynamic"
},
Expand Down
2 changes: 1 addition & 1 deletion device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/pg_profile_lookup.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@
10000 300m 1248 2288 46176 -3 2288
25000 300m 1248 2288 79040 -3 2288
40000 300m 1248 2288 108160 -3 2288
50000 300m 1248 2288 131456 -3 2288
50000 300m 1248 2288 141856 -3 2288
100000 300m 1248 2288 268736 -3 2288
6 changes: 3 additions & 3 deletions device/dell/x86_64-dell_z9100_c2538-r0/Force10-Z9100-C32/buffers_defaults_t1.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
{%- macro generate_buffer_pool_and_profiles() %}
"BUFFER_POOL": {
"ingress_lossless_pool": {
"size": "10443264",
"size": "10875072",
"type": "ingress",
"mode": "dynamic",
"xoff": "4625920"
"xoff": "4194112"
},
"egress_lossy_pool": {
"size": "8877440",
"size": "9243812",
"type": "egress",
"mode": "dynamic"
},
Expand Down
6 changes: 3 additions & 3 deletions device/dell/x86_64-dell_z9100_c2538-r0/Force10-Z9100-C8D48/buffers_defaults_t0.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@
{%- macro generate_buffer_pool_and_profiles() %}
"BUFFER_POOL": {
"ingress_lossless_pool": {
"size": "11213696",
"size": "10875072",
"type": "ingress",
"mode": "dynamic",
"xoff": "3855488"
"xoff": "4194112"
},
"egress_lossy_pool": {
"size": "9532224",
"size": "9243812",
"type": "egress",
"mode": "dynamic"
},
Expand Down
4 changes: 2 additions & 2 deletions files/build_templates/buffers_config.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,10 @@ def
"{{ port_names_active }}|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"{{ port_names_active }}|0-1": {
"{{ port_names_active }}|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"{{ port_names_active }}|5": {
"{{ port_names_active }}|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
}
}
Expand Down
Loading