Skip to content

Commit 31c84bc

Browse files
mssonicbldmssonicbld
authored
[code sync] Merge code from sonic-net/sonic-buildimage:202405 to 202405 (sonic-net#958)
```<br>* d5fd28c - (HEAD -> 202405) Merge branch '202405' of https://github.com/sonic-net/sonic-buildimage into 202405 (2025-04-11) [Sonic Automation] * 3ec660c - (head/202405) [docker-ptf]: Fix to set /run/sshd permission affecting 202405 (sonic-net#22231) (2025-04-08) [Sai Kiran] * 6fad19a - [submodule] Update submodule sonic-sairedis to the latest HEAD automatically (sonic-net#22215) (2025-04-06) [mssonicbld] * 5b44167 - [202405] Update to Linux 6.1.123 (sonic-net#21924) (2025-04-04) [Saikrishna Arcot] * ec07425 - [docker-ptf] Port changes from master (sonic-net#22181) (2025-04-02) [Sai Kiran] * 0922b06 - [submodule] Update submodule sonic-swss to the latest HEAD automatically (sonic-net#22126) (2025-03-30) [mssonicbld] * bd03187 - Adding default QoS configurations for Arista-7050CX3-32S-C28S4. (sonic-net#22141) (2025-03-26) [mssonicbld]<br>```
2 parents 3e3463b + d5fd28c commit 31c84bc

File tree

59 files changed

+1351
-109
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+1351
-109
lines changed

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,4 +116,3 @@ sources.list.*
116116
!sources.list*.j2
117117

118118
# Generated mirror configs
119-
apt-retries-count

‎build_debian.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ CONFIGURED_ARCH=$([ -f .arch ] && cat .arch || echo amd64)
3333
## docker engine version (with platform)
3434
DOCKER_VERSION=5:24.0.2-1~debian.12~$IMAGE_DISTRO
3535
CONTAINERD_IO_VERSION=1.6.21-1
36-
LINUX_KERNEL_VERSION=6.1.0-22-2
36+
LINUX_KERNEL_VERSION=6.1.0-29-2
3737

3838
## Working directory to prepare the file system
3939
FILESYSTEM_ROOT=./fsroot

‎device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C28S4/BALANCED/buffers_defaults_t0.j2‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
{%- set default_cable = '300m' %}
2+
3+
{%- macro generate_port_lists(PORT_ALL) %}
4+
{# Generate list of ports #}
5+
{%- for port_idx in range(0,32) %}
6+
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
7+
{%- endfor %}
8+
{%- endmacro %}
9+
10+
{%- set ingress_lossless_pool_size = '32689152' %}
11+
{%- set egress_lossless_pool_size = '32340992' %}
12+
{%- if (DEVICE_METADATA is defined) and ('localhost' in DEVICE_METADATA) and ('subtype' in DEVICE_METADATA['localhost']) and (DEVICE_METADATA['localhost']['subtype'] == 'DualToR') %}
13+
{%- set ingress_lossless_pool_size = '32441856' %}
14+
{%- set egress_lossless_pool_size = '32441856' %}
15+
{%- endif %}
16+
17+
{%- macro generate_buffer_pool_and_profiles() %}
18+
"BUFFER_POOL": {
19+
"ingress_lossless_pool": {
20+
"size": "{{ingress_lossless_pool_size }}",
21+
"type": "ingress",
22+
"mode": "dynamic",
23+
"xoff": "2058240"
24+
},
25+
"egress_lossy_pool": {
26+
"size": "24192256",
27+
"type": "egress",
28+
"mode": "dynamic"
29+
},
30+
"egress_lossless_pool": {
31+
"size": "{{egress_lossless_pool_size }}",
32+
"type": "egress",
33+
"mode": "static"
34+
}
35+
},
36+
"BUFFER_PROFILE": {
37+
"ingress_lossy_profile": {
38+
"pool":"ingress_lossless_pool",
39+
"size":"0",
40+
"static_th":"{{ingress_lossless_pool_size }}"
41+
},
42+
"egress_lossless_profile": {
43+
"pool":"egress_lossless_pool",
44+
"size":"0",
45+
"static_th":"{{egress_lossless_pool_size }}"
46+
},
47+
"egress_lossy_profile": {
48+
"pool":"egress_lossy_pool",
49+
"size":"1792",
50+
"dynamic_th":"3"
51+
}
52+
},
53+
{%- endmacro %}
54+
55+
{% import 'buffers_extra_queues.j2' as defs with context %}
56+
57+
{%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %}
58+
{{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }}
59+
{%- endmacro %}

‎device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C28S4/BALANCED/buffers_defaults_t1.j2‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
{%- set default_cable = '300m' %}
2+
3+
{%- macro generate_port_lists(PORT_ALL) %}
4+
{# Generate list of ports #}
5+
{%- for port_idx in range(0,32) %}
6+
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %}
7+
{%- endfor %}
8+
{%- endmacro %}
9+
10+
{%- macro generate_buffer_pool_and_profiles() %}
11+
"BUFFER_POOL": {
12+
"ingress_lossless_pool": {
13+
"size": "32712448",
14+
"type": "ingress",
15+
"mode": "dynamic",
16+
"xoff": "1622016"
17+
},
18+
"egress_lossy_pool": {
19+
"size": "24709632",
20+
"type": "egress",
21+
"mode": "dynamic"
22+
},
23+
"egress_lossless_pool": {
24+
"size": "32599040",
25+
"type": "egress",
26+
"mode": "static"
27+
}
28+
},
29+
"BUFFER_PROFILE": {
30+
"ingress_lossy_profile": {
31+
"pool":"ingress_lossless_pool",
32+
"size":"0",
33+
"static_th":"32712448"
34+
},
35+
"egress_lossless_profile": {
36+
"pool":"egress_lossless_pool",
37+
"size":"0",
38+
"static_th":"32599040"
39+
},
40+
"egress_lossy_profile": {
41+
"pool":"egress_lossy_pool",
42+
"size":"1792",
43+
"dynamic_th":"3"
44+
}
45+
},
46+
{%- endmacro %}

‎device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C28S4/BALANCED/pg_profile_lookup.ini‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# PG lossless profiles.
2+
# speed cable size xon xoff threshold xon_offset
3+
10000 5m 4608 4608 160000 0 4608
4+
50000 5m 4608 4608 160000 0 4608
5+
100000 5m 4608 4608 160000 0 4608
6+
10000 40m 4608 4608 160000 0 4608
7+
50000 40m 4608 4608 160000 0 4608
8+
100000 40m 4608 4608 160000 0 4608
9+
10000 300m 4608 4608 160000 0 4608
10+
50000 300m 4608 4608 160000 0 4608
11+
100000 300m 4608 4608 160000 0 4608

0 commit comments

Comments
 (0)